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: hide outline when ephemeral update is in progress (#4011)

Oleg Isonen98cb2ef57658
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
index 1c1586a849..e0d57d0339 100644
--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx
@@ -127,7 +127,7 @@ const AddPropertyOrAttribute = ({
}}
match={matchOrSuggestToCreate}
value={{ name: "", label: value }}
- onInputChange={(value) => {
+ onChange={(value) => {
setValue(value ?? "");
}}
getDescription={(item) => {
diff --git a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx
index 01d806463e..133c30e1f3 100644
--- a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx
@@ -96,9 +96,15 @@ export const FontFamilyControl = ({
setIntermediateValue(undefined);
}}
value={{ value: intermediateValue ?? itemValue }}
- onInputChange={(value) => {
+ onChange={(value) => {
setIntermediateValue(value);
}}
+ onBlur={() => {
+ setValue({
+ type: "fontFamily",
+ value: [itemValue],
+ });
+ }}
match={matchOrSuggestToCreate}
/>
</Flex>
diff --git a/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx b/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx
index 8870592669..5ef47e8777 100644
--- a/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/advanced/add.tsx
@@ -51,7 +51,7 @@ export const Add = ({
getItemProps={() => ({ text: "sentence" })}
onItemSelect={(item) => onSelect(item.value)}
value={item}
- onInputChange={(value) => {
+ onChange={(value) => {
setItem({ value: value ?? "", label: value ?? "" });
}}
match={matchOrSuggestToCreate}
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx
index b24c555be1..8452fd1d64 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-property.tsx
@@ -78,7 +78,7 @@ export const TransitionProperty = ({
selectedItem: undefined,
itemToString: (value) => value?.label || "",
onItemSelect: (prop) => saveAnimatableProperty(prop.name),
- onInputChange: (value) => setInputValue(value ?? ""),
+ onChange: (value) => setInputValue(value ?? ""),
// We are splitting the items into two lists.
// But when users pass a input, the list is filtered and mixed together.
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
index 9cfa21022f..afc6fb7c6d 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -449,7 +449,7 @@ export const CssValueInput = ({
value,
selectedItem: props.value,
itemToString,
- onInputChange: (inputValue) => {
+ onChange: (inputValue) => {
onChange(inputValue);
},
onItemSelect: (value) => {
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
index 0b2023a395..9b11e8607c 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-input.tsx
@@ -481,7 +481,7 @@ export const StyleSourceInput = (
props.onSelectAutocompleteItem?.(item);
}
},
- onInputChange(label) {
+ onChange(label) {
setLabel(label ?? "");
},
});
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
index 8573487626..a945707b15 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
@@ -3,14 +3,16 @@ import { $collaborativeInstanceRect } from "~/shared/nano-states";
import { Outline } from "./outline";
import { applyScale } from "./apply-scale";
import { $scale } from "~/builder/shared/nano-states";
+import { $ephemeralStyles } from "~/canvas/stores";
// Outline of an instance that is being edited by AI or a human collaborator.
export const CollaborativeInstanceOutline = () => {
const scale = useStore($scale);
const instanceRect = useStore($collaborativeInstanceRect);
+ const ephemeralStyles = useStore($ephemeralStyles);
- if (instanceRect === undefined) {
- return null;
+ if (instanceRect === undefined || ephemeralStyles.length !== 0) {
+ return;
}
const rect = applyScale(instanceRect, scale);
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.tsx
index 0fb3f099e4..68aa6c79ed 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
@@ -11,6 +11,7 @@ import { Label } from "./label";
import { applyScale } from "./apply-scale";
import { $scale } from "~/builder/shared/nano-states";
import { findClosestSlot } from "~/shared/instance-utils";
+import { $ephemeralStyles } from "~/canvas/stores";
export const SelectedInstanceOutline = () => {
const instances = useStore($instances);
@@ -18,6 +19,7 @@ export const SelectedInstanceOutline = () => {
const textEditingInstanceSelector = useStore($textEditingInstanceSelector);
const outline = useStore($selectedInstanceOutlineAndInstance);
const scale = useStore($scale);
+ const ephemeralStyles = useStore($ephemeralStyles);
const isEditingCurrentInstance =
textEditingInstanceSelector !== undefined &&
areInstanceSelectorsEqual(
@@ -28,7 +30,8 @@ export const SelectedInstanceOutline = () => {
if (
isEditingCurrentInstance ||
outline === undefined ||
- selectedInstanceSelector === undefined
+ selectedInstanceSelector === undefined ||
+ ephemeralStyles.length !== 0
) {
return;
}
diff --git a/packages/design-system/src/components/combobox.stories.tsx b/packages/design-system/src/components/combobox.stories.tsx
index 36840a7075..2144c4700e 100644
--- a/packages/design-system/src/components/combobox.stories.tsx
+++ b/packages/design-system/src/components/combobox.stories.tsx
@@ -26,7 +26,7 @@ export const Basic = () => {
itemToString={(item) => item ?? ""}
items={["Apple", "Banana", "Orange"]}
onItemSelect={setValue}
- onInputChange={(value) => {
+ onChange={(value) => {
setValue(value ?? "");
}}
/>
@@ -85,7 +85,7 @@ export const Complex = () => {
itemToString: (item) => item ?? "",
stateReducer,
onItemSelect: setValue,
- onInputChange: (value) => {
+ onChange: (value) => {
if (value) {
setValue(value);
}
diff --git a/packages/design-system/src/components/combobox.tsx b/packages/design-system/src/components/combobox.tsx
index 2d29e26574..9061fb439c 100644
--- a/packages/design-system/src/components/combobox.tsx
+++ b/packages/design-system/src/components/combobox.tsx
@@ -276,7 +276,7 @@ type UseComboboxProps<Item> = UseDownshiftComboboxProps<Item> & {
) => ComponentProps<typeof ComboboxListboxItem>;
value: Item | null; // This is to prevent: "downshift: A component has changed the uncontrolled prop "selectedItem" to be controlled."
selectedItem?: Item;
- onInputChange?: (value: string | undefined) => void;
+ onChange?: (value: string | undefined) => void;
onItemSelect?: (value: Item) => void;
onItemHighlight?: (value: Item | null) => void;
stateReducer?: (
@@ -295,7 +295,7 @@ export const useCombobox = <Item,>({
selectedItem,
getItemProps,
itemToString,
- onInputChange,
+ onChange,
onItemSelect,
onItemHighlight,
stateReducer = (_state, { changes }) => changes,
@@ -349,7 +349,7 @@ export const useCombobox = <Item,>({
// Don't call onItemSelect when ESC is pressed
if (type === comboboxStateChangeTypes.InputKeyDownEscape) {
// Reset intermediate value when ESC is pressed
- onInputChange?.(undefined);
+ onChange?.(undefined);
return;
}
@@ -388,13 +388,13 @@ export const useCombobox = <Item,>({
...inputProps,
onChange: (event: ChangeEvent<HTMLInputElement>) => {
inputProps.onChange(event);
- // If we want controllable input we need to call onInputChange here
+ // If we want controllable input we need to call onChange here
// see https://github.com/downshift-js/downshift/issues/1108
- onInputChange?.(event.target.value);
+ onChange?.(event.target.value);
},
};
},
- [downshiftGetInputProps, onInputChange]
+ [downshiftGetInputProps, onChange]
);
const downshiftHighlightedIndex = downshiftProps.highlightedIndex;
@@ -448,10 +448,10 @@ export const useCombobox = <Item,>({
};
type ComboboxProps<Item> = UseComboboxProps<Item> &
- Omit<ComponentProps<"input">, "value"> & {
- color?: ComponentProps<typeof InputField>["color"];
- suffix?: ComponentProps<typeof InputField>["suffix"];
- };
+ Pick<
+ ComponentProps<typeof InputField>,
+ "autoFocus" | "placeholder" | "color" | "suffix" | "onBlur"
+ >;
export const Combobox = <Item,>({
autoFocus,
@@ -459,6 +459,7 @@ export const Combobox = <Item,>({
placeholder,
color,
suffix,
+ onBlur,
...props
}: ComboboxProps<Item>) => {
const combobox = useCombobox<Item>(props);
@@ -479,6 +480,7 @@ export const Combobox = <Item,>({
{...combobox.getInputProps()}
placeholder={placeholder}
autoFocus={autoFocus}
+ onBlur={onBlur}
color={color}
suffix={
suffix ?? (