Skip to content

Commit 4607836

Browse files
committed
Fix build errors
1 parent 9685498 commit 4607836

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

core/shortcut_items.ts

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,13 @@
88

99
import {BlockSvg} from './block_svg.js';
1010
import * as clipboard from './clipboard.js';
11-
import { RenderedWorkspaceComment } from './comments.js';
11+
import {RenderedWorkspaceComment} from './comments.js';
1212
import * as eventUtils from './events/utils.js';
1313
import {getFocusManager} from './focus_manager.js';
1414
import {Gesture} from './gesture.js';
15-
import {
16-
ICopyable,
17-
ICopyData,
18-
isCopyable as isICopyable,
19-
} from './interfaces/i_copyable.js';
20-
import {
21-
IDeletable,
22-
isDeletable as isIDeletable,
23-
} from './interfaces/i_deletable.js';
24-
import {IDraggable, isDraggable} from './interfaces/i_draggable.js';
15+
import {ICopyData, isCopyable as isICopyable} from './interfaces/i_copyable.js';
16+
import {isDeletable as isIDeletable} from './interfaces/i_deletable.js';
17+
import {isDraggable} from './interfaces/i_draggable.js';
2518
import {IFocusableNode} from './interfaces/i_focusable_node.js';
2619
import {KeyboardShortcut, ShortcutRegistry} from './shortcut_registry.js';
2720
import {Coordinate} from './utils/coordinate.js';
@@ -182,17 +175,27 @@ export function registerCopy() {
182175
e.preventDefault();
183176

184177
const focused = scope.focusedNode;
185-
if (!focused || !isCopyable(focused)) return false;
186-
let targetWorkspace: WorkspaceSvg | null =
187-
focused.workspace instanceof WorkspaceSvg
188-
? focused.workspace
178+
if (!focused || !isICopyable(focused) || !isCopyable(focused))
179+
return false;
180+
let targetWorkspace: WorkspaceSvg | null;
181+
let hideChaff = false;
182+
if (focused instanceof BlockSvg) {
183+
hideChaff = !focused.workspace.isFlyout;
184+
targetWorkspace =
185+
focused.workspace instanceof WorkspaceSvg
186+
? focused.workspace
187+
: workspace;
188+
targetWorkspace = targetWorkspace.isFlyout
189+
? targetWorkspace.targetWorkspace
190+
: targetWorkspace;
191+
} else {
192+
targetWorkspace = workspace.isFlyout
193+
? workspace.targetWorkspace
189194
: workspace;
190-
targetWorkspace = targetWorkspace.isFlyout
191-
? targetWorkspace.targetWorkspace
192-
: targetWorkspace;
195+
}
193196
if (!targetWorkspace) return false;
194197

195-
if (!focused.workspace.isFlyout) {
198+
if (hideChaff) {
196199
targetWorkspace.hideChaff();
197200
}
198201
copyData = focused.toCopyData();

0 commit comments

Comments
 (0)