@measured/puck-plugin-heading-analyzer 0.15.0-canary.480467a → 0.15.0-canary.b1c40c6

package/dist/index.js

@@ -77164,6 +77164,16 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
     init_react_import2();
     var import_react132 = require("react");
     init_react_import2();
+    init_react_import2();
+    var getChanged = (newItem, oldItem) => {
+      return newItem ? Object.keys(newItem.props || {}).reduce((acc, item) => {
+        const newItemProps = (newItem == null ? void 0 : newItem.props) || {};
+        const oldItemProps = (oldItem == null ? void 0 : oldItem.props) || {};
+        return __spreadProps2(__spreadValues2({}, acc), {
+          [item]: oldItemProps[item] !== newItemProps[item]
+        });
+      }, {}) : {};
+    };
     var cache = { lastChange: {} };
     var resolveAllComponentData = (content, config, onResolveStart, onResolveEnd) => __async2(void 0, null, function* () {
       return yield Promise.all(
@@ -77180,25 +77190,15 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
     var resolveComponentData = (item, config, onResolveStart, onResolveEnd) => __async2(void 0, null, function* () {
       const configForItem = config.components[item.type];
       if (configForItem.resolveData) {
-        let changed = Object.keys(item.props).reduce(
-          (acc, item2) => __spreadProps2(__spreadValues2({}, acc), { [item2]: true }),
-          {}
-        );
-        if (cache.lastChange[item.props.id]) {
-          const { item: oldItem, resolved } = cache.lastChange[item.props.id];
-          if (oldItem === item) {
-            return resolved;
-          }
-          Object.keys(item.props).forEach((propName) => {
-            if (oldItem.props[propName] === item.props[propName]) {
-              changed[propName] = false;
-            }
-          });
+        const { item: oldItem = {}, resolved = {} } = cache.lastChange[item.props.id] || {};
+        if (item && item === oldItem) {
+          return resolved;
         }
+        const changed = getChanged(item, oldItem);
         if (onResolveStart) {
           onResolveStart(item);
         }
-        const { props: resolvedProps, readOnly = {} } = yield configForItem.resolveData(item, { changed });
+        const { props: resolvedProps, readOnly = {} } = yield configForItem.resolveData(item, { changed, lastData: oldItem });
         const { readOnly: existingReadOnly = {} } = item || {};
         const newReadOnly = __spreadValues2(__spreadValues2({}, existingReadOnly), readOnly);
         const resolvedItem = __spreadProps2(__spreadValues2({}, item), {
@@ -77237,26 +77237,16 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
     init_react_import2();
     var cache2 = {};
     var resolveRootData = (data, config) => __async2(void 0, null, function* () {
-      var _a3, _b;
+      var _a3, _b, _c, _d, _e;
       if (((_a3 = config.root) == null ? void 0 : _a3.resolveData) && data.root.props) {
-        let changed = Object.keys(data.root.props).reduce(
-          (acc, item) => __spreadProps2(__spreadValues2({}, acc), { [item]: true }),
-          {}
-        );
-        if (cache2.lastChange) {
-          const { original, resolved } = cache2.lastChange;
-          if (original === data.root) {
-            return resolved;
-          }
-          Object.keys(data.root.props).forEach((propName) => {
-            if (original.props[propName] === data.root.props[propName]) {
-              changed[propName] = false;
-            }
-          });
+        if (((_b = cache2.lastChange) == null ? void 0 : _b.original) === data.root) {
+          return cache2.lastChange.resolved;
         }
+        const changed = getChanged(data.root, (_c = cache2.lastChange) == null ? void 0 : _c.original);
         const rootWithProps = data.root;
-        const resolvedRoot = yield (_b = config.root) == null ? void 0 : _b.resolveData(rootWithProps, {
-          changed
+        const resolvedRoot = yield (_e = config.root) == null ? void 0 : _e.resolveData(rootWithProps, {
+          changed,
+          lastData: ((_d = cache2.lastChange) == null ? void 0 : _d.original) || {}
         });
         cache2.lastChange = {
           original: data.root,
@@ -78320,7 +78310,7 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Render2, __spreadProps2(__spreadValues2({}, mergedProps), { children }));
     };
     init_react_import2();
-    var styles_module_default14 = { "PuckFields": "_PuckFields_17k3p_1", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_17k3p_6" };
+    var styles_module_default14 = { "PuckFields": "_PuckFields_1o0if_1", "PuckFields--isLoading": "_PuckFields--isLoading_1o0if_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_1o0if_10" };
     var import_react19 = require("react");
     var import_jsx_runtime25 = require("react/jsx-runtime");
     var getClassName19 = get_class_name_factory_default2("PuckFields", styles_module_default14);
@@ -78331,13 +78321,73 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       children,
       isLoading
     }) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName19(), children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName19({ isLoading }), children: [
         children,
         isLoading && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_react_spinners6.ClipLoader, { "aria-label": "loading" }) })
       ] });
     };
+    var useResolvedFields = () => {
+      var _a3;
+      const { selectedItem, state, config } = useAppContext2();
+      const { data } = state;
+      const rootFields = ((_a3 = config.root) == null ? void 0 : _a3.fields) || defaultPageFields;
+      const componentConfig = selectedItem ? config.components[selectedItem.type] : null;
+      const defaultFields = selectedItem ? componentConfig == null ? void 0 : componentConfig.fields : rootFields;
+      const rootProps = data.root.props || data.root;
+      const [lastSelectedData, setLastSelectedData] = (0, import_react19.useState)(
+        {}
+      );
+      const [resolvedFields, setResolvedFields] = (0, import_react19.useState)(defaultFields || {});
+      const [fieldsLoading, setFieldsLoading] = (0, import_react19.useState)(false);
+      const defaultResolveFields = (_componentData, _params) => defaultFields;
+      const componentData = selectedItem ? selectedItem : { props: rootProps, readOnly: data.root.readOnly };
+      const resolveFields = (0, import_react19.useCallback)(
+        (..._0) => __async2(void 0, [..._0], function* (fields = {}) {
+          var _a22, _b, _c;
+          const lastData = ((_a22 = lastSelectedData.props) == null ? void 0 : _a22.id) === componentData.props.id ? lastSelectedData : {};
+          const changed = getChanged(componentData, lastData);
+          setLastSelectedData(componentData);
+          if (selectedItem && (componentConfig == null ? void 0 : componentConfig.resolveFields)) {
+            return yield componentConfig == null ? void 0 : componentConfig.resolveFields(
+              componentData,
+              {
+                changed,
+                fields,
+                lastFields: resolvedFields,
+                lastData,
+                appState: state
+              }
+            );
+          }
+          if (!selectedItem && ((_b = config.root) == null ? void 0 : _b.resolveFields)) {
+            return yield (_c = config.root) == null ? void 0 : _c.resolveFields(componentData, {
+              changed,
+              fields,
+              lastFields: resolvedFields,
+              lastData,
+              appState: state
+            });
+          }
+          return defaultResolveFields(componentData, {
+            changed,
+            fields,
+            lastFields: resolvedFields,
+            lastData
+          });
+        }),
+        [data, config, componentData, selectedItem, resolvedFields, state]
+      );
+      (0, import_react19.useEffect)(() => {
+        setFieldsLoading(true);
+        resolveFields(defaultFields).then((fields) => {
+          setResolvedFields(fields || {});
+          setFieldsLoading(false);
+        });
+      }, [data, defaultFields]);
+      return [resolvedFields, fieldsLoading];
+    };
     var Fields = () => {
-      var _a3, _b, _c, _d;
+      var _a3, _b;
       const {
         selectedItem,
         state,
@@ -78349,9 +78399,9 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       } = useAppContext2();
       const { data, ui } = state;
       const { itemSelector } = ui;
-      const rootFields = ((_a3 = config.root) == null ? void 0 : _a3.fields) || defaultPageFields;
-      const fields = selectedItem ? ((_b = config.components[selectedItem.type]) == null ? void 0 : _b.fields) || {} : rootFields;
-      const isLoading = selectedItem ? (_c = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _c.loading : (_d = componentState["puck-root"]) == null ? void 0 : _d.loading;
+      const [fields, fieldsResolving] = useResolvedFields();
+      const componentResolving = selectedItem ? (_a3 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a3.loading : (_b = componentState["puck-root"]) == null ? void 0 : _b.loading;
+      const isLoading = fieldsResolving || componentResolving;
       const rootProps = data.root.props || data.root;
       const Wrapper = (0, import_react19.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
@@ -78363,6 +78413,8 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Wrapper, { isLoading, itemSelector, children: Object.keys(fields).map((fieldName) => {
             const field = fields[fieldName];
+            if (!(field == null ? void 0 : field.type))
+              return null;
             const onChange = (value, updatedUi) => {
               var _a22, _b2;
               let currentProps;
@@ -79567,7 +79619,7 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
         () => createReducer({ config, record: historyStore.record })
       );
       const [initialAppState] = (0, import_react29.useState)(() => {
-        var _a22, _b, _c, _d, _e;
+        var _a22, _b, _c, _d, _e, _f;
         const initial = __spreadValues2(__spreadValues2({}, defaultAppState2.ui), initialUi);
         let clientUiState = {};
         if (typeof window !== "undefined") {
@@ -79594,11 +79646,12 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
             };
           }
         }
-        const rootProps2 = initialData.root.props || initialData.root;
-        const defaultedRootProps = __spreadValues2(__spreadValues2({}, (_e = config.root) == null ? void 0 : _e.defaultProps), rootProps2);
+        const rootProps2 = ((_e = initialData == null ? void 0 : initialData.root) == null ? void 0 : _e.props) || initialData.root || {};
+        const defaultedRootProps = __spreadValues2(__spreadValues2({}, (_f = config.root) == null ? void 0 : _f.defaultProps), rootProps2);
         return __spreadProps2(__spreadValues2({}, defaultAppState2), {
           data: __spreadProps2(__spreadValues2({}, initialData), {
-            root: defaultedRootProps
+            root: defaultedRootProps,
+            content: initialData.content || []
           }),
           ui: __spreadProps2(__spreadValues2(__spreadValues2({}, initial), clientUiState), {
             // Store categories under componentList on state to allow render functions and plugins to modify
@@ -79964,10 +80017,14 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       data
     }) {
       var _a3;
-      const rootProps = data.root.props || data.root;
+      const defaultedData = __spreadProps2(__spreadValues2({}, data), {
+        root: data.root || {},
+        content: data.content || []
+      });
+      const rootProps = defaultedData.root.props || defaultedData.root;
       const title = (rootProps == null ? void 0 : rootProps.title) || "";
       if ((_a3 = config.root) == null ? void 0 : _a3.render) {
-        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZoneProvider, { value: { data: defaultedData, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
           config.root.render,
           __spreadProps2(__spreadValues2({}, rootProps), {
             puck: {
@@ -79980,7 +80037,7 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
           })
         ) });
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZone, { zone: rootDroppableId2 }) });
+      return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZoneProvider, { value: { data: defaultedData, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(DropZone, { zone: rootDroppableId2 }) });
     }
     init_react_import2();
     var migrations = [
@@ -80004,6 +80061,11 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
       return migrations == null ? void 0 : migrations.reduce((acc, migration) => migration(acc), data);
     }
     init_react_import2();
+    init_react_import2();
+    var defaultData = (data) => __spreadProps2(__spreadValues2({}, data), {
+      root: data.root || {},
+      content: data.content || []
+    });
     function transformProps(data, propTransforms) {
       const mapItem = (item) => {
         if (propTransforms[item.type]) {
@@ -80013,18 +80075,19 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
         }
         return item;
       };
-      const rootProps = data.root.props || data.root;
-      let newRoot = __spreadValues2({}, data.root);
+      const defaultedData = defaultData(data);
+      const rootProps = defaultedData.root.props || defaultedData.root;
+      let newRoot = __spreadValues2({}, defaultedData.root);
       if (propTransforms["root"]) {
-        if (data.root.props) {
+        if (defaultedData.root.props) {
           newRoot.props = propTransforms["root"](rootProps);
         } else {
           newRoot = propTransforms["root"](rootProps);
         }
       }
-      const afterPropTransforms = __spreadProps2(__spreadValues2({}, data), {
+      const afterPropTransforms = __spreadProps2(__spreadValues2({}, defaultedData), {
         root: newRoot,
-        content: data.content.map(mapItem),
+        content: defaultedData.content.map(mapItem),
         zones: Object.keys(data.zones || {}).reduce(
           (acc, zoneKey) => __spreadProps2(__spreadValues2({}, acc), {
             [zoneKey]: data.zones[zoneKey].map(mapItem)
@@ -80037,7 +80100,8 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
     init_react_import2();
     function resolveAllData(data, config, onResolveStart, onResolveEnd) {
       return __async2(this, null, function* () {
-        const dynamicRoot = yield resolveRootData(data, config);
+        const defaultedData = defaultData(data);
+        const dynamicRoot = yield resolveRootData(defaultedData, config);
         const { zones = {} } = data;
         const zoneKeys = Object.keys(zones);
         const resolvedZones = {};
@@ -80050,10 +80114,10 @@ See https://github.com/measuredco/puck/issues/411 for more information. This mes
             onResolveEnd
           );
         }
-        return __spreadProps2(__spreadValues2({}, data), {
+        return __spreadProps2(__spreadValues2({}, defaultedData), {
           root: dynamicRoot,
           content: yield resolveAllComponentData(
-            data.content,
+            defaultedData.content,
             config,
             onResolveStart,
             onResolveEnd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck-plugin-heading-analyzer",
-  "version": "0.15.0-canary.480467a",
+  "version": "0.15.0-canary.b1c40c6",
   "author": "Measured Corporation Ltd <hello@measured.co>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",
@@ -18,7 +18,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@measured/puck": "^0.15.0-canary.480467a",
+    "@measured/puck": "^0.15.0-canary.b1c40c6",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
     "eslint": "^7.32.0",