Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-29 23:12:39 +01:00
Code Issues Releases Wiki Activity

Fixed: Copy to clipboard in non-secure contexts

Browse Source
This commit is contained in:
Bogdan 2024-09-27 10:26:47 +03:00 committed by Mark McDowall
parent e6e1078c15
commit 3828e475cc
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/Components/Link/ClipboardButton.tsx
View File

@ -1,3 +1,4 @@
import copy from 'copy-to-clipboard';
import React, { useCallback, useEffect, useState } from 'react'; import React, { useCallback, useEffect, useState } from 'react';
import FormInputButton from 'Components/Form/FormInputButton'; import FormInputButton from 'Components/Form/FormInputButton';
import Icon from 'Components/Icon'; import Icon from 'Components/Icon';
@ -37,10 +38,16 @@ export default function ClipboardButton({
const handleClick = useCallback(async () => { const handleClick = useCallback(async () => {
try { try {
await navigator.clipboard.writeText(value); if ('clipboard' in navigator) {
await navigator.clipboard.writeText(value);
} else {
copy(value);
}
setState('success'); setState('success');
} catch (_) { } catch (e) {
setState('error'); setState('error');
console.error(`Failed to copy to clipboard`, e);
} }
}, [value]); }, [value]);

1
package.json
View File

@ -34,6 +34,7 @@
"@types/react-dom": "18.2.25", "@types/react-dom": "18.2.25",
"classnames": "2.3.2", "classnames": "2.3.2",
"connected-react-router": "6.9.3", "connected-react-router": "6.9.3",
"copy-to-clipboard": "3.3.3",
"element-class": "0.2.2", "element-class": "0.2.2",
"filesize": "10.0.7", "filesize": "10.0.7",
"fuse.js": "6.6.2", "fuse.js": "6.6.2",

12
yarn.lock
View File

@ -2609,6 +2609,13 @@ copy-anything@^2.0.1:
dependencies: dependencies:
is-what "^3.14.1" is-what "^3.14.1"
copy-to-clipboard@3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
dependencies:
toggle-selection "^1.0.6"
core-js-compat@^3.36.1: core-js-compat@^3.36.1:
version "3.37.0" version "3.37.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73"
@ -6783,6 +6790,11 @@ to-space-case@^1.0.0:
dependencies: dependencies:
to-no-case "^1.0.0" to-no-case "^1.0.0"
toggle-selection@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0":
version "4.1.3" version "4.1.3"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"