Fixes in system clipboard paste.

dariuszdawidowski · Aug 16, 2024 · 9734501 · 9734501
1 parent 010d575
commit 9734501
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/app/metaviz-editor.js b/app/metaviz-editor.js
@@ -332,7 +332,8 @@ class Metaviz {
             // Browser features
             features: {
                 nativeFileSystemApi: false,
-                clipboardApi: false
+                clipboardApi: false,
+                clipboardAllowed: false
             },
 
             // Passed browser features compability
@@ -753,13 +754,28 @@ class Metaviz {
              * Optional features support
              */
 
-            // https://caniuse.com/#feat=native-filesystem-api
+            // Filesystem API: https://caniuse.com/#feat=native-filesystem-api
             this.system.features.nativeFileSystemApi = ('showOpenFilePicker' in window);
 
-            // https://caniuse.com/async-clipboard (full read/write support) Note: local file supports api but always ask about permission which is unacceptable
-            this.system.features.clipboardApi = (this.agent.protocol != 'file' && this.agent.protocol != 'http') ? ('readText' in navigator.clipboard) && ('read' in navigator.clipboard) : false;
-            if (!this.system.features.clipboardApi) console.warn('Feature clipboardApi require a https protocol.')
-
+            // Clipboard API: https://caniuse.com/async-clipboard (full read/write support) Note: local file supports api but always ask about permission which is unacceptable
+            this.system.features.clipboardApi = (this.agent.protocol != 'file') ? ('readText' in navigator.clipboard) && ('read' in navigator.clipboard) : false;
+            if (this.system.features.clipboardApi) {
+                let remember = '';
+                navigator.clipboard.readText().then((text) => {
+                    remember = text;
+                    const compare = crypto.randomUUID();
+                    navigator.clipboard.writeText(compare).then(() => {
+                        navigator.clipboard.readText().then((text) => {
+                            if (text === compare) this.system.features.clipboardAllowed = true;
+                        });
+                        navigator.clipboard.writeText(remember);
+                    });
+                });
+            }
+            else if (this.agent.protocol == 'file') {
+                console.warn('Feature clipboardApi require a http(s) protocol.');
+            }
+
             /**
              * Mandatory features support
              */

diff --git a/editor/menu.js b/editor/menu.js
@@ -855,19 +855,11 @@ class MetavizContextMenu extends TotalProMenu {
         super.show({left: args.x - container.x, top: args.y - container.y});
 
         // Permissions: Clipboard
-        if (metaviz.system.features.clipboardApi) {
-            const compare = crypto.randomUUID();
-            navigator.clipboard.writeText(compare).then(() => {
-                navigator.clipboard.readText().then((text) => {
-                    if (text === compare) this.panel.left.find('menu-settings-allow-clipboard')?.set(true);
-                    navigator.clipboard.writeText('');
-                }).catch((err) => {
-                    this.panel.left.find('menu-settings-allow-clipboard')?.set(false);
-                    navigator.clipboard.writeText('');
-                });
-            }).catch((err) => {
-                this.panel.left.find('menu-settings-allow-clipboard')?.set(false);
-            });
+        if (metaviz.system.features.clipboardApi && metaviz.system.features.clipboardAllowed) {
+            this.panel.left.find('menu-settings-allow-clipboard')?.set(true);
+        }
+        else {
+            this.panel.left.find('menu-settings-allow-clipboard')?.set(false);
         }
 
     }
@@ -935,7 +927,7 @@ class MetavizContextMenu extends TotalProMenu {
      */
 
     async checkClipboardToPaste() {
-        if (metaviz.system.features.clipboardApi) {
+        if (metaviz.system.features.clipboardApi && metaviz.system.features.clipboardAllowed) {
             try {
                 const items = await navigator.clipboard.read();
                 const text = await navigator.clipboard.readText();