@measured/puck 0.12.0-canary.349f44d → 0.12.0-canary.3f8ebc0

package/dist/{Config-e71a51c7.d.ts → Config-35e6eaae.d.ts}

@@ -171,7 +171,6 @@ type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps
 type ItemWithId = {
     _arrayId: string;
     _originalIndex: number;
-    data: any;
 };
 type ArrayState = {
     items: ItemWithId[];

package/dist/index.d.ts

@@ -1,10 +1,45 @@
-import { U as UiState, D as Data, A as AppState, C as Config, I as ItemSelector, M as MappedItem, R as RootDataWithProps, a as DefaultRootProps, b as RootData } from './Config-e71a51c7.js';
-export { d as Adaptor, c as ArrayField, p as ArrayState, l as BaseData, B as BaseField, k as ComponentConfig, m as ComponentData, i as Content, f as CustomField, g as DefaultComponentProps, q as DropZone, e as ExternalField, E as ExternalFieldWithAdaptor, F as Field, h as Fields, o as ItemWithId, P as PuckComponent, j as PuckContext, n as RootDataWithoutProps, S as SelectField, T as TextField } from './Config-e71a51c7.js';
+import { D as Data, C as Config, I as ItemSelector, U as UiState, A as AppState, M as MappedItem, R as RootDataWithProps, a as DefaultRootProps, b as RootData } from './Config-35e6eaae.js';
+export { d as Adaptor, c as ArrayField, p as ArrayState, l as BaseData, B as BaseField, k as ComponentConfig, m as ComponentData, i as Content, f as CustomField, g as DefaultComponentProps, q as DropZone, e as ExternalField, E as ExternalFieldWithAdaptor, F as Field, h as Fields, o as ItemWithId, P as PuckComponent, j as PuckContext, n as RootDataWithoutProps, S as SelectField, T as TextField } from './Config-35e6eaae.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import { ReactNode, CSSProperties, SyntheticEvent, ReactElement } from 'react';
 import { DragStart, DragUpdate } from '@hello-pangea/dnd';
 
+type PathData = Record<string, {
+    path: string[];
+    label: string;
+}>;
+type DropZoneContext = {
+    data: Data;
+    config: Config;
+    componentState?: Record<string, any>;
+    itemSelector?: ItemSelector | null;
+    setItemSelector?: (newIndex: ItemSelector | null) => void;
+    dispatch?: (action: PuckAction) => void;
+    areaId?: string;
+    draggedItem?: DragStart & Partial<DragUpdate>;
+    placeholderStyle?: CSSProperties;
+    hoveringArea?: string | null;
+    setHoveringArea?: (area: string | null) => void;
+    hoveringZone?: string | null;
+    setHoveringZone?: (zone: string | null) => void;
+    hoveringComponent?: string | null;
+    setHoveringComponent?: (id: string | null) => void;
+    registerZoneArea?: (areaId: string) => void;
+    areasWithZones?: Record<string, boolean>;
+    registerZone?: (zoneCompound: string) => void;
+    unregisterZone?: (zoneCompound: string) => void;
+    activeZones?: Record<string, boolean>;
+    pathData?: PathData;
+    registerPath?: (selector: ItemSelector) => void;
+    mode?: "edit" | "render";
+} | null;
+declare const dropZoneContext: react.Context<DropZoneContext>;
+declare const DropZoneProvider: ({ children, value, }: {
+    children: ReactNode;
+    value: DropZoneContext;
+}) => react_jsx_runtime.JSX.Element;
+
 type InsertAction = {
     type: "insert";
     componentType: string;
@@ -50,7 +85,7 @@ type SetDataAction = {
 };
 type SetAction = {
     type: "set";
-    state: Partial<AppState>;
+    state: Partial<AppState> | ((previous: AppState) => Partial<AppState>);
 };
 type RegisterZoneAction = {
     type: "registerZone";
@@ -64,41 +99,6 @@ type PuckAction = {
     recordHistory?: boolean;
 } & (ReorderAction | InsertAction | MoveAction | ReplaceAction | RemoveAction | DuplicateAction | SetAction | SetDataAction | SetUiAction | RegisterZoneAction | UnregisterZoneAction);
 
-type PathData = Record<string, {
-    path: string[];
-    label: string;
-}>;
-type DropZoneContext = {
-    data: Data;
-    config: Config;
-    componentState?: Record<string, any>;
-    itemSelector?: ItemSelector | null;
-    setItemSelector?: (newIndex: ItemSelector | null) => void;
-    dispatch?: (action: PuckAction) => void;
-    areaId?: string;
-    draggedItem?: DragStart & Partial<DragUpdate>;
-    placeholderStyle?: CSSProperties;
-    hoveringArea?: string | null;
-    setHoveringArea?: (area: string | null) => void;
-    hoveringZone?: string | null;
-    setHoveringZone?: (zone: string | null) => void;
-    hoveringComponent?: string | null;
-    setHoveringComponent?: (id: string | null) => void;
-    registerZoneArea?: (areaId: string) => void;
-    areasWithZones?: Record<string, boolean>;
-    registerZone?: (zoneCompound: string) => void;
-    unregisterZone?: (zoneCompound: string) => void;
-    activeZones?: Record<string, boolean>;
-    pathData?: PathData;
-    registerPath?: (selector: ItemSelector) => void;
-    mode?: "edit" | "render";
-} | null;
-declare const dropZoneContext: react.Context<DropZoneContext>;
-declare const DropZoneProvider: ({ children, value, }: {
-    children: ReactNode;
-    value: DropZoneContext;
-}) => react_jsx_runtime.JSX.Element;
-
 declare const Button: ({ children, href, onClick, variant, type, disabled, tabIndex, newTab, fullWidth, icon, size, }: {
     children: ReactNode;
     href?: string | undefined;
@@ -188,4 +188,4 @@ declare const FieldLabel: ({ children, icon, label, el, readOnly, className, }:
     className?: string | undefined;
 }) => react_jsx_runtime.JSX.Element;
 
-export { AppState, Button, Config, Data, DefaultRootProps, DropZoneProvider, FieldLabel, IconButton, MappedItem, Puck, Render, RootData, RootDataWithProps, UiState, dropZoneContext, resolveAllData };
+export { AppState, Button, Config, Data, DefaultRootProps, DropZoneProvider, FieldLabel, IconButton, MappedItem, Puck, PuckAction, Render, RootData, RootDataWithProps, UiState, dropZoneContext, resolveAllData };

package/dist/index.js

@@ -32436,11 +32436,6 @@ var Draggable2 = ({
   );
 };
 
-// lib/generate-id.ts
-init_react_import();
-var import_crypto = require("crypto");
-var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
-
 // components/InputOrGroup/fields/ArrayField/index.tsx
 var import_react27 = require("react");
 
@@ -32467,47 +32462,59 @@ var ArrayField = ({
   name,
   label,
   readOnly,
-  readOnlyFields = {}
+  readOnlyFields = {},
+  id
 }) => {
-  const [arrayFieldId] = (0, import_react27.useState)(generateId("ArrayField"));
   const { state, setUi } = useAppContext();
-  const arrayStateRef = (0, import_react27.useRef)(
-    state.ui.arrayState[arrayFieldId] || {
-      items: [],
-      openId: ""
-    }
-  );
-  const arrayState = arrayStateRef.current;
-  const setArrayState = (0, import_react27.useCallback)(
-    (partialArrayState, recordHistory = false) => {
-      setUi(
-        {
-          arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
-            [arrayFieldId]: __spreadValues(__spreadValues({}, arrayState), partialArrayState)
-          })
-        },
-        recordHistory
-      );
-      arrayStateRef.current = __spreadValues(__spreadValues({}, arrayState), partialArrayState);
+  const arrayState = state.ui.arrayState[id] || {
+    items: Array.from(value || []).map((item, idx) => {
+      return {
+        _originalIndex: idx,
+        _arrayId: `${id}-${idx}`,
+        data: item
+      };
+    }),
+    openId: ""
+  };
+  const [localState, setLocalState] = (0, import_react27.useState)({ arrayState, value });
+  (0, import_react27.useEffect)(() => {
+    setLocalState({ arrayState, value });
+  }, [value, state.ui.arrayState[id]]);
+  const mapArrayStateToUi = (0, import_react27.useCallback)(
+    (partialArrayState) => {
+      return {
+        arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
+          [id]: __spreadValues(__spreadValues({}, arrayState), partialArrayState)
+        })
+      };
     },
     [arrayState]
   );
-  (0, import_react27.useEffect)(() => {
-    let highestIndex = arrayState.items.reduce(
+  const getHighestIndex = (0, import_react27.useCallback)(() => {
+    return arrayState.items.reduce(
       (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
       -1
     );
-    const newItems = Array.from(value || []).map((item, idx) => {
-      var _a;
-      const arrayStateItem = arrayState.items[idx];
-      return {
-        _originalIndex: typeof (arrayStateItem == null ? void 0 : arrayStateItem._originalIndex) !== "undefined" ? arrayStateItem._originalIndex : ++highestIndex,
-        _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || generateId("ArrayItem"),
-        data: item
-      };
-    });
-    setArrayState({ items: newItems });
-  }, [value]);
+  }, [arrayState]);
+  const regenerateArrayState = (0, import_react27.useCallback)(
+    (value2) => {
+      let highestIndex = getHighestIndex();
+      const newItems = Array.from(value2 || []).map((item, idx) => {
+        var _a;
+        const arrayStateItem = arrayState.items[idx];
+        return {
+          _originalIndex: typeof (arrayStateItem == null ? void 0 : arrayStateItem._originalIndex) !== "undefined" ? arrayStateItem._originalIndex : ++highestIndex,
+          _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || `${id}-${highestIndex}`,
+          data: item
+        };
+      });
+      return __spreadProps(__spreadValues({}, arrayState), { items: newItems });
+    },
+    [arrayState]
+  );
+  (0, import_react27.useEffect)(() => {
+    setUi(mapArrayStateToUi(arrayState));
+  }, []);
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -32522,15 +32529,27 @@ var ArrayField = ({
         import_dnd5.DragDropContext,
         {
           onDragEnd: (event) => {
-            var _a;
+            var _a, _b;
             if (event.destination) {
               const newValue = reorder(
-                arrayState.items,
+                value,
                 event.source.index,
                 (_a = event.destination) == null ? void 0 : _a.index
               );
-              setArrayState(__spreadProps(__spreadValues({}, arrayState), { items: newValue }), false);
-              onChange(newValue.map(({ data }) => data));
+              const newArrayStateItems = reorder(
+                arrayState.items,
+                event.source.index,
+                (_b = event.destination) == null ? void 0 : _b.index
+              );
+              onChange(newValue, {
+                arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
+                  [id]: __spreadProps(__spreadValues({}, arrayState), { items: newArrayStateItems })
+                })
+              });
+              setLocalState({
+                value: newValue,
+                arrayState: __spreadProps(__spreadValues({}, arrayState), { items: newArrayStateItems })
+              });
             }
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_dnd4.Droppable, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
@@ -32543,8 +32562,9 @@ var ArrayField = ({
                   hasItems: Array.isArray(value) && value.length > 0
                 }),
                 children: [
-                  arrayState.items.map(({ data }, i) => {
-                    const { _arrayId, _originalIndex = i } = arrayState.items[i] || {};
+                  localState.arrayState.items.map((item, i) => {
+                    const { _arrayId = `${id}-${i}`, _originalIndex = i } = item;
+                    const data = Array.from(localState.value || [])[i];
                     return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                       Draggable2,
                       {
@@ -32552,7 +32572,7 @@ var ArrayField = ({
                         index: i,
                         className: (_, snapshot2) => getClassNameItem({
                           isExpanded: arrayState.openId === _arrayId,
-                          isDragging: snapshot2.isDragging,
+                          isDragging: snapshot2 == null ? void 0 : snapshot2.isDragging,
                           readOnly
                         }),
                         isDragDisabled: readOnly,
@@ -32562,13 +32582,17 @@ var ArrayField = ({
                             {
                               onClick: () => {
                                 if (arrayState.openId === _arrayId) {
-                                  setArrayState({
-                                    openId: ""
-                                  });
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: ""
+                                    })
+                                  );
                                 } else {
-                                  setArrayState({
-                                    openId: _arrayId
-                                  });
+                                  setUi(
+                                    mapArrayStateToUi({
+                                      openId: _arrayId
+                                    })
+                                  );
                                 }
                               },
                               className: getClassNameItem("summary"),
@@ -32588,11 +32612,12 @@ var ArrayField = ({
                                         ];
                                         existingValue.splice(i, 1);
                                         existingItems.splice(i, 1);
-                                        setArrayState(
-                                          { items: existingItems },
-                                          true
+                                        onChange(
+                                          existingValue,
+                                          mapArrayStateToUi({
+                                            items: existingItems
+                                          })
                                         );
-                                        onChange(existingValue);
                                       },
                                       title: "Delete",
                                       children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(trash_default, { size: 16 })
@@ -32613,15 +32638,18 @@ var ArrayField = ({
                                 {
                                   name: subFieldName,
                                   label: subField.label || fieldName,
+                                  id: `${id}_${fieldName}`,
                                   readOnly: typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName],
                                   readOnlyFields,
                                   field: subField,
                                   value: data[fieldName],
-                                  onChange: (val) => onChange(
-                                    replace(value, i, __spreadProps(__spreadValues({}, data), {
-                                      [fieldName]: val
-                                    }))
-                                  )
+                                  onChange: (val) => {
+                                    onChange(
+                                      replace(value, i, __spreadProps(__spreadValues({}, data), {
+                                        [fieldName]: val
+                                      }))
+                                    );
+                                  }
                                 },
                                 subFieldName
                               );
@@ -32639,7 +32667,12 @@ var ArrayField = ({
                       className: getClassName6("addButton"),
                       onClick: () => {
                         const existingValue = value || [];
-                        onChange([...existingValue, field.defaultItemProps || {}]);
+                        const newValue = [
+                          ...existingValue,
+                          field.defaultItemProps || {}
+                        ];
+                        const newArrayState = regenerateArrayState(newValue);
+                        onChange(newValue, mapArrayStateToUi(newArrayState));
                       },
                       children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(plus_default, { size: "21" })
                     }
@@ -32664,7 +32697,8 @@ var DefaultField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     FieldLabelInternal,
@@ -32690,7 +32724,8 @@ var DefaultField = ({
               onChange(e.currentTarget.value);
             }
           },
-          readOnly
+          readOnly,
+          id
         }
       )
     }
@@ -32779,7 +32814,8 @@ var ExternalInput = ({
   field,
   onChange,
   value = null,
-  name
+  name,
+  id
 }) => {
   const { mapProp = (val) => val } = field || {};
   const [data, setData] = (0, import_react29.useState)([]);
@@ -32813,6 +32849,7 @@ var ExternalInput = ({
         dataSelected: !!value,
         modalVisible: isOpen
       }),
+      id,
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName10("actions"), children: [
           /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
@@ -32890,7 +32927,8 @@ var ExternalField = ({
   onChange,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   var _a, _b, _c;
   const validField = field;
@@ -32926,7 +32964,8 @@ var ExternalField = ({
             }) : validField.fetchList
           }),
           onChange,
-          value
+          value,
+          id
         }
       )
     }
@@ -32942,7 +32981,8 @@ var RadioField = ({
   onChange,
   readOnly,
   value,
-  name
+  name,
+  id
 }) => {
   if (field.type !== "radio" || !field.options) {
     return null;
@@ -32954,7 +32994,7 @@ var RadioField = ({
       label: field.label || name,
       readOnly,
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
         "label",
         {
           className: getClassName11("radio"),
@@ -32996,7 +33036,8 @@ var SelectField = ({
   label,
   value,
   name,
-  readOnly
+  readOnly,
+  id
 }) => {
   if (field.type !== "select" || !field.options) {
     return null;
@@ -33010,6 +33051,7 @@ var SelectField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
         "select",
         {
+          id,
           className: getClassName12("input"),
           disabled: readOnly,
           onChange: (e) => {
@@ -33043,7 +33085,8 @@ var TextareaField = ({
   readOnly,
   value,
   name,
-  label
+  label,
+  id
 }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     FieldLabelInternal,
@@ -33054,6 +33097,7 @@ var TextareaField = ({
       children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         "textarea",
         {
+          id,
           className: getClassName13("input"),
           autoComplete: "off",
           name,
@@ -33096,7 +33140,6 @@ var FieldLabelInternal = ({
   el = "label",
   readOnly
 }) => {
-  const El = el;
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     FieldLabel,
     {
@@ -33114,15 +33157,15 @@ var InputOrGroup = (_a) => {
   const { name, field, value, readOnly } = props;
   const [localValue, setLocalValue] = (0, import_react31.useState)(value);
   const onChangeDb = (0, import_use_debounce2.useDebouncedCallback)(
-    (val) => {
-      onChange(val);
+    (val, ui) => {
+      onChange(val, ui);
     },
     50,
     { leading: true }
   );
-  const onChangeLocal = (0, import_react31.useCallback)((val) => {
+  const onChangeLocal = (0, import_react31.useCallback)((val, ui) => {
     setLocalValue(val);
-    onChangeDb(val);
+    onChangeDb(val, ui);
   }, []);
   (0, import_react31.useEffect)(() => {
     setLocalValue(value);
@@ -33417,6 +33460,13 @@ var import_react35 = require("react");
 // lib/use-action-history.ts
 init_react_import();
 var import_react34 = require("react");
+
+// lib/generate-id.ts
+init_react_import();
+var import_crypto = require("crypto");
+var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
+
+// lib/use-action-history.ts
 var EMPTY_HISTORY_INDEX = -1;
 function useActionHistory() {
   const [histories, setHistories] = (0, import_react34.useState)([]);
@@ -33825,13 +33875,19 @@ var storeInterceptor = (reducer) => {
     return newAppState;
   };
 };
+var setAction = (state, action) => {
+  if (typeof action.state === "object") {
+    return __spreadValues(__spreadValues({}, state), action.state);
+  }
+  return __spreadValues(__spreadValues({}, state), action.state(state));
+};
 var createReducer = ({
   config
 }) => storeInterceptor((state, action) => {
   const data = reduceData(state.data, action, config);
   const ui = reduceUi(state.ui, action);
   if (action.type === "set") {
-    return __spreadValues(__spreadValues({}, state), action.state);
+    return setAction(state, action);
   }
   return { data, ui };
 });
@@ -34202,10 +34258,10 @@ var resolveRootData = (data, config) => __async(void 0, null, function* () {
 });
 
 // lib/use-resolved-data.ts
-var useResolvedData = (data, config, dispatch) => {
-  const [{ resolverKey, newData }, setResolverState] = (0, import_react38.useState)({
+var useResolvedData = (appState, config, dispatch) => {
+  const [{ resolverKey, newAppState }, setResolverState] = (0, import_react38.useState)({
     resolverKey: 0,
-    newData: data
+    newAppState: appState
   });
   const [componentState, setComponentState] = (0, import_react38.useState)({});
   const deferredSetStates = {};
@@ -34225,14 +34281,23 @@ var useResolvedData = (data, config, dispatch) => {
     []
   );
   const runResolvers = () => __async(void 0, null, function* () {
+    const newData = newAppState.data;
     const flatContent = Object.keys(newData.zones || {}).reduce((acc, zone) => [...acc, ...newData.zones[zone]], newData.content).filter((item) => !!config.components[item.type].resolveData);
     const applyIfChange = (dynamicDataMap, dynamicRoot) => {
-      const processed = applyDynamicProps(data, dynamicDataMap, dynamicRoot);
-      const containsChanges = JSON.stringify(data) !== JSON.stringify(processed);
+      const processed = applyDynamicProps(
+        appState.data,
+        dynamicDataMap,
+        dynamicRoot
+      );
+      const processedAppState = __spreadProps(__spreadValues({}, appState), { data: processed });
+      const containsChanges = JSON.stringify(appState) !== JSON.stringify(processedAppState);
       if (containsChanges) {
         dispatch({
-          type: "setData",
-          data: (prev) => applyDynamicProps(prev, dynamicDataMap, dynamicRoot),
+          type: "set",
+          state: (prev) => __spreadProps(__spreadValues({}, prev), {
+            data: applyDynamicProps(prev.data, dynamicDataMap, dynamicRoot),
+            ui: __spreadValues(__spreadValues({}, prev.ui), newAppState.ui)
+          }),
           recordHistory: resolverKey > 0
         });
       }
@@ -34270,10 +34335,10 @@ var useResolvedData = (data, config, dispatch) => {
   (0, import_react38.useEffect)(() => {
     runResolvers();
   }, [resolverKey]);
-  const resolveData = (0, import_react38.useCallback)((newData2 = data) => {
+  const resolveData = (0, import_react38.useCallback)((newAppState2 = appState) => {
     setResolverState((curr) => ({
       resolverKey: curr.resolverKey + 1,
-      newData: newData2
+      newAppState: newAppState2
     }));
   }, []);
   return {
@@ -34416,7 +34481,7 @@ function Puck({
   );
   const { data, ui } = appState;
   const { resolveData, componentState } = useResolvedData(
-    data,
+    appState,
     config,
     dispatch
   );
@@ -34766,7 +34831,7 @@ function Puck({
                             isLoading: selectedItem ? (_a2 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a2.loading : (_b2 = componentState["puck-root"]) == null ? void 0 : _b2.loading,
                             children: Object.keys(fields).map((fieldName) => {
                               const field = fields[fieldName];
-                              const onChange2 = (value) => {
+                              const onChange2 = (value, updatedUi) => {
                                 var _a3, _b3;
                                 let currentProps;
                                 if (selectedItem) {
@@ -34778,27 +34843,51 @@ function Puck({
                                   [fieldName]: value
                                 });
                                 if (itemSelector) {
-                                  const action = {
+                                  const replaceActionData = {
                                     type: "replace",
                                     destinationIndex: itemSelector.index,
                                     destinationZone: itemSelector.zone || rootDroppableId,
                                     data: __spreadProps(__spreadValues({}, selectedItem), { props: newProps })
                                   };
+                                  const replacedData = replaceAction(
+                                    data,
+                                    replaceActionData
+                                  );
+                                  const setActionData = {
+                                    type: "set",
+                                    state: {
+                                      data: __spreadValues(__spreadValues({}, data), replacedData),
+                                      ui: __spreadValues(__spreadValues({}, ui), updatedUi)
+                                    }
+                                  };
                                   if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
-                                    resolveData(replaceAction(data, action));
+                                    resolveData(
+                                      setAction(appState, setActionData)
+                                    );
                                   } else {
-                                    dispatch(action);
+                                    dispatch(__spreadProps(__spreadValues({}, setActionData), {
+                                      recordHistory: true
+                                    }));
                                   }
                                 } else {
                                   if (data.root.props) {
                                     if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
-                                      resolveData(__spreadProps(__spreadValues({}, data), {
-                                        root: { props: newProps }
-                                      }));
+                                      resolveData({
+                                        ui: __spreadValues(__spreadValues({}, ui), updatedUi),
+                                        data: __spreadProps(__spreadValues({}, data), {
+                                          root: { props: newProps }
+                                        })
+                                      });
                                     } else {
                                       dispatch({
-                                        type: "setData",
-                                        data: { root: { props: newProps } }
+                                        type: "set",
+                                        state: {
+                                          ui: __spreadValues(__spreadValues({}, ui), updatedUi),
+                                          data: __spreadProps(__spreadValues({}, data), {
+                                            root: { props: newProps }
+                                          })
+                                        },
+                                        recordHistory: true
                                       });
                                     }
                                   } else {
@@ -34816,6 +34905,7 @@ function Puck({
                                   {
                                     field,
                                     name: fieldName,
+                                    id: `${selectedItem.props.id}_${fieldName}`,
                                     label: field.label,
                                     readOnly: readOnly[fieldName],
                                     readOnlyFields: readOnly,
@@ -34831,6 +34921,7 @@ function Puck({
                                   {
                                     field,
                                     name: fieldName,
+                                    id: `root_${fieldName}`,
                                     label: field.label,
                                     readOnly: readOnly[fieldName],
                                     readOnlyFields: readOnly,

package/dist/rsc.d.ts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { C as Config, D as Data } from './Config-e71a51c7.js';
+import { C as Config, D as Data } from './Config-35e6eaae.js';
 import 'react';
 
 declare function Render({ config, data }: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.12.0-canary.349f44d",
+  "version": "0.12.0-canary.3f8ebc0",
   "private": false,
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",