fix: ensure parent is not null on first render in resolveFields

measuredco · Jan 10, 2025 · 773a81a · 773a81a
1 parent cfd21d8
commit 773a81a
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/packages/core/components/Puck/components/Fields/index.tsx b/packages/core/components/Puck/components/Fields/index.tsx
@@ -126,22 +126,38 @@ const useResolvedFields = (): [FieldsType, boolean] => {
         lastData,
       });
     },
-    [data, config, componentData, selectedItem, resolvedFields, state]
+    [data, config, componentData, selectedItem, resolvedFields, state, parent]
   );
 
+  const [hasParent, setHasParent] = useState(false);
+
+  useEffect(() => {
+    setHasParent(!!parent);
+  }, [parent]);
+
   useEffect(() => {
-    if (hasResolver) {
-      setFieldsLoading(true);
+    // Must either be in root zone, or have parent
+    if (!state.ui.itemSelector?.zone || hasParent) {
+      if (hasResolver) {
+        setFieldsLoading(true);
 
-      resolveFields(defaultFields).then((fields) => {
-        setResolvedFields(fields || {});
+        resolveFields(defaultFields).then((fields) => {
+          setResolvedFields(fields || {});
 
-        setFieldsLoading(false);
-      });
-    } else {
-      setResolvedFields(defaultFields);
+          setFieldsLoading(false);
+        });
+      } else {
+        setResolvedFields(defaultFields);
+      }
     }
-  }, [data, defaultFields, selectedItem, hasResolver]);
+  }, [
+    data,
+    defaultFields,
+    state.ui.itemSelector,
+    selectedItem,
+    hasResolver,
+    hasParent,
+  ]);
 
   return [resolvedFields, fieldsLoading];
 };