@makeswift/runtime 0.7.5 → 0.7.7

package/dist/index.cjs5.js

@@ -10,7 +10,6 @@ require("redux");
 require("redux-thunk");
 require("./actions.cjs.js");
 require("./rich-text.cjs.js");
-require("./control.cjs.js");
 require("@emotion/css");
 require("@emotion/serialize");
 require("@emotion/utils");

package/dist/index.cjs5.js.map

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

package/dist/index.es.js

@@ -45,10 +45,9 @@ import { cache, cx } from "@emotion/css";
 import { serializeStyles } from "@emotion/serialize";
 import { registerStyles, insertStyles } from "@emotion/utils";
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
-import { T as Types, E as ElementID, B as Backgrounds, W as Width, h as ResponsiveIconRadioGroup, M as Margin, P as Padding, i as Border, j as BorderRadius, k as Shadows, G as GapY, l as GapX, m as ResponsiveSelect, n as ResponsiveNumber, o as Checkbox, p as Grid, q as TextInput, L as Link, s as ResponsiveColor, t as TextStyle, u as Images, N as Number$1, D as Date$1, F as Font, v as ResponsiveLength, w as TextArea, x as Table, y as TableFormFields, z as Image, A as ResponsiveOpacity, H as NavigationLinks, J as SocialLinks, K as RichText, V as Video, O as StyleControlProperty, Q as ImageControlValueFormat, I as ImageControlType, C as ColorControlType, U as BorderPropControllerFormat, X as ShadowsPropControllerFormat, Y as BorderRadiusPropControllerFormat, Z as MarginPropControllerFormat, _ as PaddingPropControllerFormat, $ as WidthPropControllerFormat, S as SlotControlType, a0 as RichTextControlType, a as StyleControlType } from "./rich-text.es.js";
+import { e as ShapeControlType, L as ListControlType, T as Types, E as ElementID, B as Backgrounds, W as Width, f as ResponsiveIconRadioGroup, M as Margin, P as Padding, g as Border, h as BorderRadius, i as Shadows, G as GapY, j as GapX, k as ResponsiveSelect, l as ResponsiveNumber, m as Checkbox, n as Grid, o as TextInput, p as Link, q as ResponsiveColor, s as TextStyle, t as Images, N as Number$1, D as Date$1, F as Font, u as ResponsiveLength, v as TextArea, w as Table, x as TableFormFields, y as Image, z as ResponsiveOpacity, A as NavigationLinks, H as SocialLinks, J as RichText, V as Video, K as StyleControlProperty, O as ImageControlValueFormat, S as SlotControlType, Q as LinkControlType, I as ImageControlType, C as ColorControlType, U as BorderPropControllerFormat, X as ShadowsPropControllerFormat, Y as BorderRadiusPropControllerFormat, Z as MarginPropControllerFormat, _ as PaddingPropControllerFormat, $ as WidthPropControllerFormat, a0 as RichTextControlType, a1 as StyleControlType } from "./rich-text.es.js";
 import { S as SelectControlType, T as TextAreaControlType, a as TextInputControlType, N as NumberControlType, C as CheckboxControlType } from "./text-input.es.js";
 import { C as ComboboxControlType } from "./combobox.es.js";
-import { S as ShapeControlType, L as ListControlType, b as LinkControlType } from "./control.es.js";
 import { useSyncExternalStore } from "use-sync-external-store/shim";
 import { createStore, applyMiddleware } from "redux";
 import thunk from "redux-thunk";
@@ -966,7 +965,7 @@ function useCachedSite(siteId) {
   const site = 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");
@@ -1350,7 +1349,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": {
@@ -3356,11 +3355,19 @@ function useLinkControlValue(link, _definition) {
 function ListControlValue({
   definition,
   data,
-  children
+  children,
+  control
 }) {
+  const [controls, setControls] = useState(/* @__PURE__ */ new Map());
+  useEffect(() => {
+    if (control == null || data == null)
+      return;
+    setControls(control.setItemsControl(data));
+  }, [data, control]);
   return (data != null ? data : []).reduce((renderFn, item) => (listControlValue) => /* @__PURE__ */ jsx(ControlValue, {
     definition: definition.config.type,
     data: item.value,
+    control: controls == null ? void 0 : controls.get(item.id),
     children: (value) => renderFn([value, ...listControlValue])
   }), children)([]);
 }
@@ -3373,98 +3380,18 @@ function useSelectControlValue(data, definition) {
 function ShapeControlValue({
   definition,
   data,
-  children
+  children,
+  control
 }) {
   return Object.entries(definition.config.type).reduceRight((renderFn, [key, controlDefinition]) => (shapeControlValue) => /* @__PURE__ */ 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 CheckboxControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useCheckboxControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case NumberControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useNumber,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case TextInputControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useTextInputValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case TextAreaControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useTextAreaValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case SelectControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useSelectControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case ColorControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useColorValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case ImageControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useImageControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case LinkControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useLinkControlValue,
-        parameters: [data, definition],
-        children: (value) => children(value)
-      }, definition.type);
-    case ComboboxControlType:
-      return /* @__PURE__ */ jsx(RenderHook, {
-        hook: useComboboxControlValue,
-        parameters: [data],
-        children: (value) => children(value)
-      }, definition.type);
-    case ShapeControlType:
-      return /* @__PURE__ */ jsx(ShapeControlValue, {
-        definition,
-        data,
-        children: (value) => children(value)
-      });
-    case ListControlType:
-      return /* @__PURE__ */ jsx(ListControlValue, {
-        definition,
-        data,
-        children: (value) => children(value)
-      });
-    default:
-      return children(data);
-  }
-}
 function pollBoxModel({
   element,
   onBoxModelChange
@@ -3627,6 +3554,97 @@ 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 CheckboxControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useCheckboxControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case NumberControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useNumber,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case TextInputControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useTextInputValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case TextAreaControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useTextAreaValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case SelectControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useSelectControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case ColorControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useColorValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case ImageControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useImageControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case LinkControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useLinkControlValue,
+        parameters: [data, definition],
+        children: (value) => children(value)
+      }, definition.type);
+    case ComboboxControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useComboboxControlValue,
+        parameters: [data],
+        children: (value) => children(value)
+      }, definition.type);
+    case ShapeControlType:
+      return /* @__PURE__ */ jsx(ShapeControlValue, {
+        definition,
+        data,
+        control,
+        children: (value) => children(value)
+      });
+    case ListControlType:
+      return /* @__PURE__ */ jsx(ListControlValue, {
+        definition,
+        data,
+        control,
+        children: (value) => children(value)
+      });
+    case SlotControlType:
+      return /* @__PURE__ */ jsx(RenderHook, {
+        hook: useSlot,
+        parameters: [data, control],
+        children: (value) => children(value)
+      }, definition.type);
+    default:
+      return children(data);
+  }
+}
 const Text = forwardNextDynamicRef((patch) => dynamic(() => patch(import("./index.es5.js"))));
 function useRichText(data, control) {
   const textCallbackRef = useCallback((handle) => {
@@ -3692,6 +3710,7 @@ function PropsValue({
         return /* @__PURE__ */ jsx(ControlValue, {
           definition: descriptor,
           data: props[propName],
+          control: propControllers == null ? void 0 : propControllers[propName],
           children: (value) => renderFn(__spreadProps(__spreadValues({}, propsValue), {
             [propName]: value
           }))