fix: fix defaultProps for root

measuredco · Apr 19, 2024 · 9a1cc7c · 9a1cc7c
1 parent 9df6633
commit 9a1cc7c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/apps/demo/config/index.tsx b/apps/demo/config/index.tsx
@@ -36,6 +36,9 @@ export type UserConfig = Config<
 // We avoid the name config as next gets confused
 export const conf: UserConfig = {
   root: {
+    defaultProps: {
+      title: "My Page",
+    },
     render: Root,
   },
   categories: {

diff --git a/packages/core/components/MenuBar/index.tsx b/packages/core/components/MenuBar/index.tsx
@@ -14,7 +14,7 @@ const getClassName = getClassNameFactory("MenuBar", styles);
 
 export const MenuBar = ({
   appState,
-  data = { content: [], root: { props: { title: "" } } },
+  data = { content: [], root: {} },
   dispatch,
   menuOpen = false,
   onPublish,

diff --git a/packages/core/components/Puck/context.tsx b/packages/core/components/Puck/context.tsx
@@ -17,7 +17,7 @@ import { IframeConfig } from "../../types/IframeConfig";
 import { UAParser } from "ua-parser-js";
 
 export const defaultAppState: AppState = {
-  data: { content: [], root: { props: { title: "" } } },
+  data: { content: [], root: { props: {} } },
   ui: {
     leftSideBarVisible: true,
     rightSideBarVisible: true,

diff --git a/packages/core/components/Puck/index.tsx b/packages/core/components/Puck/index.tsx
@@ -53,7 +53,7 @@ const getClassName = getClassNameFactory("Puck", styles);
 export function Puck<UserConfig extends Config = Config>({
   children,
   config,
-  data: initialData = { content: [], root: { props: { title: "" } } },
+  data: initialData = { content: [], root: {} },
   ui: initialUi,
   onChange,
   onPublish,
@@ -146,9 +146,20 @@ export function Puck<UserConfig extends Config = Config>({
       }
     }
 
+    // DEPRECATED
+    const rootProps = initialData.root.props || initialData.root;
+
+    const defaultedRootProps = {
+      ...config.root?.defaultProps,
+      ...rootProps,
+    };
+
     return {
       ...defaultAppState,
-      data: initialData,
+      data: {
+        ...initialData,
+        root: defaultedRootProps,
+      },
       ui: {
         ...initial,
         ...clientUiState,