@makeswift/runtime 0.7.5 → 0.7.7

package/dist/controls.cjs.js

@@ -3,7 +3,6 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 var textInput = require("./text-input.cjs.js");
 var richText = require("./rich-text.cjs.js");
 var combobox = require("./combobox.cjs.js");
-var control = require("./control.cjs.js");
 require("./actions.cjs.js");
 exports.Checkbox = textInput.Checkbox;
 exports.CheckboxControlType = textInput.CheckboxControlType;
@@ -20,10 +19,20 @@ exports.ColorControlType = richText.ColorControlType;
 exports.Image = richText.Image$1;
 exports.ImageControlType = richText.ImageControlType;
 exports.ImageControlValueFormat = richText.ImageControlValueFormat;
+exports.Link = richText.Link$1;
+exports.LinkControlType = richText.LinkControlType;
+exports.List = richText.List;
+exports.ListControl = richText.ListControl;
+exports.ListControlMessageType = richText.ListControlMessageType;
+exports.ListControlType = richText.ListControlType;
 exports.RichText = richText.RichText$1;
 exports.RichTextControl = richText.RichTextControl;
 exports.RichTextControlMessageType = richText.RichTextControlMessageType;
 exports.RichTextControlType = richText.RichTextControlType;
+exports.Shape = richText.Shape;
+exports.ShapeControl = richText.ShapeControl;
+exports.ShapeControlMessageType = richText.ShapeControlMessageType;
+exports.ShapeControlType = richText.ShapeControlType;
 exports.Slot = richText.Slot;
 exports.SlotControl = richText.SlotControl;
 exports.SlotControlMessageType = richText.SlotControlMessageType;
@@ -31,20 +40,14 @@ exports.SlotControlType = richText.SlotControlType;
 exports.Style = richText.Style;
 exports.StyleControlProperty = richText.StyleControlProperty;
 exports.StyleControlType = richText.StyleControlType;
+exports.copy = richText.copy;
 exports.copyColorData = richText.copyColorData;
 exports.copyImageData = richText.copyImageData;
+exports.copyLinkData = richText.copyLinkData;
+exports.copyListData = richText.copyListData;
+exports.copyShapeData = richText.copyShapeData;
 exports.copySlotData = richText.copySlotData;
 exports.copyStyleData = richText.copyStyleData;
 exports.Combobox = combobox.Combobox;
 exports.ComboboxControlType = combobox.ComboboxControlType;
-exports.Link = control.Link;
-exports.LinkControlType = control.LinkControlType;
-exports.List = control.List;
-exports.ListControlType = control.ListControlType;
-exports.Shape = control.Shape;
-exports.ShapeControlType = control.ShapeControlType;
-exports.copy = control.copy;
-exports.copyLinkData = control.copyLinkData;
-exports.copyListData = control.copyListData;
-exports.copyShapeData = control.copyShapeData;
 //# sourceMappingURL=controls.cjs.js.map

package/dist/controls.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"controls.cjs.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"controls.cjs.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/controls.es.js

@@ -1,6 +1,5 @@
 export { b as Checkbox, C as CheckboxControlType, c as Number, N as NumberControlType, d as Select, S as SelectControlType, e as TextArea, T as TextAreaControlType, f as TextInput, a as TextInputControlType } from "./text-input.es.js";
-export { a1 as Color, C as ColorControlType, a2 as Image, I as ImageControlType, Q as ImageControlValueFormat, a7 as RichText, a9 as RichTextControl, a8 as RichTextControlMessageType, a0 as RichTextControlType, a3 as Slot, a5 as SlotControl, a4 as SlotControlMessageType, S as SlotControlType, a6 as Style, O as StyleControlProperty, a as StyleControlType, e as copyColorData, d as copyImageData, c as copySlotData, b as copyStyleData } from "./rich-text.es.js";
+export { a2 as Color, C as ColorControlType, a4 as Image, I as ImageControlType, O as ImageControlValueFormat, a6 as Link, Q as LinkControlType, a8 as List, aa as ListControl, a9 as ListControlMessageType, L as ListControlType, am as RichText, ao as RichTextControl, an as RichTextControlMessageType, a0 as RichTextControlType, ac as Shape, ae as ShapeControl, ad as ShapeControlMessageType, e as ShapeControlType, ag as Slot, ai as SlotControl, ah as SlotControlMessageType, S as SlotControlType, ak as Style, K as StyleControlProperty, a1 as StyleControlType, a as copy, a3 as copyColorData, a5 as copyImageData, a7 as copyLinkData, ab as copyListData, af as copyShapeData, aj as copySlotData, al as copyStyleData } from "./rich-text.es.js";
 export { a as Combobox, C as ComboboxControlType } from "./combobox.es.js";
