IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

QueryEditor: Fix copy-paste with unicode special symbol (#39117)

Browse Source
This commit is contained in:
Alexander Kubyshkin 2021-09-13 16:46:43 +03:00 committed by GitHub
parent e1e385b318
commit 82f5fb7d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/grafana-ui/src/slate-plugins/clipboard.ts
View File

@ -10,6 +10,11 @@ const getCopiedText = (textBlocks: string[], startOffset: number, endOffset: num
return textBlocks.join('\n').slice(startOffset, excludingLastLineLength + endOffset); return textBlocks.join('\n').slice(startOffset, excludingLastLineLength + endOffset);
}; };
// Remove unicode special symbol - byte order mark (BOM), U+FEFF.
const removeBom = (str: string | undefined): string | undefined => {
return str?.replace(/[\uFEFF]/g, '');
};
export function ClipboardPlugin(): Plugin { export function ClipboardPlugin(): Plugin {
const clipboardPlugin: Plugin = { const clipboardPlugin: Plugin = {
onCopy(event: Event, editor: CoreEditor, next: () => any) { onCopy(event: Event, editor: CoreEditor, next: () => any) {
@ -26,7 +31,7 @@ export function ClipboardPlugin(): Plugin {
.toArray() .toArray()
.map((block) => block.text); .map((block) => block.text);
const copiedText = getCopiedText(selectedBlocks, startOffset, endOffset); const copiedText = removeBom(getCopiedText(selectedBlocks, startOffset, endOffset));
if (copiedText && clipEvent.clipboardData) { if (copiedText && clipEvent.clipboardData) {
clipEvent.clipboardData.setData('Text', copiedText); clipEvent.clipboardData.setData('Text', copiedText);
} }
@ -38,10 +43,10 @@ export function ClipboardPlugin(): Plugin {
const clipEvent = event as ClipboardEvent; const clipEvent = event as ClipboardEvent;
clipEvent.preventDefault(); clipEvent.preventDefault();
if (clipEvent.clipboardData) { if (clipEvent.clipboardData) {
const pastedValue = clipEvent.clipboardData.getData('Text'); const pastedValue = removeBom(clipEvent.clipboardData.getData('Text'));
const lines = pastedValue.split('\n'); const lines = pastedValue?.split('\n');
if (lines.length) { if (lines && lines.length) {
editor.insertText(lines[0]); editor.insertText(lines[0]);
for (const line of lines.slice(1)) { for (const line of lines.slice(1)) {
editor.splitBlock().insertText(line); editor.splitBlock().insertText(line);