fix: more copyText fixes (#5016)

This commit is contained in:
David Luzar 2022-04-05 23:11:00 +02:00 committed by GitHub
parent 89471094ce
commit 77d789ed8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 17 deletions

View file

@ -11,7 +11,7 @@ import {
actionCopy,
actionCopyAsPng,
actionCopyAsSvg,
copyAllTextNodesAsText,
copyText,
actionCopyStyles,
actionCut,
actionDeleteSelected,
@ -5490,8 +5490,12 @@ class App extends React.Component<AppProps, AppState> {
options.push(actionCopyAsSvg);
}
if (probablySupportsClipboardWriteText && selectedElements.length > 0) {
options.push(copyAllTextNodesAsText);
if (
type === "element" &&
copyText.contextItemPredicate(elements, this.state) &&
probablySupportsClipboardWriteText
) {
options.push(copyText);
}
if (type === "canvas") {
const viewModeOptions = [
@ -5538,7 +5542,7 @@ class App extends React.Component<AppProps, AppState> {
actionCopyAsSvg,
probablySupportsClipboardWriteText &&
selectedElements.length > 0 &&
copyAllTextNodesAsText,
copyText,
((probablySupportsClipboardBlob && elements.length > 0) ||
(probablySupportsClipboardWriteText && elements.length > 0)) &&
separator,