@measured/puck 0.12.0-canary.e38b98f → 0.12.0

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 Fragment12 = 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 = Fragment12;
+        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 = getClassName18(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 getClassName18(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 Fragment12 = 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 Fragment12:
+            case Fragment14:
               return "Fragment";
             case HostComponent:
               return type;
@@ -14313,7 +14313,7 @@ var require_react_dom_development = __commonJS({
           defaultPrevented: 0,
           isTrusted: 0
         };
-        var SyntheticEvent2 = createSyntheticEvent(EventInterface);
+        var SyntheticEvent3 = createSyntheticEvent(EventInterface);
         var UIEventInterface = assign({}, EventInterface, {
           view: 0,
           detail: 0
@@ -14789,7 +14789,7 @@ var require_react_dom_development = __commonJS({
           enqueueStateRestore(target);
           var listeners = accumulateTwoPhaseListeners(inst, "onChange");
           if (listeners.length > 0) {
-            var event = new SyntheticEvent2("onChange", "change", null, nativeEvent, target);
+            var event = new SyntheticEvent3("onChange", "change", null, nativeEvent, target);
             dispatchQueue.push({
               event,
               listeners
@@ -15293,7 +15293,7 @@ var require_react_dom_development = __commonJS({
             lastSelection = currentSelection;
             var listeners = accumulateTwoPhaseListeners(activeElementInst$1, "onSelect");
             if (listeners.length > 0) {
-              var event = new SyntheticEvent2("onSelect", "select", null, nativeEvent, nativeEventTarget);
+              var event = new SyntheticEvent3("onSelect", "select", null, nativeEvent, nativeEventTarget);
               dispatchQueue.push({
                 event,
                 listeners
@@ -15405,7 +15405,7 @@ var require_react_dom_development = __commonJS({
           if (reactName === void 0) {
             return;
           }
-          var SyntheticEventCtor = SyntheticEvent2;
+          var SyntheticEventCtor = SyntheticEvent3;
           var reactEventType = domEventName;
           switch (domEventName) {
             case "keypress":
@@ -19867,7 +19867,7 @@ var require_react_dom_development = __commonJS({
             }
           }
           function updateFragment2(returnFiber, current2, fragment, lanes, key) {
-            if (current2 === null || current2.tag !== Fragment12) {
+            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 === Fragment12) {
+                  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 Fragment12:
+            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 Fragment12:
+            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(Fragment12, 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_1muck_1", "Button--medium": "_Button--medium_1muck_20", "Button--large": "_Button--large_1muck_27", "Button-icon": "_Button-icon_1muck_34", "Button--primary": "_Button--primary_1muck_42", "Button--secondary": "_Button--secondary_1muck_51", "Button--flush": "_Button--flush_1muck_62", "Button--disabled": "_Button--disabled_1muck_66", "Button--fullWidth": "_Button--fullWidth_1muck_76" };
+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" })
         ] })
       ]
     }
@@ -32359,7 +32361,7 @@ var IconButton = ({
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react38 = require("react");
+var import_react39 = require("react");
 var import_dnd7 = require("@hello-pangea/dnd");
 
 // components/InputOrGroup/index.tsx
@@ -32367,10 +32369,10 @@ 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_1kw16_1", "Input-label": "_Input-label_1kw16_27", "Input-labelIcon": "_Input-labelIcon_1kw16_34", "Input-disabledIcon": "_Input-disabledIcon_1kw16_40", "Input-input": "_Input-input_1kw16_45", "Input--readOnly": "_Input--readOnly_1kw16_66", "Input-radioGroupItems": "_Input-radioGroupItems_1kw16_78", "Input-radio": "_Input-radio_1kw16_78", "Input-radioInner": "_Input-radioInner_1kw16_95", "Input-radioInput": "_Input-radioInput_1kw16_117" };
+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_react30 = require("react");
+var import_react31 = require("react");
 
 // components/InputOrGroup/fields/index.tsx
 init_react_import();
@@ -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_13rp0_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_13rp0_13", "ArrayField-addButton": "_ArrayField-addButton_13rp0_17", "ArrayField--hasItems": "_ArrayField--hasItems_13rp0_31", "ArrayFieldItem": "_ArrayFieldItem_13rp0_45", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_13rp0_53", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_13rp0_58", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_13rp0_72", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_13rp0_84", "ArrayFieldItem-body": "_ArrayFieldItem-body_13rp0_105", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_13rp0_113", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_13rp0_120", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_13rp0_126", "ArrayFieldItem-action": "_ArrayFieldItem-action_13rp0_126" };
+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,40 +32462,59 @@ var ArrayField = ({
   name,
   label,
   readOnly,
-  readOnlyFields = {}
+  readOnlyFields = {},
+  id
 }) => {
-  const [arrayFieldId] = (0, import_react27.useState)(generateId("ArrayField"));
   const { state, setUi } = useAppContext();
-  const arrayState = state.ui.arrayState[arrayFieldId] || {
-    items: Array.from(value || []).map((v) => ({
-      _arrayId: generateId("ArrayItem"),
-      data: v
-    })),
+  const arrayState = state.ui.arrayState[id] || {
+    items: Array.from(value || []).map((item, idx) => {
+      return {
+        _originalIndex: idx,
+        _arrayId: `${id}-${idx}`,
+        data: item
+      };
+    }),
     openId: ""
   };
-  const setArrayState = (0, import_react27.useCallback)(
-    (newArrayState, recordHistory = false) => {
-      setUi(
-        {
-          arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
-            [arrayFieldId]: __spreadValues(__spreadValues({}, arrayState), newArrayState)
-          })
-        },
-        recordHistory
-      );
+  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]
+  );
+  const getHighestIndex = (0, import_react27.useCallback)(() => {
+    return arrayState.items.reduce(
+      (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
+      -1
+    );
+  }, [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)(() => {
-    const newItems = Array.from(value || []).map((item, idx) => {
-      var _a;
-      return {
-        _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || generateId("ArrayItem"),
-        data: item
-      };
-    });
-    setArrayState({ items: newItems });
-  }, [value]);
+    setUi(mapArrayStateToUi(arrayState));
+  }, []);
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -32513,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) => {
@@ -32534,97 +32562,104 @@ var ArrayField = ({
                   hasItems: Array.isArray(value) && value.length > 0
                 }),
                 children: [
-                  Array.isArray(value) && value.length > 0 ? arrayState.items.map(({ _arrayId, data }, i) => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-                    Draggable2,
-                    {
-                      id: _arrayId,
-                      index: i,
-                      className: (_, snapshot2) => getClassNameItem({
-                        isExpanded: arrayState.openId === _arrayId,
-                        isDragging: snapshot2.isDragging,
-                        readOnly
-                      }),
-                      isDragDisabled: readOnly,
-                      children: () => /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
-                          "div",
-                          {
-                            onClick: () => {
-                              if (arrayState.openId === _arrayId) {
-                                setArrayState({
-                                  openId: ""
-                                });
-                              } else {
-                                setArrayState({
-                                  openId: _arrayId
-                                });
-                              }
-                            },
-                            className: getClassNameItem("summary"),
-                            children: [
-                              field.getItemSummary ? field.getItemSummary(data, i) : `Item #${i}`,
-                              /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: getClassNameItem("rhs"), children: [
-                                !readOnly && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-                                  IconButton,
-                                  {
-                                    onClick: () => {
-                                      const existingValue = [
-                                        ...value || []
-                                      ];
-                                      const existingItems = [
-                                        ...arrayState.items || []
-                                      ];
-                                      existingValue.splice(i, 1);
-                                      existingItems.splice(i, 1);
-                                      setArrayState(
-                                        { items: existingItems },
-                                        true
-                                      );
-                                      onChange(existingValue);
-                                    },
-                                    title: "Delete",
-                                    children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(trash_default, { size: 16 })
-                                  }
-                                ) }) }),
-                                /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DragIcon, {}) })
-                              ] })
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("body"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-                          "fieldset",
-                          {
-                            className: getClassNameItem("fieldset"),
-                            children: Object.keys(field.arrayFields).map(
-                              (fieldName) => {
-                                const subField = field.arrayFields[fieldName];
-                                const subFieldName = `${name}[${i}].${fieldName}`;
-                                const wildcardFieldName = `${name}[*].${fieldName}`;
-                                return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
-                                  InputOrGroup,
-                                  {
-                                    name: subFieldName,
-                                    label: subField.label || fieldName,
-                                    readOnly: typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName],
-                                    readOnlyFields,
-                                    field: subField,
-                                    value: data[fieldName],
-                                    onChange: (val) => onChange(
+                  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,
+                      {
+                        id: _arrayId,
+                        index: i,
+                        className: (_, snapshot2) => getClassNameItem({
+                          isExpanded: arrayState.openId === _arrayId,
+                          isDragging: snapshot2 == null ? void 0 : snapshot2.isDragging,
+                          readOnly
+                        }),
+                        isDragDisabled: readOnly,
+                        children: () => /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
+                            "div",
+                            {
+                              onClick: () => {
+                                if (arrayState.openId === _arrayId) {
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: ""
+                                    })
+                                  );
+                                } else {
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: _arrayId
+                                    })
+                                  );
+                                }
+                              },
+                              className: getClassNameItem("summary"),
+                              children: [
+                                field.getItemSummary ? field.getItemSummary(data, i) : `Item #${_originalIndex}`,
+                                /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: getClassNameItem("rhs"), children: [
+                                  !readOnly && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                    IconButton,
+                                    {
+                                      onClick: (e) => {
+                                        e.stopPropagation();
+                                        const existingValue = [
+                                          ...value || []
+                                        ];
+                                        const existingItems = [
+                                          ...arrayState.items || []
+                                        ];
+                                        existingValue.splice(i, 1);
+                                        existingItems.splice(i, 1);
+                                        onChange(
+                                          existingValue,
+                                          mapArrayStateToUi({
+                                            items: existingItems
+                                          })
+                                        );
+                                      },
+                                      title: "Delete",
+                                      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(trash_default, { size: 16 })
+                                    }
+                                  ) }) }),
+                                  /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DragIcon, {}) })
+                                ] })
+                              ]
+                            }
+                          ),
+                          /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("body"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("fieldset", { className: getClassNameItem("fieldset"), children: Object.keys(field.arrayFields).map(
+                            (fieldName) => {
+                              const subField = field.arrayFields[fieldName];
+                              const subFieldName = `${name}[${i}].${fieldName}`;
+                              const wildcardFieldName = `${name}[*].${fieldName}`;
+                              return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                InputOrGroup,
+                                {
+                                  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
                                       }))
-                                    )
-                                  },
-                                  subFieldName
-                                );
-                              }
-                            )
-                          }
-                        ) })
-                      ] })
-                    },
-                    _arrayId
-                  )) : null,
+                                    );
+                                  }
+                                },
+                                subFieldName
+                              );
+                            }
+                          ) }) })
+                        ] })
+                      },
+                      _arrayId
+                    );
+                  }),
                   provided.placeholder,
                   /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                     "button",
