Skip to content

fix: Fix copy instance if no text is selected #4858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 12, 2025
Merged

fix: Fix copy instance if no text is selected #4858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99a2995
copy instance if no text selected
kof Feb 11, 2025
e771fad
clear text selection when selecting instance
kof Feb 11, 2025
8794cf6
add comment
kof Feb 11, 2025
6e58b37
Fix copy-paste
istarkov Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions apps/builder/app/builder/features/navigator/navigator-tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,12 @@ const canDrag = (instance: Instance, instanceSelector: InstanceSelector) => {
if (instanceSelector.length === 1) {
return false;
}

// Do not drag if the instance name is being edited
if ($editingItemSelector.get()?.join(",") === instanceSelector.join(",")) {
return false;
}

if ($isContentMode.get()) {
const parentId = instanceSelector[1];
const parentInstance = $instances.get().get(parentId);
Expand Down Expand Up @@ -542,6 +548,20 @@ export const NavigatorTree = () => {
}
}, [selectedInstanceSelector]);

const selectInstanceAndClearSelection = (
instanceSelector: undefined | Instance["id"][],
event: React.MouseEvent | React.FocusEvent
) => {
if (event.currentTarget.querySelector("[contenteditable]") === null) {
// Allow text selection and edits inside current TreeNode
// Outside if text is selected, it needs to be unselected before selecting the instance.
// Otherwise user will cmd+c the text instead of copying the instance.
window.getSelection()?.removeAllRanges();
}

selectInstance(instanceSelector);
};

return (
<ScrollArea
direction="both"
Expand All @@ -558,8 +578,10 @@ export const NavigatorTree = () => {
level={0}
isSelected={selectedKey === ROOT_INSTANCE_ID}
buttonProps={{
onClick: () => selectInstance([ROOT_INSTANCE_ID]),
onFocus: () => selectInstance([ROOT_INSTANCE_ID]),
onClick: (event) =>
selectInstanceAndClearSelection([ROOT_INSTANCE_ID], event),
onFocus: (event) =>
selectInstanceAndClearSelection([ROOT_INSTANCE_ID], event),
}}
action={
<Tooltip
Expand Down Expand Up @@ -664,8 +686,10 @@ export const NavigatorTree = () => {
$blockChildOutline.set(undefined);
},
onMouseLeave: () => $hoveredInstanceSelector.set(undefined),
onClick: () => selectInstance(item.selector),
onFocus: () => selectInstance(item.selector),
onClick: (event) =>
selectInstanceAndClearSelection(item.selector, event),
onFocus: (event) =>
selectInstanceAndClearSelection(item.selector, event),
onKeyDown: (event) => {
if (event.key === "Enter") {
emitCommand("editInstanceText");
Expand Down
19 changes: 3 additions & 16 deletions apps/builder/app/shared/copy-paste/init-copy-paste.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,10 @@ const validateClipboardEvent = (event: ClipboardEvent) => {
// Allows native selection of text in the Builder panels, such as CSS Preview.
if (event.type === "copy") {
const isInBuilderContext = window.self === window.top;
const selection = window.getSelection();

if (isInBuilderContext) {
// Note on event.target:
//
// The spec (https://w3c.github.io/clipboard-apis/#to-fire-a-clipboard-event)
// says that if the context is not editable, the target should be the focused node.
//
// But in practice it seems that the target is based
// on where the cursor is, rather than which element has focus.
// For example, if a <button> has focus, the target is the <body> element.
// If some text is selected, the target is a wrapping element of the text.
// (at least in Chrome).

// We are using the behavior described above: if some text is selected, the target is usually (at least in the cases we need) not the body.
if (event.target !== window.document.body) {
return false;
}
if (isInBuilderContext && selection && selection.isCollapsed === false) {
return false;
}
}

Expand Down
Loading