Skip to content

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.

fix: show token name when convert local styles to token (#5123)

Bogdan Chadkin61511385f94b
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
index 982a408869..75eb0d02b3 100644
--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx
+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
@@ -437,7 +437,9 @@ const TreeNodeContent = ({
ref={mergeRefs(editableRef, ref)}
{...handlers}
isEditing={isEditing}
- />
+ >
+ {label}
+ </EditableTreeNodeLabel>
</TreeNodeLabel>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
index 7bc5ce2770..9b7a39fbb3 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
@@ -136,12 +136,16 @@ const EditableText = ({
spellCheck={false}
userSelect={isEditing ? "text" : "none"}
css={{
+ // prevent collapsing horizontally editable text when empty
+ flexGrow: 1,
outline: "none",
textOverflow: isEditing ? "clip" : "ellipsis",
cursor: isEditing ? "auto" : "default",
}}
{...handlers}
- />
+ >
+ {value}
+ </Text>
);
};
diff --git a/apps/builder/app/shared/dom-hooks/use-content-editable.ts b/apps/builder/app/shared/dom-hooks/use-content-editable.ts
index b20207e5cf..9e4ea08c61 100644
--- a/apps/builder/app/shared/dom-hooks/use-content-editable.ts
+++ b/apps/builder/app/shared/dom-hooks/use-content-editable.ts
@@ -20,19 +20,8 @@ export const useContentEditable = ({
value: string;
}) => {
const elementRef = useRef<HTMLDivElement | null>(null);
- const setTextContent = () => {
- if (elementRef.current && isEditing === false) {
- elementRef.current.textContent = value;
- }
- };
- const ref = (element: HTMLDivElement | null) => {
- elementRef.current = element;
- setTextContent();
- };
const getValue = () => elementRef.current?.textContent ?? "";
- useEffect(setTextContent, [value, isEditing]);
-
useEffect(() => {
const element = elementRef.current;
if (element === null) {
@@ -56,13 +45,6 @@ export const useContentEditable = ({
}
element.removeAttribute("contenteditable");
- // This is needed to force layout to recalc max-width when editing is done,
- // because otherwise, layout will keep the value from before engaging contenteditable.
- const { parentElement } = element;
- if (parentElement) {
- parentElement.removeChild(element);
- parentElement.appendChild(element);
- }
}, [isEditing]);
const handleEnd = (event: KeyboardEvent<Element> | FocusEvent<Element>) => {
@@ -111,5 +93,5 @@ export const useContentEditable = ({
onDoubleClick: handleDoubleClick,
};
- return { ref, handlers };
+ return { ref: elementRef, handlers };
};