@webstudio-is/react-sdk 0.87.0 → 0.88.0

package/src/props.ts

@@ -31,7 +31,6 @@ export const useInstanceProps = (instanceId: Instance["id"]) => {
     dataSourceValuesStore,
     executeEffectfulExpression,
     setDataSourceValues,
-    renderer,
     indexesWithinAncestors,
   } = useContext(ReactSdkContext);
   const index = indexesWithinAncestors.get(instanceId);
@@ -61,10 +60,6 @@ export const useInstanceProps = (instanceId: Instance["id"]) => {
           }
           if (prop.type === "action") {
             instancePropsObject[prop.name] = (...args: unknown[]) => {
-              // prevent all actions in canvas mode
-              if (renderer === "canvas") {
-                return;
-              }
               for (const value of prop.value) {
                 if (value.type === "execute") {
                   const argsMap = new Map<string, unknown>();
@@ -91,7 +86,6 @@ export const useInstanceProps = (instanceId: Instance["id"]) => {
     propsByInstanceIdStore,
     dataSourceValuesStore,
     instanceId,
-    renderer,
     executeEffectfulExpression,
     setDataSourceValues,
     index,
@@ -147,54 +141,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