Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: Allow select link selector during text edit (#4505)
Ivan Starkov9806caa5d2cc
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsxindex ac3128624e..11e7edb50e 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx@@ -5,13 +5,20 @@ import {$selectedInstanceSelector,} from "~/shared/nano-states";import { $textEditingInstanceSelector } from "~/shared/nano-states";-import { areInstanceSelectorsEqual } from "~/shared/tree-utils";+import { type InstanceSelector } from "~/shared/tree-utils";import { Outline } from "./outline";import { applyScale } from "./apply-scale";import { $scale } from "~/builder/shared/nano-states";import { findClosestSlot } from "~/shared/instance-utils";import { $ephemeralStyles } from "~/canvas/stores";+const isDescendantOrSelf = (+ descendant: InstanceSelector,+ self: InstanceSelector+) => {+ return descendant.join(",").endsWith(self.join(","));+};+export const SelectedInstanceOutline = () => {const instances = useStore($instances);const selectedInstanceSelector = useStore($selectedInstanceSelector);@@ -20,17 +27,20 @@ export const SelectedInstanceOutline = () => {const scale = useStore($scale);const ephemeralStyles = useStore($ephemeralStyles);+ if (selectedInstanceSelector === undefined) {+ return;+ }+const isEditingCurrentInstance =textEditingInstanceSelector !== undefined &&- areInstanceSelectorsEqual(- textEditingInstanceSelector.selector,- selectedInstanceSelector+ isDescendantOrSelf(+ selectedInstanceSelector,+ textEditingInstanceSelector.selector);if (isEditingCurrentInstance ||outline === undefined ||- selectedInstanceSelector === undefined ||ephemeralStyles.length !== 0) {return;diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.tsxindex b96ccf1a6b..95290093fd 100644--- a/apps/builder/app/canvas/features/text-editor/text-editor.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.tsx@@ -62,6 +62,7 @@ import {$hoveredInstanceOutline,$hoveredInstanceSelector,$registeredComponentMetas,+ $selectedInstanceSelector,$textEditingInstanceSelector,} from "~/shared/nano-states";import {@@ -71,6 +72,7 @@ import {import deepEqual from "fast-deep-equal";import { setDataCollapsed } from "~/canvas/collapsed";import { $selectedPage, selectInstance } from "~/shared/awareness";+import { shallowEqual } from "shallow-equal";const BindInstanceToNodePlugin = ({refs,@@ -93,7 +95,7 @@ const BindInstanceToNodePlugin = ({// @todo: A normal selector must be used, but it would require significantly more code to detect the tree structure.element.setAttribute(selectorIdAttribute,- [idAttribute, ...rootInstanceSelector].join(",")+ [instanceId, ...rootInstanceSelector].join(","));}}@@ -174,6 +176,67 @@ const OnChangeOnBlurPlugin = ({return null;};+const LinkSelectionPlugin = () => {+ const [editor] = useLexicalComposerContext();+ const [preservedSelection] = useState($selectedInstanceSelector.get());++ useEffect(() => {+ if (!editor.isEditable()) {+ return;+ }++ const removeUpdateListener = editor.registerUpdateListener(+ ({ editorState }) => {+ editorState.read(() => {+ const selection = $getSelection();+ // console.log(selection);+ if (!$isRangeSelection(selection)) {+ return false;+ }+ const key = selection.anchor.getNode().getKey();++ const elt = editor.getElementByKey(key);+ const link = elt?.closest(`a[${selectorIdAttribute}]`);++ if (link == null) {+ if (+ shallowEqual(preservedSelection, $selectedInstanceSelector.get())+ ) {+ return false;+ }++ selectInstance(preservedSelection);++ return false;+ }++ const selectorAttribute = link+ .getAttribute(selectorIdAttribute)+ ?.split(",");++ if (selectorAttribute === undefined) {+ return false;+ }++ if (+ shallowEqual(selectorAttribute, $selectedInstanceSelector.get())+ ) {+ return false;+ }++ selectInstance(selectorAttribute);+ });+ }+ );++ return () => {+ removeUpdateListener();+ };+ }, [editor, preservedSelection]);++ return null;+};+const RemoveParagaphsPlugin = () => {const [editor] = useLexicalComposerContext();@@ -434,6 +497,7 @@ const InitCursorPlugin = () => {}const normalizedSelection =$normalizeSelection__EXPERIMENTAL(selection);+$setSelection(normalizedSelection);return;}@@ -1071,12 +1135,14 @@ export const TextEditor = ({placeholder={<></>}/><LinkPlugin />+<LinkSanitizePlugin /><HistoryPlugin /><SwitchBlockPlugin onNext={handleNext} /><OnChangeOnBlurPlugin onChange={handleChange} /><InitCursorPlugin />+ <LinkSelectionPlugin /><AnyKeyDownPlugin onKeyDown={handleAnyKeydown} /><InitialJSONStatePluginonInitialState={(json) => {