fix: don't throw warning when user is correctly specifying root props

measuredco · May 12, 2024 · 46aa8ff · 46aa8ff
1 parent b1c40c6
commit 46aa8ff
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/packages/core/components/Puck/index.tsx b/packages/core/components/Puck/index.tsx
@@ -147,7 +147,17 @@ export function Puck<UserConfig extends Config = Config>({
     }
 
     // DEPRECATED
-    const rootProps = initialData?.root?.props || initialData.root || {};
+    if (
+      Object.keys(initialData?.root || {}).length > 0 &&
+      !initialData?.root?.props
+    ) {
+      console.error(
+        "Warning: Defining props on `root` is deprecated. Please use `root.props`, or republish this page to migrate automatically."
+      );
+    }
+
+    // Deprecated
+    const rootProps = initialData?.root?.props || initialData?.root || {};
 
     const defaultedRootProps = {
       ...config.root?.defaultProps,
@@ -158,7 +168,7 @@ export function Puck<UserConfig extends Config = Config>({
       ...defaultAppState,
       data: {
         ...initialData,
-        root: defaultedRootProps,
+        root: { ...initialData?.root, props: defaultedRootProps },
         content: initialData.content || [],
       },
       ui: {
@@ -232,15 +242,6 @@ export function Puck<UserConfig extends Config = Config>({
   // DEPRECATED
   const rootProps = data.root.props || data.root;
 
-  // DEPRECATED
-  useEffect(() => {
-    if (Object.keys(data.root).length > 0 && !data.root.props) {
-      console.error(
-        "Warning: Defining props on `root` is deprecated. Please use `root.props`. This will be a breaking change in a future release."
-      );
-    }
-  }, []);
-
   const toggleSidebars = useCallback(
     (sidebar: "left" | "right") => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;