@@ -32632,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" })
                     }
@@ -32657,7 +32697,8 @@ var DefaultField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     FieldLabelInternal,
@@ -32683,7 +32724,8 @@ var DefaultField = ({
               onChange(e.currentTarget.value);
             }
           },
-          readOnly
+          readOnly,
+          id
         }
       )
     }
@@ -32692,18 +32734,19 @@ var DefaultField = ({
 
 // components/InputOrGroup/fields/ExternalField/index.tsx
 init_react_import();
-var import_react29 = require("react");
+var import_react30 = require("react");
 
 // components/ExternalInput/index.tsx
 init_react_import();
-var import_react28 = require("react");
+var import_react29 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ExternalInput/styles.module.css#css-module
 init_react_import();
-var styles_module_default6 = { "ExternalInput": "_ExternalInput_z7jih_1", "ExternalInput-actions": "_ExternalInput-actions_z7jih_5", "ExternalInput-button": "_ExternalInput-button_z7jih_9", "ExternalInput-detachButton": "_ExternalInput-detachButton_z7jih_28", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_z7jih_35", "ExternalInputModal": "_ExternalInputModal_z7jih_56", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_z7jih_63", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_z7jih_68", "ExternalInputModal-table": "_ExternalInputModal-table_z7jih_68", "ExternalInputModal-thead": "_ExternalInputModal-thead_z7jih_82", "ExternalInputModal-th": "_ExternalInputModal-th_z7jih_82", "ExternalInputModal-td": "_ExternalInputModal-td_z7jih_96", "ExternalInputModal-tr": "_ExternalInputModal-tr_z7jih_101", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_z7jih_113", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_z7jih_132", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_z7jih_136", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_z7jih_144", "ExternalInputModal-noContentBanner": "_ExternalInputModal-noContentBanner_z7jih_148", "ExternalInputModal--loaded": "_ExternalInputModal--loaded_z7jih_152" };
+var styles_module_default6 = { "ExternalInput": "_ExternalInput_157li_1", "ExternalInput-actions": "_ExternalInput-actions_157li_5", "ExternalInput-button": "_ExternalInput-button_157li_9", "ExternalInput-detachButton": "_ExternalInput-detachButton_157li_28", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_157li_35", "ExternalInputModal": "_ExternalInputModal_157li_56", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_157li_63", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_157li_68", "ExternalInputModal-table": "_ExternalInputModal-table_157li_68", "ExternalInputModal-thead": "_ExternalInputModal-thead_157li_83", "ExternalInputModal-th": "_ExternalInputModal-th_157li_83", "ExternalInputModal-td": "_ExternalInputModal-td_157li_97", "ExternalInputModal-tr": "_ExternalInputModal-tr_157li_102", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_157li_114", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_157li_133", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_157li_137", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_157li_145", "ExternalInputModal-noContentBanner": "_ExternalInputModal-noContentBanner_157li_149", "ExternalInputModal--loaded": "_ExternalInputModal--loaded_157li_153" };
 
 // components/Modal/index.tsx
 init_react_import();
+var import_react28 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Modal/styles.module.css#css-module
 init_react_import();
@@ -32718,7 +32761,10 @@ var Modal = ({
   onClose,
   isOpen
 }) => {
-  const rootEl = document.getElementById("puck-portal-root");
+  const [rootEl, setRootEl] = (0, import_react28.useState)(null);
+  (0, import_react28.useEffect)(() => {
+    setRootEl(document.getElementById("puck-portal-root"));
+  }, []);
   if (!rootEl) {
     return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", {});
   }
@@ -32768,13 +32814,14 @@ var ExternalInput = ({
   field,
   onChange,
   value = null,
-  name
+  name,
+  id
 }) => {
   const { mapProp = (val) => val } = field || {};
-  const [data, setData] = (0, import_react28.useState)([]);
-  const [isOpen, setOpen] = (0, import_react28.useState)(false);
-  const [isLoading, setIsLoading] = (0, import_react28.useState)(true);
-  const keys = (0, import_react28.useMemo)(() => {
+  const [data, setData] = (0, import_react29.useState)([]);
+  const [isOpen, setOpen] = (0, import_react29.useState)(false);
+  const [isLoading, setIsLoading] = (0, import_react29.useState)(true);
+  const keys = (0, import_react29.useMemo)(() => {
     const validKeys = /* @__PURE__ */ new Set();
     for (const item of data) {
       for (const key of Object.keys(item)) {
@@ -32785,7 +32832,7 @@ var ExternalInput = ({
     }
     return Array.from(validKeys);
   }, [data]);
-  (0, import_react28.useEffect)(() => {
+  (0, import_react29.useEffect)(() => {
     (() => __async(void 0, null, function* () {
       const listData = dataCache[name] || (yield field.fetchList());
       if (listData) {
@@ -32802,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)(
@@ -32879,12 +32927,13 @@ var ExternalField = ({
   onChange,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   var _a, _b, _c;
   const validField = field;
   const deprecatedField = field;
-  (0, import_react29.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     if (deprecatedField.adaptor) {
       console.error(
         "Warning: The `adaptor` API is deprecated. Please use updated APIs on the `external` field instead. This will be a breaking change in a future release."
@@ -32906,7 +32955,7 @@ var ExternalField = ({
           name,
           field: __spreadProps(__spreadValues({}, validField), {
             // DEPRECATED
-            placeholder: ((_a = deprecatedField.adaptor) == null ? void 0 : _a.name) ? `Select from ${deprecatedField.adaptor.name}` : validField.placeholder,
+            placeholder: ((_a = deprecatedField.adaptor) == null ? void 0 : _a.name) ? `Select from ${deprecatedField.adaptor.name}` : validField.placeholder || "Select data",
             mapProp: ((_b = deprecatedField.adaptor) == null ? void 0 : _b.mapProp) || validField.mapProp,
             fetchList: ((_c = deprecatedField.adaptor) == null ? void 0 : _c.fetchList) ? () => __async(void 0, null, function* () {
               return yield deprecatedField.adaptor.fetchList(
@@ -32915,7 +32964,8 @@ var ExternalField = ({
             }) : validField.fetchList
           }),
           onChange,
-          value
+          value,
+          id
         }
       )
     }
@@ -32931,7 +32981,8 @@ var RadioField = ({
   onChange,
   readOnly,
   value,
-  name
+  name,
+  id
 }) => {
   if (field.type !== "radio" || !field.options) {
     return null;
@@ -32943,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"),
@@ -32985,7 +33036,8 @@ var SelectField = ({
   label,
   value,
   name,
-  readOnly
+  readOnly,
+  id
 }) => {
   if (field.type !== "select" || !field.options) {
     return null;
@@ -32999,6 +33051,7 @@ var SelectField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
         "select",
         {
+          id,
           className: getClassName12("input"),
           disabled: readOnly,
           onChange: (e) => {
@@ -33032,7 +33085,8 @@ var TextareaField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     FieldLabelInternal,
@@ -33043,6 +33097,7 @@ var TextareaField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         "textarea",
         {
+          id,
           className: getClassName13("input"),
           autoComplete: "off",
           name,
@@ -33085,7 +33140,6 @@ var FieldLabelInternal = ({
   el = "label",
   readOnly
 }) => {
-  const El = el;
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     FieldLabel,
     {
@@ -33101,17 +33155,19 @@ var FieldLabelInternal = ({
 var InputOrGroup = (_a) => {
   var _b = _a, { onChange } = _b, props = __objRest(_b, ["onChange"]);
   const { name, field, value, readOnly } = props;
-  const [localValue, setLocalValue] = (0, import_react30.useState)(value);
-  const [localValueDb] = (0, import_use_debounce2.useDebounce)(localValue, 50, { leading: true });
-  (0, import_react30.useEffect)(() => {
-    if (value !== localValueDb) {
-      onChange(localValueDb);
-    }
-  }, [localValueDb]);
-  const onChangeLocal = (0, import_react30.useCallback)((val) => {
+  const [localValue, setLocalValue] = (0, import_react31.useState)(value);
+  const onChangeDb = (0, import_use_debounce2.useDebouncedCallback)(
+    (val, ui) => {
+      onChange(val, ui);
+    },
+    50,
+    { leading: true }
+  );
+  const onChangeLocal = (0, import_react31.useCallback)((val, ui) => {
     setLocalValue(val);
+    onChangeDb(val, ui);
   }, []);
-  (0, import_react30.useEffect)(() => {
+  (0, import_react31.useEffect)(() => {
     setLocalValue(value);
   }, [value]);
   const localProps = {
@@ -33152,7 +33208,7 @@ var import_dnd6 = require("@hello-pangea/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 init_react_import();
-var styles_module_default9 = { "ComponentList": "_ComponentList_3rdy2_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_3rdy2_6", "ComponentList-content": "_ComponentList-content_3rdy2_10", "ComponentList-title": "_ComponentList-title_3rdy2_18", "ComponentList-titleIcon": "_ComponentList-titleIcon_3rdy2_39", "ComponentListItem": "_ComponentListItem_3rdy2_43", "ComponentListItem-draggable": "_ComponentListItem-draggable_3rdy2_43", "ComponentListItemIcon": "_ComponentListItemIcon_3rdy2_61", "ComponentList--isDraggingFrom": "_ComponentList--isDraggingFrom_3rdy2_65" };
+var styles_module_default9 = { "ComponentList": "_ComponentList_1m8r5_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1m8r5_6", "ComponentList-content": "_ComponentList-content_1m8r5_10", "ComponentList-title": "_ComponentList-title_1m8r5_18", "ComponentList-titleIcon": "_ComponentList-titleIcon_1m8r5_39", "ComponentListItem": "_ComponentListItem_1m8r5_43", "ComponentListItem-draggable": "_ComponentListItem-draggable_1m8r5_43", "ComponentListItem-name": "_ComponentListItem-name_1m8r5_60", "ComponentList--isDraggingFrom": "_ComponentList--isDraggingFrom_1m8r5_66" };
 
 // components/ComponentList/index.tsx
 var import_jsx_runtime18 = require("react/jsx-runtime");
@@ -33172,7 +33228,7 @@ var ComponentListItem = ({
       disableAnimations: true,
       className: () => getClassNameItem2("draggable"),
       children: () => /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_jsx_runtime18.Fragment, { children: [
-        component,
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameItem2("name"), children: component }),
         /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DragIcon, {}) })
       ] })
     },
@@ -33241,10 +33297,10 @@ ComponentList.Item = ComponentListItem;
 
 // lib/use-placeholder-style.ts
 init_react_import();
-var import_react31 = require("react");
+var import_react32 = require("react");
 var usePlaceholderStyle = () => {
   const queryAttr = "data-rfd-drag-handle-draggable-id";
-  const [placeholderStyle, setPlaceholderStyle] = (0, import_react31.useState)();
+  const [placeholderStyle, setPlaceholderStyle] = (0, import_react32.useState)();
   const onDragStartOrUpdate = (draggedItem) => {
     var _a;
     const draggableId = draggedItem.draggableId;
@@ -33292,11 +33348,11 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/SidebarSection/styles.module.css#css-module
 init_react_import();
-var styles_module_default10 = { "SidebarSection": "_SidebarSection_r7dv3_1", "SidebarSection-title": "_SidebarSection-title_r7dv3_12", "SidebarSection-content": "_SidebarSection-content_r7dv3_19", "SidebarSection--noPadding": "_SidebarSection--noPadding_r7dv3_24", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_r7dv3_33", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_r7dv3_44", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_r7dv3_33", "SidebarSection-heading": "_SidebarSection-heading_r7dv3_56", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_r7dv3_60" };
+var styles_module_default10 = { "SidebarSection": "_SidebarSection_1uyg2_1", "SidebarSection-title": "_SidebarSection-title_1uyg2_12", "SidebarSection-content": "_SidebarSection-content_1uyg2_19", "SidebarSection--noPadding": "_SidebarSection--noPadding_1uyg2_24", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_1uyg2_37", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_1uyg2_48", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_1uyg2_37", "SidebarSection-heading": "_SidebarSection-heading_1uyg2_60", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_1uyg2_64" };
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react32 = require("react");
+var import_react33 = require("react");
 var convertPathDataToBreadcrumbs = (selectedItem, pathData, data) => {
   const id = selectedItem ? selectedItem == null ? void 0 : selectedItem.props.id : "";
   const currentPathData = pathData && id && pathData[id] ? __spreadValues({}, pathData[id]) : { label: "Page", path: [] };
@@ -33346,8 +33402,8 @@ var useBreadcrumbs = (renderCount) => {
     state: { data },
     selectedItem
   } = useAppContext();
-  const dzContext = (0, import_react32.useContext)(dropZoneContext);
-  return (0, import_react32.useMemo)(() => {
+  const dzContext = (0, import_react33.useContext)(dropZoneContext);
+  return (0, import_react33.useMemo)(() => {
     const breadcrumbs = convertPathDataToBreadcrumbs(
       selectedItem,
       dzContext == null ? void 0 : dzContext.pathData,
@@ -33399,15 +33455,22 @@ init_react_import();
 
 // lib/use-puck-history.ts
 init_react_import();
-var import_react34 = require("react");
+var import_react35 = require("react");
 
 // lib/use-action-history.ts
 init_react_import();
-var import_react33 = require("react");
+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_react33.useState)([]);
-  const [currentHistoryIndex, setCurrentHistoryIndex] = (0, import_react33.useState)(EMPTY_HISTORY_INDEX);
+  const [histories, setHistories] = (0, import_react34.useState)([]);
+  const [currentHistoryIndex, setCurrentHistoryIndex] = (0, import_react34.useState)(EMPTY_HISTORY_INDEX);
   const currentHistory = histories[currentHistoryIndex];
   const canRewind = currentHistoryIndex > EMPTY_HISTORY_INDEX;
   const canForward = currentHistoryIndex < histories.length - 1;
@@ -33486,7 +33549,7 @@ function usePuckHistory({
       dispatch
     });
   }, DEBOUNCE_TIME);
-  (0, import_react34.useEffect)(() => {
+  (0, import_react35.useEffect)(() => {
     historyEmitter.on(RECORD_DIFF, handleRecordDiff);
     return () => {
       historyEmitter.off(RECORD_DIFF, handleRecordDiff);
@@ -33812,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 };
 });
@@ -33828,7 +33897,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/LayerTree/styles.module.css#css-module
 init_react_import();
-var styles_module_default11 = { "LayerTree": "_LayerTree_1dcmd_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_1dcmd_11", "LayerTree-helper": "_LayerTree-helper_1dcmd_17", "Layer": "_Layer_1dcmd_1", "Layer-inner": "_Layer-inner_1dcmd_29", "Layer--containsZone": "_Layer--containsZone_1dcmd_35", "Layer-clickable": "_Layer-clickable_1dcmd_39", "Layer--isSelected": "_Layer--isSelected_1dcmd_48", "Layer--isHovering": "_Layer--isHovering_1dcmd_49", "Layer-chevron": "_Layer-chevron_1dcmd_65", "Layer--childIsSelected": "_Layer--childIsSelected_1dcmd_66", "Layer-zones": "_Layer-zones_1dcmd_70", "Layer-title": "_Layer-title_1dcmd_84", "Layer-icon": "_Layer-icon_1dcmd_92", "Layer-zoneIcon": "_Layer-zoneIcon_1dcmd_97" };
+var styles_module_default11 = { "LayerTree": "_LayerTree_o89yt_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_o89yt_11", "LayerTree-helper": "_LayerTree-helper_o89yt_17", "Layer": "_Layer_o89yt_1", "Layer-inner": "_Layer-inner_o89yt_29", "Layer--containsZone": "_Layer--containsZone_o89yt_35", "Layer-clickable": "_Layer-clickable_o89yt_39", "Layer--isSelected": "_Layer--isSelected_o89yt_48", "Layer--isHovering": "_Layer--isHovering_o89yt_49", "Layer-chevron": "_Layer-chevron_o89yt_65", "Layer--childIsSelected": "_Layer--childIsSelected_o89yt_66", "Layer-zones": "_Layer-zones_o89yt_70", "Layer-title": "_Layer-title_o89yt_84", "Layer-name": "_Layer-name_o89yt_93", "Layer-icon": "_Layer-icon_o89yt_99", "Layer-zoneIcon": "_Layer-zoneIcon_o89yt_104" };
 
 // lib/scroll-into-view.ts
 init_react_import();
@@ -33842,7 +33911,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react35 = require("react");
+var import_react36 = require("react");
 
 // lib/find-zones-for-area.ts
 init_react_import();
@@ -33880,7 +33949,7 @@ var LayerTree = ({
   label
 }) => {
   const zones = data.zones || {};
-  const ctx = (0, import_react35.useContext)(dropZoneContext);
+  const ctx = (0, import_react36.useContext)(dropZoneContext);
   return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
     label && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassName17("zoneTitle"), children: [
       /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName17("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(layers_default, { size: "16" }) }),
@@ -33954,7 +34023,7 @@ var LayerTree = ({
                     ),
                     /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassNameLayer("title"), children: [
                       /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(type_default, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(grid_default, { size: "16" }) }),
-                      item.type
+                      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("name"), children: item.type })
                     ] })
                   ]
                 }
@@ -34005,11 +34074,11 @@ var flushZones = (appState) => {
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react36 = require("react");
+var import_react37 = require("react");
 var import_jsx_runtime21 = require("react/jsx-runtime");
 var useComponentList = (config, ui) => {
-  const [componentList, setComponentList] = (0, import_react36.useState)();
-  (0, import_react36.useEffect)(() => {
+  const [componentList, setComponentList] = (0, import_react37.useState)();
+  (0, import_react37.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(ui.componentList).length > 0) {
       const matchedComponents = [];
@@ -34075,7 +34144,7 @@ var useComponentList = (config, ui) => {
 
 // lib/use-resolved-data.ts
 init_react_import();
-var import_react37 = require("react");
+var import_react38 = require("react");
 
 // lib/resolve-component-data.ts
 init_react_import();
@@ -34189,20 +34258,20 @@ 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_react37.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_react37.useState)({});
+  const [componentState, setComponentState] = (0, import_react38.useState)({});
   const deferredSetStates = {};
-  const setComponentLoading = (0, import_react37.useCallback)(
+  const setComponentLoading = (0, import_react38.useCallback)(
     (id, loading, defer = 0) => {
       if (deferredSetStates[id]) {
         clearTimeout(deferredSetStates[id]);
         delete deferredSetStates[id];
       }
-      const setLoading = deferredSetStates[id] = setTimeout(() => {
+      deferredSetStates[id] = setTimeout(() => {
         setComponentState((prev) => __spreadProps(__spreadValues({}, prev), {
           [id]: __spreadProps(__spreadValues({}, prev[id]), { loading })
         }));
@@ -34212,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
         });
       }
@@ -34254,13 +34332,13 @@ var useResolvedData = (data, config, dispatch) => {
     });
     yield Promise.all(promises);
   });
-  (0, import_react37.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     runResolvers();
   }, [resolverKey]);
-  const resolveData = (0, import_react37.useCallback)((newData2 = data) => {
+  const resolveData = (0, import_react38.useCallback)((newAppState2 = appState) => {
     setResolverState((curr) => ({
       resolverKey: curr.resolverKey + 1,
-      newData: newData2
+      newAppState: newAppState2
     }));
   }, []);
   return {
@@ -34269,8 +34347,86 @@ var useResolvedData = (data, config, dispatch) => {
   };
 };
 
-// components/Puck/index.tsx
+// 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_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_runtime23 = require("react/jsx-runtime");
+var getClassName19 = get_class_name_factory_default("Puck", styles_module_default13);
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -34282,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
   );
 };
@@ -34299,8 +34455,8 @@ function Puck({
   headerPath
 }) {
   var _a, _b;
-  const [reducer] = (0, import_react38.useState)(() => createReducer({ config }));
-  const initialAppState = __spreadProps(__spreadValues({}, defaultAppState), {
+  const [reducer] = (0, import_react39.useState)(() => createReducer({ config }));
+  const [initialAppState] = (0, import_react39.useState)(__spreadProps(__spreadValues({}, defaultAppState), {
     data: initialData,
     ui: __spreadProps(__spreadValues({}, defaultAppState.ui), {
       // Store categories under componentList on state to allow render functions and plugins to modify
@@ -34318,23 +34474,20 @@ function Puck({
         {}
       ) : {}
     })
-  });
-  const [appState, dispatch] = (0, import_react38.useReducer)(
+  }));
+  const [appState, dispatch] = (0, import_react39.useReducer)(
     reducer,
     flushZones(initialAppState)
   );
   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 setItemSelector = (0, import_react38.useCallback)(
+  const [menuOpen, setMenuOpen] = (0, import_react39.useState)(false);
+  const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
+  const setItemSelector = (0, import_react39.useCallback)(
     (newItemSelector) => {
       dispatch({
         type: "setUi",
@@ -34344,10 +34497,10 @@ function Puck({
     []
   );
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  const Page = (0, import_react38.useCallback)(
+  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,
@@ -34360,8 +34513,8 @@ function Puck({
     },
     [config.root]
   );
-  const PageFieldWrapper = (0, import_react38.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  const PageFieldWrapper = (0, import_react39.useCallback)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34373,8 +34526,8 @@ function Puck({
     ),
     []
   );
-  const ComponentFieldWrapper = (0, import_react38.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  const ComponentFieldWrapper = (0, import_react39.useCallback)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34386,8 +34539,8 @@ function Puck({
     ),
     []
   );
-  const ComponentListWrapper = (0, import_react38.useCallback)((props) => {
-    const children = /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  const ComponentListWrapper = (0, import_react39.useCallback)((props) => {
+    const children = /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34406,27 +34559,64 @@ function Puck({
   const FieldWrapper = itemSelector ? ComponentFieldWrapper : PageFieldWrapper;
   const rootFields = ((_a = config.root) == null ? void 0 : _a.fields) || defaultPageFields;
   let fields = selectedItem ? ((_b = config.components[selectedItem.type]) == null ? void 0 : _b.fields) || {} : rootFields;
-  (0, import_react38.useEffect)(() => {
+  (0, import_react39.useEffect)(() => {
     if (onChange)
       onChange(data);
   }, [data]);
   const { onDragStartOrUpdate, placeholderStyle } = usePlaceholderStyle();
-  const [draggedItem, setDraggedItem] = (0, import_react38.useState)();
+  const [draggedItem, setDraggedItem] = (0, import_react39.useState)();
   const componentList = useComponentList(config, appState.ui);
   const rootProps = data.root.props || data.root;
-  (0, import_react38.useEffect)(() => {
+  (0, import_react39.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."
       );
     }
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: "puck", 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) => {
@@ -34479,7 +34669,7 @@ function Puck({
                 });
               }
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
               DropZoneProvider,
               {
                 value: {
@@ -34493,248 +34683,133 @@ 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)(
+                  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
                     "div",
                     {
-                      style: {
-                        display: "grid",
-                        gridTemplateAreas: '"header header header" "left editor right"',
-                        gridTemplateColumns: `${leftSideBarVisible ? "288px" : "0px"} auto 288px`,
-                        gridTemplateRows: "min-content auto",
-                        height: "100vh",
-                        position: "fixed",
-                        top: 0,
-                        bottom: 0,
-                        left: 0,
-                        right: 0
-                      },
+                      className: getClassName19({
+                        leftSideBarVisible,
+                        menuOpen,
+                        rightSideBarVisible
+                      }),
                       children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                          "header",
-                          {
-                            style: {
-                              gridArea: "header",
-                              color: "var(--puck-color-black)",
-                              background: "var(--puck-color-white)",
-                              borderBottom: "1px solid var(--puck-color-grey-8)"
-                            },
-                            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",
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("header", { className: getClassName19("header"), children: renderHeader ? renderHeader({
+                          children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+                            Button,
+                            {
+                              onClick: () => {
+                                onPublish(data);
+                              },
+                              icon: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(globe_default, { size: "14px" }),
+                              children: "Publish"
+                            }
+                          ),
+                          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,
                               {
-                                style: {
-                                  display: "grid",
-                                  padding: 16,
-                                  gridTemplateAreas: '"left middle right"',
-                                  gridTemplateColumns: "344px auto 344px",
-                                  gridTemplateRows: "auto"
+                                onClick: () => {
+                                  toggleSidebars("left");
                                 },
-                                children: [
-                                  /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                    "div",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        gap: 16
-                                      },
-                                      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",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        justifyContent: "center",
-                                        alignItems: "center"
-                                      },
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Heading, { rank: 2, size: "xs", children: [
-                                        headerTitle || rootProps.title || "Page",
-                                        headerPath && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                          "small",
-                                          {
-                                            style: { fontWeight: 400, marginLeft: 4 },
-                                            children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("code", { children: headerPath })
-                                          }
-                                        )
-                                      ] })
-                                    }
-                                  ),
-                                  /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
-                                    "div",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        gap: 16,
-                                        justifyContent: "flex-end"
-                                      },
-                                      children: [
-                                        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex" }, 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)"
-                                                }
-                                              )
-                                            }
-                                          )
-                                        ] }),
-                                        renderHeaderActions && renderHeaderActions({
-                                          state: appState,
-                                          dispatch
-                                        }),
-                                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                          Button,
-                                          {
-                                            onClick: () => {
-                                              onPublish(data);
-                                            },
-                                            icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
-                                            children: "Publish"
-                                          }
-                                        )
-                                      ]
-                                    }
-                                  )
-                                ]
+                                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_runtime22.jsxs)(
-                          "div",
-                          {
-                            style: {
-                              gridArea: "left",
-                              background: "var(--puck-color-grey-11)",
-                              borderRight: "1px solid var(--puck-color-grey-8)",
-                              overflowY: "auto",
-                              display: "flex",
-                              flexDirection: "column"
-                            },
-                            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)(
+                          ] })
+                        ] }) }),
+                        /* @__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: areaContainsZones(data, "root") ? rootDroppableId : "",
+                                zoneContent: data.content,
+                                setItemSelector,
+                                itemSelector
+                              }
+                            ),
+                            Object.entries(findZonesForArea(data, "root")).map(
+                              ([zoneKey, zone]) => {
+                                return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
                                   LayerTree,
                                   {
                                     data,
-                                    label: areaContainsZones(data, "root") ? rootDroppableId : "",
-                                    zoneContent: data.content,
+                                    label: zoneKey,
+                                    zone: zoneKey,
+                                    zoneContent: zone,
                                     setItemSelector,
                                     itemSelector
-                                  }
-                                ),
-                                Object.entries(findZonesForArea(data, "root")).map(
-                                  ([zoneKey, zone]) => {
-                                    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                      LayerTree,
-                                      {
-                                        data,
-                                        label: zoneKey,
-                                        zone: zoneKey,
-                                        zoneContent: zone,
-                                        setItemSelector,
-                                        itemSelector
-                                      },
-                                      zoneKey
-                                    );
-                                  }
-                                )
-                              ] })
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
+                                  },
+                                  zoneKey
+                                );
+                              }
+                            )
+                          ] })
+                        ] }),
+                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
                           "div",
                           {
-                            style: {
-                              overflowY: "auto",
-                              gridArea: "editor",
-                              position: "relative",
-                              display: "flex",
-                              flexDirection: "column"
-                            },
+                            className: getClassName19("frame"),
                             onClick: () => setItemSelector(null),
                             id: "puck-frame",
                             children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                "div",
-                                {
-                                  className: "puck-root",
-                                  style: {
-                                    boxShadow: "0px 0px 0px 32px var(--puck-color-grey-10)",
-                                    margin: 32,
-                                    zoom: 0.75
-                                  },
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                    "div",
-                                    {
-                                      style: {
-                                        border: "1px solid var(--puck-color-grey-8)"
-                                      },
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                                        Page,
-                                        __spreadProps(__spreadValues({
-                                          dispatch,
-                                          state: appState
-                                        }, data.root), {
-                                          children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZone, { zone: rootDroppableId })
-                                        })
-                                      )
-                                    }
-                                  )
-                                }
-                              ),
-                              /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                              /* @__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: {
@@ -34747,106 +34822,118 @@ function Puck({
                             ]
                           }
                         ),
-                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-                          "div",
+                        /* @__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,
                           {
-                            style: {
-                              borderLeft: "1px solid var(--puck-color-grey-8)",
-                              overflowY: "auto",
-                              gridArea: "right",
-                              fontFamily: "var(--puck-font-stack)",
-                              display: "flex",
-                              flexDirection: "column",
-                              background: "var(--puck-color-white)"
-                            },
-                            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 = data.root;
-                                    }
-                                    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);
-                                      }
-                                    } else {
-                                      if (data.root.props) {
-                                        if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
-                                          resolveData(__spreadProps(__spreadValues({}, data), {
-                                            root: { props: { newProps } }
-                                          }));
-                                        } else {
-                                          dispatch({
-                                            type: "setData",
-                                            data: { root: { props: { newProps } } }
-                                          });
-                                        }
-                                      } else {
-                                        dispatch({
-                                          type: "setData",
-                                          data: { root: newProps }
-                                        });
-                                      }
+                            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 {
+                                  currentProps = rootProps;
+                                }
+                                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 (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}`
+                                  if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
+                                    resolveData(
+                                      setAction(appState, setActionData)
                                     );
                                   } 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}`
-                                    );
+                                    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}`
+                                );
                               }
-                            ) })
+                            })
                           }
-                        )
+                        ) }) })
                       ]
                     }
                   );
@@ -34857,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: {
@@ -34878,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