-export { d as Link, b as LinkControlType, f as List, L as ListControlType, h as Shape, S as ShapeControlType, a as copy, e as copyLinkData, g as copyListData, i as copyShapeData } from "./control.es.js";
 import "./actions.es.js";
 //# sourceMappingURL=controls.es.js.map

package/dist/controls.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"controls.es.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"controls.es.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/index.cjs.js

@@ -48,7 +48,6 @@ var jsxRuntime = require("react/jsx-runtime");
 var richText = require("./rich-text.cjs.js");
 var textInput = require("./text-input.cjs.js");
 var combobox = require("./combobox.cjs.js");
-var control = require("./control.cjs.js");
 var shim = require("use-sync-external-store/shim");
 var redux = require("redux");
 var thunk = require("redux-thunk");
@@ -172,13 +171,13 @@ async function introspect(element, client, store) {
             remaining.push(child);
           }
         });
-        if (descriptor.type === control.ShapeControlType) {
+        if (descriptor.type === richText.ShapeControlType) {
           const prop = props[propName];
           if (prop == null)
             return;
           getResourcesFromElementDescriptors(descriptor.config.type, prop);
         }
-        if (descriptor.type === control.ListControlType) {
+        if (descriptor.type === richText.ListControlType) {
           const prop = props[propName];
           if (prop == null)
             return;
@@ -1001,7 +1000,7 @@ function useCachedSite(siteId) {
   const site = shim.useSyncExternalStore(client.subscribe, getSnapshot, getSnapshot);
   return site;
 }
-const version = "0.7.5";
+const version = "0.7.7";
 class Makeswift {
   constructor(apiKey, { apiOrigin = "https://api.makeswift.com" } = {}) {
     __publicField(this, "apiKey");
@@ -1385,7 +1384,7 @@ Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/d
           previewMode: true,
           interactionMode: true,
           clientSideNavigation: true,
-          elementFromPoint: true
+          elementFromPoint: false
         });
       }
       case "revalidate": {
@@ -3417,11 +3416,19 @@ function useLinkControlValue(link, _definition) {
 function ListControlValue({
   definition,
   data,
-  children
+  children,
+  control
 }) {
+  const [controls, setControls] = React.useState(/* @__PURE__ */ new Map());
+  React.useEffect(() => {
+    if (control == null || data == null)
+      return;
+    setControls(control.setItemsControl(data));
+  }, [data, control]);
   return (data != null ? data : []).reduce((renderFn, item) => (listControlValue) => /* @__PURE__ */ jsxRuntime.jsx(ControlValue, {
     definition: definition.config.type,
     data: item.value,
+    control: controls == null ? void 0 : controls.get(item.id),
     children: (value) => renderFn([value, ...listControlValue])
   }), children)([]);
 }
@@ -3434,98 +3441,18 @@ function useSelectControlValue(data, definition) {
 function ShapeControlValue({
   definition,
   data,
-  children
+  children,
+  control
 }) {
   return Object.entries(definition.config.type).reduceRight((renderFn, [key, controlDefinition]) => (shapeControlValue) => /* @__PURE__ */ jsxRuntime.jsx(ControlValue, {
     definition: controlDefinition,
     data: data == null ? void 0 : data[key],
+    control: control == null ? void 0 : control.controls.get(key),
     children: (value) => renderFn(__spreadProps(__spreadValues({}, shapeControlValue), {
       [key]: value
     }))
   }), children)({});
 }
-function useTextAreaValue(data, definition) {
-  return data != null ? data : definition.config.defaultValue;
-}
-function useTextInputValue(data, definition) {
-  return data != null ? data : definition.config.defaultValue;
-}
-function ControlValue({
-  data,
-  definition,
-  children
-}) {
-  switch (definition.type) {
-    case textInput.CheckboxControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useCheckboxControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case textInput.NumberControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useNumber,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case textInput.TextInputControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useTextInputValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case textInput.TextAreaControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useTextAreaValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case textInput.SelectControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useSelectControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case richText.ColorControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useColorValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case richText.ImageControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useImageControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case control.LinkControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useLinkControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case combobox.ComboboxControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
-        hook: useComboboxControlValue,
-        parameters: [data],
-        children: (value) => children(value)
-      }, definition.type);
-    case control.ShapeControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(ShapeControlValue, {
-        definition,
-        data,
-        children: (value) => children(value)
-      });
-    case control.ListControlType:
-      return /* @__PURE__ */ jsxRuntime.jsx(ListControlValue, {
-        definition,
-        data,
-        children: (value) => children(value)
-      });
-    default:
-      return children(data);
-  }
-}
 function pollBoxModel({
   element,
   onBoxModelChange
@@ -3545,16 +3472,16 @@ function pollBoxModel({
     onBoxModelChange(null);
   };
 }
-function useSlot(data, control2) {
+function useSlot(data, control) {
   if (data == null || data.elements.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Slot.Placeholder, {
-      control: control2
+      control
     });
   }
   return /* @__PURE__ */ jsxRuntime.jsx(Slot, {
-    control: control2,
+    control,
     children: data.elements.map((element, i) => /* @__PURE__ */ jsxRuntime.jsx(Slot.Item, {
-      control: control2,
+      control,
       grid: data.columns,
       index: i,
       children: /* @__PURE__ */ jsxRuntime.jsx(Element$1, {
@@ -3566,7 +3493,7 @@ function useSlot(data, control2) {
 function Slot(_f) {
   var _g = _f, {
     as,
-    control: control2,
+    control,
     children,
     className
   } = _g, restOfProps = __objRest(_g, [
@@ -3583,13 +3510,13 @@ function Slot(_f) {
     width: "100%"
   });
   React.useEffect(() => {
-    if (element == null || control2 == null)
+    if (element == null || control == null)
       return;
     return pollBoxModel({
       element,
-      onBoxModelChange: (boxModel) => control2.changeContainerBoxModel(boxModel)
+      onBoxModelChange: (boxModel) => control.changeContainerBoxModel(boxModel)
     });
-  }, [element, control2]);
+  }, [element, control]);
   return /* @__PURE__ */ jsxRuntime.jsx(As, __spreadProps(__spreadValues({}, restOfProps), {
     ref: setElement,
     className: css.cx(baseClassName, className),
@@ -3601,7 +3528,7 @@ Slot.Item = SlotItem;
 function SlotItem(_h) {
   var _i = _h, {
     as,
-    control: control2,
+    control,
     grid,
     index,
     children,
@@ -3633,13 +3560,13 @@ function SlotItem(_h) {
     };
   })));
   React.useEffect(() => {
-    if (element == null || control2 == null)
+    if (element == null || control == null)
       return;
     return pollBoxModel({
       element,
-      onBoxModelChange: (boxModel) => control2.changeItemBoxModel(index, boxModel)
+      onBoxModelChange: (boxModel) => control.changeItemBoxModel(index, boxModel)
     });
-  }, [element, control2, index]);
+  }, [element, control, index]);
   return /* @__PURE__ */ jsxRuntime.jsx(As, __spreadProps(__spreadValues({}, restOfProps), {
     ref: setElement,
     className: css.cx(baseClassName, className),
@@ -3647,17 +3574,17 @@ function SlotItem(_h) {
   }));
 }
 function SlotPlaceholder({
-  control: control2
+  control
 }) {
   const [element, setElement] = React.useState(null);
   React.useEffect(() => {
-    if (element == null || control2 == null)
+    if (element == null || control == null)
       return;
     return pollBoxModel({
       element,
-      onBoxModelChange: (boxModel) => control2.changeContainerBoxModel(boxModel)
+      onBoxModelChange: (boxModel) => control.changeContainerBoxModel(boxModel)
     });
-  }, [element, control2]);
+  }, [element, control]);
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
     ref: setElement,
     className: useStyle({
@@ -3688,17 +3615,108 @@ function SlotPlaceholder({
     })
   });
 }
+function useTextAreaValue(data, definition) {
+  return data != null ? data : definition.config.defaultValue;
+}
+function useTextInputValue(data, definition) {
+  return data != null ? data : definition.config.defaultValue;
+}
+function ControlValue({
+  data,
+  definition,
+  children,
+  control
+}) {
+  switch (definition.type) {
+    case textInput.CheckboxControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useCheckboxControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case textInput.NumberControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useNumber,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case textInput.TextInputControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useTextInputValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case textInput.TextAreaControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useTextAreaValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case textInput.SelectControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useSelectControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case richText.ColorControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useColorValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case richText.ImageControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useImageControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case richText.LinkControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useLinkControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case combobox.ComboboxControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useComboboxControlValue,
+        parameters: [data],
+        children: (value) => children(value)
+      }, definition.type);
+    case richText.ShapeControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(ShapeControlValue, {
+        definition,
+        data,
+        control,
+        children: (value) => children(value)
+      });
+    case richText.ListControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(ListControlValue, {
+        definition,
+        data,
+        control,
+        children: (value) => children(value)
+      });
+    case richText.SlotControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useSlot,
+        parameters: [data, control],
+        children: (value) => children(value)
+      }, definition.type);
+    default:
+      return children(data);
+  }
+}
 const Text = forwardNextDynamicRef((patch) => dynamic__default["default"](() => patch(Promise.resolve().then(function() {
   return require("./index.cjs5.js");
 }))));
-function useRichText(data, control2) {
+function useRichText(data, control) {
   const textCallbackRef = React.useCallback((handle) => {
     var _a;
     if (constants.isPropControllersHandle(handle))
-      (_a = handle == null ? void 0 : handle.setPropControllers) == null ? void 0 : _a.call(handle, control2 == null ? null : {
-        text: control2
+      (_a = handle == null ? void 0 : handle.setPropControllers) == null ? void 0 : _a.call(handle, control == null ? null : {
+        text: control
       });
-  }, [control2]);
+  }, [control]);
   return /* @__PURE__ */ jsxRuntime.jsx(Text, {
     text: data,
     ref: textCallbackRef
@@ -3749,12 +3767,13 @@ function PropsValue({
       case richText.ColorControlType:
       case richText.ImageControlType:
       case combobox.ComboboxControlType:
-      case control.ShapeControlType:
-      case control.ListControlType:
-      case control.LinkControlType:
+      case richText.ShapeControlType:
+      case richText.ListControlType:
+      case richText.LinkControlType:
         return /* @__PURE__ */ jsxRuntime.jsx(ControlValue, {
           definition: descriptor,
           data: props[propName],
+          control: propControllers == null ? void 0 : propControllers[propName],
           children: (value) => renderFn(__spreadProps(__spreadValues({}, propsValue), {
             [propName]: value
           }))
@@ -3768,10 +3787,10 @@ function PropsValue({
           }))
         }, descriptor.type);
       case richText.RichTextControlType:
-        const control$1 = (_a2 = propControllers == null ? void 0 : propControllers[propName]) != null ? _a2 : null;
+        const control = (_a2 = propControllers == null ? void 0 : propControllers[propName]) != null ? _a2 : null;
         return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
           hook: useRichText,
-          parameters: [props[propName], control$1],
+          parameters: [props[propName], control],
           children: (value) => renderFn(__spreadProps(__spreadValues({}, propsValue), {
             [propName]: value
           }))