fix: undefined state error

packages/visual-editor/src/internal/components/InternalLayoutEditor.tsx

@@ -129,22 +129,28 @@ export const InternalLayoutEditor = ({
           }
         }
 
-        if (layoutSaveState?.hash !== histories[index].id) {
+        const current = histories[index];
+
+        if (!current?.state) {
+          return;
+        }
+
+        if (layoutSaveState?.hash !== current.id) {
           if (templateMetadata.isDevMode && !templateMetadata.devOverride) {
             devLogger.logFunc("sendDevSaveStateData");
             sendDevSaveStateData({
               payload: {
-                devSaveStateData: JSON.stringify(histories[index].state.data),
+                devSaveStateData: JSON.stringify(current.state.data),
               },
             });
           } else {
             devLogger.logFunc("saveLayoutSaveState");
             saveLayoutSaveState({
               payload: {
-                hash: histories[index].id,
+                hash: current.id,
                 history: JSON.stringify({
-                  data: histories[index].state.data,
-                  ui: histories[index].state.ui,
+                  data: current.state.data,
+                  ui: current.state.ui,
                 }),
               },
             });

packages/visual-editor/src/internal/components/LayoutEditor.tsx

@@ -148,22 +148,25 @@ export const LayoutEditor = (props: LayoutEditorProps) => {
         devLogger.log("Layout Dev Mode - Using layout data from localStorage");
         const localHistories = (
           JSON.parse(localHistoryArray) as History<AppState>[]
-        ).map((history) => ({
-          id: history.id,
-          state: {
-            data: migrate(history.state.data, migrationRegistry, puckConfig),
-            ui: history.state.ui,
-          },
-        }));
+        )
+          .filter((history): history is History<AppState> => !!history?.state)
+          .map((history) => ({
+            id: history.id,
+            state: {
+              data: migrate(history.state.data, migrationRegistry, puckConfig),
+              ui: history.state.ui,
+            },
+          }));
         const localHistoryIndex = localHistories.length - 1;
-        // @ts-expect-error https://github.com/measuredco/puck/issues/673
-        setPuckInitialHistory({
-          histories: localHistories,
-          index: localHistoryIndex,
-          appendData: false,
-        });
-        setPuckInitialHistoryFetched(true);
-        return;
+        if (localHistoryIndex >= 0) {
+          setPuckInitialHistory({
+            histories: localHistories as any,
+            index: localHistoryIndex,
+            appendData: false,
+          });
+          setPuckInitialHistoryFetched(true);
+          return;
+        }
       }
 
       // Otherwise start fresh from Content
@@ -250,8 +253,11 @@ export const LayoutEditor = (props: LayoutEditorProps) => {
     }
 
     const historyToSend =
-      puckInitialHistory?.histories[puckInitialHistory.histories.length - 1]
-        .state.data;
+      puckInitialHistory?.histories?.[puckInitialHistory.histories.length - 1]
+        ?.state?.data;
+    if (!historyToSend) {
+      return;
+    }
 
     devLogger.logFunc("sendDevSaveStateData useEffect");
     sendDevLayoutSaveStateData({

packages/visual-editor/src/internal/components/ThemeEditor.tsx

@@ -88,16 +88,17 @@ export const ThemeEditor = (props: ThemeEditorProps) => {
       const localHistories = (
         localHistoryArray ? JSON.parse(localHistoryArray) : []
       ) as History<AppState>[];
-      const localHistoryIndex = localHistories.length - 1;
-      if (localHistoryIndex >= 0) {
-        devLogger.log("Theme Dev Mode - Using layout data from local storage");
-        const histories = localHistories.map((h) => {
+      const histories = localHistories
+        .filter((h) => h?.state)
+        .map((h) => {
           // strip ui state
           return { id: h.id, state: { data: { ...h.state.data } } };
         });
-        // @ts-expect-error https://github.com/measuredco/puck/issues/673
+      const localHistoryIndex = histories.length - 1;
+      if (localHistoryIndex >= 0) {
+        devLogger.log("Theme Dev Mode - Using layout data from local storage");
         setPuckInitialHistory({
-          histories: histories,
+          histories: histories as any,
           index: localHistoryIndex,
           appendData: false,
         });