@measured/puck 0.14.0-canary.4932a6e → 0.14.0-canary.4c77ac5

package/dist/index.js

@@ -8264,8 +8264,8 @@ var require_react_dom_development = __commonJS({
               if (propertyInfo !== null) {
                 return !propertyInfo.acceptsBooleans;
               } else {
-                var prefix2 = name.toLowerCase().slice(0, 5);
-                return prefix2 !== "data-" && prefix2 !== "aria-";
+                var prefix3 = name.toLowerCase().slice(0, 5);
+                return prefix3 !== "data-" && prefix3 !== "aria-";
               }
             }
             default:
@@ -8937,18 +8937,18 @@ var require_react_dom_development = __commonJS({
           }
         }
         var ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
-        var prefix;
+        var prefix2;
         function describeBuiltInComponentFrame(name, source, ownerFn) {
           {
-            if (prefix === void 0) {
+            if (prefix2 === void 0) {
               try {
                 throw Error();
               } catch (x) {
                 var match = x.stack.trim().match(/\n( *(at )?)/);
-                prefix = match && match[1] || "";
+                prefix2 = match && match[1] || "";
               }
             }
-            return "\n" + prefix + name;
+            return "\n" + prefix2 + name;
           }
         }
         var reentry = false;
@@ -10033,13 +10033,13 @@ var require_react_dom_development = __commonJS({
           strokeOpacity: true,
           strokeWidth: true
         };
-        function prefixKey(prefix2, key) {
-          return prefix2 + key.charAt(0).toUpperCase() + key.substring(1);
+        function prefixKey(prefix3, key) {
+          return prefix3 + key.charAt(0).toUpperCase() + key.substring(1);
         }
         var prefixes = ["Webkit", "ms", "Moz", "O"];
         Object.keys(isUnitlessNumber).forEach(function(prop) {
-          prefixes.forEach(function(prefix2) {
-            isUnitlessNumber[prefixKey(prefix2, prop)] = isUnitlessNumber[prop];
+          prefixes.forEach(function(prefix3) {
+            isUnitlessNumber[prefixKey(prefix3, prop)] = isUnitlessNumber[prop];
           });
         });
         function dangerousStyleValue(name, value, isCustomProperty) {
@@ -29173,7 +29173,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_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" };
+var Button_module_default = { "Button": "_Button_8fn3a_1", "Button--medium": "_Button--medium_8fn3a_29", "Button--large": "_Button--large_8fn3a_37", "Button-icon": "_Button-icon_8fn3a_44", "Button--primary": "_Button--primary_8fn3a_48", "Button--secondary": "_Button--secondary_8fn3a_67", "Button--flush": "_Button--flush_8fn3a_82", "Button--disabled": "_Button--disabled_8fn3a_86", "Button--fullWidth": "_Button--fullWidth_8fn3a_93", "Button-spinner": "_Button-spinner_8fn3a_98" };
 
 // lib/get-class-name-factory.ts
 init_react_import();
@@ -29227,7 +29227,7 @@ var Button = ({
 }) => {
   const [loading, setLoading] = (0, import_react2.useState)(loadingProp);
   (0, import_react2.useEffect)(() => setLoading(loadingProp), [loadingProp]);
-  const ElementType = href ? "a" : onClick ? "button" : "div";
+  const ElementType = href ? "a" : type ? "button" : "span";
   const el = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     ElementType,
     {
@@ -29255,10 +29255,7 @@ var Button = ({
       children: [
         icon && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: getClassName("icon"), children: icon }),
         children,
-        loading && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-          "\xA0\xA0",
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_spinners.ClipLoader, { "aria-label": "loading", color: "inherit", size: "14px" })
-        ] })
+        loading && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: getClassName("spinner"), children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_spinners.ClipLoader, { "aria-label": "loading", color: "inherit", size: "14px" }) })
       ]
     }
   );
@@ -29267,15 +29264,15 @@ var Button = ({
 
 // components/Drawer/index.tsx
 init_react_import();
-var import_dnd2 = require("@hello-pangea/dnd");
+var import_dnd2 = require("@measured/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Drawer/styles.module.css#css-module
 init_react_import();
-var styles_module_default = { "DrawerItem": "_DrawerItem_1qydx_1", "DrawerItem-default": "_DrawerItem-default_1qydx_1", "DrawerItem-draggableWrapper": "_DrawerItem-draggableWrapper_1qydx_1", "DrawerItem-draggable": "_DrawerItem-draggable_1qydx_1", "Drawer": "_Drawer_1qydx_1", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_1qydx_21", "DrawerItem-name": "_DrawerItem-name_1qydx_26" };
+var styles_module_default = { "Drawer": "_Drawer_6zh0b_1", "DrawerItem-default": "_DrawerItem-default_6zh0b_5", "DrawerItem-draggableWrapper": "_DrawerItem-draggableWrapper_6zh0b_5", "DrawerItem": "_DrawerItem_6zh0b_5", "DrawerItem-draggable": "_DrawerItem-draggable_6zh0b_5", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_6zh0b_31", "DrawerItem-name": "_DrawerItem-name_6zh0b_47" };
 
 // components/Draggable/index.tsx
 init_react_import();
-var import_dnd = require("@hello-pangea/dnd");
+var import_dnd = require("@measured/dnd");
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var Draggable = ({
   className,
@@ -29350,7 +29347,7 @@ var replace = (list, index, newItem) => {
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DragIcon/styles.module.css#css-module
 init_react_import();
-var styles_module_default2 = { "DragIcon": "_DragIcon_o29on_1" };
+var styles_module_default2 = { "DragIcon": "_DragIcon_1p5wn_1" };
 
 // components/DragIcon/index.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
@@ -29385,16 +29382,17 @@ var DrawerItem = ({
   name,
   children,
   id,
+  label,
   index
 }) => {
   const ctx = (0, import_react3.useContext)(drawerContext);
   const resolvedId = `${ctx.droppableId}::${id || name}`;
   const CustomInner = (0, import_react3.useMemo)(
-    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("default"), children: children2 })),
+    () => children || (({ children: children2, name: name2 }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("default"), children: children2 })),
     [children]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DrawerDraggable, { id: resolvedId, index, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CustomInner, { children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: getClassNameItem("draggable"), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("name"), children: name }),
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DrawerDraggable, { id: resolvedId, index, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: getClassNameItem("draggable"), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("name"), children: label != null ? label : name }),
     /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassNameItem("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DragIcon, {}) })
   ] }) }) }) });
 };
@@ -29425,12 +29423,12 @@ var import_react9 = require("react");
 
 // components/DraggableComponent/index.tsx
 init_react_import();
