{"body":"* Use exportFunction() to share clipboard copy with JS running in document\/page context.\r\n\r\n* Remove no-longer-used option to disable copy operation.","parents":["2b903da355fa53b3ac5a7f340134575119de2f40"],"patch":"diff --git a\/packages\/react-devtools-extensions\/firefox\/manifest.json b\/packages\/react-devtools-extensions\/firefox\/manifest.json\nindex 038fe627b1..de33cac872 100644\n--- a\/packages\/react-devtools-extensions\/firefox\/manifest.json\n+++ b\/packages\/react-devtools-extensions\/firefox\/manifest.json\n@@ -44,7 +44,7 @@\n \"scripts\": [\"build\/background.js\"]\n },\n \n- \"permissions\": [\"file:\/\/\/*\", \"http:\/\/*\/*\", \"https:\/\/*\/*\"],\n+ \"permissions\": [\"file:\/\/\/*\", \"http:\/\/*\/*\", \"https:\/\/*\/*\", \"clipboardWrite\"],\n \n \"content_scripts\": [\n {\ndiff --git a\/packages\/react-devtools-extensions\/src\/injectGlobalHook.js b\/packages\/react-devtools-extensions\/src\/injectGlobalHook.js\nindex dd38c8ce1b..0aaa4810d0 100644\n--- a\/packages\/react-devtools-extensions\/src\/injectGlobalHook.js\n+++ b\/packages\/react-devtools-extensions\/src\/injectGlobalHook.js\n@@ -97,3 +97,19 @@ if (document.contentType === 'text\/html') {\n detectReact,\n );\n }\n+\n+if (typeof exportFunction === 'function') {\n+ \/\/ eslint-disable-next-line no-undef\n+ exportFunction(\n+ text => {\n+ \/\/ Call clipboard.writeText from the extension content script\n+ \/\/ (as it has the clipboardWrite permission) and return a Promise\n+ \/\/ accessible to the webpage js code.\n+ return new window.Promise((resolve, reject) =>\n+ window.navigator.clipboard.writeText(text).then(resolve, reject),\n+ );\n+ },\n+ window.wrappedJSObject.__REACT_DEVTOOLS_GLOBAL_HOOK__,\n+ {defineAs: 'clipboardCopyText'},\n+ );\n+}\ndiff --git a\/packages\/react-devtools-extensions\/src\/main.js b\/packages\/react-devtools-extensions\/src\/main.js\nindex 98ae0714f0..0b2f5b1c31 100644\n--- a\/packages\/react-devtools-extensions\/src\/main.js\n+++ b\/packages\/react-devtools-extensions\/src\/main.js\n@@ -211,7 +211,6 @@ function createPanelIfReactLoaded() {\n browserTheme: getBrowserTheme(),\n componentsPortalContainer,\n enabledInspectedElementContextMenu: true,\n- enabledInspectedElementContextMenuCopy: isChrome,\n overrideTab,\n profilerPortalContainer,\n showTabBar: false,\ndiff --git a\/packages\/react-devtools-shared\/src\/backend\/utils.js b\/packages\/react-devtools-shared\/src\/backend\/utils.js\nindex 47355f2072..c08daac1d7 100644\n--- a\/packages\/react-devtools-shared\/src\/backend\/utils.js\n+++ b\/packages\/react-devtools-shared\/src\/backend\/utils.js\n@@ -40,7 +40,19 @@ export function cleanForBridge(\n \n export function copyToClipboard(value: any): void {\n const safeToCopy = serializeToString(value);\n- copy(safeToCopy === undefined ? 'undefined' : safeToCopy);\n+ const text = safeToCopy === undefined ? 'undefined' : safeToCopy;\n+ const {clipboardCopyText} = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;\n+\n+ \/\/ On Firefox navigator.clipboard.writeText has to be called from\n+ \/\/ the content script js code (because it requires the clipboardWrite\n+ \/\/ permission to be allowed out of a \"user handling\" callback),\n+ \/\/ clipboardCopyText is an helper injected into the page from.\n+ \/\/ injectGlobalHook.\n+ if (typeof clipboardCopyText === 'function') {\n+ clipboardCopyText(text).catch(err => {});\n+ } else {\n+ copy(text);\n+ }\n }\n \n export function copyWithSet(\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/SelectedElement.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/SelectedElement.js\nindex 07f168214c..055378efca 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/SelectedElement.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/Components\/SelectedElement.js\n@@ -303,7 +303,6 @@ function InspectedElementView({\n \n const {\n isEnabledForInspectedElement,\n- supportsCopyOperation,\n viewAttributeSourceFunction,\n } = useContext(ContextMenuContext);\n \n@@ -445,14 +444,12 @@ function InspectedElementView({\n \n {data => (\n \n- {supportsCopyOperation && (\n- copyInspectedElementPath(id, data.path)}\n- title=\"Copy value to clipboard\">\n- Copy\n- value to clipboard\n- <\/ContextMenuItem>\n- )}\n+ copyInspectedElementPath(id, data.path)}\n+ title=\"Copy value to clipboard\">\n+ Copy\n+ value to clipboard\n+ <\/ContextMenuItem>\n storeAsGlobal(id, data.path)}\n title=\"Store as global variable\">\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\nindex 42e194e70c..f05cdd54e7 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js\n@@ -54,7 +54,6 @@ export type Props = {|\n canViewElementSourceFunction?: ?CanViewElementSource,\n defaultTab?: TabID,\n enabledInspectedElementContextMenu?: boolean,\n- enabledInspectedElementContextMenuCopy?: boolean,\n showTabBar?: boolean,\n store: Store,\n warnIfLegacyBackendDetected?: boolean,\n@@ -97,7 +96,6 @@ export default function DevTools({\n componentsPortalContainer,\n defaultTab = 'components',\n enabledInspectedElementContextMenu = false,\n- enabledInspectedElementContextMenuCopy = false,\n overrideTab,\n profilerPortalContainer,\n showTabBar = false,\n@@ -123,14 +121,9 @@ export default function DevTools({\n const contextMenu = useMemo(\n () => ({\n isEnabledForInspectedElement: enabledInspectedElementContextMenu,\n- supportsCopyOperation: enabledInspectedElementContextMenuCopy,\n viewAttributeSourceFunction: viewAttributeSourceFunction || null,\n }),\n- [\n- enabledInspectedElementContextMenu,\n- enabledInspectedElementContextMenuCopy,\n- viewAttributeSourceFunction,\n- ],\n+ [enabledInspectedElementContextMenu, viewAttributeSourceFunction],\n );\n \n useEffect(\ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/views\/context.js b\/packages\/react-devtools-shared\/src\/devtools\/views\/context.js\nindex 92fec05d7d..fcc59935d4 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/views\/context.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/views\/context.js\n@@ -23,13 +23,11 @@ StoreContext.displayName = 'StoreContext';\n \n export type ContextMenuContextType = {|\n isEnabledForInspectedElement: boolean,\n- supportsCopyOperation: boolean,\n viewAttributeSourceFunction?: ?ViewAttributeSource,\n |};\n \n export const ContextMenuContext = createContext({\n isEnabledForInspectedElement: false,\n- supportsCopyOperation: false,\n viewAttributeSourceFunction: null,\n });\n ContextMenuContext.displayName = 'ContextMenuContext';\ndiff --git a\/packages\/react-devtools-shell\/src\/devtools.js b\/packages\/react-devtools-shell\/src\/devtools.js\nindex 41926dbbca..4879e719c8 100644\n--- a\/packages\/react-devtools-shell\/src\/devtools.js\n+++ b\/packages\/react-devtools-shell\/src\/devtools.js\n@@ -56,7 +56,6 @@ inject('dist\/app.js', () => {\n createElement(DevTools, {\n browserTheme: 'light',\n enabledInspectedElementContextMenu: true,\n- enabledInspectedElementContextMenuCopy: true,\n showTabBar: true,\n warnIfLegacyBackendDetected: true,\n warnIfUnsupportedVersionDetected: true,\n","files":[{"status":"M","path":"packages\/react-devtools-extensions\/firefox\/manifest.json"},{"status":"M","path":"packages\/react-devtools-extensions\/src\/injectGlobalHook.js"},{"status":"M","path":"packages\/react-devtools-extensions\/src\/main.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/backend\/utils.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/Components\/SelectedElement.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/DevTools.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/devtools\/views\/context.js"},{"status":"M","path":"packages\/react-devtools-shell\/src\/devtools.js"}],"commit":{"authorEmail":"bvaughn@fb.com","authoredAt":"2019-12-29T13:27:44-08:00","subject":"Devtools renable copy attr context menu for firefox (#17740)","shortRevision":"22ef96ae63","revision":"22ef96ae63f40b1b9367bc2d8bdb3db33e6943b0","authorName":"Brian Vaughn"}}

dillon1000/react

Files changed