@measured/puck 0.12.0-canary.da2bc0f → 0.12.0-canary.f882878

package/dist/index.js

@@ -327,7 +327,7 @@ var require_react_is_development = __commonJS({
         var ContextProvider = REACT_PROVIDER_TYPE;
         var Element = REACT_ELEMENT_TYPE;
         var ForwardRef = REACT_FORWARD_REF_TYPE;
-        var Fragment13 = REACT_FRAGMENT_TYPE;
+        var Fragment14 = REACT_FRAGMENT_TYPE;
         var Lazy = REACT_LAZY_TYPE;
         var Memo = REACT_MEMO_TYPE;
         var Portal = REACT_PORTAL_TYPE;
@@ -386,7 +386,7 @@ var require_react_is_development = __commonJS({
         exports.ContextProvider = ContextProvider;
         exports.Element = Element;
         exports.ForwardRef = ForwardRef;
-        exports.Fragment = Fragment13;
+        exports.Fragment = Fragment14;
         exports.Lazy = Lazy;
         exports.Memo = Memo;
         exports.Portal = Portal;
@@ -760,7 +760,7 @@ var require_factoryWithTypeCheckers = __commonJS({
         function validate(props, propName, componentName, location, propFullName) {
           if (!(props[propName] instanceof expectedClass)) {
             var expectedClassName = expectedClass.name || ANONYMOUS;
-            var actualClassName = getClassName19(props[propName]);
+            var actualClassName = getClassName20(props[propName]);
             return new PropTypeError("Invalid " + location + " `" + propFullName + "` of type " + ("`" + actualClassName + "` supplied to `" + componentName + "`, expected ") + ("instance of `" + expectedClassName + "`."));
           }
           return null;
@@ -1012,7 +1012,7 @@ var require_factoryWithTypeCheckers = __commonJS({
             return type;
         }
       }
-      function getClassName19(propValue) {
+      function getClassName20(propValue) {
         if (!propValue.constructor || !propValue.constructor.name) {
           return ANONYMOUS;
         }
@@ -9040,7 +9040,7 @@ var require_react_dom_development = __commonJS({
         var HostPortal = 4;
         var HostComponent = 5;
         var HostText = 6;
-        var Fragment13 = 7;
+        var Fragment14 = 7;
         var Mode = 8;
         var ContextConsumer = 9;
         var ContextProvider = 10;
@@ -10196,7 +10196,7 @@ var require_react_dom_development = __commonJS({
               return "DehydratedFragment";
             case ForwardRef:
               return getWrappedName$1(type, type.render, "ForwardRef");
-            case Fragment13:
+            case Fragment14:
               return "Fragment";
             case HostComponent:
               return type;
@@ -19867,7 +19867,7 @@ var require_react_dom_development = __commonJS({
             }
           }
           function updateFragment2(returnFiber, current2, fragment, lanes, key) {
-            if (current2 === null || current2.tag !== Fragment13) {
+            if (current2 === null || current2.tag !== Fragment14) {
               var created = createFiberFromFragment(fragment, returnFiber.mode, lanes, key);
               created.return = returnFiber;
               return created;
@@ -20270,7 +20270,7 @@ var require_react_dom_development = __commonJS({
               if (child.key === key) {
                 var elementType = element.type;
                 if (elementType === REACT_FRAGMENT_TYPE) {
-                  if (child.tag === Fragment13) {
+                  if (child.tag === Fragment14) {
                     deleteRemainingChildren(returnFiber, child.sibling);
                     var existing = useFiber(child, element.props.children);
                     existing.return = returnFiber;
@@ -24445,7 +24445,7 @@ var require_react_dom_development = __commonJS({
               var _resolvedProps2 = workInProgress2.elementType === type ? _unresolvedProps2 : resolveDefaultProps(type, _unresolvedProps2);
               return updateForwardRef(current2, workInProgress2, type, _resolvedProps2, renderLanes2);
             }
-            case Fragment13:
+            case Fragment14:
               return updateFragment(current2, workInProgress2, renderLanes2);
             case Mode:
               return updateMode(current2, workInProgress2, renderLanes2);
@@ -24718,7 +24718,7 @@ var require_react_dom_development = __commonJS({
             case SimpleMemoComponent:
             case FunctionComponent:
             case ForwardRef:
-            case Fragment13:
+            case Fragment14:
             case Mode:
             case Profiler:
             case ContextConsumer:
@@ -28977,7 +28977,7 @@ var require_react_dom_development = __commonJS({
           return fiber;
         }
         function createFiberFromFragment(elements, mode, lanes, key) {
-          var fiber = createFiber(Fragment13, elements, key, mode);
+          var fiber = createFiber(Fragment14, elements, key, mode);
           fiber.lanes = lanes;
           return fiber;
         }
@@ -30125,7 +30125,7 @@ var import_react2 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Button/Button.module.css#css-module
 init_react_import();
-var Button_module_default = { "Button": "_Button_zx1c8_1", "Button--medium": "_Button--medium_zx1c8_21", "Button--large": "_Button--large_zx1c8_28", "Button-icon": "_Button-icon_zx1c8_35", "Button--primary": "_Button--primary_zx1c8_43", "Button--secondary": "_Button--secondary_zx1c8_52", "Button--flush": "_Button--flush_zx1c8_63", "Button--disabled": "_Button--disabled_zx1c8_67", "Button--fullWidth": "_Button--fullWidth_zx1c8_77" };
+var Button_module_default = { "Button": "_Button_1brfa_1", "Button--medium": "_Button--medium_1brfa_22", "Button--large": "_Button--large_1brfa_29", "Button-icon": "_Button-icon_1brfa_36", "Button--primary": "_Button--primary_1brfa_44", "Button--secondary": "_Button--secondary_1brfa_53", "Button--flush": "_Button--flush_1brfa_64", "Button--disabled": "_Button--disabled_1brfa_68", "Button--fullWidth": "_Button--fullWidth_1brfa_78" };
 
 // lib/get-class-name-factory.ts
 init_react_import();
@@ -31974,6 +31974,7 @@ var defaultAppState = {
   data: { content: [], root: { title: "" } },
   ui: {
     leftSideBarVisible: true,
+    rightSideBarVisible: true,
     arrayState: {},
     itemSelector: null,
     componentList: {}
@@ -32301,7 +32302,7 @@ var import_react26 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/IconButton/IconButton.module.css#css-module
 init_react_import();
-var IconButton_module_default = { "IconButton": "_IconButton_13gzt_1" };
+var IconButton_module_default = { "IconButton": "_IconButton_38xdr_1", "IconButton-title": "_IconButton-title_38xdr_18" };
 
 // components/IconButton/IconButton.tsx
 var import_react_spinners3 = require("react-spinners");
@@ -32346,10 +32347,11 @@ var IconButton = ({
       href,
       title,
       children: [
+        /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("span", { className: getClassName4("title"), children: title }),
         children,
         loading && /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
           "\xA0\xA0",
-          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_spinners3.ClipLoader, { color: "inherit", size: "14px" })
+          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_spinners3.ClipLoader, { "aria-label": "Loading", color: "inherit", size: "14px" })
         ] })
       ]
     }
@@ -32367,7 +32369,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/styles.module.css#css-module
 init_react_import();
-var styles_module_default3 = { "Input": "_Input_199j9_1", "Input-label": "_Input-label_199j9_27", "Input-labelIcon": "_Input-labelIcon_199j9_35", "Input-disabledIcon": "_Input-disabledIcon_199j9_41", "Input-input": "_Input-input_199j9_46", "Input--readOnly": "_Input--readOnly_199j9_68", "Input-radioGroupItems": "_Input-radioGroupItems_199j9_86", "Input-radio": "_Input-radio_199j9_86", "Input-radioInner": "_Input-radioInner_199j9_103", "Input-radioInput": "_Input-radioInput_199j9_125" };
+var styles_module_default3 = { "Input": "_Input_1jyrm_1", "Input-label": "_Input-label_1jyrm_27", "Input-labelIcon": "_Input-labelIcon_1jyrm_35", "Input-disabledIcon": "_Input-disabledIcon_1jyrm_41", "Input-input": "_Input-input_1jyrm_46", "Input--readOnly": "_Input--readOnly_1jyrm_69", "Input-radioGroupItems": "_Input-radioGroupItems_1jyrm_87", "Input-radio": "_Input-radio_1jyrm_87", "Input-radioInner": "_Input-radioInner_1jyrm_104", "Input-radioInput": "_Input-radioInput_1jyrm_126" };
 
 // components/InputOrGroup/index.tsx
 var import_react31 = require("react");
@@ -32380,7 +32382,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/fields/ArrayField/styles.module.css#css-module
 init_react_import();
-var styles_module_default4 = { "ArrayField": "_ArrayField_hsw7n_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_hsw7n_13", "ArrayField-addButton": "_ArrayField-addButton_hsw7n_17", "ArrayField--hasItems": "_ArrayField--hasItems_hsw7n_31", "ArrayFieldItem": "_ArrayFieldItem_hsw7n_45", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_hsw7n_53", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_hsw7n_58", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_hsw7n_73", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_hsw7n_86", "ArrayFieldItem-body": "_ArrayFieldItem-body_hsw7n_107", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_hsw7n_115", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_hsw7n_122", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_hsw7n_128", "ArrayFieldItem-action": "_ArrayFieldItem-action_hsw7n_128" };
+var styles_module_default4 = { "ArrayField": "_ArrayField_1auyc_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_1auyc_13", "ArrayField-addButton": "_ArrayField-addButton_1auyc_17", "ArrayField--hasItems": "_ArrayField--hasItems_1auyc_31", "ArrayFieldItem": "_ArrayFieldItem_1auyc_45", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_1auyc_53", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_1auyc_58", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_1auyc_73", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_1auyc_86", "ArrayFieldItem-body": "_ArrayFieldItem-body_1auyc_107", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_1auyc_115", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_1auyc_122", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_1auyc_128", "ArrayFieldItem-action": "_ArrayFieldItem-action_1auyc_128" };
 
 // components/InputOrGroup/fields/ArrayField/index.tsx
 var import_dnd4 = require("@hello-pangea/dnd");
@@ -32434,11 +32436,6 @@ var Draggable2 = ({
   );
 };
 
-// lib/generate-id.ts
-init_react_import();
-var import_crypto = require("crypto");
-var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
-
 // components/InputOrGroup/fields/ArrayField/index.tsx
 var import_react27 = require("react");
 
@@ -32465,47 +32462,59 @@ var ArrayField = ({
   name,
   label,
   readOnly,
-  readOnlyFields = {}
+  readOnlyFields = {},
+  id
 }) => {
-  const [arrayFieldId] = (0, import_react27.useState)(generateId("ArrayField"));
   const { state, setUi } = useAppContext();
-  const arrayStateRef = (0, import_react27.useRef)(
-    state.ui.arrayState[arrayFieldId] || {
-      items: [],
-      openId: ""
-    }
-  );
-  const arrayState = arrayStateRef.current;
-  const setArrayState = (0, import_react27.useCallback)(
-    (partialArrayState, recordHistory = false) => {
-      setUi(
-        {
-          arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
-            [arrayFieldId]: __spreadValues(__spreadValues({}, arrayState), partialArrayState)
-          })
-        },
-        recordHistory
-      );
-      arrayStateRef.current = __spreadValues(__spreadValues({}, arrayState), partialArrayState);
+  const arrayState = state.ui.arrayState[id] || {
+    items: Array.from(value || []).map((item, idx) => {
+      return {
+        _originalIndex: idx,
+        _arrayId: `${id}-${idx}`,
+        data: item
+      };
+    }),
+    openId: ""
+  };
+  const [localState, setLocalState] = (0, import_react27.useState)({ arrayState, value });
+  (0, import_react27.useEffect)(() => {
+    setLocalState({ arrayState, value });
+  }, [value, state.ui.arrayState[id]]);
+  const mapArrayStateToUi = (0, import_react27.useCallback)(
+    (partialArrayState) => {
+      return {
+        arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
+          [id]: __spreadValues(__spreadValues({}, arrayState), partialArrayState)
+        })
+      };
     },
     [arrayState]
   );
-  (0, import_react27.useEffect)(() => {
-    let highestIndex = arrayState.items.reduce(
+  const getHighestIndex = (0, import_react27.useCallback)(() => {
+    return arrayState.items.reduce(
       (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
       -1
     );
-    const newItems = Array.from(value || []).map((item, idx) => {
-      var _a;
-      const arrayStateItem = arrayState.items[idx];
-      return {
-        _originalIndex: typeof (arrayStateItem == null ? void 0 : arrayStateItem._originalIndex) !== "undefined" ? arrayStateItem._originalIndex : ++highestIndex,
-        _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || generateId("ArrayItem"),
-        data: item
-      };
-    });
-    setArrayState({ items: newItems });
-  }, [value]);
+  }, [arrayState]);
+  const regenerateArrayState = (0, import_react27.useCallback)(
+    (value2) => {
+      let highestIndex = getHighestIndex();
+      const newItems = Array.from(value2 || []).map((item, idx) => {
+        var _a;
+        const arrayStateItem = arrayState.items[idx];
+        return {
+          _originalIndex: typeof (arrayStateItem == null ? void 0 : arrayStateItem._originalIndex) !== "undefined" ? arrayStateItem._originalIndex : ++highestIndex,
+          _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || `${id}-${highestIndex}`,
+          data: item
+        };
+      });
+      return __spreadProps(__spreadValues({}, arrayState), { items: newItems });
+    },
+    [arrayState]
+  );
+  (0, import_react27.useEffect)(() => {
+    setUi(mapArrayStateToUi(arrayState));
+  }, []);
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -32520,15 +32529,27 @@ var ArrayField = ({
         import_dnd5.DragDropContext,
         {
           onDragEnd: (event) => {
-            var _a;
+            var _a, _b;
             if (event.destination) {
               const newValue = reorder(
-                arrayState.items,
+                value,
                 event.source.index,
                 (_a = event.destination) == null ? void 0 : _a.index
               );
-              setArrayState(__spreadProps(__spreadValues({}, arrayState), { items: newValue }), false);
-              onChange(newValue.map(({ data }) => data));
+              const newArrayStateItems = reorder(
+                arrayState.items,
+                event.source.index,
+                (_b = event.destination) == null ? void 0 : _b.index
+              );
+              onChange(newValue, {
+                arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
+                  [id]: __spreadProps(__spreadValues({}, arrayState), { items: newArrayStateItems })
+                })
+              });
+              setLocalState({
+                value: newValue,
+                arrayState: __spreadProps(__spreadValues({}, arrayState), { items: newArrayStateItems })
+              });
             }
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_dnd4.Droppable, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
@@ -32541,8 +32562,9 @@ var ArrayField = ({
                   hasItems: Array.isArray(value) && value.length > 0
                 }),
                 children: [
-                  arrayState.items.map(({ data }, i) => {
-                    const { _arrayId, _originalIndex = i } = arrayState.items[i] || {};
+                  localState.arrayState.items.map((item, i) => {
+                    const { _arrayId = `${id}-${i}`, _originalIndex = i } = item;
+                    const data = Array.from(localState.value || [])[i];
                     return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                       Draggable2,
                       {
@@ -32550,7 +32572,7 @@ var ArrayField = ({
                         index: i,
                         className: (_, snapshot2) => getClassNameItem({
                           isExpanded: arrayState.openId === _arrayId,
-                          isDragging: snapshot2.isDragging,
+                          isDragging: snapshot2 == null ? void 0 : snapshot2.isDragging,
                           readOnly
                         }),
                         isDragDisabled: readOnly,
@@ -32560,13 +32582,17 @@ var ArrayField = ({
                             {
                               onClick: () => {
                                 if (arrayState.openId === _arrayId) {
-                                  setArrayState({
-                                    openId: ""
-                                  });
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: ""
+                                    })
+                                  );
                                 } else {
-                                  setArrayState({
-                                    openId: _arrayId
-                                  });
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: _arrayId
+                                    })
+                                  );
                                 }
                               },
                               className: getClassNameItem("summary"),
@@ -32586,11 +32612,12 @@ var ArrayField = ({
                                         ];
                                         existingValue.splice(i, 1);
                                         existingItems.splice(i, 1);
-                                        setArrayState(
-                                          { items: existingItems },
-                                          true
+                                        onChange(
+                                          existingValue,
+                                          mapArrayStateToUi({
+                                            items: existingItems
+                                          })
                                         );
-                                        onChange(existingValue);
                                       },
                                       title: "Delete",
                                       children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(trash_default, { size: 16 })
@@ -32611,15 +32638,18 @@ var ArrayField = ({
                                 {
                                   name: subFieldName,
                                   label: subField.label || fieldName,
+                                  id: `${id}_${fieldName}`,
                                   readOnly: typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName],
                                   readOnlyFields,
                                   field: subField,
                                   value: data[fieldName],
-                                  onChange: (val) => onChange(
-                                    replace(value, i, __spreadProps(__spreadValues({}, data), {
-                                      [fieldName]: val
-                                    }))
-                                  )
+                                  onChange: (val) => {
+                                    onChange(
+                                      replace(value, i, __spreadProps(__spreadValues({}, data), {
+                                        [fieldName]: val
+                                      }))
+                                    );
+                                  }
                                 },
                                 subFieldName
                               );
@@ -32637,7 +32667,12 @@ var ArrayField = ({
                       className: getClassName6("addButton"),
                       onClick: () => {
                         const existingValue = value || [];
-                        onChange([...existingValue, field.defaultItemProps || {}]);
+                        const newValue = [
+                          ...existingValue,
+                          field.defaultItemProps || {}
+                        ];
+                        const newArrayState = regenerateArrayState(newValue);
+                        onChange(newValue, mapArrayStateToUi(newArrayState));
                       },
                       children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(plus_default, { size: "21" })
                     }
@@ -32662,7 +32697,8 @@ var DefaultField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     FieldLabelInternal,
@@ -32688,7 +32724,8 @@ var DefaultField = ({
               onChange(e.currentTarget.value);
             }
           },
-          readOnly
+          readOnly,
+          id
         }
       )
     }
@@ -32777,7 +32814,8 @@ var ExternalInput = ({
   field,
   onChange,
   value = null,
-  name
+  name,
+  id
 }) => {
   const { mapProp = (val) => val } = field || {};
   const [data, setData] = (0, import_react29.useState)([]);
@@ -32811,6 +32849,7 @@ var ExternalInput = ({
         dataSelected: !!value,
         modalVisible: isOpen
       }),
+      id,
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName10("actions"), children: [
           /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
@@ -32888,7 +32927,8 @@ var ExternalField = ({
   onChange,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   var _a, _b, _c;
   const validField = field;
@@ -32924,7 +32964,8 @@ var ExternalField = ({
             }) : validField.fetchList
           }),
           onChange,
-          value
+          value,
+          id
         }
       )
     }
@@ -32940,7 +32981,8 @@ var RadioField = ({
   onChange,
   readOnly,
   value,
-  name
+  name,
+  id
 }) => {
   if (field.type !== "radio" || !field.options) {
     return null;
@@ -32952,7 +32994,7 @@ var RadioField = ({
       label: field.label || name,
       readOnly,
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
         "label",
         {
           className: getClassName11("radio"),
@@ -32994,7 +33036,8 @@ var SelectField = ({
   label,
   value,
   name,
-  readOnly
+  readOnly,
+  id
 }) => {
   if (field.type !== "select" || !field.options) {
     return null;
@@ -33008,6 +33051,7 @@ var SelectField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
         "select",
         {
+          id,
           className: getClassName12("input"),
           disabled: readOnly,
           onChange: (e) => {
@@ -33041,7 +33085,8 @@ var TextareaField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     FieldLabelInternal,
@@ -33052,6 +33097,7 @@ var TextareaField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         "textarea",
         {
+          id,
           className: getClassName13("input"),
           autoComplete: "off",
           name,
@@ -33094,7 +33140,6 @@ var FieldLabelInternal = ({
   el = "label",
   readOnly
 }) => {
-  const El = el;
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     FieldLabel,
     {
@@ -33112,15 +33157,15 @@ var InputOrGroup = (_a) => {
   const { name, field, value, readOnly } = props;
   const [localValue, setLocalValue] = (0, import_react31.useState)(value);
   const onChangeDb = (0, import_use_debounce2.useDebouncedCallback)(
-    (val) => {
-      onChange(val);
+    (val, ui) => {
+      onChange(val, ui);
     },
     50,
     { leading: true }
   );
-  const onChangeLocal = (0, import_react31.useCallback)((val) => {
+  const onChangeLocal = (0, import_react31.useCallback)((val, ui) => {
     setLocalValue(val);
-    onChangeDb(val);
+    onChangeDb(val, ui);
   }, []);
   (0, import_react31.useEffect)(() => {
     setLocalValue(value);
@@ -33415,6 +33460,13 @@ var import_react35 = require("react");
 // lib/use-action-history.ts
 init_react_import();
 var import_react34 = require("react");
+
+// lib/generate-id.ts
+init_react_import();
+var import_crypto = require("crypto");
+var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
+
+// lib/use-action-history.ts
 var EMPTY_HISTORY_INDEX = -1;
 function useActionHistory() {
   const [histories, setHistories] = (0, import_react34.useState)([]);
@@ -33823,13 +33875,19 @@ var storeInterceptor = (reducer) => {
     return newAppState;
   };
 };
+var setAction = (state, action) => {
+  if (typeof action.state === "object") {
+    return __spreadValues(__spreadValues({}, state), action.state);
+  }
+  return __spreadValues(__spreadValues({}, state), action.state(state));
+};
 var createReducer = ({
   config
 }) => storeInterceptor((state, action) => {
   const data = reduceData(state.data, action, config);
   const ui = reduceUi(state.ui, action);
   if (action.type === "set") {
-    return __spreadValues(__spreadValues({}, state), action.state);
+    return setAction(state, action);
   }
   return { data, ui };
 });
@@ -34200,10 +34258,10 @@ var resolveRootData = (data, config) => __async(void 0, null, function* () {
 });
 
 // lib/use-resolved-data.ts
-var useResolvedData = (data, config, dispatch) => {
-  const [{ resolverKey, newData }, setResolverState] = (0, import_react38.useState)({
+var useResolvedData = (appState, config, dispatch) => {
+  const [{ resolverKey, newAppState }, setResolverState] = (0, import_react38.useState)({
     resolverKey: 0,
-    newData: data
+    newAppState: appState
   });
   const [componentState, setComponentState] = (0, import_react38.useState)({});
   const deferredSetStates = {};
@@ -34223,14 +34281,23 @@ var useResolvedData = (data, config, dispatch) => {
     []
   );
   const runResolvers = () => __async(void 0, null, function* () {
+    const newData = newAppState.data;
     const flatContent = Object.keys(newData.zones || {}).reduce((acc, zone) => [...acc, ...newData.zones[zone]], newData.content).filter((item) => !!config.components[item.type].resolveData);
     const applyIfChange = (dynamicDataMap, dynamicRoot) => {
-      const processed = applyDynamicProps(data, dynamicDataMap, dynamicRoot);
-      const containsChanges = JSON.stringify(data) !== JSON.stringify(processed);
+      const processed = applyDynamicProps(
+        appState.data,
+        dynamicDataMap,
+        dynamicRoot
+      );
+      const processedAppState = __spreadProps(__spreadValues({}, appState), { data: processed });
+      const containsChanges = JSON.stringify(appState) !== JSON.stringify(processedAppState);
       if (containsChanges) {
         dispatch({
-          type: "setData",
-          data: (prev) => applyDynamicProps(prev, dynamicDataMap, dynamicRoot),
+          type: "set",
+          state: (prev) => __spreadProps(__spreadValues({}, prev), {
+            data: applyDynamicProps(prev.data, dynamicDataMap, dynamicRoot),
+            ui: __spreadValues(__spreadValues({}, prev.ui), newAppState.ui)
+          }),
           recordHistory: resolverKey > 0
         });
       }
@@ -34268,10 +34335,10 @@ var useResolvedData = (data, config, dispatch) => {
   (0, import_react38.useEffect)(() => {
     runResolvers();
   }, [resolverKey]);
-  const resolveData = (0, import_react38.useCallback)((newData2 = data) => {
+  const resolveData = (0, import_react38.useCallback)((newAppState2 = appState) => {
     setResolverState((curr) => ({
       resolverKey: curr.resolverKey + 1,
-      newData: newData2
+      newAppState: newAppState2
     }));
   }, []);
   return {
@@ -34280,13 +34347,86 @@ var useResolvedData = (data, config, dispatch) => {
   };
 };
 
+// components/MenuBar/index.tsx
+init_react_import();
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/MenuBar/styles.module.css#css-module
+init_react_import();
+var styles_module_default12 = { "MenuBar": "_MenuBar_12sp7_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_12sp7_14", "MenuBar-inner": "_MenuBar-inner_12sp7_29", "MenuBar-history": "_MenuBar-history_12sp7_45" };
+
+// components/MenuBar/index.tsx
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var getClassName18 = get_class_name_factory_default("MenuBar", styles_module_default12);
+var MenuBar = ({
+  appState,
+  data = { content: [], root: { props: { title: "" } } },
+  dispatch,
+  menuOpen = false,
+  onPublish,
+  renderHeaderActions,
+  setMenuOpen
+}) => {
+  const { canForward, canRewind, rewind, forward } = usePuckHistory({
+    appState,
+    dispatch
+  });
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    "div",
+    {
+      className: getClassName18({ menuOpen }),
+      onClick: (event) => {
+        var _a;
+        const element = event.target;
+        if (window.matchMedia("(min-width: 638px)").matches) {
+          return;
+        }
+        if (element.tagName === "A" && ((_a = element.getAttribute("href")) == null ? void 0 : _a.startsWith("#"))) {
+          setMenuOpen(false);
+        }
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(IconButton, { title: "undo", disabled: !canRewind, onClick: rewind, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+            chevron_left_default,
+            {
+              size: 21,
+              stroke: canRewind ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
+            }
+          ) }),
+          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(IconButton, { title: "redo", disabled: !canForward, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+            chevron_right_default,
+            {
+              size: 21,
+              stroke: canForward ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
+            }
+          ) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(import_jsx_runtime22.Fragment, { children: renderHeaderActions && renderHeaderActions({
+          state: appState,
+          dispatch
+        }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          Button,
+          {
+            onClick: () => {
+              onPublish(data);
+            },
+            icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
+            children: "Publish"
+          }
+        ) })
+      ] })
+    }
+  );
+};
+
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default12 = { "Puck": "_Puck_vj9gy_19", "Puck--leftSideBarVisible": "_Puck--leftSideBarVisible_vj9gy_36", "Puck-header": "_Puck-header_vj9gy_72", "Puck-headerInner": "_Puck-headerInner_vj9gy_79", "Puck-headerToggle": "_Puck-headerToggle_vj9gy_89", "Puck-headerTitle": "_Puck-headerTitle_vj9gy_93", "Puck-headerPath": "_Puck-headerPath_vj9gy_97", "Puck-headerTools": "_Puck-headerTools_vj9gy_104", "Puck-leftSideBar": "_Puck-leftSideBar_vj9gy_110", "Puck-frame": "_Puck-frame_vj9gy_119", "Puck-root": "_Puck-root_vj9gy_127", "Puck-page": "_Puck-page_vj9gy_139", "Puck-rightSideBar": "_Puck-rightSideBar_vj9gy_143" };
+var styles_module_default13 = { "Puck": "_Puck_103k9_19", "Puck--leftSideBarVisible": "_Puck--leftSideBarVisible_103k9_35", "Puck--rightSideBarVisible": "_Puck--rightSideBarVisible_103k9_41", "Puck-header": "_Puck-header_103k9_95", "Puck-headerInner": "_Puck-headerInner_103k9_104", "Puck-headerToggle": "_Puck-headerToggle_103k9_114", "Puck-rightSideBarToggle": "_Puck-rightSideBarToggle_103k9_121", "Puck-leftSideBarToggle": "_Puck-leftSideBarToggle_103k9_126", "Puck-headerTitle": "_Puck-headerTitle_103k9_130", "Puck-headerPath": "_Puck-headerPath_103k9_134", "Puck-headerTools": "_Puck-headerTools_103k9_141", "Puck-menuButton": "_Puck-menuButton_103k9_147", "Puck--menuOpen": "_Puck--menuOpen_103k9_152", "Puck-leftSideBar": "_Puck-leftSideBar_103k9_126", "Puck-frame": "_Puck-frame_103k9_171", "Puck-root": "_Puck-root_103k9_179", "Puck-page": "_Puck-page_103k9_192", "Puck-rightSideBar": "_Puck-rightSideBar_103k9_121" };
 
 // components/Puck/index.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
-var getClassName18 = get_class_name_factory_default("Puck", styles_module_default12);
+var import_jsx_runtime23 = require("react/jsx-runtime");
+var getClassName19 = get_class_name_factory_default("Puck", styles_module_default13);
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -34298,7 +34438,7 @@ var PluginRenderer = ({
   renderMethod
 }) => {
   return plugins.filter((item) => item[renderMethod]).map((item) => item[renderMethod]).reduce(
-    (accChildren, Item) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Item, { dispatch, state, children: accChildren }),
+    (accChildren, Item) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Item, { dispatch, state, children: accChildren }),
     children
   );
 };
@@ -34341,15 +34481,12 @@ function Puck({
   );
   const { data, ui } = appState;
   const { resolveData, componentState } = useResolvedData(
-    data,
+    appState,
     config,
     dispatch
   );
-  const { canForward, canRewind, rewind, forward } = usePuckHistory({
-    appState,
-    dispatch
-  });
-  const { itemSelector, leftSideBarVisible } = ui;
+  const [menuOpen, setMenuOpen] = (0, import_react39.useState)(false);
+  const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
   const setItemSelector = (0, import_react39.useCallback)(
     (newItemSelector) => {
       dispatch({
@@ -34363,7 +34500,7 @@ function Puck({
   const Page = (0, import_react39.useCallback)(
     (pageProps) => {
       var _a2, _b2;
-      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
         PluginRenderer,
         {
           plugins,
@@ -34377,7 +34514,7 @@ function Puck({
     [config.root]
   );
   const PageFieldWrapper = (0, import_react39.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34390,7 +34527,7 @@ function Puck({
     []
   );
   const ComponentFieldWrapper = (0, import_react39.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34403,7 +34540,7 @@ function Puck({
     []
   );
   const ComponentListWrapper = (0, import_react39.useCallback)((props) => {
-    const children = /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    const children = /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34437,12 +34574,49 @@ function Puck({
       );
     }
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  const toggleSidebars = (0, import_react39.useCallback)(
+    (sidebar) => {
+      const widerViewport = window.matchMedia("(min-width: 638px)").matches;
+      const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
+      const oppositeSideBar = sidebar === "left" ? "rightSideBarVisible" : "leftSideBarVisible";
+      dispatch({
+        type: "setUi",
+        ui: __spreadValues({
+          [`${sidebar}SideBarVisible`]: !sideBarVisible
+        }, !widerViewport ? { [oppositeSideBar]: false } : {})
+      });
+    },
+    [dispatch, leftSideBarVisible, rightSideBarVisible]
+  );
+  (0, import_react39.useEffect)(() => {
+    if (!window.matchMedia("(min-width: 638px)").matches) {
+      dispatch({
+        type: "setUi",
+        ui: {
+          leftSideBarVisible: false,
+          rightSideBarVisible: false
+        }
+      });
+    }
+    const handleResize = () => {
+      if (!window.matchMedia("(min-width: 638px)").matches) {
+        dispatch({
+          type: "setUi",
+          ui: (ui2) => __spreadValues(__spreadValues({}, ui2), ui2.rightSideBarVisible ? { leftSideBarVisible: false } : {})
+        });
+      }
+    };
+    window.addEventListener("resize", handleResize);
+    return () => {
+      window.removeEventListener("resize", handleResize);
+    };
+  }, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       AppProvider,
       {
         value: { state: appState, dispatch, config, componentState },
-        children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
           import_dnd7.DragDropContext,
           {
             onDragUpdate: (update) => {
@@ -34495,7 +34669,7 @@ function Puck({
                 });
               }
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
               DropZoneProvider,
               {
                 value: {
@@ -34509,239 +34683,260 @@ function Puck({
                   mode: "edit",
                   areaId: "root"
                 },
-                children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(dropZoneContext.Consumer, { children: (ctx) => {
+                children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(dropZoneContext.Consumer, { children: (ctx) => {
                   var _a2, _b2;
-                  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18({ leftSideBarVisible }), children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("header", { className: getClassName18("header"), children: renderHeader ? renderHeader({
-                      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                        Button,
-                        {
-                          onClick: () => {
-                            onPublish(data);
-                          },
-                          icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
-                          children: "Publish"
-                        }
-                      ),
-                      dispatch,
-                      state: appState
-                    }) : /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("headerInner"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("headerToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                        IconButton,
-                        {
-                          onClick: () => dispatch({
-                            type: "setUi",
-                            ui: {
-                              leftSideBarVisible: !leftSideBarVisible
-                            }
-                          }),
-                          title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(sidebar_default, {})
-                        }
-                      ) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Heading, { rank: 2, size: "xs", children: [
-                        headerTitle || rootProps.title || "Page",
-                        headerPath && /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(import_jsx_runtime22.Fragment, { children: [
-                          " ",
-                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("code", { className: getClassName18("headerPath"), children: headerPath })
-                        ] })
-                      ] }) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("headerTools"), children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex" }, children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                            IconButton,
+                  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
+                    "div",
+                    {
+                      className: getClassName19({
+                        leftSideBarVisible,
+                        menuOpen,
+                        rightSideBarVisible
+                      }),
+                      children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("header", { className: getClassName19("header"), children: renderHeader ? renderHeader({
+                          children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                            Button,
                             {
-                              title: "undo",
-                              disabled: !canRewind,
-                              onClick: rewind,
-                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                chevron_left_default,
-                                {
-                                  size: 21,
-                                  stroke: canRewind ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
-                                }
-                              )
+                              onClick: () => {
+                                onPublish(data);
+                              },
+                              icon: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(globe_default, { size: "14px" }),
+                              children: "Publish"
                             }
                           ),
-                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                            IconButton,
-                            {
-                              title: "redo",
-                              disabled: !canForward,
-                              onClick: forward,
-                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                chevron_right_default,
-                                {
-                                  size: 21,
-                                  stroke: canForward ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
-                                }
-                              )
-                            }
-                          )
-                        ] }),
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { children: renderHeaderActions && renderHeaderActions({
-                          state: appState,
-                          dispatch
-                        }) }),
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                          Button,
-                          {
-                            onClick: () => {
-                              onPublish(data);
-                            },
-                            icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
-                            children: "Publish"
-                          }
-                        ) })
-                      ] })
-                    ] }) }),
-                    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("leftSideBar"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SidebarSection, { title: "Components", children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(ComponentListWrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(ComponentList, { id: "all" }) }) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(SidebarSection, { title: "Outline", children: [
-                        (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                          LayerTree,
-                          {
-                            data,
-                            label: areaContainsZones(data, "root") ? rootDroppableId : "",
-                            zoneContent: data.content,
-                            setItemSelector,
-                            itemSelector
-                          }
-                        ),
-                        Object.entries(findZonesForArea(data, "root")).map(
-                          ([zoneKey, zone]) => {
-                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                          dispatch,
+                          state: appState
+                        }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName19("headerInner"), children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName19("headerToggle"), children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                              IconButton,
+                              {
+                                onClick: () => {
+                                  toggleSidebars("left");
+                                },
+                                title: "Toggle left sidebar",
+                                children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(sidebar_default, { focusable: "false" })
+                              }
+                            ) }),
+                            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                              IconButton,
+                              {
+                                onClick: () => {
+                                  toggleSidebars("right");
+                                },
+                                title: "Toggle right sidebar",
+                                children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(sidebar_default, { focusable: "false" })
+                              }
+                            ) })
+                          ] }),
+                          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Heading, { rank: 2, size: "xs", children: [
+                            headerTitle || rootProps.title || "Page",
+                            headerPath && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(import_jsx_runtime23.Fragment, { children: [
+                              " ",
+                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("code", { className: getClassName19("headerPath"), children: headerPath })
+                            ] })
+                          ] }) }),
+                          /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName19("headerTools"), children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                              IconButton,
+                              {
+                                onClick: () => {
+                                  return setMenuOpen(!menuOpen);
+                                },
+                                title: "Toggle menu bar",
+                                children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(chevron_up_default, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(chevron_down_default, { focusable: "false" })
+                              }
+                            ) }),
+                            /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                              MenuBar,
+                              {
+                                appState,
+                                data,
+                                dispatch,
+                                onPublish,
+                                menuOpen,
+                                renderHeaderActions,
+                                setMenuOpen
+                              }
+                            )
+                          ] })
+                        ] }) }),
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName19("leftSideBar"), children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(SidebarSection, { title: "Components", children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ComponentListWrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ComponentList, { id: "all" }) }) }),
+                          /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(SidebarSection, { title: "Outline", children: [
+                            (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
                               LayerTree,
                               {
                                 data,
-                                label: zoneKey,
-                                zone: zoneKey,
-                                zoneContent: zone,
+                                label: areaContainsZones(data, "root") ? rootDroppableId : "",
+                                zoneContent: data.content,
                                 setItemSelector,
                                 itemSelector
-                              },
-                              zoneKey
-                            );
-                          }
-                        )
-                      ] })
-                    ] }),
-                    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
-                      "div",
-                      {
-                        className: getClassName18("frame"),
-                        onClick: () => setItemSelector(null),
-                        id: "puck-frame",
-                        children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("root"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("page"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                            Page,
-                            __spreadProps(__spreadValues({
-                              dispatch,
-                              state: appState
-                            }, rootProps), {
-                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZone, { zone: rootDroppableId })
-                            })
-                          ) }) }),
-                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                            "div",
-                            {
-                              style: {
-                                background: "var(--puck-color-grey-10)",
-                                height: "100%",
-                                flexGrow: 1
                               }
-                            }
-                          )
-                        ]
-                      }
-                    ),
-                    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(FieldWrapper, { dispatch, state: appState, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                      SidebarSection,
-                      {
-                        noPadding: true,
-                        showBreadcrumbs: true,
-                        title: selectedItem ? selectedItem.type : "Page",
-                        isLoading: selectedItem ? (_a2 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a2.loading : (_b2 = componentState["puck-root"]) == null ? void 0 : _b2.loading,
-                        children: Object.keys(fields).map((fieldName) => {
-                          const field = fields[fieldName];
-                          const onChange2 = (value) => {
-                            var _a3, _b3;
-                            let currentProps;
-                            if (selectedItem) {
-                              currentProps = selectedItem.props;
-                            } else {
-                              currentProps = rootProps;
-                            }
-                            const newProps = __spreadProps(__spreadValues({}, currentProps), {
-                              [fieldName]: value
-                            });
-                            if (itemSelector) {
-                              const action = {
-                                type: "replace",
-                                destinationIndex: itemSelector.index,
-                                destinationZone: itemSelector.zone || rootDroppableId,
-                                data: __spreadProps(__spreadValues({}, selectedItem), { props: newProps })
-                              };
-                              if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
-                                resolveData(replaceAction(data, action));
-                              } else {
-                                dispatch(action);
+                            ),
+                            Object.entries(findZonesForArea(data, "root")).map(
+                              ([zoneKey, zone]) => {
+                                return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                                  LayerTree,
+                                  {
+                                    data,
+                                    label: zoneKey,
+                                    zone: zoneKey,
+                                    zoneContent: zone,
+                                    setItemSelector,
+                                    itemSelector
+                                  },
+                                  zoneKey
+                                );
                               }
-                            } else {
-                              if (data.root.props) {
-                                if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
-                                  resolveData(__spreadProps(__spreadValues({}, data), {
-                                    root: { props: newProps }
-                                  }));
+                            )
+                          ] })
+                        ] }),
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
+                          "div",
+                          {
+                            className: getClassName19("frame"),
+                            onClick: () => setItemSelector(null),
+                            id: "puck-frame",
+                            children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("root"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("page"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                                Page,
+                                __spreadProps(__spreadValues({
+                                  dispatch,
+                                  state: appState
+                                }, rootProps), {
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId })
+                                })
+                              ) }) }),
+                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                                "div",
+                                {
+                                  style: {
+                                    background: "var(--puck-color-grey-10)",
+                                    height: "100%",
+                                    flexGrow: 1
+                                  }
+                                }
+                              )
+                            ]
+                          }
+                        ),
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(FieldWrapper, { dispatch, state: appState, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                          SidebarSection,
+                          {
+                            noPadding: true,
+                            showBreadcrumbs: true,
+                            title: selectedItem ? selectedItem.type : "Page",
+                            isLoading: selectedItem ? (_a2 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a2.loading : (_b2 = componentState["puck-root"]) == null ? void 0 : _b2.loading,
+                            children: Object.keys(fields).map((fieldName) => {
+                              const field = fields[fieldName];
+                              const onChange2 = (value, updatedUi) => {
+                                var _a3, _b3;
+                                let currentProps;
+                                if (selectedItem) {
+                                  currentProps = selectedItem.props;
                                 } else {
-                                  dispatch({
-                                    type: "setData",
-                                    data: { root: { props: newProps } }
-                                  });
+                                  currentProps = rootProps;
                                 }
-                              } else {
-                                dispatch({
-                                  type: "setData",
-                                  data: { root: newProps }
+                                const newProps = __spreadProps(__spreadValues({}, currentProps), {
+                                  [fieldName]: value
                                 });
+                                if (itemSelector) {
+                                  const replaceActionData = {
+                                    type: "replace",
+                                    destinationIndex: itemSelector.index,
+                                    destinationZone: itemSelector.zone || rootDroppableId,
+                                    data: __spreadProps(__spreadValues({}, selectedItem), { props: newProps })
+                                  };
+                                  const replacedData = replaceAction(
+                                    data,
+                                    replaceActionData
+                                  );
+                                  const setActionData = {
+                                    type: "set",
+                                    state: {
+                                      data: __spreadValues(__spreadValues({}, data), replacedData),
+                                      ui: __spreadValues(__spreadValues({}, ui), updatedUi)
+                                    }
+                                  };
+                                  if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
+                                    resolveData(
+                                      setAction(appState, setActionData)
+                                    );
+                                  } else {
+                                    dispatch(__spreadProps(__spreadValues({}, setActionData), {
+                                      recordHistory: true
+                                    }));
+                                  }
+                                } else {
+                                  if (data.root.props) {
+                                    if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
+                                      resolveData({
+                                        ui: __spreadValues(__spreadValues({}, ui), updatedUi),
+                                        data: __spreadProps(__spreadValues({}, data), {
+                                          root: { props: newProps }
+                                        })
+                                      });
+                                    } else {
+                                      dispatch({
+                                        type: "set",
+                                        state: {
+                                          ui: __spreadValues(__spreadValues({}, ui), updatedUi),
+                                          data: __spreadProps(__spreadValues({}, data), {
+                                            root: { props: newProps }
+                                          })
+                                        },
+                                        recordHistory: true
+                                      });
+                                    }
+                                  } else {
+                                    dispatch({
+                                      type: "setData",
+                                      data: { root: newProps }
+                                    });
+                                  }
+                                }
+                              };
+                              if (selectedItem && itemSelector) {
+                                const { readOnly = {} } = selectedItem;
+                                return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                                  InputOrGroup,
+                                  {
+                                    field,
+                                    name: fieldName,
+                                    id: `${selectedItem.props.id}_${fieldName}`,
+                                    label: field.label,
+                                    readOnly: readOnly[fieldName],
+                                    readOnlyFields: readOnly,
+                                    value: selectedItem.props[fieldName],
+                                    onChange: onChange2
+                                  },
+                                  `${selectedItem.props.id}_${fieldName}`
+                                );
+                              } else {
+                                const { readOnly = {} } = data.root;
+                                return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                                  InputOrGroup,
+                                  {
+                                    field,
+                                    name: fieldName,
+                                    id: `root_${fieldName}`,
+                                    label: field.label,
+                                    readOnly: readOnly[fieldName],
+                                    readOnlyFields: readOnly,
+                                    value: rootProps[fieldName],
+                                    onChange: onChange2
+                                  },
+                                  `page_${fieldName}`
+                                );
                               }
-                            }
-                          };
-                          if (selectedItem && itemSelector) {
-                            const { readOnly = {} } = selectedItem;
-                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                              InputOrGroup,
-                              {
-                                field,
-                                name: fieldName,
-                                label: field.label,
-                                readOnly: readOnly[fieldName],
-                                readOnlyFields: readOnly,
-                                value: selectedItem.props[fieldName],
-                                onChange: onChange2
-                              },
-                              `${selectedItem.props.id}_${fieldName}`
-                            );
-                          } else {
-                            const { readOnly = {} } = data.root;
-                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                              InputOrGroup,
-                              {
-                                field,
-                                name: fieldName,
-                                label: field.label,
-                                readOnly: readOnly[fieldName],
-                                readOnlyFields: readOnly,
-                                value: rootProps[fieldName],
-                                onChange: onChange2
-                              },
-                              `page_${fieldName}`
-                            );
+                            })
                           }
-                        })
-                      }
-                    ) }) })
-                  ] });
+                        ) }) })
+                      ]
+                    }
+                  );
                 } })
               }
             )
@@ -34749,19 +34944,19 @@ function Puck({
         )
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { id: "puck-portal-root" })
+    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { id: "puck-portal-root" })
   ] });
 }
 
 // components/Render/index.tsx
 init_react_import();
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 function Render({ config, data }) {
   var _a;
   const rootProps = data.root.props || data.root;
   const title = rootProps.title || "";
   if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       config.root.render,
       __spreadProps(__spreadValues({}, rootProps), {
         puck: {
@@ -34770,11 +34965,11 @@ function Render({ config, data }) {
         title,
         editMode: false,
         id: "puck-root",
-        children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId })
+        children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZone, { zone: rootDroppableId })
       })
     ) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZone, { zone: rootDroppableId }) });
 }
 
 // lib/resolve-all-data.ts