Fixed copy to clipboard and updated Discovery.js (#81)

* Fixed copy to clipboard and updated Discovery.js

* Flash message when copying from navbar

Author: exdis

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.13.2 (06-09-2022)
+
+* Fixed copy to clipboard in FireFox
+* Updated `discovery` to `1.0.0-beta.68`
+
 ## 1.13.1 (18-07-2022)
 
 * Fixed manifest permissions

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "jsondiscovery",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "Browser (Chrome, Firefox) extension for JSON discovery",
   "author": "[email protected]",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "build": "NODE_ENV=production node ./scripts/build.js && node ./scripts/zip.js"
   },
   "devDependencies": {
-    "@discoveryjs/discovery": "1.0.0-beta.66",
+    "@discoveryjs/discovery": "1.0.0-beta.68",
     "@discoveryjs/json-ext": "^0.5.7",
     "css-tree": "^2.1.0",
     "esbuild": "^0.14.49",

package.json

@@ -1,25 +1,12 @@
 import { flashMessage } from './flash-messages';
-
-export async function copyToClipboard(text) {
-    try {
-        await navigator.clipboard.writeText(text);
-    } catch (err) {
-        // clipboard textarea fallback
-        const textarea = document.createElement('textarea');
-        textarea.innerText = text;
-        document.body.appendChild(textarea);
-        textarea.select();
-        document.execCommand('copy');
-        document.body.removeChild(textarea);
-    }
-
-    flashMessage('JSON copied to clipboard', 'success');
-}
+import copyText from '@discoveryjs/discovery/src/core/utils/copy-text';
 
 export const copyToClipboardButton = {
     view: 'button',
     content: 'text:"Copy to clipboard"',
     onClick(_, { json }) {
-        copyToClipboard(json);
+        copyText(json).then(() => {
+            flashMessage('JSON copied to clipboard', 'success');
+        });
     }
 };

src/discovery/copy-to-clipboard.js

@@ -12,7 +12,9 @@ import * as pages from './pages';
 export function initDiscovery(options, data) {
     const { settings, progressbar, raw } = options;
     const { darkmode = 'auto' } = settings;
-    const discovery = new Widget(options.node, null, {
+    const discovery = new Widget({
+        defaultPage: null,
+        container: options.node,
         inspector: true,
         darkmode,
         darkmodePersistent: false,

src/discovery/index.js

@@ -1,6 +1,7 @@
 import { navButtons } from '@discoveryjs/discovery';
-import { copyToClipboard } from './copy-to-clipboard';
+import copyText from '@discoveryjs/discovery/src/core/utils/copy-text';
 import { downloadAsFile } from './download-as-file';
+import { flashMessage } from './flash-messages';
 
 export default host => {
     host.nav.append({
@@ -31,7 +32,9 @@ export default host => {
     });
     host.nav.menu.append({
         content: 'text:"Copy JSON to clipboard"',
-        onClick: (_, { hide }) => hide() & copyToClipboard(host.raw.json)
+        onClick: (_, { hide }) => hide() &
+            copyText(host.raw.json) &
+            flashMessage('JSON copied to clipboard', 'success')
     });
     host.nav.menu.append({
         content: 'text:"Settings"',