-var import_react6 = require("react");
-var import_dnd3 = require("@hello-pangea/dnd");
+var import_react7 = require("react");
+var import_dnd3 = require("@measured/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
 init_react_import();
-var styles_module_default3 = { "DraggableComponent": "_DraggableComponent_foluk_1", "DraggableComponent--isDragging": "_DraggableComponent--isDragging_foluk_6", "DraggableComponent-contents": "_DraggableComponent-contents_foluk_12", "DraggableComponent-overlay": "_DraggableComponent-overlay_foluk_25", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_foluk_39", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_foluk_55", "DraggableComponent--forceHover": "_DraggableComponent--forceHover_foluk_61", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_foluk_66", "DraggableComponent--indicativeHover": "_DraggableComponent--indicativeHover_foluk_71", "DraggableComponent-actions": "_DraggableComponent-actions_foluk_97", "DraggableComponent-actionsLabel": "_DraggableComponent-actionsLabel_foluk_120", "DraggableComponent-action": "_DraggableComponent-action_foluk_97" };
+var styles_module_default3 = { "DraggableComponent": "_DraggableComponent_175tf_1", "DraggableComponent--isDragging": "_DraggableComponent--isDragging_175tf_11", "DraggableComponent-contents": "_DraggableComponent-contents_175tf_16", "DraggableComponent-overlay": "_DraggableComponent-overlay_175tf_29", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_175tf_49", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_175tf_65", "DraggableComponent--forceHover": "_DraggableComponent--forceHover_175tf_71", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_175tf_76", "DraggableComponent--indicativeHover": "_DraggableComponent--indicativeHover_175tf_81", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_175tf_97", "DraggableComponent-actions": "_DraggableComponent-actions_175tf_97", "DraggableComponent-actionsLabel": "_DraggableComponent-actionsLabel_175tf_127", "DraggableComponent-action": "_DraggableComponent-action_175tf_97" };
 
 // ../../node_modules/lucide-react/dist/esm/lucide-react.js
 init_react_import();
@@ -29582,6 +29580,14 @@ var Lock = createLucideIcon("Lock", [
   ["path", { d: "M7 11V7a5 5 0 0 1 10 0v4", key: "fwvmzm" }]
 ]);
 
+// ../../node_modules/lucide-react/dist/esm/icons/monitor.js
+init_react_import();
+var Monitor = createLucideIcon("Monitor", [
+  ["rect", { width: "20", height: "14", x: "2", y: "3", rx: "2", key: "48i651" }],
+  ["line", { x1: "8", x2: "16", y1: "21", y2: "21", key: "1svkeh" }],
+  ["line", { x1: "12", x2: "12", y1: "17", y2: "21", key: "vw1qmm" }]
+]);
+
 // ../../node_modules/lucide-react/dist/esm/icons/more-vertical.js
 init_react_import();
 var MoreVertical = createLucideIcon("MoreVertical", [
@@ -29618,6 +29624,34 @@ var Search = createLucideIcon("Search", [
   ["path", { d: "m21 21-4.3-4.3", key: "1qie3q" }]
 ]);
 
+// ../../node_modules/lucide-react/dist/esm/icons/sliders-horizontal.js
+init_react_import();
+var SlidersHorizontal = createLucideIcon("SlidersHorizontal", [
+  ["line", { x1: "21", x2: "14", y1: "4", y2: "4", key: "obuewd" }],
+  ["line", { x1: "10", x2: "3", y1: "4", y2: "4", key: "1q6298" }],
+  ["line", { x1: "21", x2: "12", y1: "12", y2: "12", key: "1iu8h1" }],
+  ["line", { x1: "8", x2: "3", y1: "12", y2: "12", key: "ntss68" }],
+  ["line", { x1: "21", x2: "16", y1: "20", y2: "20", key: "14d8ph" }],
+  ["line", { x1: "12", x2: "3", y1: "20", y2: "20", key: "m0wm8r" }],
+  ["line", { x1: "14", x2: "14", y1: "2", y2: "6", key: "14e1ph" }],
+  ["line", { x1: "8", x2: "8", y1: "10", y2: "14", key: "1i6ji0" }],
+  ["line", { x1: "16", x2: "16", y1: "18", y2: "22", key: "1lctlv" }]
+]);
+
+// ../../node_modules/lucide-react/dist/esm/icons/smartphone.js
+init_react_import();
+var Smartphone = createLucideIcon("Smartphone", [
+  ["rect", { width: "14", height: "20", x: "5", y: "2", rx: "2", ry: "2", key: "1yt0o3" }],
+  ["path", { d: "M12 18h.01", key: "mhygvu" }]
+]);
+
+// ../../node_modules/lucide-react/dist/esm/icons/tablet.js
+init_react_import();
+var Tablet = createLucideIcon("Tablet", [
+  ["rect", { width: "16", height: "20", x: "4", y: "2", rx: "2", ry: "2", key: "76otgf" }],
+  ["line", { x1: "12", x2: "12.01", y1: "18", y2: "18", key: "1dp563" }]
+]);
+
 // ../../node_modules/lucide-react/dist/esm/icons/trash.js
 init_react_import();
 var Trash = createLucideIcon("Trash", [
@@ -29641,6 +29675,23 @@ var Unlock = createLucideIcon("Unlock", [
   ["path", { d: "M7 11V7a5 5 0 0 1 9.9-1", key: "1mm8w8" }]
 ]);
 
+// ../../node_modules/lucide-react/dist/esm/icons/zoom-in.js
+init_react_import();
+var ZoomIn = createLucideIcon("ZoomIn", [
+  ["circle", { cx: "11", cy: "11", r: "8", key: "4ej97u" }],
+  ["line", { x1: "21", x2: "16.65", y1: "21", y2: "16.65", key: "13gj7c" }],
+  ["line", { x1: "11", x2: "11", y1: "8", y2: "14", key: "1vmskp" }],
+  ["line", { x1: "8", x2: "14", y1: "11", y2: "11", key: "durymu" }]
+]);
+
+// ../../node_modules/lucide-react/dist/esm/icons/zoom-out.js
+init_react_import();
+var ZoomOut = createLucideIcon("ZoomOut", [
+  ["circle", { cx: "11", cy: "11", r: "8", key: "4ej97u" }],
+  ["line", { x1: "21", x2: "16.65", y1: "21", y2: "16.65", key: "13gj7c" }],
+  ["line", { x1: "8", x2: "14", y1: "11", y2: "11", key: "durymu" }]
+]);
+
 // lib/use-modifier-held.ts
 init_react_import();
 var import_react5 = require("react");
@@ -29669,8 +29720,118 @@ var useModifierHeld = (modifier) => {
 
 // components/DraggableComponent/index.tsx
 var import_react_spinners2 = require("react-spinners");
+
+// components/Puck/context.tsx
+init_react_import();
+var import_react6 = require("react");
+
+// lib/get-item.ts
+init_react_import();
+
+// lib/root-droppable-id.ts
+init_react_import();
+var rootDroppableId = "default-zone";
+
+// lib/setup-zone.ts
+init_react_import();
+var setupZone = (data, zoneKey) => {
+  if (zoneKey === rootDroppableId) {
+    return data;
+  }
+  const newData = __spreadValues({}, data);
+  newData.zones = data.zones || {};
+  newData.zones[zoneKey] = newData.zones[zoneKey] || [];
+  return newData;
+};
+
+// lib/get-item.ts
+var getItem = (selector, data, dynamicProps = {}) => {
+  if (!selector.zone || selector.zone === rootDroppableId) {
+    const item2 = data.content[selector.index];
+    return __spreadProps(__spreadValues({}, item2), { props: dynamicProps[item2.props.id] || item2.props });
+  }
+  const item = setupZone(data, selector.zone).zones[selector.zone][selector.index];
+  return __spreadProps(__spreadValues({}, item), { props: dynamicProps[item.props.id] || item.props });
+};
+
+// components/ViewportControls/default-viewports.ts
+init_react_import();
+var defaultViewports = [
+  { width: 360, height: "auto", icon: "Smartphone", label: "Small" },
+  { width: 768, height: "auto", icon: "Tablet", label: "Medium" },
+  { width: 1280, height: "auto", icon: "Monitor", label: "Large" }
+];
+
+// components/Puck/context.tsx
 var import_jsx_runtime5 = require("react/jsx-runtime");
+var defaultAppState = {
+  data: { content: [], root: { props: { title: "" } } },
+  ui: {
+    leftSideBarVisible: true,
+    rightSideBarVisible: true,
+    arrayState: {},
+    itemSelector: null,
+    componentList: {},
+    isDragging: false,
+    viewports: {
+      current: {
+        width: defaultViewports[0].width,
+        height: defaultViewports[0].height || "auto"
+      },
+      options: [],
+      controlsVisible: true
+    }
+  }
+};
+var defaultContext = {
+  state: defaultAppState,
+  dispatch: () => null,
+  config: { components: {} },
+  componentState: {},
+  resolveData: () => {
+  },
+  plugins: [],
+  overrides: {},
+  history: {},
+  viewports: defaultViewports,
+  zoomConfig: {
+    autoZoom: 0,
+    rootHeight: 0,
+    zoom: 1
+  },
+  setZoomConfig: () => null
+};
+var appContext = (0, import_react6.createContext)(defaultContext);
+var AppProvider = ({
+  children,
+  value
+}) => {
+  const [zoomConfig, setZoomConfig] = (0, import_react6.useState)(defaultContext.zoomConfig);
+  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(appContext.Provider, { value: __spreadProps(__spreadValues({}, value), { zoomConfig, setZoomConfig }), children });
+};
+function useAppContext() {
+  const mainContext = (0, import_react6.useContext)(appContext);
+  const selectedItem = mainContext.state.ui.itemSelector ? getItem(mainContext.state.ui.itemSelector, mainContext.state.data) : void 0;
+  return __spreadProps(__spreadValues({}, mainContext), {
+    // Helpers
+    selectedItem,
+    setUi: (ui, recordHistory) => {
+      return mainContext.dispatch({
+        type: "setUi",
+        ui,
+        recordHistory
+      });
+    }
+  });
+}
+
+// components/DraggableComponent/index.tsx
+var import_jsx_runtime6 = require("react/jsx-runtime");
 var getClassName4 = get_class_name_factory_default("DraggableComponent", styles_module_default3);
+var space = 8;
+var actionsOverlayTop = space * 6.5;
+var actionsTop = -(actionsOverlayTop - 8);
+var actionsRight = space;
 var DraggableComponent = ({
   children,
   id,
@@ -29693,15 +29854,16 @@ var DraggableComponent = ({
   indicativeHover = false,
   style
 }) => {
+  const { zoomConfig } = useAppContext();
   const isModifierHeld = useModifierHeld("Alt");
-  (0, import_react6.useEffect)(onMount, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+  (0, import_react7.useEffect)(onMount, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     import_dnd3.Draggable,
     {
       draggableId: id,
       index,
       isDragDisabled,
-      children: (provided, snapshot) => /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
+      children: (provided, snapshot) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
         "div",
         __spreadProps(__spreadValues(__spreadValues({
           ref: provided.innerRef
@@ -29724,13 +29886,34 @@ var DraggableComponent = ({
           onClick,
           children: [
             debug,
-            isLoading && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { className: getClassName4("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_spinners2.ClipLoader, { "aria-label": "loading", size: 16, color: "inherit" }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { className: getClassName4("overlay"), children: /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("div", { className: getClassName4("actions"), children: [
-              label && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { className: getClassName4("actionsLabel"), children: label }),
-              /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("button", { className: getClassName4("action"), onClick: onDuplicate, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Copy, { size: 16 }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("button", { className: getClassName4("action"), onClick: onDelete, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Trash, { size: 16 }) })
-            ] }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { className: getClassName4("contents"), children })
+            isLoading && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: getClassName4("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react_spinners2.ClipLoader, { "aria-label": "loading", size: 16, color: "inherit" }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+              "div",
+              {
+                className: getClassName4("actionsOverlay"),
+                style: {
+                  top: actionsOverlayTop / zoomConfig.zoom
+                },
+                children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
+                  "div",
+                  {
+                    className: getClassName4("actions"),
+                    style: {
+                      transform: `scale(${1 / zoomConfig.zoom}`,
+                      top: actionsTop / zoomConfig.zoom,
+                      right: actionsRight / zoomConfig.zoom
+                    },
+                    children: [
+                      label && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: getClassName4("actionsLabel"), children: label }),
+                      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { className: getClassName4("action"), onClick: onDuplicate, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Copy, { size: 16 }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("button", { className: getClassName4("action"), onClick: onDelete, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Trash, { size: 16 }) })
+                    ]
+                  }
+                )
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: getClassName4("overlay") }),
+            /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("div", { className: getClassName4("contents"), children })
           ]
         })
       )
@@ -29740,44 +29923,15 @@ var DraggableComponent = ({
 };
 
 // components/DropZone/index.tsx
-var import_dnd4 = require("@hello-pangea/dnd");
-
-// lib/get-item.ts
-init_react_import();
-
-// lib/root-droppable-id.ts
-init_react_import();
-var rootDroppableId = "default-zone";
-
-// lib/setup-zone.ts
-init_react_import();
-var setupZone = (data, zoneKey) => {
-  if (zoneKey === rootDroppableId) {
-    return data;
-  }
-  const newData = __spreadValues({}, data);
-  newData.zones = data.zones || {};
-  newData.zones[zoneKey] = newData.zones[zoneKey] || [];
-  return newData;
-};
-
-// lib/get-item.ts
-var getItem = (selector, data, dynamicProps = {}) => {
-  if (!selector.zone || selector.zone === rootDroppableId) {
-    const item2 = data.content[selector.index];
-    return __spreadProps(__spreadValues({}, item2), { props: dynamicProps[item2.props.id] || item2.props });
-  }
-  const item = setupZone(data, selector.zone).zones[selector.zone][selector.index];
-  return __spreadProps(__spreadValues({}, item), { props: dynamicProps[item.props.id] || item.props });
-};
+var import_dnd4 = require("@measured/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DropZone/styles.module.css#css-module
 init_react_import();
-var styles_module_default4 = { "DropZone": "_DropZone_i675d_1", "DropZone--zoomEnabled": "_DropZone--zoomEnabled_i675d_10", "DropZone-renderWrapper": "_DropZone-renderWrapper_i675d_14", "DropZone-content": "_DropZone-content_i675d_18", "DropZone--userIsDragging": "_DropZone--userIsDragging_i675d_23", "DropZone--draggingOverArea": "_DropZone--draggingOverArea_i675d_27", "DropZone--draggingNewComponent": "_DropZone--draggingNewComponent_i675d_28", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_i675d_34", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_i675d_35", "DropZone--isDisabled": "_DropZone--isDisabled_i675d_36", "DropZone--isRootZone": "_DropZone--isRootZone_i675d_37", "DropZone--hasChildren": "_DropZone--hasChildren_i675d_43", "DropZone--isDestination": "_DropZone--isDestination_i675d_48", "DropZone-item": "_DropZone-item_i675d_56", "DropZone-hitbox": "_DropZone-hitbox_i675d_60" };
+var styles_module_default4 = { "DropZone": "_DropZone_jtf9d_1", "DropZone-content": "_DropZone-content_jtf9d_10", "DropZone--userIsDragging": "_DropZone--userIsDragging_jtf9d_15", "DropZone--draggingOverArea": "_DropZone--draggingOverArea_jtf9d_19", "DropZone--draggingNewComponent": "_DropZone--draggingNewComponent_jtf9d_20", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_jtf9d_26", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_jtf9d_27", "DropZone--isDisabled": "_DropZone--isDisabled_jtf9d_28", "DropZone--isRootZone": "_DropZone--isRootZone_jtf9d_29", "DropZone--hasChildren": "_DropZone--hasChildren_jtf9d_30", "DropZone--isDestination": "_DropZone--isDestination_jtf9d_40", "DropZone-item": "_DropZone-item_jtf9d_48", "DropZone-hitbox": "_DropZone-hitbox_jtf9d_52" };
 
 // components/DropZone/context.tsx
 init_react_import();
-var import_react7 = require("react");
+var import_react8 = require("react");
 var import_use_debounce = require("use-debounce");
 
 // lib/get-zone-id.ts
@@ -29793,30 +29947,30 @@ var getZoneId = (zoneCompound) => {
 };
 
 // components/DropZone/context.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
-var dropZoneContext = (0, import_react7.createContext)(null);
+var import_jsx_runtime7 = require("react/jsx-runtime");
+var dropZoneContext = (0, import_react8.createContext)(null);
 var DropZoneProvider = ({
   children,
   value
 }) => {
-  const [hoveringArea, setHoveringArea] = (0, import_react7.useState)(null);
-  const [hoveringZone, setHoveringZone] = (0, import_react7.useState)(
+  const [hoveringArea, setHoveringArea] = (0, import_react8.useState)(null);
+  const [hoveringZone, setHoveringZone] = (0, import_react8.useState)(
     rootDroppableId
   );
-  const [hoveringComponent, setHoveringComponent] = (0, import_react7.useState)();
+  const [hoveringComponent, setHoveringComponent] = (0, import_react8.useState)();
   const [hoveringAreaDb] = (0, import_use_debounce.useDebounce)(hoveringArea, 75, { leading: false });
-  const [areasWithZones, setAreasWithZones] = (0, import_react7.useState)(
+  const [areasWithZones, setAreasWithZones] = (0, import_react8.useState)(
     {}
   );
-  const [activeZones, setActiveZones] = (0, import_react7.useState)({});
+  const [activeZones, setActiveZones] = (0, import_react8.useState)({});
   const { dispatch = null } = value ? value : {};
-  const registerZoneArea = (0, import_react7.useCallback)(
+  const registerZoneArea = (0, import_react8.useCallback)(
     (area) => {
       setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
     },
     [setAreasWithZones]
   );
-  const registerZone = (0, import_react7.useCallback)(
+  const registerZone = (0, import_react8.useCallback)(
     (zoneCompound) => {
       if (!dispatch) {
         return;
@@ -29829,7 +29983,7 @@ var DropZoneProvider = ({
     },
     [setActiveZones, dispatch]
   );
-  const unregisterZone = (0, import_react7.useCallback)(
+  const unregisterZone = (0, import_react8.useCallback)(
     (zoneCompound) => {
       if (!dispatch) {
         return;
@@ -29844,8 +29998,8 @@ var DropZoneProvider = ({
     },
     [setActiveZones, dispatch]
   );
-  const [pathData, setPathData] = (0, import_react7.useState)();
-  const registerPath = (0, import_react7.useCallback)(
+  const [pathData, setPathData] = (0, import_react8.useState)();
+  const registerPath = (0, import_react8.useCallback)(
     (selector) => {
       if (!(value == null ? void 0 : value.data)) {
         return;
@@ -29870,7 +30024,8 @@ var DropZoneProvider = ({
     },
     [value, setPathData]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, { children: value && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+  const [zoneWillDrag, setZoneWillDrag] = (0, import_react8.useState)("");
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: value && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
     dropZoneContext.Provider,
     {
       value: __spreadValues({
@@ -29886,57 +30041,17 @@ var DropZoneProvider = ({
         unregisterZone,
         activeZones,
         registerPath,
-        pathData
+        pathData,
+        zoneWillDrag,
+        setZoneWillDrag
       }, value),
       children
     }
   ) });
 };
 
-// components/Puck/context.tsx
-init_react_import();
-var import_react8 = require("react");
-var defaultAppState = {
-  data: { content: [], root: { props: { title: "" } } },
-  ui: {
-    leftSideBarVisible: true,
-    rightSideBarVisible: true,
-    arrayState: {},
-    itemSelector: null,
-    componentList: {},
-    isDragging: false
-  }
-};
-var appContext = (0, import_react8.createContext)({
-  state: defaultAppState,
-  dispatch: () => null,
-  config: { components: {} },
-  componentState: {},
-  resolveData: () => {
-  },
-  plugins: [],
-  overrides: {},
-  history: {}
-});
-var AppProvider = appContext.Provider;
-function useAppContext() {
-  const mainContext = (0, import_react8.useContext)(appContext);
-  const selectedItem = mainContext.state.ui.itemSelector ? getItem(mainContext.state.ui.itemSelector, mainContext.state.data) : void 0;
-  return __spreadProps(__spreadValues({}, mainContext), {
-    // Helpers
-    selectedItem,
-    setUi: (ui, recordHistory) => {
-      return mainContext.dispatch({
-        type: "setUi",
-        ui,
-        recordHistory
-      });
-    }
-  });
-}
-
 // components/DropZone/index.tsx
-var import_jsx_runtime7 = require("react/jsx-runtime");
+var import_jsx_runtime8 = require("react/jsx-runtime");
 var getClassName5 = get_class_name_factory_default("DropZone", styles_module_default4);
 function DropZoneEdit({ zone, allow, disallow, style }) {
   var _a;
@@ -29955,7 +30070,8 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
     registerZoneArea,
     areasWithZones,
     hoveringComponent,
-    disableZoom = false
+    zoneWillDrag,
+    setZoneWillDrag = () => null
   } = ctx || {};
   let content = data.content || [];
   let zoneCompound = rootDroppableId;
@@ -29985,12 +30101,12 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
   const draggedDestinationId = draggedItem && ((_a = draggedItem.destination) == null ? void 0 : _a.droppableId);
   const [zoneArea] = getZoneId(zoneCompound);
   const [draggedSourceArea] = getZoneId(draggedSourceId);
-  const [userWillDrag, setUserWillDrag] = (0, import_react9.useState)(false);
+  const userWillDrag = zoneWillDrag === zone;
   const userIsDragging = !!draggedItem;
   const draggingOverArea = userIsDragging && zoneArea === draggedSourceArea;
   const draggingNewComponent = draggedSourceId == null ? void 0 : draggedSourceId.startsWith("component-list");
   if (!(ctx == null ? void 0 : ctx.config) || !ctx.setHoveringArea || !ctx.setHoveringZone || !ctx.setHoveringComponent || !ctx.setItemSelector || !ctx.registerPath || !ctx.dispatch) {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { children: "DropZone requires context to work." });
+    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { children: "DropZone requires context to work." });
   }
   const {
     hoveringArea = "root",
@@ -30027,7 +30143,7 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
   }
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
   const isAreaSelected = selectedItem && zoneArea === selectedItem.props.id;
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
     "div",
     {
       className: getClassName5({
@@ -30039,17 +30155,19 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
         isDestination: draggedDestinationId === zoneCompound,
         isDisabled: !isEnabled,
         isAreaSelected,
-        hasChildren: content.length > 0,
-        zoomEnabled: !disableZoom
+        hasChildren: content.length > 0
       }),
-      children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+      onMouseUp: () => {
+        setZoneWillDrag("");
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
         import_dnd4.Droppable,
         {
           droppableId: zoneCompound,
           direction: "vertical",
           isDropDisabled: !isEnabled,
           children: (provided, snapshot) => {
-            return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+            return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
               "div",
               __spreadProps(__spreadValues({}, (provided || { droppableProps: {} }).droppableProps), {
                 className: getClassName5("content"),
@@ -30063,7 +30181,7 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
                 },
                 children: [
                   content.map((item, i) => {
-                    var _a2, _b;
+                    var _a2, _b, _c;
                     const componentId = item.props.id;
                     const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a2 = config.components[item.type]) == null ? void 0 : _a2.defaultProps), item.props), {
                       puck: { renderDropZone: DropZone },
@@ -30074,33 +30192,33 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
                       "draggable-"
                     )[1] === componentId;
                     const containsZone = areasWithZones ? areasWithZones[componentId] : false;
-                    const Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
+                    const Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
                       "No configuration for ",
                       item.type
                     ] });
-                    return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+                    return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
                       "div",
                       {
                         className: getClassName5("item"),
                         style: { zIndex: isDragging ? 1 : void 0 },
                         children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                          /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                             DropZoneProvider,
                             {
                               value: __spreadProps(__spreadValues({}, ctx), {
                                 areaId: componentId
                               }),
-                              children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                              children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                                 DraggableComponent,
                                 {
-                                  label: item.type.toString(),
+                                  label: (_b = config.components[item.type]["label"]) != null ? _b : item.type.toString(),
                                   id: `draggable-${componentId}`,
                                   index: i,
                                   isSelected,
                                   isLocked: userIsDragging,
                                   forceHover: hoveringComponent === componentId && !userIsDragging,
                                   indicativeHover: userIsDragging && containsZone && hoveringArea === componentId,
-                                  isLoading: (_b = appContext2.componentState[componentId]) == null ? void 0 : _b.loading,
+                                  isLoading: (_c = appContext2.componentState[componentId]) == null ? void 0 : _c.loading,
                                   onMount: () => {
                                     ctx.registerPath({
                                       index: i,
@@ -30116,11 +30234,7 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
                                   },
                                   onMouseDown: (e) => {
                                     e.stopPropagation();
-                                    setUserWillDrag(true);
-                                  },
-                                  onMouseUp: (e) => {
-                                    e.stopPropagation();
-                                    setUserWillDrag(false);
+                                    setZoneWillDrag(zone);
                                   },
                                   onMouseOver: (e) => {
                                     e.stopPropagation();
@@ -30161,12 +30275,12 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
                                   style: {
                                     pointerEvents: userIsDragging && draggingNewComponent ? "all" : void 0
                                   },
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: getClassName5("renderWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Render2, __spreadValues({}, defaultedProps)) })
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassName5("renderWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Render2, __spreadValues({}, defaultedProps)) })
                                 }
                               )
                             }
                           ),
-                          userIsDragging && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                          userIsDragging && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                             "div",
                             {
                               className: getClassName5("hitbox"),
@@ -30183,12 +30297,12 @@ function DropZoneEdit({ zone, allow, disallow, style }) {
                     );
                   }),
                   provided == null ? void 0 : provided.placeholder,
-                  (snapshot == null ? void 0 : snapshot.isDraggingOver) && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                  (snapshot == null ? void 0 : snapshot.isDraggingOver) && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                     "div",
                     {
                       "data-puck-placeholder": true,
                       style: __spreadProps(__spreadValues({}, placeholderStyle), {
-                        background: "var(--puck-color-azure-5)",
+                        background: "var(--puck-color-azure-06)",
                         opacity: 0.3,
                         zIndex: 0
                       })
@@ -30215,14 +30329,14 @@ function DropZoneRender({ zone }) {
     zoneCompound = `${areaId}:${zone}`;
     content = setupZone(data, zoneCompound).zones[zoneCompound];
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_jsx_runtime7.Fragment, { children: content.map((item) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_jsx_runtime8.Fragment, { children: content.map((item) => {
     const Component = config.components[item.type];
     if (Component) {
-      return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
         DropZoneProvider,
         {
           value: { data, config, areaId: item.props.id },
-          children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
             Component.render,
             __spreadProps(__spreadValues({}, item.props), {
               puck: { renderDropZone: DropZone }
@@ -30238,9 +30352,9 @@ function DropZoneRender({ zone }) {
 function DropZone(props) {
   const ctx = (0, import_react9.useContext)(dropZoneContext);
   if ((ctx == null ? void 0 : ctx.mode) === "edit") {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(DropZoneEdit, __spreadValues({}, props));
+    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DropZoneEdit, __spreadValues({}, props));
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(DropZoneRender, __spreadValues({}, props));
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DropZoneRender, __spreadValues({}, props));
 }
 
 // components/IconButton/index.ts
@@ -30252,11 +30366,11 @@ var import_react10 = 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_38xdr_1", "IconButton-title": "_IconButton-title_38xdr_18" };
+var IconButton_module_default = { "IconButton": "_IconButton_swpni_1", "IconButton--disabled": "_IconButton--disabled_swpni_20", "IconButton-title": "_IconButton-title_swpni_33" };
 
 // components/IconButton/IconButton.tsx
 var import_react_spinners3 = require("react-spinners");
-var import_jsx_runtime8 = require("react/jsx-runtime");
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var getClassName6 = get_class_name_factory_default("IconButton", IconButton_module_default);
 var IconButton = ({
   children,
@@ -30272,7 +30386,7 @@ var IconButton = ({
 }) => {
   const [loading, setLoading] = (0, import_react10.useState)(false);
   const ElementType = href ? "a" : "button";
-  const el = /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
+  const el = /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
     ElementType,
     {
       className: getClassName6({
@@ -30297,11 +30411,11 @@ var IconButton = ({
       href,
       title,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("span", { className: getClassName6("title"), children: title }),
+        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { className: getClassName6("title"), children: title }),
         children,
-        loading && /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
+        loading && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
           "\xA0\xA0",
-          /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_react_spinners3.ClipLoader, { "aria-label": "Loading", color: "inherit", size: "14px" })
+          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_react_spinners3.ClipLoader, { "aria-label": "Loading", color: "inherit", size: "14px" })
         ] })
       ]
     }
@@ -30311,8 +30425,8 @@ var IconButton = ({
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react26 = require("react");
-var import_dnd7 = require("@hello-pangea/dnd");
+var import_react28 = require("react");
+var import_dnd7 = require("@measured/dnd");
 
 // lib/use-placeholder-style.ts
 init_react_import();
@@ -30321,16 +30435,17 @@ var usePlaceholderStyle = () => {
   const queryAttr = "data-rfd-drag-handle-draggable-id";
   const [placeholderStyle, setPlaceholderStyle] = (0, import_react11.useState)();
   const onDragStartOrUpdate = (draggedItem) => {
-    var _a;
+    var _a, _b, _c;
     const draggableId = draggedItem.draggableId;
     const destinationIndex = (draggedItem.destination || draggedItem.source).index;
     const droppableId = (draggedItem.destination || draggedItem.source).droppableId;
     const domQuery = `[${queryAttr}='${draggableId}']`;
-    const draggedDOM = document.querySelector(domQuery);
+    const iframe = document.querySelector(`#preview-iframe`);
+    const draggedDOM = document.querySelector(domQuery) || ((_a = iframe == null ? void 0 : iframe.contentWindow) == null ? void 0 : _a.document.querySelector(domQuery));
     if (!draggedDOM) {
       return;
     }
-    const targetListElement = document.querySelector(
+    const targetListElement = (_b = iframe == null ? void 0 : iframe.contentWindow) == null ? void 0 : _b.document.querySelector(
       `[data-rfd-droppable-id='${droppableId}']`
     );
     const { clientHeight } = draggedDOM;
@@ -30338,7 +30453,7 @@ var usePlaceholderStyle = () => {
       return;
     }
     let clientY = 0;
-    const isSameDroppable = draggedItem.source.droppableId === ((_a = draggedItem.destination) == null ? void 0 : _a.droppableId);
+    const isSameDroppable = draggedItem.source.droppableId === ((_c = draggedItem.destination) == null ? void 0 : _c.droppableId);
     if (destinationIndex > 0) {
       const end = destinationIndex > draggedItem.source.index && isSameDroppable ? destinationIndex + 1 : destinationIndex;
       const children = Array.from(targetListElement.children).filter(
@@ -30367,21 +30482,21 @@ 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_default5 = { "SidebarSection": "_SidebarSection_170gs_1", "SidebarSection-title": "_SidebarSection-title_170gs_12", "SidebarSection--noBorderTop": "_SidebarSection--noBorderTop_170gs_20", "SidebarSection-content": "_SidebarSection-content_170gs_24", "SidebarSection--noPadding": "_SidebarSection--noPadding_170gs_28", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_170gs_41", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_170gs_52", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_170gs_41", "SidebarSection-heading": "_SidebarSection-heading_170gs_64", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_170gs_68" };
+var styles_module_default5 = { "SidebarSection": "_SidebarSection_125qe_1", "SidebarSection-title": "_SidebarSection-title_125qe_12", "SidebarSection--noBorderTop": "_SidebarSection--noBorderTop_125qe_20", "SidebarSection-content": "_SidebarSection-content_125qe_24", "SidebarSection--noPadding": "_SidebarSection--noPadding_125qe_28", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_125qe_41", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_125qe_70", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_125qe_41", "SidebarSection-heading": "_SidebarSection-heading_125qe_82", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_125qe_86" };
 
 // components/Heading/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Heading/styles.module.css#css-module
 init_react_import();
-var styles_module_default6 = { "Heading": "_Heading_1bvy5_1", "Heading--xxxxl": "_Heading--xxxxl_1bvy5_13", "Heading--xxxl": "_Heading--xxxl_1bvy5_19", "Heading--xxl": "_Heading--xxl_1bvy5_23", "Heading--xl": "_Heading--xl_1bvy5_27", "Heading--l": "_Heading--l_1bvy5_31", "Heading--m": "_Heading--m_1bvy5_35", "Heading--s": "_Heading--s_1bvy5_39", "Heading--xs": "_Heading--xs_1bvy5_43" };
+var styles_module_default6 = { "Heading": "_Heading_qxrry_1", "Heading--xxxxl": "_Heading--xxxxl_qxrry_12", "Heading--xxxl": "_Heading--xxxl_qxrry_18", "Heading--xxl": "_Heading--xxl_qxrry_22", "Heading--xl": "_Heading--xl_qxrry_26", "Heading--l": "_Heading--l_qxrry_30", "Heading--m": "_Heading--m_qxrry_34", "Heading--s": "_Heading--s_qxrry_38", "Heading--xs": "_Heading--xs_qxrry_42" };
 
 // components/Heading/index.tsx
-var import_jsx_runtime9 = require("react/jsx-runtime");
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var getClassName7 = get_class_name_factory_default("Heading", styles_module_default6);
 var Heading = ({ children, rank, size = "m" }) => {
   const Tag = rank ? `h${rank}` : "span";
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
     Tag,
     {
       className: getClassName7({
@@ -30460,7 +30575,7 @@ var useBreadcrumbs = (renderCount) => {
 
 // components/SidebarSection/index.tsx
 var import_react_spinners4 = require("react-spinners");
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var getClassName8 = get_class_name_factory_default("SidebarSection", styles_module_default5);
 var SidebarSection = ({
   children,
@@ -30473,28 +30588,28 @@ var SidebarSection = ({
 }) => {
   const { setUi } = useAppContext();
   const breadcrumbs = useBreadcrumbs(1);
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(
     "div",
     {
       className: getClassName8({ noBorderTop, noPadding }),
       style: { background },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName8("title"), children: /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: getClassName8("breadcrumbs"), children: [
-          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: getClassName8("breadcrumb"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
-              "div",
+        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName8("title"), children: /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("div", { className: getClassName8("breadcrumbs"), children: [
+          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("div", { className: getClassName8("breadcrumb"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+              "button",
               {
                 className: getClassName8("breadcrumbLabel"),
                 onClick: () => setUi({ itemSelector: breadcrumb.selector }),
                 children: breadcrumb.label
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ChevronRight, { size: 16 })
+            /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(ChevronRight, { size: 16 })
           ] }, i)) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName8("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Heading, { rank: 2, size: "xs", children: title }) })
+          /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName8("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Heading, { rank: 2, size: "xs", children: title }) })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName8("content"), children }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName8("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_react_spinners4.ClipLoader, { "aria-label": "loading" }) })
+        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName8("content"), children }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName8("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_react_spinners4.ClipLoader, { "aria-label": "loading" }) })
       ]
     }
   );
@@ -30527,8 +30642,8 @@ init_react_import();
 
 // lib/generate-id.ts
 init_react_import();
-var import_crypto = require("crypto");
-var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
+var import_uuid = require("uuid");
+var generateId = (type) => `${type}-${(0, import_uuid.v4)()}`;
 
 // lib/reduce-related-zones.ts
 var reduceRelatedZones = (item, data, fn) => {
@@ -31000,7 +31115,10 @@ var useResolvedData = (appState, 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 flatContent = Object.keys(newData.zones || {}).reduce((acc, zone) => [...acc, ...newData.zones[zone]], newData.content).filter((item) => {
+      var _a;
+      return !!((_a = config.components[item.type]) == null ? void 0 : _a.resolveData);
+    });
     const applyIfChange = (dynamicDataMap, dynamicRoot) => {
       const processed = applyDynamicProps(
         appState.data,
@@ -31070,10 +31188,10 @@ 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_default7 = { "MenuBar": "_MenuBar_12sp7_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_12sp7_14", "MenuBar-inner": "_MenuBar-inner_12sp7_29", "MenuBar-history": "_MenuBar-history_12sp7_45" };
+var styles_module_default7 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
 
 // components/MenuBar/index.tsx
-var import_jsx_runtime11 = require("react/jsx-runtime");
+var import_jsx_runtime12 = require("react/jsx-runtime");
 var getClassName9 = get_class_name_factory_default("MenuBar", styles_module_default7);
 var MenuBar = ({
   appState,
@@ -31088,7 +31206,7 @@ var MenuBar = ({
     history: { back, forward, historyStore }
   } = useAppContext();
   const { hasFuture = false, hasPast = false } = historyStore || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
     "div",
     {
       className: getClassName9({ menuOpen }),
@@ -31102,34 +31220,34 @@ var MenuBar = ({
           setMenuOpen(false);
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("div", { className: getClassName9("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)("div", { className: getClassName9("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName9("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName9("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
             ChevronLeft,
             {
               size: 21,
-              stroke: hasPast ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
+              stroke: hasPast ? "var(--puck-color-black)" : "var(--puck-color-grey-08)"
             }
           ) }),
-          /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
             ChevronRight,
             {
               size: 21,
-              stroke: hasFuture ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
+              stroke: hasFuture ? "var(--puck-color-black)" : "var(--puck-color-grey-08)"
             }
           ) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(import_jsx_runtime11.Fragment, { children: renderHeaderActions && renderHeaderActions({
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_jsx_runtime12.Fragment, { children: renderHeaderActions && renderHeaderActions({
           state: appState,
           dispatch
         }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
           Button,
           {
             onClick: () => {
               onPublish && onPublish(data);
             },
-            icon: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Globe, { size: "14px" }),
+            icon: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Globe, { size: "14px" }),
             children: "Publish"
           }
         ) })
@@ -31140,7 +31258,7 @@ var MenuBar = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default8 = { "Puck": "_Puck_17hk3_19", "Puck--leftSideBarVisible": "_Puck--leftSideBarVisible_17hk3_35", "Puck--rightSideBarVisible": "_Puck--rightSideBarVisible_17hk3_41", "Puck-header": "_Puck-header_17hk3_95", "Puck-headerInner": "_Puck-headerInner_17hk3_104", "Puck-headerToggle": "_Puck-headerToggle_17hk3_114", "Puck-rightSideBarToggle": "_Puck-rightSideBarToggle_17hk3_121", "Puck-leftSideBarToggle": "_Puck-leftSideBarToggle_17hk3_122", "Puck-headerTitle": "_Puck-headerTitle_17hk3_126", "Puck-headerPath": "_Puck-headerPath_17hk3_130", "Puck-headerTools": "_Puck-headerTools_17hk3_137", "Puck-menuButton": "_Puck-menuButton_17hk3_143", "Puck--menuOpen": "_Puck--menuOpen_17hk3_148", "Puck-leftSideBar": "_Puck-leftSideBar_17hk3_122", "Puck-frame": "_Puck-frame_17hk3_167", "Puck-root": "_Puck-root_17hk3_175", "Puck-rightSideBar": "_Puck-rightSideBar_17hk3_121" };
+var styles_module_default8 = { "Puck": "_Puck_3qn7l_19", "Puck--leftSideBarVisible": "_Puck--leftSideBarVisible_3qn7l_36", "Puck--rightSideBarVisible": "_Puck--rightSideBarVisible_3qn7l_42", "Puck-header": "_Puck-header_3qn7l_96", "Puck-headerInner": "_Puck-headerInner_3qn7l_105", "Puck-headerToggle": "_Puck-headerToggle_3qn7l_115", "Puck-rightSideBarToggle": "_Puck-rightSideBarToggle_3qn7l_122", "Puck-leftSideBarToggle": "_Puck-leftSideBarToggle_3qn7l_123", "Puck-headerTitle": "_Puck-headerTitle_3qn7l_127", "Puck-headerPath": "_Puck-headerPath_3qn7l_131", "Puck-headerTools": "_Puck-headerTools_3qn7l_138", "Puck-menuButton": "_Puck-menuButton_3qn7l_144", "Puck--menuOpen": "_Puck--menuOpen_3qn7l_149", "Puck-leftSideBar": "_Puck-leftSideBar_3qn7l_123", "Puck-frame": "_Puck-frame_3qn7l_168", "Puck-root": "_Puck-root_3qn7l_179", "Puck-rightSideBar": "_Puck-rightSideBar_3qn7l_122", "Puck-canvas": "_Puck-canvas_3qn7l_211", "Puck-canvasControls": "_Puck-canvasControls_3qn7l_226" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
@@ -31151,7 +31269,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/styles.module.css#css-module
 init_react_import();
-var styles_module_default9 = { "Input": "_Input_1v7zr_1", "Input-label": "_Input-label_1v7zr_27", "Input-labelIcon": "_Input-labelIcon_1v7zr_35", "Input-disabledIcon": "_Input-disabledIcon_1v7zr_41", "Input-input": "_Input-input_1v7zr_46", "Input--readOnly": "_Input--readOnly_1v7zr_69", "Input-radioGroupItems": "_Input-radioGroupItems_1v7zr_87", "Input-radio": "_Input-radio_1v7zr_87", "Input-radioInner": "_Input-radioInner_1v7zr_104", "Input-radioInput": "_Input-radioInput_1v7zr_126" };
+var styles_module_default9 = { "Input": "_Input_1qi5b_1", "Input-label": "_Input-label_1qi5b_26", "Input-labelIcon": "_Input-labelIcon_1qi5b_34", "Input-disabledIcon": "_Input-disabledIcon_1qi5b_41", "Input-input": "_Input-input_1qi5b_46", "Input--readOnly": "_Input--readOnly_1qi5b_90", "Input-radioGroupItems": "_Input-radioGroupItems_1qi5b_101", "Input-radio": "_Input-radio_1qi5b_101", "Input-radioInner": "_Input-radioInner_1qi5b_118", "Input-radioInput": "_Input-radioInput_1qi5b_163" };
 
 // components/InputOrGroup/index.tsx
 var import_react18 = require("react");
@@ -31164,13 +31282,13 @@ 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_default10 = { "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" };
+var styles_module_default10 = { "ArrayField": "_ArrayField_1txra_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_1txra_13", "ArrayField-addButton": "_ArrayField-addButton_1txra_17", "ArrayField--hasItems": "_ArrayField--hasItems_1txra_32", "ArrayFieldItem": "_ArrayFieldItem_1txra_61", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_1txra_69", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_1txra_74", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_1txra_84", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_1txra_108", "ArrayFieldItem-body": "_ArrayFieldItem-body_1txra_142", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_1txra_150", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_1txra_157", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_1txra_163" };
 
 // components/InputOrGroup/fields/ArrayField/index.tsx
-var import_dnd5 = require("@hello-pangea/dnd");
-var import_dnd6 = require("@hello-pangea/dnd");
+var import_dnd5 = require("@measured/dnd");
+var import_dnd6 = require("@measured/dnd");
 var import_react14 = require("react");
-var import_jsx_runtime12 = require("react/jsx-runtime");
+var import_jsx_runtime13 = require("react/jsx-runtime");
 var getClassName10 = get_class_name_factory_default("ArrayField", styles_module_default10);
 var getClassNameItem2 = get_class_name_factory_default("ArrayFieldItem", styles_module_default10);
 var ArrayField = ({
@@ -31240,14 +31358,14 @@ var ArrayField = ({
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(List, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(List, { size: 16 }),
       el: "div",
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
         import_dnd6.DragDropContext,
         {
           onDragEnd: (event) => {
@@ -31274,8 +31392,8 @@ var ArrayField = ({
               });
             }
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_dnd5.Droppable, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
-            return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(import_dnd5.Droppable, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
+            return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
               "div",
               __spreadProps(__spreadValues({}, provided.droppableProps), {
                 ref: provided.innerRef,
@@ -31295,7 +31413,7 @@ var ArrayField = ({
                   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_runtime12.jsx)(
+                    return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                       Draggable,
                       {
                         id: _arrayId,
@@ -31306,8 +31424,8 @@ var ArrayField = ({
                           readOnly
                         }),
                         isDragDisabled: readOnly || !hovering,
-                        children: () => /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+                        children: () => /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_jsx_runtime13.Fragment, { children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
                             "div",
                             {
                               onClick: () => {
@@ -31328,10 +31446,11 @@ var ArrayField = ({
                               className: getClassNameItem2("summary"),
                               children: [
                                 field.getItemSummary ? field.getItemSummary(data, i) : `Item #${_originalIndex}`,
-                                /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassNameItem2("rhs"), children: [
-                                  !readOnly && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameItem2("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameItem2("action"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                                /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassNameItem2("rhs"), children: [
+                                  !readOnly && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameItem2("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameItem2("action"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                                     IconButton,
                                     {
+                                      disabled: field.min !== void 0 && field.min >= localState.arrayState.items.length,
                                       onClick: (e) => {
                                         e.stopPropagation();
                                         const existingValue = [
@@ -31350,20 +31469,20 @@ var ArrayField = ({
                                         );
                                       },
                                       title: "Delete",
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Trash, { size: 16 })
+                                      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Trash, { size: 16 })
                                     }
                                   ) }) }),
-                                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(DragIcon, {}) })
+                                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(DragIcon, {}) })
                                 ] })
                               ]
                             }
                           ),
-                          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameItem2("body"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("fieldset", { className: getClassNameItem2("fieldset"), children: Object.keys(field.arrayFields).map(
+                          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameItem2("body"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("fieldset", { className: getClassNameItem2("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_runtime12.jsx)(
+                              return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                                 InputOrGroup,
                                 {
                                   name: subFieldName,
@@ -31392,10 +31511,11 @@ var ArrayField = ({
                     );
                   }),
                   provided.placeholder,
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                     "button",
                     {
                       className: getClassName10("addButton"),
+                      disabled: field.max !== void 0 && localState.arrayState.items.length >= field.max,
                       onClick: () => {
                         const existingValue = value || [];
                         const newValue = [
@@ -31405,7 +31525,7 @@ var ArrayField = ({
                         const newArrayState = regenerateArrayState(newValue);
                         onChange(newValue, mapArrayStateToUi(newArrayState));
                       },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Plus, { size: "21" })
+                      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Plus, { size: 21 })
                     }
                   )
                 ]
@@ -31420,7 +31540,7 @@ var ArrayField = ({
 
 // components/InputOrGroup/fields/DefaultField/index.tsx
 init_react_import();
-var import_jsx_runtime13 = require("react/jsx-runtime");
+var import_jsx_runtime14 = require("react/jsx-runtime");
 var getClassName11 = get_class_name_factory_default("Input", styles_module_default9);
 var DefaultField = ({
   field,
@@ -31431,16 +31551,16 @@ var DefaultField = ({
   label,
   id
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_jsx_runtime13.Fragment, { children: [
-        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Type, { size: 16 }),
-        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Hash, { size: 16 })
+      icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, { children: [
+        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Type, { size: 16 }),
+        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Hash, { size: 16 })
       ] }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
         "input",
         {
           className: getClassName11("input"),
@@ -31456,6 +31576,7 @@ var DefaultField = ({
             }
           },
           readOnly,
+          tabIndex: readOnly ? -1 : void 0,
           id,
           min: field.type === "number" ? field.min : void 0,
           max: field.type === "number" ? field.max : void 0
@@ -31475,7 +31596,7 @@ var import_react16 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ExternalInput/styles.module.css#css-module
 init_react_import();
-var styles_module_default11 = { "ExternalInput": "_ExternalInput_s6fxy_1", "ExternalInput-actions": "_ExternalInput-actions_s6fxy_5", "ExternalInput-button": "_ExternalInput-button_s6fxy_9", "ExternalInput-detachButton": "_ExternalInput-detachButton_s6fxy_28", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_s6fxy_35", "ExternalInputModal": "_ExternalInputModal_s6fxy_56", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_s6fxy_64", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_s6fxy_72", "ExternalInputModal-table": "_ExternalInputModal-table_s6fxy_72", "ExternalInputModal-thead": "_ExternalInputModal-thead_s6fxy_88", "ExternalInputModal-th": "_ExternalInputModal-th_s6fxy_88", "ExternalInputModal-td": "_ExternalInputModal-td_s6fxy_102", "ExternalInputModal-tr": "_ExternalInputModal-tr_s6fxy_107", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_s6fxy_119", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_s6fxy_138", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_s6fxy_142", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_s6fxy_155", "ExternalInputModal-noContentBanner": "_ExternalInputModal-noContentBanner_s6fxy_159", "ExternalInputModal--loaded": "_ExternalInputModal--loaded_s6fxy_166", "ExternalInputModal-searchForm": "_ExternalInputModal-searchForm_s6fxy_171", "ExternalInputModal-search": "_ExternalInputModal-search_s6fxy_171", "ExternalInputModal-searchIcon": "_ExternalInputModal-searchIcon_s6fxy_194", "ExternalInputModal-searchIconText": "_ExternalInputModal-searchIconText_s6fxy_206", "ExternalInputModal-searchInput": "_ExternalInputModal-searchInput_s6fxy_216" };
+var styles_module_default11 = { "ExternalInput-actions": "_ExternalInput-actions_19obq_1", "ExternalInput-button": "_ExternalInput-button_19obq_5", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_19obq_25", "ExternalInput-detachButton": "_ExternalInput-detachButton_19obq_32", "ExternalInputModal": "_ExternalInputModal_19obq_74", "ExternalInputModal-grid": "_ExternalInputModal-grid_19obq_84", "ExternalInputModal--filtersToggled": "_ExternalInputModal--filtersToggled_19obq_95", "ExternalInputModal-filters": "_ExternalInputModal-filters_19obq_100", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_19obq_119", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_19obq_128", "ExternalInputModal-table": "_ExternalInputModal-table_19obq_128", "ExternalInputModal-thead": "_ExternalInputModal-thead_19obq_144", "ExternalInputModal-th": "_ExternalInputModal-th_19obq_144", "ExternalInputModal-td": "_ExternalInputModal-td_19obq_159", "ExternalInputModal-tr": "_ExternalInputModal-tr_19obq_164", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_19obq_171", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_19obq_197", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_19obq_201", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_19obq_218", "ExternalInputModal-searchForm": "_ExternalInputModal-searchForm_19obq_222", "ExternalInputModal-search": "_ExternalInputModal-search_19obq_222", "ExternalInputModal-searchIcon": "_ExternalInputModal-searchIcon_19obq_259", "ExternalInputModal-searchIconText": "_ExternalInputModal-searchIconText_19obq_284", "ExternalInputModal-searchInput": "_ExternalInputModal-searchInput_19obq_294", "ExternalInputModal-searchActions": "_ExternalInputModal-searchActions_19obq_308", "ExternalInputModal-searchActionIcon": "_ExternalInputModal-searchActionIcon_19obq_321", "ExternalInputModal-footer": "_ExternalInputModal-footer_19obq_325" };
 
 // components/Modal/index.tsx
 init_react_import();
@@ -31483,11 +31604,11 @@ var import_react15 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Modal/styles.module.css#css-module
 init_react_import();
-var styles_module_default12 = { "Modal": "_Modal_hx2u6_1", "Modal--isOpen": "_Modal--isOpen_hx2u6_15", "Modal-inner": "_Modal-inner_hx2u6_19" };
+var styles_module_default12 = { "Modal": "_Modal_ikbaj_1", "Modal--isOpen": "_Modal--isOpen_ikbaj_15", "Modal-inner": "_Modal-inner_ikbaj_19" };
 
 // components/Modal/index.tsx
 var import_react_dom = __toESM(require_react_dom());
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 var getClassName12 = get_class_name_factory_default("Modal", styles_module_default12);
 var Modal = ({
   children,
@@ -31499,10 +31620,10 @@ var Modal = ({
     setRootEl(document.getElementById("puck-portal-root"));
   }, []);
   if (!rootEl) {
-    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", {});
+    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", {});
   }
   return (0, import_react_dom.createPortal)(
-    /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName12({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassName12({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
       "div",
       {
         className: getClassName12("inner"),
@@ -31516,7 +31637,7 @@ var Modal = ({
 
 // components/ExternalInput/index.tsx
 var import_react_spinners5 = require("react-spinners");
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 var getClassName13 = get_class_name_factory_default("ExternalInput", styles_module_default11);
 var getClassNameModal = get_class_name_factory_default("ExternalInputModal", styles_module_default11);
 var dataCache = {};
@@ -31527,13 +31648,23 @@ var ExternalInput = ({
   name,
   id
 }) => {
-  const { mapProp = (val) => val } = field || {};
+  const {
+    mapProp = (val) => val,
+    mapRow = (val) => val,
+    filterFields
+  } = field || {};
   const [data, setData] = (0, import_react16.useState)([]);
   const [isOpen, setOpen] = (0, import_react16.useState)(false);
   const [isLoading, setIsLoading] = (0, import_react16.useState)(true);
+  const hasFilterFields = !!filterFields;
+  const [filters, setFilters] = (0, import_react16.useState)(field.initialFilters || {});
+  const [filtersToggled, setFiltersToggled] = (0, import_react16.useState)(hasFilterFields);
+  const mappedData = (0, import_react16.useMemo)(() => {
+    return data.map(mapRow);
+  }, [data]);
   const keys = (0, import_react16.useMemo)(() => {
     const validKeys = /* @__PURE__ */ new Set();
-    for (const item of data) {
+    for (const item of mappedData) {
       for (const key of Object.keys(item)) {
         if (typeof item[key] === "string" || typeof item[key] === "number") {
           validKeys.add(key);
@@ -31541,13 +31672,13 @@ var ExternalInput = ({
       }
     }
     return Array.from(validKeys);
-  }, [data]);
+  }, [mappedData]);
   const [searchQuery, setSearchQuery] = (0, import_react16.useState)(field.initialQuery || "");
   const search = (0, import_react16.useCallback)(
-    (query) => __async(void 0, null, function* () {
+    (query, filters2) => __async(void 0, null, function* () {
       setIsLoading(true);
-      const cacheKey = `${id}-${name}-${query}`;
-      const listData = dataCache[cacheKey] || (yield field.fetchList({ query }));
+      const cacheKey = `${id}-${name}-${query}-${JSON.stringify(filters2)}`;
+      const listData = dataCache[cacheKey] || (yield field.fetchList({ query, filters: filters2 }));
       if (listData) {
         setData(listData);
         setIsLoading(false);
@@ -31557,9 +31688,9 @@ var ExternalInput = ({
     [name, field]
   );
   (0, import_react16.useEffect)(() => {
-    search(searchQuery);
+    search(searchQuery, filters);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
     "div",
     {
       className: getClassName13({
@@ -31568,102 +31699,133 @@ var ExternalInput = ({
       }),
       id,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: getClassName13("actions"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassName13("actions"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
             "button",
             {
               onClick: () => setOpen(true),
               className: getClassName13("button"),
-              children: value ? field.getItemSummary ? field.getItemSummary(value) : "External item" : /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(import_jsx_runtime15.Fragment, { children: [
-                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Link, { size: "16" }),
-                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { children: field.placeholder })
+              children: value ? field.getItemSummary ? field.getItemSummary(value) : "External item" : /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(import_jsx_runtime16.Fragment, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Link, { size: "16" }),
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { children: field.placeholder })
               ] })
             }
           ),
-          value && /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+          value && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
             "button",
             {
               className: getClassName13("detachButton"),
               onClick: () => {
                 onChange(null);
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Unlock, { size: 16 })
+              children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Unlock, { size: 16 })
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
-          "div",
+        /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
+          "form",
           {
             className: getClassNameModal({
               isLoading,
               loaded: !isLoading,
-              hasData: data.length > 0
+              hasData: mappedData.length > 0,
+              filtersToggled
             }),
+            onSubmit: (e) => {
+              e.preventDefault();
+              search(searchQuery, filters);
+            },
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: getClassNameModal("masthead"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Heading, { rank: 2, size: "xxl", children: "Select content" }),
-                field.showSearch && /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
-                  "form",
-                  {
-                    className: getClassNameModal("searchForm"),
-                    onSubmit: (e) => {
-                      e.preventDefault();
-                      search(searchQuery);
-                    },
-                    children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("label", { className: getClassNameModal("search"), children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: getClassNameModal("searchIconText"), children: "Search" }),
-                        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassNameModal("searchIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Search, { size: "18" }) }),
-                        /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-                          "input",
-                          {
-                            className: getClassNameModal("searchInput"),
-                            name: "q",
-                            type: "search",
-                            placeholder: "Search",
-                            onChange: (e) => {
-                              setSearchQuery(e.currentTarget.value);
-                            },
-                            autoComplete: "off",
-                            value: searchQuery
-                          }
-                        )
-                      ] }),
-                      /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Button, { type: "submit", loading: isLoading, disabled: isLoading, children: "Search" })
-                    ]
-                  }
-                )
-              ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: getClassNameModal("tableWrapper"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("table", { className: getClassNameModal("table"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("thead", { className: getClassNameModal("thead"), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("tr", { className: getClassNameModal("tr"), children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-                    "th",
+              /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: getClassNameModal("masthead"), children: field.showSearch ? /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassNameModal("searchForm"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("label", { className: getClassNameModal("search"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("span", { className: getClassNameModal("searchIconText"), children: "Search" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: getClassNameModal("searchIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Search, { size: "18" }) }),
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+                    "input",
+                    {
+                      className: getClassNameModal("searchInput"),
+                      name: "q",
+                      type: "search",
+                      placeholder: field.placeholder,
+                      onChange: (e) => {
+                        setSearchQuery(e.currentTarget.value);
+                      },
+                      autoComplete: "off",
+                      value: searchQuery
+                    }
+                  )
+                ] }),
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassNameModal("searchActions"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Button, { type: "submit", loading: isLoading, fullWidth: true, children: "Search" }),
+                  hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: getClassNameModal("searchActionIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+                    IconButton,
                     {
-                      className: getClassNameModal("th"),
-                      style: { textAlign: "left" },
-                      children: key
+                      title: "Toggle filters",
+                      onClick: (e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        setFiltersToggled(!filtersToggled);
+                      },
+                      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(SlidersHorizontal, { size: 20 })
+                    }
+                  ) })
+                ] })
+              ] }) : /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Heading, { rank: 2, size: "xs", children: field.placeholder || "Select data" }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassNameModal("grid"), children: [
+                hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: getClassNameModal("filters"), children: hasFilterFields && Object.keys(filterFields).map((fieldName) => {
+                  const filterField = filterFields[fieldName];
+                  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+                    InputOrGroup,
+                    {
+                      field: filterField,
+                      name: fieldName,
+                      id: `external_field_${fieldName}_filter`,
+                      label: filterField.label || fieldName,
+                      value: filters[fieldName],
+                      onChange: (value2) => {
+                        const newFilters = __spreadProps(__spreadValues({}, filters), { [fieldName]: value2 });
+                        setFilters(newFilters);
+                        search(searchQuery, newFilters);
+                      }
                     },
-                    key
-                  )) }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("tbody", { className: getClassNameModal("tbody"), children: data.map((item, i) => {
-                    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
-                      "tr",
+                    fieldName
+                  );
+                }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassNameModal("tableWrapper"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("table", { className: getClassNameModal("table"), children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("thead", { className: getClassNameModal("thead"), children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("tr", { className: getClassNameModal("tr"), children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+                      "th",
                       {
-                        style: { whiteSpace: "nowrap" },
-                        className: getClassNameModal("tr"),
-                        onClick: (e) => {
-                          onChange(mapProp(item));
-                          setOpen(false);
-                        },
-                        children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
+                        className: getClassNameModal("th"),
+                        style: { textAlign: "left" },
+                        children: key
                       },
-                      i
-                    );
-                  }) })
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(import_react_spinners5.ClipLoader, { size: 24, "aria-label": "Loading" }) })
+                      key
+                    )) }) }),
+                    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("tbody", { className: getClassNameModal("tbody"), children: mappedData.map((item, i) => {
+                      return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+                        "tr",
+                        {
+                          style: { whiteSpace: "nowrap" },
+                          className: getClassNameModal("tr"),
+                          onClick: () => {
+                            onChange(mapProp(data[i]));
+                            setOpen(false);
+                          },
+                          children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
+                        },
+                        i
+                      );
+                    }) })
+                  ] }),
+                  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(import_react_spinners5.ClipLoader, { size: 24, "aria-label": "Loading" }) })
+                ] })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassNameModal("noContentBanner"), children: "No results." })
+              /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)("div", { className: getClassNameModal("footer"), children: [
+                mappedData.length,
+                " result",
+                mappedData.length === 1 ? "" : "s"
+              ] })
             ]
           }
         ) })
@@ -31673,7 +31835,7 @@ var ExternalInput = ({
 };
 
 // components/InputOrGroup/fields/ExternalField/index.tsx
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 var ExternalField = ({
   field,
   onChange,
@@ -31695,13 +31857,13 @@ var ExternalField = ({
   if (field.type !== "external") {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Link, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Link, { size: 16 }),
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
         ExternalInput,
         {
           name,
@@ -31709,6 +31871,7 @@ var ExternalField = ({
             // DEPRECATED
             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,
+            mapRow: validField.mapRow,
             fetchList: ((_c = deprecatedField.adaptor) == null ? void 0 : _c.fetchList) ? () => __async(void 0, null, function* () {
               return yield deprecatedField.adaptor.fetchList(
                 deprecatedField.adaptorParams
@@ -31726,7 +31889,7 @@ var ExternalField = ({
 
 // components/InputOrGroup/fields/RadioField/index.tsx
 init_react_import();
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 var getClassName14 = get_class_name_factory_default("Input", styles_module_default9);
 var RadioField = ({
   field,
@@ -31740,19 +31903,19 @@ var RadioField = ({
   if (field.type !== "radio" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
     FieldLabelInternal,
     {
-      icon: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(CheckCircle, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(CheckCircle, { size: 16 }),
       label: label || name,
       readOnly,
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
         "label",
         {
           className: getClassName14("radio"),
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
               "input",
               {
                 type: "radio",
@@ -31770,7 +31933,7 @@ var RadioField = ({
                 defaultChecked: value === option.value
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14("radioInner"), children: option.label || option.value })
+            /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14("radioInner"), children: option.label || option.value })
           ]
         },
         option.label + option.value
@@ -31781,7 +31944,7 @@ var RadioField = ({
 
 // components/InputOrGroup/fields/SelectField/index.tsx
 init_react_import();
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_jsx_runtime19 = require("react/jsx-runtime");
 var getClassName15 = get_class_name_factory_default("Input", styles_module_default9);
 var SelectField = ({
   field,
@@ -31795,13 +31958,13 @@ var SelectField = ({
   if (field.type !== "select" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(ChevronDown, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ChevronDown, { size: 16 }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
         "select",
         {
           id,
@@ -31815,7 +31978,7 @@ var SelectField = ({
             onChange(e.currentTarget.value);
           },
           value,
-          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
             "option",
             {
               label: option.label,
@@ -31831,7 +31994,7 @@ var SelectField = ({
 
 // components/InputOrGroup/fields/TextareaField/index.tsx
 init_react_import();
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime20 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("Input", styles_module_default9);
 var TextareaField = ({
   onChange,
@@ -31841,13 +32004,13 @@ var TextareaField = ({
   label,
   id
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Type, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Type, { size: 16 }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
         "textarea",
         {
           id,
@@ -31857,6 +32020,7 @@ var TextareaField = ({
           value: typeof value === "undefined" ? "" : value,
           onChange: (e) => onChange(e.currentTarget.value),
           readOnly,
+          tabIndex: readOnly ? -1 : void 0,
           rows: 5
         }
       )
@@ -31872,10 +32036,10 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/fields/ObjectField/styles.module.css#css-module
 init_react_import();
-var styles_module_default13 = { "ObjectField": "_ObjectField_56z4t_5", "ObjectField-fieldset": "_ObjectField-fieldset_56z4t_13" };
+var styles_module_default13 = { "ObjectField": "_ObjectField_15j63_5", "ObjectField-fieldset": "_ObjectField-fieldset_15j63_13" };
 
 // components/InputOrGroup/fields/ObjectField/index.tsx
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var getClassName17 = get_class_name_factory_default("ObjectField", styles_module_default13);
 var getClassNameItem3 = get_class_name_factory_default("ObjectFieldItem", styles_module_default13);
 var ObjectField = ({
@@ -31892,18 +32056,18 @@ var ObjectField = ({
     return null;
   }
   const data = value || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(MoreVertical, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(MoreVertical, { size: 16 }),
       el: "div",
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName17(), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("fieldset", { className: getClassName17("fieldset"), children: Object.keys(field.objectFields).map((fieldName) => {
+      children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName17(), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("fieldset", { className: getClassName17("fieldset"), children: Object.keys(field.objectFields).map((fieldName) => {
         const subField = field.objectFields[fieldName];
         const subFieldName = `${name}.${fieldName}`;
         const wildcardFieldName = `${name}.${fieldName}`;
-        return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
           InputOrGroup,
           {
             name: subFieldName,
@@ -31930,7 +32094,7 @@ var ObjectField = ({
 };
 
 // components/InputOrGroup/index.tsx
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_jsx_runtime22 = require("react/jsx-runtime");
 var getClassName18 = get_class_name_factory_default("Input", styles_module_default9);
 var FieldLabel = ({
   children,
@@ -31941,11 +32105,11 @@ var FieldLabel = ({
   className
 }) => {
   const El = el;
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(El, { className, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: getClassName18("label"), children: [
-      icon ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName18("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_jsx_runtime21.Fragment, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(El, { className, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("label"), children: [
+      icon ? /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(import_jsx_runtime22.Fragment, {}),
       label,
-      readOnly && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName18("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Lock, { size: "12" }) })
+      readOnly && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Lock, { size: "12" }) })
     ] }),
     children
   ] });
@@ -31962,7 +32126,7 @@ var FieldLabelInternal = ({
     () => overrides.fieldLabel || FieldLabel,
     [overrides]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     Wrapper,
     {
       label,
@@ -32002,7 +32166,7 @@ var InputOrGroup = (_a) => {
     if (!field.render) {
       return null;
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName18(), children: field.render(__spreadValues({
+    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18(), children: field.render(__spreadValues({
       field,
       name,
       readOnly
@@ -32031,16 +32195,16 @@ var InputOrGroup = (_a) => {
   const mergedProps = __spreadProps(__spreadValues(__spreadValues({}, props), localProps), { field });
   const children = defaultFields[field.type](mergedProps);
   const Render2 = render[field.type];
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Render2, __spreadProps(__spreadValues({}, mergedProps), { children }));
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Render2, __spreadProps(__spreadValues({}, mergedProps), { children }));
 };
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Fields/styles.module.css#css-module
 init_react_import();
-var styles_module_default14 = { "PuckFields": "_PuckFields_1276r_1", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_1276r_5" };
+var styles_module_default14 = { "PuckFields": "_PuckFields_17k3p_1", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_17k3p_6" };
 
 // components/Puck/components/Fields/index.tsx
 var import_react19 = require("react");
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 var getClassName19 = get_class_name_factory_default("PuckFields", styles_module_default14);
 var defaultPageFields = {
   title: { type: "text" }
@@ -32049,9 +32213,9 @@ var DefaultFields = ({
   children,
   isLoading
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName19(), children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName19(), children: [
     children,
-    isLoading && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(import_react_spinners6.ClipLoader, { "aria-label": "loading" }) })
+    isLoading && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_react_spinners6.ClipLoader, { "aria-label": "loading" }) })
   ] });
 };
 var Fields = () => {
@@ -32072,14 +32236,14 @@ var Fields = () => {
   const isLoading = selectedItem ? (_c = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _c.loading : (_d = componentState["puck-root"]) == null ? void 0 : _d.loading;
   const rootProps = data.root.props || data.root;
   const Wrapper = (0, import_react19.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     "form",
     {
       className: getClassName19(),
       onSubmit: (e) => {
         e.preventDefault();
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Wrapper, { isLoading, itemSelector, children: Object.keys(fields).map((fieldName) => {
+      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Wrapper, { isLoading, itemSelector, children: Object.keys(fields).map((fieldName) => {
         const field = fields[fieldName];
         const onChange = (value, updatedUi) => {
           var _a2, _b2;
@@ -32145,7 +32309,7 @@ var Fields = () => {
         };
         if (selectedItem && itemSelector) {
           const { readOnly = {} } = selectedItem;
-          return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
             InputOrGroup,
             {
               field,
@@ -32161,7 +32325,7 @@ var Fields = () => {
           );
         } else {
           const { readOnly = {} } = data.root;
-          return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
             InputOrGroup,
             {
               field,
@@ -32193,17 +32357,18 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 init_react_import();
-var styles_module_default15 = { "ComponentList": "_ComponentList_1di93_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1di93_6", "ComponentList-content": "_ComponentList-content_1di93_10", "ComponentList-title": "_ComponentList-title_1di93_18", "ComponentList-titleIcon": "_ComponentList-titleIcon_1di93_39" };
+var styles_module_default15 = { "ComponentList": "_ComponentList_odh9d_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_odh9d_5", "ComponentList-content": "_ComponentList-content_odh9d_9", "ComponentList-title": "_ComponentList-title_odh9d_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_odh9d_53" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("ComponentList", styles_module_default15);
 var ComponentListItem = ({
   name,
+  label,
   index
 }) => {
   const { overrides } = useAppContext();
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Drawer.Item, { name, index, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Drawer.Item, { label, name, index, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -32212,9 +32377,9 @@ var ComponentList = ({
 }) => {
   const { config, state, setUi } = useAppContext();
   const { expanded = true } = state.ui.componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName20({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-      "div",
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: getClassName20({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
+      "button",
       {
         className: getClassName20("title"),
         onClick: () => setUi({
@@ -32226,15 +32391,17 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName20("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName20("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName20("content"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Drawer, { droppableId: `component-list${title ? `:${title}` : ""}`, children: children || Object.keys(config.components).map((componentKey, i) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName20("content"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Drawer, { droppableId: `component-list${title ? `:${title}` : ""}`, children: children || Object.keys(config.components).map((componentKey, i) => {
+      var _a;
+      return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         ComponentListItem,
         {
+          label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
           name: componentKey,
           index: i
         },
@@ -32246,7 +32413,7 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var useComponentList = (config, ui) => {
   const [componentList, setComponentList] = (0, import_react20.useState)();
   (0, import_react20.useEffect)(() => {
@@ -32259,16 +32426,18 @@ var useComponentList = (config, ui) => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             ComponentList,
             {
               id: categoryKey,
               title: category.title || categoryKey,
               children: category.components.map((componentName, i) => {
+                var _a2;
                 matchedComponents.push(componentName);
-                return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
                   ComponentList.Item,
                   {
+                    label: (_a2 = config.components[componentName]["label"]) != null ? _a2 : componentName,
                     name: componentName,
                     index: i
                   },
@@ -32285,16 +32454,18 @@ var useComponentList = (config, ui) => {
       );
       if (remainingComponents.length > 0 && !((_a = ui.componentList.other) == null ? void 0 : _a.components) && ((_b = ui.componentList.other) == null ? void 0 : _b.visible) !== false) {
         _componentList.push(
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             ComponentList,
             {
               id: "other",
               title: ((_c = ui.componentList.other) == null ? void 0 : _c.title) || "Other",
               children: remainingComponents.map((componentName, i) => {
-                return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+                var _a2;
+                return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
+                    label: (_a2 = config.components[componentName]["label"]) != null ? _a2 : componentName,
                     index: i
                   },
                   componentName
@@ -32307,24 +32478,32 @@ var useComponentList = (config, ui) => {
       }
       setComponentList(_componentList);
     }
-  }, [config.categories, ui.componentList]);
+  }, [config.categories, config.components, ui.componentList]);
   return componentList;
 };
 
 // components/Puck/components/Components/index.tsx
 var import_react21 = require("react");
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var Components = () => {
   const { config, state, overrides } = useAppContext();
   const componentList = useComponentList(config, state.ui);
   const Wrapper = (0, import_react21.useMemo)(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ComponentList, { id: "all" }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
 var import_react22 = require("react");
-var import_jsx_runtime26 = require("react/jsx-runtime");
+var import_auto_frame_component = __toESM(require("@measured/auto-frame-component"));
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Preview/styles.module.css#css-module
+init_react_import();
+var styles_module_default16 = { "PuckPreview": "_PuckPreview_29rm6_1", "PuckPreview-iframe": "_PuckPreview-iframe_29rm6_5" };
+
+// components/Puck/components/Preview/index.tsx
+var import_jsx_runtime27 = require("react/jsx-runtime");
+var getClassName21 = get_class_name_factory_default("PuckPreview", styles_module_default16);
 var Preview = ({ id = "puck-preview" }) => {
   const { config, dispatch, state } = useAppContext();
   const Page = (0, import_react22.useCallback)(
@@ -32335,16 +32514,25 @@ var Preview = ({ id = "puck-preview" }) => {
     [config.root]
   );
   const rootProps = state.data.root.props || state.data.root;
-  const { disableZoom = false } = (0, import_react22.useContext)(dropZoneContext) || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+  const ref = (0, import_react22.useRef)(null);
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     "div",
     {
+      className: getClassName21(),
       id,
       onClick: () => {
         dispatch({ type: "setUi", ui: __spreadProps(__spreadValues({}, state.ui), { itemSelector: null }) });
       },
-      style: { zoom: disableZoom ? 1 : 0.75 },
-      children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Page, __spreadProps(__spreadValues({ dispatch, state }, rootProps), { children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZone, { zone: rootDroppableId }) }))
+      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+        import_auto_frame_component.default,
+        {
+          id: "preview-iframe",
+          className: getClassName21("iframe"),
+          "data-rfd-iframe": true,
+          ref,
+          children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Page, __spreadProps(__spreadValues({ dispatch, state }, rootProps), { children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DropZone, { zone: rootDroppableId }) }))
+        }
+      )
     }
   );
 };
@@ -32378,7 +32566,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_default16 = { "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" };
+var styles_module_default17 = { "LayerTree": "_LayerTree_1pgw8_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_1pgw8_11", "LayerTree-helper": "_LayerTree-helper_1pgw8_17", "Layer": "_Layer_1pgw8_1", "Layer-inner": "_Layer-inner_1pgw8_29", "Layer--containsZone": "_Layer--containsZone_1pgw8_35", "Layer-clickable": "_Layer-clickable_1pgw8_39", "Layer--isSelected": "_Layer--isSelected_1pgw8_61", "Layer-chevron": "_Layer-chevron_1pgw8_77", "Layer--childIsSelected": "_Layer--childIsSelected_1pgw8_78", "Layer-zones": "_Layer-zones_1pgw8_82", "Layer-title": "_Layer-title_1pgw8_96", "Layer-name": "_Layer-name_1pgw8_105", "Layer-icon": "_Layer-icon_1pgw8_111", "Layer-zoneIcon": "_Layer-zoneIcon_1pgw8_116" };
 
 // lib/scroll-into-view.ts
 init_react_import();
@@ -32406,11 +32594,12 @@ var isChildOfZone = (item, maybeChild, ctx) => {
 };
 
 // components/LayerTree/index.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
-var getClassName21 = get_class_name_factory_default("LayerTree", styles_module_default16);
-var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default16);
+var import_jsx_runtime28 = require("react/jsx-runtime");
+var getClassName22 = get_class_name_factory_default("LayerTree", styles_module_default17);
+var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default17);
 var LayerTree = ({
   data,
+  config,
   zoneContent,
   itemSelector,
   setItemSelector,
@@ -32419,15 +32608,16 @@ var LayerTree = ({
 }) => {
   const zones = data.zones || {};
   const ctx = (0, import_react23.useContext)(dropZoneContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(import_jsx_runtime27.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName21("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Layers, { size: "16" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(import_jsx_runtime28.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName22("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName22("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Layers, { size: "16" }) }),
       " ",
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("ul", { className: getClassName21(), children: [
-      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("ul", { className: getClassName22(), children: [
+      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName22("helper"), children: "No items" }),
       zoneContent.map((item, i) => {
+        var _a;
         const isSelected = (itemSelector == null ? void 0 : itemSelector.index) === i && (itemSelector.zone === zone || itemSelector.zone === rootDroppableId && !zone);
         const zonesForItem = findZonesForArea(data, item.props.id);
         const containsZone = Object.keys(zonesForItem).length > 0;
@@ -32441,7 +32631,7 @@ var LayerTree = ({
         const selectedItem = itemSelector && data ? getItem(itemSelector, data) : null;
         const isHovering = hoveringComponent === item.props.id;
         const childIsSelected = isChildOfZone(item, selectedItem, ctx);
-        return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
+        return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
           "li",
           {
             className: getClassNameLayer({
@@ -32451,8 +32641,8 @@ var LayerTree = ({
               childIsSelected
             }),
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
-                "div",
+              /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
+                "button",
                 {
                   className: getClassNameLayer("clickable"),
                   onClick: () => {
@@ -32465,8 +32655,14 @@ var LayerTree = ({
                       zone
                     });
                     const id = zoneContent[i].props.id;
+                    const iframe = document.querySelector("#preview-iframe");
+                    if (!(iframe == null ? void 0 : iframe.contentDocument)) {
+                      throw new Error(
+                        `Preview iframe could not be found when trying to scroll to item ${id}`
+                      );
+                    }
                     scrollIntoView(
-                      document.querySelector(
+                      iframe.contentDocument.querySelector(
                         `[data-rfd-drag-handle-draggable-id="draggable-${id}"]`
                       )
                     );
@@ -32482,24 +32678,25 @@ var LayerTree = ({
                     setHoveringComponent(null);
                   },
                   children: [
-                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                       "div",
                       {
                         className: getClassNameLayer("chevron"),
                         title: isSelected ? "Collapse" : "Expand",
-                        children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(ChevronDown, { size: "12" })
+                        children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ChevronDown, { size: "12" })
                       }
                     ),
-                    /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(LayoutGrid, { size: "16" }) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameLayer("name"), children: item.type })
+                    /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(LayoutGrid, { size: "16" }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassNameLayer("name"), children: (_a = config.components[item.type]["label"]) != null ? _a : item.type })
                     ] })
                   ]
                 }
               ) }),
-              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
                 LayerTree,
                 {
+                  config,
                   data,
                   zoneContent: zones[zoneKey],
                   setItemSelector,
@@ -32519,9 +32716,9 @@ var LayerTree = ({
 
 // components/Puck/components/Outline/index.tsx
 var import_react24 = require("react");
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var Outline = () => {
-  const { dispatch, state, overrides } = useAppContext();
+  const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
   const setItemSelector = (0, import_react24.useCallback)(
@@ -32534,10 +32731,11 @@ var Outline = () => {
     []
   );
   const Wrapper = (0, import_react24.useMemo)(() => overrides.outline || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Wrapper, { children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(import_jsx_runtime28.Fragment, { children: [
-    (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Wrapper, { children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(import_jsx_runtime29.Fragment, { children: [
+    (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
       LayerTree,
       {
+        config,
         data,
         label: areaContainsZones(data, "root") ? rootDroppableId : "",
         zoneContent: data.content,
@@ -32547,9 +32745,10 @@ var Outline = () => {
     ),
     Object.entries(findZonesForArea(data, "root")).map(
       ([zoneKey, zone]) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
           LayerTree,
           {
+            config,
             data,
             label: zoneKey,
             zone: zoneKey,
@@ -32570,7 +32769,7 @@ var loadOverrides = ({
   overrides,
   plugins
 }) => {
-  const collected = overrides;
+  const collected = __spreadValues({}, overrides);
   plugins.forEach((plugin) => {
     Object.keys(plugin.overrides).forEach((overridesType) => {
       if (overridesType === "fieldTypes") {
@@ -32673,14 +32872,421 @@ function useHistoryStore() {
   };
 }
 
+// components/Puck/components/Canvas/index.tsx
+init_react_import();
+
+// ../../node_modules/css-box-model/dist/css-box-model.esm.js
+init_react_import();
+
+// ../../node_modules/tiny-invariant/dist/esm/tiny-invariant.js
+init_react_import();
+var isProduction = process.env.NODE_ENV === "production";
+var prefix = "Invariant failed";
+function invariant(condition, message) {
+  if (condition) {
+    return;
+  }
+  if (isProduction) {
+    throw new Error(prefix);
+  }
+  var provided = typeof message === "function" ? message() : message;
+  var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
+  throw new Error(value);
+}
+
+// ../../node_modules/css-box-model/dist/css-box-model.esm.js
+var getRect = function getRect2(_ref) {
+  var top = _ref.top, right = _ref.right, bottom = _ref.bottom, left = _ref.left;
+  var width = right - left;
+  var height = bottom - top;
+  var rect = {
+    top,
+    right,
+    bottom,
+    left,
+    width,
+    height,
+    x: left,
+    y: top,
+    center: {
+      x: (right + left) / 2,
+      y: (bottom + top) / 2
+    }
+  };
+  return rect;
+};
+var expand = function expand2(target, expandBy) {
+  return {
+    top: target.top - expandBy.top,
+    left: target.left - expandBy.left,
+    bottom: target.bottom + expandBy.bottom,
+    right: target.right + expandBy.right
+  };
+};
+var shrink = function shrink2(target, shrinkBy) {
+  return {
+    top: target.top + shrinkBy.top,
+    left: target.left + shrinkBy.left,
+    bottom: target.bottom - shrinkBy.bottom,
+    right: target.right - shrinkBy.right
+  };
+};
+var noSpacing = {
+  top: 0,
+  right: 0,
+  bottom: 0,
+  left: 0
+};
+var createBox = function createBox2(_ref2) {
+  var borderBox = _ref2.borderBox, _ref2$margin = _ref2.margin, margin = _ref2$margin === void 0 ? noSpacing : _ref2$margin, _ref2$border = _ref2.border, border = _ref2$border === void 0 ? noSpacing : _ref2$border, _ref2$padding = _ref2.padding, padding = _ref2$padding === void 0 ? noSpacing : _ref2$padding;
+  var marginBox = getRect(expand(borderBox, margin));
+  var paddingBox = getRect(shrink(borderBox, border));
+  var contentBox = getRect(shrink(paddingBox, padding));
+  return {
+    marginBox,
+    borderBox: getRect(borderBox),
+    paddingBox,
+    contentBox,
+    margin,
+    border,
+    padding
+  };
+};
+var parse = function parse2(raw) {
+  var value = raw.slice(0, -2);
+  var suffix = raw.slice(-2);
+  if (suffix !== "px") {
+    return 0;
+  }
+  var result = Number(value);
+  !!isNaN(result) ? process.env.NODE_ENV !== "production" ? invariant(false, "Could not parse value [raw: " + raw + ", without suffix: " + value + "]") : invariant(false) : void 0;
+  return result;
+};
+var calculateBox = function calculateBox2(borderBox, styles) {
+  var margin = {
+    top: parse(styles.marginTop),
+    right: parse(styles.marginRight),
+    bottom: parse(styles.marginBottom),
+    left: parse(styles.marginLeft)
+  };
+  var padding = {
+    top: parse(styles.paddingTop),
+    right: parse(styles.paddingRight),
+    bottom: parse(styles.paddingBottom),
+    left: parse(styles.paddingLeft)
+  };
+  var border = {
+    top: parse(styles.borderTopWidth),
+    right: parse(styles.borderRightWidth),
+    bottom: parse(styles.borderBottomWidth),
+    left: parse(styles.borderLeftWidth)
+  };
+  return createBox({
+    borderBox,
+    margin,
+    padding,
+    border
+  });
+};
+var getBox = function getBox2(el) {
+  var borderBox = el.getBoundingClientRect();
+  var styles = window.getComputedStyle(el);
+  return calculateBox(borderBox, styles);
+};
+
+// components/Puck/components/Canvas/index.tsx
+var import_react27 = require("react");
+
+// components/ViewportControls/index.tsx
+init_react_import();
+var import_react26 = require("react");
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
+init_react_import();
+var styles_module_default18 = { "ViewportControls": "_ViewportControls_14bhf_1", "ViewportControls-divider": "_ViewportControls-divider_14bhf_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_14bhf_21", "ViewportButton--isActive": "_ViewportButton--isActive_14bhf_33", "ViewportButton-inner": "_ViewportButton-inner_14bhf_33" };
+
+// components/ViewportControls/index.tsx
+var import_jsx_runtime30 = require("react/jsx-runtime");
+var icons = {
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Monitor, { size: 16 })
+};
+var getClassName23 = get_class_name_factory_default("ViewportControls", styles_module_default18);
+var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default18);
+var ViewportButton = ({
+  children,
+  height = "auto",
+  title,
+  width,
+  onClick
+}) => {
+  const { state } = useAppContext();
+  const isActive = width === state.ui.viewports.current.width;
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+    IconButton,
+    {
+      title,
+      disabled: isActive,
+      onClick: (e) => {
+        e.stopPropagation();
+        onClick({ width, height });
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("span", { className: getClassNameButton("inner"), children })
+    }
+  ) });
+};
+var defaultZoomOptions = [
+  { label: "25%", value: 0.25 },
+  { label: "50%", value: 0.5 },
+  { label: "75%", value: 0.75 },
+  { label: "100%", value: 1 },
+  { label: "125%", value: 1.25 },
+  { label: "150%", value: 1.5 },
+  { label: "200%", value: 2 }
+];
+var ViewportControls = ({
+  autoZoom,
+  zoom,
+  onViewportChange,
+  onZoom
+}) => {
+  const { state, viewports } = useAppContext();
+  const viewport = state.ui.viewports.current;
+  const defaultsContainAutoZoom = defaultZoomOptions.find(
+    (option) => option.value === autoZoom
+  );
+  const zoomOptions = (0, import_react26.useMemo)(
+    () => [
+      ...defaultZoomOptions,
+      ...defaultsContainAutoZoom ? [] : [
+        {
+          value: autoZoom,
+          label: `${(autoZoom * 100).toFixed(0)}% (Auto)`
+        }
+      ]
+    ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
+    [autoZoom]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)("div", { className: getClassName23(), children: [
+    viewports.map((viewport2, i) => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+      ViewportButton,
+      {
+        height: viewport2.height,
+        width: viewport2.width,
+        title: viewport2.label ? `Switch to ${viewport2.label} viewport` : "Switch viewport",
+        onClick: onViewportChange,
+        children: typeof viewport2.icon === "string" ? icons[viewport2.icon] || viewport2.icon : viewport2.icon || icons.Smartphone
+      },
+      i
+    )),
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName23("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+      IconButton,
+      {
+        title: "Zoom viewport out",
+        disabled: zoom <= zoomOptions[0].value,
+        onClick: (e) => {
+          e.stopPropagation();
+          onZoom(
+            zoomOptions[Math.max(
+              zoomOptions.findIndex((option) => option.value === zoom) - 1,
+              0
+            )].value
+          );
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ZoomOut, { size: 16 })
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+      IconButton,
+      {
+        title: "Zoom viewport in",
+        disabled: zoom >= zoomOptions[zoomOptions.length - 1].value,
+        onClick: (e) => {
+          e.stopPropagation();
+          onZoom(
+            zoomOptions[Math.min(
+              zoomOptions.findIndex((option) => option.value === zoom) + 1,
+              zoomOptions.length - 1
+            )].value
+          );
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ZoomIn, { size: 16 })
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName23("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+      "select",
+      {
+        className: getClassName23("zoomSelect"),
+        value: zoom.toString(),
+        onChange: (e) => {
+          onZoom(parseFloat(e.currentTarget.value));
+        },
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+          "option",
+          {
+            value: option.value,
+            label: option.label
+          },
+          option.label
+        ))
+      }
+    )
+  ] });
+};
+
+// lib/get-zoom-config.ts
+init_react_import();
+var RESET_ZOOM_SMALLER_THAN_FRAME = true;
+var getZoomConfig = (uiViewport, frame, zoom) => {
+  const box = getBox(frame);
+  const { width: frameWidth, height: frameHeight } = box.contentBox;
+  const viewportHeight = uiViewport.height === "auto" ? frameHeight : uiViewport.height;
+  let rootHeight = 0;
+  let autoZoom = 1;
+  if (uiViewport.width > frameWidth || viewportHeight > frameHeight) {
+    const widthZoom = Math.min(frameWidth / uiViewport.width, 1);
+    const heightZoom = Math.min(frameHeight / viewportHeight, 1);
+    zoom = widthZoom;
+    if (widthZoom < heightZoom) {
+      rootHeight = viewportHeight / zoom;
+    } else {
+      rootHeight = viewportHeight;
+      zoom = heightZoom;
+    }
+    autoZoom = zoom;
+  } else {
+    if (RESET_ZOOM_SMALLER_THAN_FRAME) {
+      autoZoom = 1;
+      zoom = 1;
+      rootHeight = viewportHeight;
+    }
+  }
+  return { autoZoom, rootHeight, zoom };
+};
+
+// components/Puck/components/Canvas/index.tsx
+var import_jsx_runtime31 = require("react/jsx-runtime");
+var getClassName24 = get_class_name_factory_default("Puck", styles_module_default8);
+var ZOOM_ON_CHANGE = true;
+var Canvas = () => {
+  const { dispatch, state, overrides, setUi, zoomConfig, setZoomConfig } = useAppContext();
+  const { ui } = state;
+  const frameRef = (0, import_react27.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react27.useState)(false);
+  const defaultRender = (0, import_react27.useMemo)(() => {
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_jsx_runtime31.Fragment, { children });
+    return PuckDefault;
+  }, []);
+  const CustomPreview = (0, import_react27.useMemo)(
+    () => overrides.preview || defaultRender,
+    [overrides]
+  );
+  const getFrameDimensions = (0, import_react27.useCallback)(() => {
+    if (frameRef.current) {
+      const frame = frameRef.current;
+      const box = getBox(frame);
+      return { width: box.contentBox.width, height: box.contentBox.height };
+    }
+    return { width: 0, height: 0 };
+  }, [frameRef]);
+  const resetAutoZoom = (0, import_react27.useCallback)(
+    (ui2 = state.ui) => {
+      if (frameRef.current) {
+        setZoomConfig(
+          getZoomConfig(ui2.viewports.current, frameRef.current, zoomConfig.zoom)
+        );
+      }
+    },
+    [frameRef, zoomConfig, state.ui]
+  );
+  (0, import_react27.useEffect)(() => {
+    setShowTransition(false);
+    resetAutoZoom();
+  }, [frameRef, ui.leftSideBarVisible, ui.rightSideBarVisible]);
+  (0, import_react27.useEffect)(() => {
+    const { height: frameHeight } = getFrameDimensions();
+    if (ui.viewports.current.height === "auto") {
+      setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
+        rootHeight: frameHeight / zoomConfig.zoom
+      }));
+    }
+  }, [zoomConfig.zoom]);
+  (0, import_react27.useEffect)(() => {
+    const observer = new ResizeObserver(() => {
+      setShowTransition(false);
+      resetAutoZoom();
+    });
+    if (document.body) {
+      observer.observe(document.body);
+    }
+    return () => {
+      observer.disconnect();
+    };
+  }, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+    "div",
+    {
+      className: getClassName24("canvas"),
+      onClick: () => dispatch({
+        type: "setUi",
+        ui: { itemSelector: null },
+        recordHistory: true
+      }),
+      children: [
+        ui.viewports.controlsVisible && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName24("canvasControls"), children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          ViewportControls,
+          {
+            autoZoom: zoomConfig.autoZoom,
+            zoom: zoomConfig.zoom,
+            onViewportChange: (viewport) => {
+              setShowTransition(true);
+              const uiViewport = __spreadProps(__spreadValues({}, viewport), {
+                height: viewport.height || "auto",
+                zoom: zoomConfig.zoom
+              });
+              const newUi = __spreadProps(__spreadValues({}, ui), {
+                viewports: __spreadProps(__spreadValues({}, ui.viewports), { current: uiViewport })
+              });
+              setUi(newUi);
+              if (ZOOM_ON_CHANGE) {
+                resetAutoZoom(newUi);
+              }
+            },
+            onZoom: (zoom) => {
+              setShowTransition(true);
+              setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), { zoom }));
+            }
+          }
+        ) }),
+        /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName24("frame"), ref: frameRef, children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          "div",
+          {
+            className: getClassName24("root"),
+            style: {
+              width: ui.viewports.current.width,
+              height: zoomConfig.rootHeight,
+              transform: `scale(${zoomConfig.zoom})`,
+              transition: showTransition ? "width 150ms ease-out, height 150ms ease-out, transform 150ms ease-out" : ""
+            },
+            children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Preview, {}) })
+          }
+        ) })
+      ]
+    }
+  );
+};
+
 // components/Puck/index.tsx
-var import_jsx_runtime29 = require("react/jsx-runtime");
-var getClassName22 = get_class_name_factory_default("Puck", styles_module_default8);
+var import_jsx_runtime32 = require("react/jsx-runtime");
+var getClassName25 = get_class_name_factory_default("Puck", styles_module_default8);
 function Puck({
   children,
   config,
   data: initialData = { content: [], root: { props: { title: "" } } },
-  ui: initialUi = defaultAppState.ui,
+  ui: initialUi,
   onChange,
   onPublish,
   plugins = [],
@@ -32688,32 +33294,58 @@ function Puck({
   renderHeader,
   renderHeaderActions,
   headerTitle,
-  headerPath
+  headerPath,
+  viewports = defaultViewports
 }) {
+  var _a;
   const historyStore = useHistoryStore();
-  const [reducer] = (0, import_react26.useState)(
+  const [reducer] = (0, import_react28.useState)(
     () => createReducer({ config, record: historyStore.record })
   );
-  const [initialAppState] = (0, import_react26.useState)(() => __spreadProps(__spreadValues({}, defaultAppState), {
-    data: initialData,
-    ui: __spreadProps(__spreadValues(__spreadValues({}, defaultAppState.ui), initialUi), {
-      // Store categories under componentList on state to allow render functions and plugins to modify
-      componentList: config.categories ? Object.entries(config.categories).reduce(
-        (acc, [categoryName, category]) => {
-          return __spreadProps(__spreadValues({}, acc), {
-            [categoryName]: {
-              title: category.title,
-              components: category.components,
-              expanded: category.defaultExpanded,
-              visible: category.visible
-            }
-          });
-        },
-        {}
-      ) : {}
-    })
-  }));
-  const [appState, dispatch] = (0, import_react26.useReducer)(
+  const [initialAppState] = (0, import_react28.useState)(() => {
+    var _a2, _b, _c, _d;
+    const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
+    let clientUiState = {};
+    if (typeof window !== "undefined") {
+      const viewportWidth = window.innerWidth;
+      const viewportDifferences = Object.entries(viewports).map(([key, value]) => ({
+        key,
+        diff: Math.abs(viewportWidth - value.width)
+      })).sort((a, b) => a.diff > b.diff ? 1 : -1);
+      const closestViewport = viewportDifferences[0].key;
+      clientUiState = __spreadProps(__spreadValues({}, window.matchMedia("(min-width: 638px)").matches ? {} : {
+        leftSideBarVisible: false,
+        rightSideBarVisible: false
+      }), {
+        viewports: __spreadProps(__spreadValues({}, initial.viewports), {
+          current: __spreadProps(__spreadValues({}, initial.viewports.current), {
+            height: ((_b = (_a2 = initialUi == null ? void 0 : initialUi.viewports) == null ? void 0 : _a2.current) == null ? void 0 : _b.height) || viewports[closestViewport].height || "auto",
+            width: ((_d = (_c = initialUi == null ? void 0 : initialUi.viewports) == null ? void 0 : _c.current) == null ? void 0 : _d.width) || viewports[closestViewport].width
+          })
+        })
+      });
+    }
+    return __spreadProps(__spreadValues({}, defaultAppState), {
+      data: initialData,
+      ui: __spreadProps(__spreadValues(__spreadValues({}, initial), clientUiState), {
+        // Store categories under componentList on state to allow render functions and plugins to modify
+        componentList: config.categories ? Object.entries(config.categories).reduce(
+          (acc, [categoryName, category]) => {
+            return __spreadProps(__spreadValues({}, acc), {
+              [categoryName]: {
+                title: category.title,
+                components: category.components,
+                expanded: category.defaultExpanded,
+                visible: category.visible
+              }
+            });
+          },
+          {}
+        ) : {}
+      })
+    });
+  });
+  const [appState, dispatch] = (0, import_react28.useReducer)(
     reducer,
     flushZones(initialAppState)
   );
@@ -32724,9 +33356,9 @@ function Puck({
     config,
     dispatch
   );
-  const [menuOpen, setMenuOpen] = (0, import_react26.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react28.useState)(false);
   const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
-  const setItemSelector = (0, import_react26.useCallback)(
+  const setItemSelector = (0, import_react28.useCallback)(
     (newItemSelector) => {
       if (newItemSelector === itemSelector)
         return;
@@ -32739,21 +33371,21 @@ function Puck({
     [itemSelector]
   );
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  (0, import_react26.useEffect)(() => {
+  (0, import_react28.useEffect)(() => {
     if (onChange)
       onChange(data);
   }, [data]);
   const { onDragStartOrUpdate, placeholderStyle } = usePlaceholderStyle();
-  const [draggedItem, setDraggedItem] = (0, import_react26.useState)();
+  const [draggedItem, setDraggedItem] = (0, import_react28.useState)();
   const rootProps = data.root.props || data.root;
-  (0, import_react26.useEffect)(() => {
+  (0, import_react28.useEffect)(() => {
     if (Object.keys(data.root).length > 0 && !data.root.props) {
       console.error(
         "Warning: Defining props on `root` is deprecated. Please use `root.props`. This will be a breaking change in a future release."
       );
     }
   }, []);
-  const toggleSidebars = (0, import_react26.useCallback)(
+  const toggleSidebars = (0, import_react28.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -32767,7 +33399,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react26.useEffect)(() => {
+  (0, import_react28.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -32790,59 +33422,54 @@ function Puck({
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultRender = (0, import_react26.useMemo)(() => {
-    const PuckDefault = ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: children2 });
+  const defaultRender = (0, import_react28.useMemo)(() => {
+    const PuckDefault = ({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(import_jsx_runtime32.Fragment, { children: children2 });
     return PuckDefault;
   }, []);
-  const defaultHeaderRender = (0, import_react26.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react28.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
       );
-      const RenderHeader = (_a) => {
-        var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
+      const RenderHeader = (_a2) => {
+        var _b = _a2, { actions } = _b, props = __objRest(_b, ["actions"]);
         const Comp = renderHeader;
-        return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+        return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
       };
       return RenderHeader;
     }
     return defaultRender;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react26.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react28.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
       );
       const RenderHeader = (props) => {
         const Comp = renderHeaderActions;
-        return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+        return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
       };
       return RenderHeader;
     }
     return defaultRender;
   }, [renderHeader]);
-  const loadedOverrides = (0, import_react26.useMemo)(() => {
+  const loadedOverrides = (0, import_react28.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins]);
-  const CustomPuck = (0, import_react26.useMemo)(
+  const CustomPuck = (0, import_react28.useMemo)(
     () => loadedOverrides.puck || defaultRender,
     [loadedOverrides]
   );
-  const CustomPreview = (0, import_react26.useMemo)(
-    () => loadedOverrides.preview || defaultRender,
-    [loadedOverrides]
-  );
-  const CustomHeader = (0, import_react26.useMemo)(
+  const CustomHeader = (0, import_react28.useMemo)(
     () => loadedOverrides.header || defaultHeaderRender,
     [loadedOverrides]
   );
-  const CustomHeaderActions = (0, import_react26.useMemo)(
+  const CustomHeaderActions = (0, import_react28.useMemo)(
     () => loadedOverrides.headerActions || defaultHeaderActionsRender,
     [loadedOverrides]
   );
-  const disableZoom = children || loadedOverrides.puck ? true : false;
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: "Puck", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: "Puck", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       AppProvider,
       {
         value: {
@@ -32853,9 +33480,10 @@ function Puck({
           resolveData,
           plugins,
           overrides: loadedOverrides,
-          history
+          history,
+          viewports
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
           import_dnd7.DragDropContext,
           {
             onDragUpdate: (update) => {
@@ -32910,7 +33538,7 @@ function Puck({
                 });
               }
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
               DropZoneProvider,
               {
                 value: {
@@ -32922,77 +33550,75 @@ function Puck({
                   draggedItem,
                   placeholderStyle,
                   mode: "edit",
-                  areaId: "root",
-                  disableZoom
+                  areaId: "root"
                 },
-                children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
+                children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
                   "div",
                   {
-                    className: getClassName22({
+                    className: getClassName25({
                       leftSideBarVisible,
                       menuOpen,
-                      rightSideBarVisible,
-                      disableZoom
+                      rightSideBarVisible
                     }),
                     children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                         CustomHeader,
                         {
-                          actions: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(import_jsx_runtime29.Fragment, { children: [
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(CustomHeaderActions, {}),
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                          actions: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_jsx_runtime32.Fragment, { children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(CustomHeaderActions, {}),
+                            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                               Button,
                               {
                                 onClick: () => {
                                   onPublish && onPublish(data);
                                 },
-                                icon: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Globe, { size: "14px" }),
+                                icon: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Globe, { size: "14px" }),
                                 children: "Publish"
                               }
                             )
                           ] }),
-                          children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("header", { className: getClassName22("header"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22("headerInner"), children: [
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22("headerToggle"), children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                          children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("header", { className: getClassName25("header"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassName25("headerInner"), children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassName25("headerToggle"), children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName25("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                                 IconButton,
                                 {
                                   onClick: () => {
                                     toggleSidebars("left");
                                   },
                                   title: "Toggle left sidebar",
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(PanelLeft, { focusable: "false" })
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(PanelLeft, { focusable: "false" })
                                 }
                               ) }),
-                              /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName25("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                                 IconButton,
                                 {
                                   onClick: () => {
                                     toggleSidebars("right");
                                   },
                                   title: "Toggle right sidebar",
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(PanelRight, { focusable: "false" })
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(PanelRight, { focusable: "false" })
                                 }
                               ) })
                             ] }),
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(Heading, { rank: 2, size: "xs", children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName25("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Heading, { rank: 2, size: "xs", children: [
                               headerTitle || rootProps.title || "Page",
-                              headerPath && /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(import_jsx_runtime29.Fragment, { children: [
+                              headerPath && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_jsx_runtime32.Fragment, { children: [
                                 " ",
-                                /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("code", { className: getClassName22("headerPath"), children: headerPath })
+                                /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("code", { className: getClassName25("headerPath"), children: headerPath })
                               ] })
                             ] }) }),
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22("headerTools"), children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                            /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassName25("headerTools"), children: [
+                              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName25("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                                 IconButton,
                                 {
                                   onClick: () => {
                                     return setMenuOpen(!menuOpen);
                                   },
                                   title: "Toggle menu bar",
-                                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronDown, { focusable: "false" })
+                                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ChevronDown, { focusable: "false" })
                                 }
                               ) }),
-                              /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                                 MenuBar,
                                 {
                                   appState,
@@ -33000,7 +33626,7 @@ function Puck({
                                   dispatch,
                                   onPublish,
                                   menuOpen,
-                                  renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(CustomHeaderActions, {}),
+                                  renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(CustomHeaderActions, {}),
                                   setMenuOpen
                                 }
                               )
@@ -33008,38 +33634,19 @@ function Puck({
                           ] }) })
                         }
                       ),
-                      /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22("leftSideBar"), children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Components, {}) }),
-                        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Outline, {}) })
+                      /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassName25("leftSideBar"), children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Components, {}) }),
+                        /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Outline, {}) })
                       ] }),
-                      /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
-                        "div",
-                        {
-                          className: getClassName22("frame"),
-                          onClick: () => setItemSelector(null),
-                          children: [
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("root"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Preview, {}) }) }),
-                            /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
-                              "div",
-                              {
-                                style: {
-                                  background: "var(--puck-color-grey-10)",
-                                  height: "100%",
-                                  flexGrow: 1
-                                }
-                              }
-                            )
-                          ]
-                        }
-                      ),
-                      /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+                      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Canvas, {}),
+                      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName25("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                         SidebarSection,
                         {
                           noPadding: true,
                           noBorderTop: true,
                           showBreadcrumbs: true,
-                          title: selectedItem ? selectedItem.type : "Page",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Fields, {})
+                          title: selectedItem ? (_a = config.components[selectedItem.type]["label"]) != null ? _a : selectedItem.type : "Page",
+                          children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Fields, {})
                         }
                       ) })
                     ]
@@ -33051,7 +33658,7 @@ function Puck({
         )
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { id: "puck-portal-root" })
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { id: "puck-portal-root" })
   ] });
 }
 Puck.Components = Components;
@@ -33061,13 +33668,13 @@ Puck.Preview = Preview;
 
 // components/Render/index.tsx
 init_react_import();
-var import_jsx_runtime30 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 function Render({ config, data }) {
   var _a;
   const rootProps = data.root.props || data.root;
   const title = (rootProps == null ? void 0 : rootProps.title) || "";
   if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
       config.root.render,
       __spreadProps(__spreadValues({}, rootProps), {
         puck: {
@@ -33076,11 +33683,11 @@ function Render({ config, data }) {
         title,
         editMode: false,
         id: "puck-root",
-        children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(DropZone, { zone: rootDroppableId })
+        children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZone, { zone: rootDroppableId })
       })
     ) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(DropZone, { zone: rootDroppableId }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZone, { zone: rootDroppableId }) });
 }
 
 // lib/migrate.ts
@@ -33170,8 +33777,8 @@ var resolveAllData = (data, config, onResolveStart, onResolveEnd) => __async(voi
 // lib/use-puck.ts
 init_react_import();
 var usePuck = () => {
-  const { state: appState, config, dispatch } = useAppContext();
-  return { appState, config, dispatch };
+  const { state: appState, config, history, dispatch } = useAppContext();
+  return { appState, config, dispatch, history };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -33375,6 +33982,14 @@ lucide-react/dist/esm/icons/lock.js:
    * See the LICENSE file in the root directory of this source tree.
    *)
 
+lucide-react/dist/esm/icons/monitor.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
 lucide-react/dist/esm/icons/more-vertical.js:
   (**
    * @license lucide-react v0.298.0 - ISC
@@ -33415,6 +34030,30 @@ lucide-react/dist/esm/icons/search.js:
    * See the LICENSE file in the root directory of this source tree.
    *)
 
+lucide-react/dist/esm/icons/sliders-horizontal.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
+lucide-react/dist/esm/icons/smartphone.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
+lucide-react/dist/esm/icons/tablet.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
 lucide-react/dist/esm/icons/trash.js:
   (**
    * @license lucide-react v0.298.0 - ISC
@@ -33439,6 +34078,22 @@ lucide-react/dist/esm/icons/unlock.js:
    * See the LICENSE file in the root directory of this source tree.
    *)
 
+lucide-react/dist/esm/icons/zoom-in.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
+lucide-react/dist/esm/icons/zoom-out.js:
+  (**
+   * @license lucide-react v0.298.0 - ISC
+   *
+   * This source code is licensed under the ISC license.
+   * See the LICENSE file in the root directory of this source tree.
+   *)
+
 lucide-react/dist/esm/lucide-react.js:
   (**
    * @license lucide-react v0.298.0 - ISC