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 new href property duplicated on unmount (#2170)

Ivan Starkovab436a6fc460
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 904d7ac59d..d606cc395d 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
@@ -217,6 +217,17 @@ export const PropsSectionContainer = ({
dataSourceVariablesStore.set(dataSourceVariables);
} else {
store.createTransaction([propsStore], (props) => {
+ const istanceProps = propsByInstanceId.get(instance.id) ?? [];
+ // Fixing a bug that caused some props to be duplicated on unmount by removing duplicates.
+ // see for details https://github.com/webstudio-is/webstudio-builder/pull/2170
+ const duplicateProps = istanceProps
+ .filter((prop) => prop.id !== update.id)
+ .filter((prop) => prop.name === update.name);
+
+ for (const prop of duplicateProps) {
+ props.delete(prop.id);
+ }
+
props.set(update.id, update);
});
}
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsx
index f98f48721b..f429bb2fd8 100644
--- a/apps/builder/app/builder/features/settings-panel/shared.tsx
+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx
@@ -87,10 +87,13 @@ export const useLocalValue = <Type,>(
const [_, setRefresh] = useState(0);
+ const onSaveRef = useRef(onSave);
+ onSaveRef.current = onSave;
+
const save = () => {
if (equal(localValueRef.current, savedValue) === false) {
// To synchronize with setState immediately followed by save
- onSave(localValueRef.current);
+ onSaveRef.current(localValueRef.current);
}
};
diff --git a/packages/react-sdk/src/props.test.ts b/packages/react-sdk/src/props.test.ts
index 90522bb11f..e898c1c1be 100644
--- a/packages/react-sdk/src/props.test.ts
+++ b/packages/react-sdk/src/props.test.ts
@@ -87,6 +87,24 @@ describe("resolveUrlProp", () => {
value: unique(),
};
+ const duplicatePropName = unique();
+
+ const duplicateUrlPropFirst: Prop = {
+ type: "string",
+ id: unique(),
+ instanceId,
+ name: duplicatePropName,
+ value: unique(),
+ };
+
+ const duplicateUrlPropSecond: Prop = {
+ type: "string",
+ id: unique(),
+ instanceId,
+ name: duplicatePropName,
+ value: unique(),
+ };
+
const props: PropsByInstanceId = new Map([
[
instanceId,
@@ -96,6 +114,8 @@ describe("resolveUrlProp", () => {
arbitraryUrlProp,
assetProp,
pageSectionProp,
+ duplicateUrlPropFirst,
+ duplicateUrlPropSecond,
],
],
[instnaceIdProp.instanceId, [instnaceIdProp]],
@@ -156,4 +176,13 @@ describe("resolveUrlProp", () => {
url: arbitraryUrlProp.value,
});
});
+
+ // We had a bug that some props were duplicated https://github.com/webstudio-is/webstudio-builder/pull/2170
+ // Use the latest prop to ensure consistency with the builder settings panel.
+ test("duplicate prop name", () => {
+ expect(resolveUrlProp(instanceId, duplicatePropName, stores)).toEqual({
+ type: "string",
+ url: duplicateUrlPropSecond.value,
+ });
+ });
});
diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.ts
index 6e7cf6e2d0..497d624ca1 100644
--- a/packages/react-sdk/src/props.ts
+++ b/packages/react-sdk/src/props.ts
@@ -147,54 +147,64 @@ export const resolveUrlProp = (
if (instanceProps === undefined) {
return;
}
- for (const prop of instanceProps) {
- if (prop.name !== name) {
+
+ let prop = undefined;
+
+ // We had a bug that some props were duplicated https://github.com/webstudio-is/webstudio-builder/pull/2170
+ // Use the latest prop to ensure consistency with the builder settings panel.
+ for (const intanceProp of instanceProps) {
+ if (intanceProp.name !== name) {
continue;
}
+ prop = intanceProp;
+ }
- if (prop.type === "page") {
- if (typeof prop.value === "string") {
- const page = pages.get(prop.value);
- return page && { type: "page", page };
- }
+ if (prop === undefined) {
+ return;
+ }
- const { instanceId, pageId } = prop.value;
+ if (prop.type === "page") {
+ if (typeof prop.value === "string") {
+ const page = pages.get(prop.value);
+ return page && { type: "page", page };
+ }
- const page = pages.get(pageId);
+ const { instanceId, pageId } = prop.value;
- if (page === undefined) {
- return;
- }
+ const page = pages.get(pageId);
- const idProp = props.get(instanceId)?.find((prop) => prop.name === "id");
-
- return {
- type: "page",
- page,
- instanceId,
- hash:
- idProp === undefined || idProp.type !== "string"
- ? undefined
- : idProp.value,
- };
+ if (page === undefined) {
+ return;
}
- if (prop.type === "string") {
- for (const page of pages.values()) {
- if (page.path === prop.value) {
- return { type: "page", page };
- }
- }
- return { type: "string", url: prop.value };
- }
+ const idProp = props.get(instanceId)?.find((prop) => prop.name === "id");
+
+ return {
+ type: "page",
+ page,
+ instanceId,
+ hash:
+ idProp === undefined || idProp.type !== "string"
+ ? undefined
+ : idProp.value,
+ };
+ }
- if (prop.type === "asset") {
- const asset = assets.get(prop.value);
- return asset && { type: "asset", asset };
+ if (prop.type === "string") {
+ for (const page of pages.values()) {
+ if (page.path === prop.value) {
+ return { type: "page", page };
+ }
}
+ return { type: "string", url: prop.value };
+ }
- return;
+ if (prop.type === "asset") {
+ const asset = assets.get(prop.value);
+ return asset && { type: "asset", asset };
}
+
+ return;
};
// this utility is used for link component in both builder and preview