@puckeditor/plugin-pages 0.9.0-canary.26589e83 → 0.9.0-canary.2cecde46

package/dist/index.js

@@ -8665,11 +8665,14 @@ function registerDynamicConfig(config, data) {
   }
 }
 var resolvedVersions = /* @__PURE__ */ new WeakMap();
-var rememberResolvedData = (data, resolved) => resolvedVersions.set(data, resolved);
+var rememberResolvedData = (data, resolved) => resolvedVersions.set(data, resolvedVersions.get(resolved) ?? resolved);
 var isDirty = ({
   appState,
   history
-}, version2) => history.histories.length > 1 && !(0, import_fast_equals.deepEqual)(appState.data, version2?.data);
+}, version2) => history.histories.length > 1 && !(0, import_fast_equals.deepEqual)(
+  appState.data,
+  version2 && (resolvedVersions.get(version2.data) ?? version2.data)
+);
 var usePageEditorState = () => {
   const getPuck = (0, import_core3.useGetPuck)();
   return (0, import_react25.useMemo)(() => {
@@ -8677,9 +8680,9 @@ var usePageEditorState = () => {
       const { config } = getPuck();
       const pageData = { root: {}, content: [], ...data };
       registerDynamicConfig(config, pageData);
-      const resolvedData = (data && resolvedVersions.get(data)) ?? await (0, import_core3.resolveAllData)(pageData, config);
+      let resolvedData = (data && resolvedVersions.get(data)) ?? await (0, import_core3.resolveAllData)(pageData, config);
+      if (isCurrent()) resolvedData = showData(resolvedData);
       if (data) rememberResolvedData(data, resolvedData);
-      if (isCurrent()) showData(resolvedData);
     };
     const showData = (data) => {
       const { appState, history, dispatch } = getPuck();
@@ -8690,6 +8693,17 @@ var usePageEditorState = () => {
       };
       history.setHistories([{ state: nextState }]);
       dispatch({ type: "set", state: nextState });
+      const shownData = getPuck().appState.data;
+      setTimeout(() => dropStaleHistory(nextState, shownData), 250);
+      return shownData;
+    };
+    const dropStaleHistory = (shown, shownData) => {
+      const { appState, history } = getPuck();
+      const [first, ...rest] = history.histories;
+      if (first?.state !== shown || !rest.length) return;
+      history.setHistories(
+        (0, import_fast_equals.deepEqual)(appState.data, shownData) ? [{ state: appState }] : [first, { state: appState }]
+      );
     };
     const unloadPageData = () => {
       const { appState, history } = getPuck();

package/dist/index.mjs

@@ -8663,11 +8663,14 @@ function registerDynamicConfig(config, data) {
   }
 }
 var resolvedVersions = /* @__PURE__ */ new WeakMap();
-var rememberResolvedData = (data, resolved) => resolvedVersions.set(data, resolved);
+var rememberResolvedData = (data, resolved) => resolvedVersions.set(data, resolvedVersions.get(resolved) ?? resolved);
 var isDirty = ({
   appState,
   history
-}, version2) => history.histories.length > 1 && !deepEqual2(appState.data, version2?.data);
+}, version2) => history.histories.length > 1 && !deepEqual2(
+  appState.data,
+  version2 && (resolvedVersions.get(version2.data) ?? version2.data)
+);
 var usePageEditorState = () => {
   const getPuck = useGetPuck();
   return useMemo21(() => {
@@ -8675,9 +8678,9 @@ var usePageEditorState = () => {
       const { config } = getPuck();
       const pageData = { root: {}, content: [], ...data };
       registerDynamicConfig(config, pageData);
-      const resolvedData = (data && resolvedVersions.get(data)) ?? await resolveAllData(pageData, config);
+      let resolvedData = (data && resolvedVersions.get(data)) ?? await resolveAllData(pageData, config);
+      if (isCurrent()) resolvedData = showData(resolvedData);
       if (data) rememberResolvedData(data, resolvedData);
-      if (isCurrent()) showData(resolvedData);
     };
     const showData = (data) => {
       const { appState, history, dispatch } = getPuck();
@@ -8688,6 +8691,17 @@ var usePageEditorState = () => {
       };
       history.setHistories([{ state: nextState }]);
       dispatch({ type: "set", state: nextState });
+      const shownData = getPuck().appState.data;
+      setTimeout(() => dropStaleHistory(nextState, shownData), 250);
+      return shownData;
+    };
+    const dropStaleHistory = (shown, shownData) => {
+      const { appState, history } = getPuck();
+      const [first, ...rest] = history.histories;
+      if (first?.state !== shown || !rest.length) return;
+      history.setHistories(
+        deepEqual2(appState.data, shownData) ? [{ state: appState }] : [first, { state: appState }]
+      );
     };
     const unloadPageData = () => {
       const { appState, history } = getPuck();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@puckeditor/plugin-pages",
-  "version": "0.9.0-canary.26589e83",
+  "version": "0.9.0-canary.2cecde46",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "typescript": "^5.5.4",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^4.1.11",
-    "tsconfig": "0.9.0-canary.26589e83",
-    "tsup-config": "0.9.0-canary.26589e83",
-    "eslint-config-custom": "0.9.0-canary.26589e83"
+    "tsconfig": "0.9.0-canary.2cecde46",
+    "tsup-config": "0.9.0-canary.2cecde46",
+    "eslint-config-custom": "0.9.0-canary.2cecde46"
   },
   "peerDependencies": {
     "@puckeditor/core": "^0",