@makeswift/runtime 0.19.4 → 0.20.0-canary.0

package/dist/esm/prop-controllers/instances.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/instances.ts"],"sourcesContent":["import { Editor } from 'slate'\nimport { Descriptor } from './descriptors'\nimport { BuilderEditMode } from '../state/modules/builder-edit-mode'\nimport { BoxModel } from '../state/modules/box-models'\nimport {\n  ListControl,\n  ListControlMessage,\n  ListControlType,\n  RichTextControl,\n  RichTextControlMessage,\n  RichTextControlType,\n  ShapeControl,\n  ShapeControlMessage,\n  ShapeControlType,\n  richTextDAOToDTO,\n  RichTextDTO,\n  SlotControl,\n  SlotControlMessage,\n  SlotControlType,\n  StyleControl,\n  StyleControlType,\n  StyleControlMessage,\n  RichTextV2ControlMessage,\n  RichTextV2ControlType,\n  RichTextV2Control,\n  StyleV2Control,\n  StyleV2ControlType,\n  StyleV2ControlMessage,\n} from '../controls'\nimport { PropController } from './base'\nimport {\n  Types as PropControllerTypes,\n  TableFormFieldsDescriptor,\n} from '@makeswift/prop-controllers'\n\nexport const RichTextPropControllerMessageType = {\n  CHANGE_BUILDER_EDIT_MODE: 'CHANGE_BUILDER_EDIT_MODE',\n  INITIALIZE_EDITOR: 'INITIALIZE_EDITOR',\n  CHANGE_EDITOR_VALUE: 'CHANGE_EDITOR_VALUE',\n  FOCUS: 'FOCUS',\n  BLUR: 'BLUR',\n  UNDO: 'UNDO',\n  REDO: 'REDO',\n  CHANGE_BOX_MODEL: 'CHANGE_BOX_MODEL',\n} as const\n\ntype ChangeBuilderEditModeRichTextPropControllerMessage = {\n  type: typeof RichTextPropControllerMessageType.CHANGE_BUILDER_EDIT_MODE\n  editMode: BuilderEditMode\n}\n\ntype InitializeEditorRichTextPropControllerMessage = {\n  type: typeof RichTextPropControllerMessageType.INITIALIZE_EDITOR\n  value: RichTextDTO\n}\n\ntype ChangeEditorValueRichTextPropControllerMessage = {\n  type: typeof RichTextPropControllerMessageType.CHANGE_EDITOR_VALUE\n  value: RichTextDTO\n}\n\ntype FocusRichTextPropControllerMessage = { type: typeof RichTextPropControllerMessageType.FOCUS }\n\ntype BlurRichTextPropControllerMessage = { type: typeof RichTextPropControllerMessageType.BLUR }\n\ntype UndoRichTextPropControllerMessage = { type: typeof RichTextPropControllerMessageType.UNDO }\n\ntype RedoRichTextPropControllerMessage = { type: typeof RichTextPropControllerMessageType.REDO }\n\ntype ChangeBoxModelRichTextPropControllerMessage = {\n  type: typeof RichTextPropControllerMessageType.CHANGE_BOX_MODEL\n  payload: { boxModel: BoxModel | null }\n}\n\nexport type RichTextPropControllerMessage =\n  | ChangeBuilderEditModeRichTextPropControllerMessage\n  | InitializeEditorRichTextPropControllerMessage\n  | ChangeEditorValueRichTextPropControllerMessage\n  | FocusRichTextPropControllerMessage\n  | BlurRichTextPropControllerMessage\n  | UndoRichTextPropControllerMessage\n  | RedoRichTextPropControllerMessage\n  | ChangeBoxModelRichTextPropControllerMessage\n\nexport type PropControllerMessage =\n  | RichTextPropControllerMessage\n  | TableFormFieldsMessage\n  | SlotControlMessage\n  | RichTextControlMessage\n  | RichTextV2ControlMessage\n  | ListControlMessage\n  | ShapeControlMessage\n  | StyleControlMessage\n\nexport type Send<T = PropControllerMessage> = (message: T) => void\n\nclass DefaultPropController extends PropController {\n  recv = (_message: PropControllerMessage) => {\n    // Do nothing.\n  }\n}\n\nclass RichTextPropController extends PropController<RichTextPropControllerMessage> {\n  private editor: Editor | null = null\n\n  recv = (message: RichTextPropControllerMessage) => {\n    if (!this.editor) return\n    switch (message.type) {\n      case RichTextPropControllerMessageType.CHANGE_BUILDER_EDIT_MODE: {\n        switch (message.editMode) {\n          case BuilderEditMode.BUILD:\n          case BuilderEditMode.INTERACT:\n            this.editor.deselectAndBlur()\n        }\n        break\n      }\n      case RichTextPropControllerMessageType.FOCUS: {\n        this.editor.focusAndSelectAll()\n        break\n      }\n    }\n  }\n\n  setSlateEditor(editor: Editor) {\n    this.editor = editor\n\n    this.send({\n      type: RichTextPropControllerMessageType.INITIALIZE_EDITOR,\n      value: richTextDAOToDTO(editor.children, editor.selection),\n    })\n\n    const _onChange = editor.onChange\n    this.editor.onChange = options => {\n      _onChange(options)\n\n      // if onChange is local then it will include an operation(s)\n      // that is the only case in which we want to push updates\n      // this prevent infinite loops that can occur when collaborating\n      if (options?.operation != null) {\n        this.send({\n          type: RichTextPropControllerMessageType.CHANGE_EDITOR_VALUE,\n          value: richTextDAOToDTO(editor.children, editor.selection),\n        })\n      }\n    }\n  }\n\n  focus() {\n    this.send({ type: RichTextPropControllerMessageType.FOCUS })\n  }\n\n  blur() {\n    this.send({ type: RichTextPropControllerMessageType.BLUR })\n  }\n\n  undo() {\n    this.send({ type: RichTextPropControllerMessageType.UNDO })\n  }\n\n  redo() {\n    this.send({ type: RichTextPropControllerMessageType.REDO })\n  }\n\n  changeBoxModel(boxModel: BoxModel | null): void {\n    this.send({ type: RichTextPropControllerMessageType.CHANGE_BOX_MODEL, payload: { boxModel } })\n  }\n}\n\nexport const TableFormFieldsMessageType = {\n  TABLE_FORM_LAYOUT_CHANGE: 'TABLE_FORM_LAYOUT_CHANGE',\n  TABLE_FORM_FIELD_LAYOUT_CHANGE: 'TABLE_FORM_FIELD_LAYOUT_CHANGE',\n} as const\n\ntype TableLayoutTableFormFieldsMessage = {\n  type: typeof TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE\n  payload: { layout: BoxModel }\n}\n\ntype TableFieldLayoutTableFormFieldsMessage = {\n  type: typeof TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE\n  payload: { layout: BoxModel; index: number }\n}\n\nexport type TableFormFieldsMessage =\n  | TableLayoutTableFormFieldsMessage\n  | TableFieldLayoutTableFormFieldsMessage\n\nexport class TableFormFieldsPropController extends PropController<TableFormFieldsMessage> {\n  recv = () => {}\n\n  tableFormLayoutChange(payload: { layout: BoxModel }) {\n    this.send({ type: TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE, payload })\n  }\n\n  tableFormFieldLayoutChange(payload: { layout: BoxModel; index: number }) {\n    this.send({ type: TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE, payload })\n  }\n}\n\ntype DescriptorPropController<T extends Descriptor> = T extends { type: typeof RichTextControlType }\n  ? RichTextControl\n  : T extends { type: typeof RichTextV2ControlType }\n  ? RichTextV2Control\n  : T extends { type: typeof PropControllerTypes.TableFormFields }\n  ? TableFormFieldsPropController\n  : DefaultPropController\n\nexport type DescriptorsPropControllers<T extends Record<string, Descriptor>> = {\n  [K in keyof T]: undefined extends T[K]\n    ? DescriptorPropController<Exclude<T[K], undefined>>\n    : DescriptorPropController<T[K]>\n}\n\nexport type AnyPropController =\n  | DefaultPropController\n  | RichTextPropController\n  | TableFormFieldsPropController\n  | SlotControl\n  | RichTextControl\n  | RichTextV2Control\n  | ListControl\n  | ShapeControl\n  | StyleControl\n  | StyleV2Control\n\nexport function createPropController(\n  descriptor: TableFormFieldsDescriptor,\n  send: Send<TableFormFieldsMessage>,\n): TableFormFieldsPropController\nexport function createPropController(descriptor: Descriptor, send: Send): DefaultPropController\nexport function createPropController<T extends PropControllerMessage>(\n  descriptor: Descriptor,\n  send: Send<T>,\n): AnyPropController {\n  switch (descriptor.type) {\n    case PropControllerTypes.TableFormFields:\n      return new TableFormFieldsPropController(send as Send<TableFormFieldsMessage>)\n\n    case SlotControlType:\n      return new SlotControl(send as Send<SlotControlMessage>)\n\n    case RichTextControlType:\n      return new RichTextControl(send as Send<RichTextControlMessage>)\n\n    case RichTextV2ControlType:\n      return new RichTextV2Control(send as Send<RichTextV2ControlMessage>, descriptor)\n\n    case ListControlType:\n      return new ListControl(send as Send<ListControlMessage>, descriptor)\n\n    case ShapeControlType:\n      return new ShapeControl(send as Send<ShapeControlMessage>, descriptor)\n\n    case StyleControlType:\n      return new StyleControl(send as Send<StyleControlMessage>)\n\n    case StyleV2ControlType:\n      return new StyleV2Control(send as Send<StyleV2ControlMessage>, descriptor)\n\n    default:\n      return new DefaultPropController(send as Send)\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/prop-controllers/instances.ts"],"sourcesContent":["import { type Descriptor, isLegacyDescriptor } from './descriptors'\nimport { type BoxModel } from '../state/modules/box-models'\nimport { Types as PropControllerTypes } from '@makeswift/prop-controllers'\n\nimport {\n  type ControlMessage,\n  type SendMessage,\n  type InstanceType,\n  ControlInstance,\n  DefaultControlInstance,\n} from '@makeswift/controls'\n\nexport type PropControllerMessage = ControlMessage\n\nexport const TableFormFieldsMessageType = {\n  TABLE_FORM_LAYOUT_CHANGE: 'TABLE_FORM_LAYOUT_CHANGE',\n  TABLE_FORM_FIELD_LAYOUT_CHANGE: 'TABLE_FORM_FIELD_LAYOUT_CHANGE',\n} as const\n\ntype TableLayoutTableFormFieldsMessage = {\n  type: typeof TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE\n  payload: { layout: BoxModel }\n}\n\ntype TableFieldLayoutTableFormFieldsMessage = {\n  type: typeof TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE\n  payload: { layout: BoxModel; index: number }\n}\n\nexport type TableFormFieldsMessage =\n  | TableLayoutTableFormFieldsMessage\n  | TableFieldLayoutTableFormFieldsMessage\n\nexport class TableFormFieldsPropController extends ControlInstance<TableFormFieldsMessage> {\n  recv = () => {}\n  child(_key: string): ControlInstance | undefined {\n    return undefined\n  }\n\n  tableFormLayoutChange(payload: { layout: BoxModel }) {\n    this.sendMessage({ type: TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE, payload })\n  }\n\n  tableFormFieldLayoutChange(payload: { layout: BoxModel; index: number }) {\n    this.sendMessage({ type: TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE, payload })\n  }\n}\n\ntype DescriptorPropController<T extends Descriptor> = T extends {\n  type: typeof PropControllerTypes.TableFormFields\n}\n  ? TableFormFieldsPropController\n  : InstanceType<T>\n\nexport type DescriptorsPropControllers<T extends Record<string, Descriptor>> = {\n  [K in keyof T]: undefined extends T[K]\n    ? DescriptorPropController<Exclude<T[K], undefined>>\n    : DescriptorPropController<T[K]>\n}\n\nexport type AnyPropController = ControlInstance<any> | TableFormFieldsPropController\n\nexport function createPropController(\n  descriptor: Descriptor,\n  send: SendMessage<PropControllerMessage>,\n): AnyPropController {\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.createInstance(send)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.TableFormFields:\n      return new TableFormFieldsPropController(send as SendMessage<TableFormFieldsMessage>)\n\n    default:\n      return new DefaultControlInstance(send as SendMessage)\n  }\n}\n"],"mappings":"AAAA,SAA0B,0BAA0B;AAEpD,SAAS,SAAS,2BAA2B;AAE7C;AAAA,EAIE;AAAA,EACA;AAAA,OACK;AAIA,MAAM,6BAA6B;AAAA,EACxC,0BAA0B;AAAA,EAC1B,gCAAgC;AAClC;AAgBO,MAAM,sCAAsC,gBAAwC;AAAA,EACzF,OAAO,MAAM;AAAA,EAAC;AAAA,EACd,MAAM,MAA2C;AAC/C,WAAO;AAAA,EACT;AAAA,EAEA,sBAAsB,SAA+B;AACnD,SAAK,YAAY,EAAE,MAAM,2BAA2B,0BAA0B,QAAQ,CAAC;AAAA,EACzF;AAAA,EAEA,2BAA2B,SAA8C;AACvE,SAAK,YAAY,EAAE,MAAM,2BAA2B,gCAAgC,QAAQ,CAAC;AAAA,EAC/F;AACF;AAgBO,SAAS,qBACd,YACA,MACmB;AACnB,MAAI,CAAC,mBAAmB,UAAU,GAAG;AACnC,WAAO,WAAW,eAAe,IAAI;AAAA,EACvC;AAEA,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,IAAI,8BAA8B,IAA2C;AAAA,IAEtF;AACE,aAAO,IAAI,uBAAuB,IAAmB;AAAA,EACzD;AACF;","names":[]}

package/dist/esm/prop-controllers/introspection.js

@@ -1,43 +1,8 @@
+import { isLegacyDescriptor } from "./descriptors";
 import {
-  ColorControlType,
-  getListElementChildren,
-  getListFileIds,
-  getListPageIds,
-  getListSwatchIds,
-  getListTypographyIds,
-  getShapeElementChildren,
-  getShapeFileIds,
-  getShapePageIds,
-  getShapeSwatchIds,
-  getShapeTypographyIds,
-  getStyleSwatchIds,
-  getTypographySwatchIds,
-  getTypographyTypographyIds,
-  ImageControlType,
-  LinkControlType,
-  ListControlType,
-  RichTextControlType,
-  ShapeControlType,
-  SlotControlType,
-  StyleControlType,
-  StyleV2ControlType,
-  TypographyControlType
-} from "../controls";
-import {
-  getRichTextPageIds,
-  getRichTextSwatchIds,
-  getRichTextTypographyIds
-} from "../controls/rich-text/introspection";
-import {
-  getRichTextV2PageIds,
-  getRichTextV2SwatchIds,
-  getRichTextV2TypographyIds
-} from "../controls/rich-text-v2/introspection";
-import {
-  RichTextV2ControlType,
-  isRichTextV1Data
-} from "../controls/rich-text-v2/rich-text-v2";
-import { match, P } from "ts-pattern";
+  introspectRichTextData,
+  Targets
+} from "@makeswift/controls";
 import {
   getLinkPropControllerPageIds,
   getResponsiveColorPropControllerDataSawtchIds,
@@ -58,21 +23,12 @@ import { DELETED_PROP_CONTROLLER_TYPES } from "./deleted";
 function getElementChildren(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.ChildrenElement);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Grid:
       return getGridPropControllerElementChildren(prop);
-    case SlotControlType:
-      return prop.elements;
-    case ListControlType:
-      return prop.flatMap(
-        ({ value }) => getElementChildren(descriptor.config.type, value)
-      );
-    case ShapeControlType: {
-      return getShapeElementChildren(descriptor, prop);
-    }
-    case ListControlType: {
-      return getListElementChildren(descriptor, prop);
-    }
     default:
       return [];
   }
@@ -80,6 +36,9 @@ function getElementChildren(descriptor, prop) {
 function getElementId(descriptor, prop) {
   if (prop == null)
     return null;
+  if (!isLegacyDescriptor(descriptor)) {
+    return null;
+  }
   switch (descriptor.type) {
     case PropControllerTypes.ElementID:
       return getElementIDPropControllerDataElementID(prop) ?? null;
@@ -90,6 +49,9 @@ function getElementId(descriptor, prop) {
 function getSwatchIds(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.Swatch);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Backgrounds:
       return getBackgroundsPropControllerSwatchIds(prop);
@@ -102,35 +64,8 @@ function getSwatchIds(descriptor, prop) {
       return getResponsiveColorPropControllerDataSawtchIds(prop);
     case PropControllerTypes.Shadows:
       return getShadowsPropControllerDataSwatchIds(prop);
-    case RichTextControlType:
     case DELETED_PROP_CONTROLLER_TYPES.RichText: {
-      return getRichTextSwatchIds(prop);
-    }
-    case ColorControlType: {
-      const value = prop;
-      return value?.swatchId == null ? [] : [value.swatchId];
-    }
-    case TypographyControlType: {
-      return getTypographySwatchIds(prop);
-    }
-    case StyleControlType: {
-      return getStyleSwatchIds(prop);
-    }
-    case StyleV2ControlType: {
-      const value = prop;
-      return value?.flatMap((value2) => getSwatchIds(descriptor.config.type, value2.value)) ?? [];
-    }
-    case RichTextV2ControlType: {
-      const data = prop;
-      if (isRichTextV1Data(data))
-        return getRichTextSwatchIds(data);
-      return getRichTextV2SwatchIds(descriptor, data);
-    }
-    case ShapeControlType: {
-      return getShapeSwatchIds(descriptor, prop);
-    }
-    case ListControlType: {
-      return getListSwatchIds(descriptor, prop);
+      return introspectRichTextData(prop, Targets.Swatch);
     }
     default:
       return [];
@@ -139,6 +74,9 @@ function getSwatchIds(descriptor, prop) {
 function getFileIds(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.File);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Backgrounds:
       return getBackgroundsPropControllerFileIds(prop);
@@ -148,16 +86,6 @@ function getFileIds(descriptor, prop) {
     case PropControllerTypes.Images: {
       return getImagesPropControllerFileIds(prop);
     }
-    case ImageControlType: {
-      const value = prop;
-      return match(value).with(P.string, (f) => [f]).with({ type: "makeswift-file" }, (f) => [f.id]).with({ type: "external-file" }, () => []).otherwise(() => []);
-    }
-    case ShapeControlType: {
-      return getShapeFileIds(descriptor, prop);
-    }
-    case ListControlType: {
-      return getListFileIds(descriptor, prop);
-    }
     default:
       return [];
   }
@@ -165,25 +93,12 @@ function getFileIds(descriptor, prop) {
 function getTypographyIds(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.Typography);
+  }
   switch (descriptor.type) {
-    case TypographyControlType: {
-      return getTypographyTypographyIds(prop);
-    }
-    case RichTextControlType:
     case DELETED_PROP_CONTROLLER_TYPES.RichText: {
-      return getRichTextTypographyIds(prop);
-    }
-    case RichTextV2ControlType: {
-      const data = prop;
-      if (isRichTextV1Data(data))
-        return getRichTextTypographyIds(data);
-      return getRichTextV2TypographyIds(descriptor, data);
-    }
-    case ShapeControlType: {
-      return getShapeTypographyIds(descriptor, prop);
-    }
-    case ListControlType: {
-      return getListTypographyIds(descriptor, prop);
+      return introspectRichTextData(prop, Targets.Typography);
     }
     default:
       return [];
@@ -192,6 +107,9 @@ function getTypographyIds(descriptor, prop) {
 function getTableIds(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.Table);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Table: {
       return getTablePropControllerDataTableIds(prop);
@@ -203,39 +121,18 @@ function getTableIds(descriptor, prop) {
 function getPageIds(descriptor, prop) {
   if (prop == null)
     return [];
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.introspect(prop, Targets.Page);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Link: {
       return getLinkPropControllerPageIds(prop);
     }
-    case LinkControlType: {
-      const value = prop;
-      if (value == null)
-        return [];
-      switch (value.type) {
-        case "OPEN_PAGE":
-          return value.payload.pageId == null ? [] : [value.payload.pageId];
-        default:
-          return [];
-      }
-    }
     case PropControllerTypes.NavigationLinks: {
       return getNavigationLinksPropControllerPageIds(prop);
     }
-    case RichTextControlType:
     case DELETED_PROP_CONTROLLER_TYPES.RichText: {
-      return getRichTextPageIds(prop);
-    }
-    case RichTextV2ControlType: {
-      const data = prop;
-      if (isRichTextV1Data(data))
-        return getRichTextPageIds(data);
-      return getRichTextV2PageIds(descriptor, data);
-    }
-    case ShapeControlType: {
-      return getShapePageIds(descriptor, prop);
-    }
-    case ListControlType: {
-      return getListPageIds(descriptor, prop);
+      return introspectRichTextData(prop, Targets.Page);
     }
     default:
       return [];

package/dist/esm/prop-controllers/introspection.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/introspection.ts"],"sourcesContent":["import { Descriptor } from './descriptors'\nimport { Data, Element } from '../state/react-page'\nimport {\n  ColorControlData,\n  ColorControlType,\n  getListElementChildren,\n  getListFileIds,\n  getListPageIds,\n  getListSwatchIds,\n  getListTypographyIds,\n  getShapeElementChildren,\n  getShapeFileIds,\n  getShapePageIds,\n  getShapeSwatchIds,\n  getShapeTypographyIds,\n  getStyleSwatchIds,\n  getTypographySwatchIds,\n  getTypographyTypographyIds,\n  ImageControlData,\n  ImageControlType,\n  LinkControlData,\n  LinkControlType,\n  ListControlData,\n  ListControlType,\n  RichTextControlData,\n  RichTextControlType,\n  RichTextValue,\n  ShapeControlData,\n  ShapeControlType,\n  SlotControlData,\n  SlotControlType,\n  StyleControlData,\n  StyleControlType,\n  StyleV2ControlData,\n  StyleV2ControlType,\n  TypographyControlData,\n  TypographyControlType,\n} from '../controls'\nimport {\n  getRichTextPageIds,\n  getRichTextSwatchIds,\n  getRichTextTypographyIds,\n} from '../controls/rich-text/introspection'\nimport {\n  getRichTextV2PageIds,\n  getRichTextV2SwatchIds,\n  getRichTextV2TypographyIds,\n} from '../controls/rich-text-v2/introspection'\nimport {\n  RichTextV2ControlType,\n  RichTextV2ControlData,\n  isRichTextV1Data,\n} from '../controls/rich-text-v2/rich-text-v2'\nimport { match, P } from 'ts-pattern'\nimport {\n  getLinkPropControllerPageIds,\n  getResponsiveColorPropControllerDataSawtchIds,\n  getShadowsPropControllerDataSwatchIds,\n  LinkPropControllerData,\n  Types as PropControllerTypes,\n  ResponsiveColorData,\n  ShadowsPropControllerData,\n  getBorderPropControllerDataSwatchIds,\n  TablePropControllerData,\n  getTablePropControllerDataTableIds,\n  getNavigationLinksPropControllerPageIds,\n  NavigationLinksPropControllerData,\n  getNavigationLinksPropControllerSwatchIds,\n  BorderPropControllerData,\n  getElementIDPropControllerDataElementID,\n  ElementIDPropControllerData,\n  getGridPropControllerElementChildren,\n  GridPropControllerData,\n  getImagePropControllerFileIds,\n  ImagePropControllerData,\n  getImagesPropControllerFileIds,\n  ImagesPropControllerData,\n  getBackgroundsPropControllerFileIds,\n  getBackgroundsPropControllerSwatchIds,\n  BackgroundsPropControllerData,\n} from '@makeswift/prop-controllers'\nimport { DELETED_PROP_CONTROLLER_TYPES } from './deleted'\n\nexport function getElementChildren<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): Element[] {\n  if (prop == null) return []\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Grid:\n      return getGridPropControllerElementChildren(prop as GridPropControllerData | undefined)\n\n    case SlotControlType:\n      return (prop as SlotControlData).elements\n\n    case ListControlType:\n      return (prop as ListControlData).flatMap(({ value }) =>\n        getElementChildren(descriptor.config.type, value),\n      )\n\n    case ShapeControlType: {\n      return getShapeElementChildren(descriptor, prop as ShapeControlData)\n    }\n\n    case ListControlType: {\n      return getListElementChildren(descriptor, prop as ListControlData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getElementId<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string | null {\n  if (prop == null) return null\n\n  switch (descriptor.type) {\n    case PropControllerTypes.ElementID:\n      return getElementIDPropControllerDataElementID(prop as ElementIDPropControllerData) ?? null\n\n    default:\n      return null\n  }\n}\n\nexport function getSwatchIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return getBackgroundsPropControllerSwatchIds(prop as BackgroundsPropControllerData)\n\n    case PropControllerTypes.Border:\n      return getBorderPropControllerDataSwatchIds(prop as BorderPropControllerData)\n\n    case PropControllerTypes.NavigationLinks: {\n      return getNavigationLinksPropControllerSwatchIds(prop as NavigationLinksPropControllerData)\n    }\n\n    case PropControllerTypes.ResponsiveColor:\n      return getResponsiveColorPropControllerDataSawtchIds(prop as ResponsiveColorData)\n\n    case PropControllerTypes.Shadows:\n      return getShadowsPropControllerDataSwatchIds(prop as ShadowsPropControllerData)\n\n    case RichTextControlType:\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return getRichTextSwatchIds(prop as RichTextValue)\n    }\n\n    case ColorControlType: {\n      const value = prop as ColorControlData\n      return value?.swatchId == null ? [] : [value.swatchId]\n    }\n\n    case TypographyControlType: {\n      return getTypographySwatchIds(prop as TypographyControlData[number])\n    }\n\n    case StyleControlType: {\n      return getStyleSwatchIds(prop as StyleControlData)\n    }\n\n    case StyleV2ControlType: {\n      const value = prop as StyleV2ControlData\n\n      return value?.flatMap(value => getSwatchIds(descriptor.config.type, value.value)) ?? []\n    }\n\n    case RichTextV2ControlType: {\n      const data = prop as RichTextV2ControlData | RichTextControlData\n\n      if (isRichTextV1Data(data)) return getRichTextSwatchIds(data)\n\n      return getRichTextV2SwatchIds(descriptor, data)\n    }\n\n    case ShapeControlType: {\n      return getShapeSwatchIds(descriptor, prop as ShapeControlData)\n    }\n\n    case ListControlType: {\n      return getListSwatchIds(descriptor, prop as ListControlData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getFileIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return getBackgroundsPropControllerFileIds(prop as BackgroundsPropControllerData)\n\n    case PropControllerTypes.Image: {\n      return getImagePropControllerFileIds(prop as ImagePropControllerData)\n    }\n\n    case PropControllerTypes.Images: {\n      return getImagesPropControllerFileIds(prop as ImagesPropControllerData)\n    }\n\n    case ImageControlType: {\n      const value = prop as ImageControlData\n      return match(value)\n        .with(P.string, f => [f])\n        .with({ type: 'makeswift-file' }, f => [f.id])\n        .with({ type: 'external-file' }, () => [])\n        .otherwise(() => [])\n    }\n\n    case ShapeControlType: {\n      return getShapeFileIds(descriptor, prop as ShapeControlData)\n    }\n\n    case ListControlType: {\n      return getListFileIds(descriptor, prop as ListControlData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getTypographyIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  switch (descriptor.type) {\n    case TypographyControlType: {\n      return getTypographyTypographyIds(prop as TypographyControlData[number])\n    }\n    case RichTextControlType:\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return getRichTextTypographyIds(prop as RichTextControlData)\n    }\n\n    case RichTextV2ControlType: {\n      const data = prop as RichTextV2ControlData | RichTextControlData\n\n      if (isRichTextV1Data(data)) return getRichTextTypographyIds(data)\n\n      return getRichTextV2TypographyIds(descriptor, data)\n    }\n\n    case ShapeControlType: {\n      return getShapeTypographyIds(descriptor, prop as ShapeControlData)\n    }\n\n    case ListControlType: {\n      return getListTypographyIds(descriptor, prop as ListControlData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getTableIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Table: {\n      return getTablePropControllerDataTableIds(prop as TablePropControllerData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getPageIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Link: {\n      return getLinkPropControllerPageIds(prop as LinkPropControllerData)\n    }\n\n    case LinkControlType: {\n      const value = prop as LinkControlData\n\n      if (value == null) return []\n\n      switch (value.type) {\n        case 'OPEN_PAGE':\n          return value.payload.pageId == null ? [] : [value.payload.pageId]\n\n        default:\n          return []\n      }\n    }\n\n    case PropControllerTypes.NavigationLinks: {\n      return getNavigationLinksPropControllerPageIds(prop as NavigationLinksPropControllerData)\n    }\n\n    case RichTextControlType:\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return getRichTextPageIds(prop as RichTextControlData)\n    }\n\n    case RichTextV2ControlType: {\n      const data = prop as RichTextV2ControlData | RichTextControlData\n\n      if (isRichTextV1Data(data)) return getRichTextPageIds(data)\n\n      return getRichTextV2PageIds(descriptor, data)\n    }\n\n    case ShapeControlType: {\n      return getShapePageIds(descriptor, prop as ShapeControlData)\n    }\n\n    case ListControlType: {\n      return getListPageIds(descriptor, prop as ListControlData)\n    }\n\n    default:\n      return []\n  }\n}\n"],"mappings":"AAEA;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAGA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EAEA;AAAA,OACK;AACP,SAAS,OAAO,SAAS;AACzB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EAEA,SAAS;AAAA,EAGT;AAAA,EAEA;AAAA,EACA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EACA;AAAA,OAEK;AACP,SAAS,qCAAqC;AAEvC,SAAS,mBACd,YACA,MACW;AACX,MAAI,QAAQ;AAAM,WAAO,CAAC;AAE1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,qCAAqC,IAA0C;AAAA,IAExF,KAAK;AACH,aAAQ,KAAyB;AAAA,IAEnC,KAAK;AACH,aAAQ,KAAyB;AAAA,QAAQ,CAAC,EAAE,MAAM,MAChD,mBAAmB,WAAW,OAAO,MAAM,KAAK;AAAA,MAClD;AAAA,IAEF,KAAK,kBAAkB;AACrB,aAAO,wBAAwB,YAAY,IAAwB;AAAA,IACrE;AAAA,IAEA,KAAK,iBAAiB;AACpB,aAAO,uBAAuB,YAAY,IAAuB;AAAA,IACnE;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;AAEO,SAAS,aACd,YACA,MACe;AACf,MAAI,QAAQ;AAAM,WAAO;AAEzB,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,wCAAwC,IAAmC,KAAK;AAAA,IAEzF;AACE,aAAO;AAAA,EACX;AACF;AAEO,SAAS,aACd,YACA,MACU;AACV,MAAI,QAAQ;AAAM,WAAO,CAAC;AAC1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,IAAqC;AAAA,IAEpF,KAAK,oBAAoB;AACvB,aAAO,qCAAqC,IAAgC;AAAA,IAE9E,KAAK,oBAAoB,iBAAiB;AACxC,aAAO,0CAA0C,IAAyC;AAAA,IAC5F;AAAA,IAEA,KAAK,oBAAoB;AACvB,aAAO,8CAA8C,IAA2B;AAAA,IAElF,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,IAAiC;AAAA,IAEhF,KAAK;AAAA,IACL,KAAK,8BAA8B,UAAU;AAC3C,aAAO,qBAAqB,IAAqB;AAAA,IACnD;AAAA,IAEA,KAAK,kBAAkB;AACrB,YAAM,QAAQ;AACd,aAAO,OAAO,YAAY,OAAO,CAAC,IAAI,CAAC,MAAM,QAAQ;AAAA,IACvD;AAAA,IAEA,KAAK,uBAAuB;AAC1B,aAAO,uBAAuB,IAAqC;AAAA,IACrE;AAAA,IAEA,KAAK,kBAAkB;AACrB,aAAO,kBAAkB,IAAwB;AAAA,IACnD;AAAA,IAEA,KAAK,oBAAoB;AACvB,YAAM,QAAQ;AAEd,aAAO,OAAO,QAAQ,CAAAA,WAAS,aAAa,WAAW,OAAO,MAAMA,OAAM,KAAK,CAAC,KAAK,CAAC;AAAA,IACxF;AAAA,IAEA,KAAK,uBAAuB;AAC1B,YAAM,OAAO;AAEb,UAAI,iBAAiB,IAAI;AAAG,eAAO,qBAAqB,IAAI;AAE5D,aAAO,uBAAuB,YAAY,IAAI;AAAA,IAChD;AAAA,IAEA,KAAK,kBAAkB;AACrB,aAAO,kBAAkB,YAAY,IAAwB;AAAA,IAC/D;AAAA,IAEA,KAAK,iBAAiB;AACpB,aAAO,iBAAiB,YAAY,IAAuB;AAAA,IAC7D;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;AAEO,SAAS,WACd,YACA,MACU;AACV,MAAI,QAAQ;AAAM,WAAO,CAAC;AAE1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,oCAAoC,IAAqC;AAAA,IAElF,KAAK,oBAAoB,OAAO;AAC9B,aAAO,8BAA8B,IAA+B;AAAA,IACtE;AAAA,IAEA,KAAK,oBAAoB,QAAQ;AAC/B,aAAO,+BAA+B,IAAgC;AAAA,IACxE;AAAA,IAEA,KAAK,kBAAkB;AACrB,YAAM,QAAQ;AACd,aAAO,MAAM,KAAK,EACf,KAAK,EAAE,QAAQ,OAAK,CAAC,CAAC,CAAC,EACvB,KAAK,EAAE,MAAM,iBAAiB,GAAG,OAAK,CAAC,EAAE,EAAE,CAAC,EAC5C,KAAK,EAAE,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,EACxC,UAAU,MAAM,CAAC,CAAC;AAAA,IACvB;AAAA,IAEA,KAAK,kBAAkB;AACrB,aAAO,gBAAgB,YAAY,IAAwB;AAAA,IAC7D;AAAA,IAEA,KAAK,iBAAiB;AACpB,aAAO,eAAe,YAAY,IAAuB;AAAA,IAC3D;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;AAEO,SAAS,iBACd,YACA,MACU;AACV,MAAI,QAAQ;AAAM,WAAO,CAAC;AAE1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,uBAAuB;AAC1B,aAAO,2BAA2B,IAAqC;AAAA,IACzE;AAAA,IACA,KAAK;AAAA,IACL,KAAK,8BAA8B,UAAU;AAC3C,aAAO,yBAAyB,IAA2B;AAAA,IAC7D;AAAA,IAEA,KAAK,uBAAuB;AAC1B,YAAM,OAAO;AAEb,UAAI,iBAAiB,IAAI;AAAG,eAAO,yBAAyB,IAAI;AAEhE,aAAO,2BAA2B,YAAY,IAAI;AAAA,IACpD;AAAA,IAEA,KAAK,kBAAkB;AACrB,aAAO,sBAAsB,YAAY,IAAwB;AAAA,IACnE;AAAA,IAEA,KAAK,iBAAiB;AACpB,aAAO,qBAAqB,YAAY,IAAuB;AAAA,IACjE;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;AAEO,SAAS,YACd,YACA,MACU;AACV,MAAI,QAAQ;AAAM,WAAO,CAAC;AAE1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB,OAAO;AAC9B,aAAO,mCAAmC,IAA+B;AAAA,IAC3E;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;AAEO,SAAS,WACd,YACA,MACU;AACV,MAAI,QAAQ;AAAM,WAAO,CAAC;AAE1B,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB,MAAM;AAC7B,aAAO,6BAA6B,IAA8B;AAAA,IACpE;AAAA,IAEA,KAAK,iBAAiB;AACpB,YAAM,QAAQ;AAEd,UAAI,SAAS;AAAM,eAAO,CAAC;AAE3B,cAAQ,MAAM,MAAM;AAAA,QAClB,KAAK;AACH,iBAAO,MAAM,QAAQ,UAAU,OAAO,CAAC,IAAI,CAAC,MAAM,QAAQ,MAAM;AAAA,QAElE;AACE,iBAAO,CAAC;AAAA,MACZ;AAAA,IACF;AAAA,IAEA,KAAK,oBAAoB,iBAAiB;AACxC,aAAO,wCAAwC,IAAyC;AAAA,IAC1F;AAAA,IAEA,KAAK;AAAA,IACL,KAAK,8BAA8B,UAAU;AAC3C,aAAO,mBAAmB,IAA2B;AAAA,IACvD;AAAA,IAEA,KAAK,uBAAuB;AAC1B,YAAM,OAAO;AAEb,UAAI,iBAAiB,IAAI;AAAG,eAAO,mBAAmB,IAAI;AAE1D,aAAO,qBAAqB,YAAY,IAAI;AAAA,IAC9C;AAAA,IAEA,KAAK,kBAAkB;AACrB,aAAO,gBAAgB,YAAY,IAAwB;AAAA,IAC7D;AAAA,IAEA,KAAK,iBAAiB;AACpB,aAAO,eAAe,YAAY,IAAuB;AAAA,IAC3D;AAAA,IAEA;AACE,aAAO,CAAC;AAAA,EACZ;AACF;","names":["value"]}
+{"version":3,"sources":["../../../src/prop-controllers/introspection.ts"],"sourcesContent":["import { type Descriptor, isLegacyDescriptor } from './descriptors'\nimport {\n  introspectRichTextData,\n  Targets,\n  type Data,\n  type Element,\n  type RichTextValue,\n} from '@makeswift/controls'\n\nimport {\n  getLinkPropControllerPageIds,\n  getResponsiveColorPropControllerDataSawtchIds,\n  getShadowsPropControllerDataSwatchIds,\n  LinkPropControllerData,\n  Types as PropControllerTypes,\n  ResponsiveColorData,\n  ShadowsPropControllerData,\n  getBorderPropControllerDataSwatchIds,\n  TablePropControllerData,\n  getTablePropControllerDataTableIds,\n  getNavigationLinksPropControllerPageIds,\n  NavigationLinksPropControllerData,\n  getNavigationLinksPropControllerSwatchIds,\n  BorderPropControllerData,\n  getElementIDPropControllerDataElementID,\n  ElementIDPropControllerData,\n  getGridPropControllerElementChildren,\n  GridPropControllerData,\n  getImagePropControllerFileIds,\n  ImagePropControllerData,\n  getImagesPropControllerFileIds,\n  ImagesPropControllerData,\n  getBackgroundsPropControllerFileIds,\n  getBackgroundsPropControllerSwatchIds,\n  BackgroundsPropControllerData,\n} from '@makeswift/prop-controllers'\n\nimport { DELETED_PROP_CONTROLLER_TYPES } from './deleted'\n\nexport function getElementChildren<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): Element[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.ChildrenElement)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Grid:\n      return getGridPropControllerElementChildren(prop as GridPropControllerData | undefined)\n\n    default:\n      return []\n  }\n}\n\nexport function getElementId<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string | null {\n  if (prop == null) return null\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return null\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.ElementID:\n      return getElementIDPropControllerDataElementID(prop as ElementIDPropControllerData) ?? null\n\n    default:\n      return null\n  }\n}\n\nexport function getSwatchIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.Swatch)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return getBackgroundsPropControllerSwatchIds(prop as BackgroundsPropControllerData)\n\n    case PropControllerTypes.Border:\n      return getBorderPropControllerDataSwatchIds(prop as BorderPropControllerData)\n\n    case PropControllerTypes.NavigationLinks: {\n      return getNavigationLinksPropControllerSwatchIds(prop as NavigationLinksPropControllerData)\n    }\n\n    case PropControllerTypes.ResponsiveColor:\n      return getResponsiveColorPropControllerDataSawtchIds(prop as ResponsiveColorData)\n\n    case PropControllerTypes.Shadows:\n      return getShadowsPropControllerDataSwatchIds(prop as ShadowsPropControllerData)\n\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return introspectRichTextData(prop as RichTextValue, Targets.Swatch)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getFileIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.File)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return getBackgroundsPropControllerFileIds(prop as BackgroundsPropControllerData)\n\n    case PropControllerTypes.Image: {\n      return getImagePropControllerFileIds(prop as ImagePropControllerData)\n    }\n\n    case PropControllerTypes.Images: {\n      return getImagesPropControllerFileIds(prop as ImagesPropControllerData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getTypographyIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.Typography)\n  }\n\n  switch (descriptor.type) {\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return introspectRichTextData(prop as RichTextValue, Targets.Typography)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getTableIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.Table)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Table: {\n      return getTablePropControllerDataTableIds(prop as TablePropControllerData)\n    }\n\n    default:\n      return []\n  }\n}\n\nexport function getPageIds<T extends Data>(\n  descriptor: Descriptor<T>,\n  prop: T | undefined,\n): string[] {\n  if (prop == null) return []\n\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.introspect(prop, Targets.Page)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Link: {\n      return getLinkPropControllerPageIds(prop as LinkPropControllerData)\n    }\n\n    case PropControllerTypes.NavigationLinks: {\n      return getNavigationLinksPropControllerPageIds(prop as NavigationLinksPropControllerData)\n    }\n\n    case DELETED_PROP_CONTROLLER_TYPES.RichText: {\n      return introspectRichTextData(prop as RichTextValue, Targets.Page)\n    }\n\n    default:\n      return []\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/esm/runtimes/react/components/Element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/components/Element.tsx"],"sourcesContent":["'use client'\n\nimport { Ref, forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef } from 'react'\nimport { Element as ReactPageElement, isElementReference } from '../../../state/react-page'\nimport { ElementImperativeHandle } from '../element-imperative-handle'\nimport { useDispatch } from '../hooks/use-dispatch'\nimport { useDocumentKey } from '../hooks/use-document-key'\nimport { useDisableRegisterElement } from '../hooks/use-disable-register-element'\nimport { mountComponentEffect, registerComponentHandleEffect } from '../../../state/actions'\nimport { ElementReference } from './ElementReference'\nimport { ElementData } from './ElementData'\nimport { FindDomNode } from '../find-dom-node'\n\ntype ElementProps = {\n  element: ReactPageElement\n}\n\nexport const Element = memo(\n  forwardRef(function Element(\n    { element }: ElementProps,\n    ref: Ref<ElementImperativeHandle>,\n  ): JSX.Element {\n    const elementKey = element.key\n    const dispatch = useDispatch()\n    const documentKey = useDocumentKey()\n    const useFindDomNodeRef = useRef(true)\n    const imperativeHandleRef = useRef(new ElementImperativeHandle())\n    const findDomNodeCallbackRef = useCallback((current: (() => Element | Text | null) | null) => {\n      if (useFindDomNodeRef.current === true) {\n        imperativeHandleRef.current.callback(() => current?.() ?? null)\n      }\n    }, [])\n    const elementCallbackRef = useCallback((current: unknown | null) => {\n      useFindDomNodeRef.current = false\n\n      imperativeHandleRef.current.callback(() => current)\n    }, [])\n    const isRegisterElementDisabled = useDisableRegisterElement()\n\n    useImperativeHandle(ref, () => imperativeHandleRef.current, [])\n\n    useEffect(() => {\n      if (documentKey == null || isRegisterElementDisabled) return\n\n      return dispatch(\n        registerComponentHandleEffect(documentKey, elementKey, imperativeHandleRef.current),\n      )\n    }, [dispatch, documentKey, elementKey, isRegisterElementDisabled])\n\n    useEffect(() => {\n      if (documentKey == null || isRegisterElementDisabled) return\n\n      return dispatch(mountComponentEffect(documentKey, elementKey))\n    }, [dispatch, documentKey, elementKey, isRegisterElementDisabled])\n\n    return (\n      <FindDomNode ref={findDomNodeCallbackRef}>\n        {isElementReference(element) ? (\n          <ElementReference key={elementKey} ref={elementCallbackRef} elementReference={element} />\n        ) : (\n          <ElementData key={elementKey} ref={elementCallbackRef} elementData={element} />\n        )}\n      </FindDomNode>\n    )\n  }),\n)\n"],"mappings":";AA0DU;AAxDV,SAAc,YAAY,MAAM,aAAa,WAAW,qBAAqB,cAAc;AAC3F,SAAsC,0BAA0B;AAChE,SAAS,+BAA+B;AACxC,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,iCAAiC;AAC1C,SAAS,sBAAsB,qCAAqC;AACpE,SAAS,wBAAwB;AACjC,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAMrB,MAAM,UAAU;AAAA,EACrB,WAAW,SAASA,SAClB,EAAE,QAAQ,GACV,KACa;AACb,UAAM,aAAa,QAAQ;AAC3B,UAAM,WAAW,YAAY;AAC7B,UAAM,cAAc,eAAe;AACnC,UAAM,oBAAoB,OAAO,IAAI;AACrC,UAAM,sBAAsB,OAAO,IAAI,wBAAwB,CAAC;AAChE,UAAM,yBAAyB,YAAY,CAAC,YAAkD;AAC5F,UAAI,kBAAkB,YAAY,MAAM;AACtC,4BAAoB,QAAQ,SAAS,MAAM,UAAU,KAAK,IAAI;AAAA,MAChE;AAAA,IACF,GAAG,CAAC,CAAC;AACL,UAAM,qBAAqB,YAAY,CAAC,YAA4B;AAClE,wBAAkB,UAAU;AAE5B,0BAAoB,QAAQ,SAAS,MAAM,OAAO;AAAA,IACpD,GAAG,CAAC,CAAC;AACL,UAAM,4BAA4B,0BAA0B;AAE5D,wBAAoB,KAAK,MAAM,oBAAoB,SAAS,CAAC,CAAC;AAE9D,cAAU,MAAM;AACd,UAAI,eAAe,QAAQ;AAA2B;AAEtD,aAAO;AAAA,QACL,8BAA8B,aAAa,YAAY,oBAAoB,OAAO;AAAA,MACpF;AAAA,IACF,GAAG,CAAC,UAAU,aAAa,YAAY,yBAAyB,CAAC;AAEjE,cAAU,MAAM;AACd,UAAI,eAAe,QAAQ;AAA2B;AAEtD,aAAO,SAAS,qBAAqB,aAAa,UAAU,CAAC;AAAA,IAC/D,GAAG,CAAC,UAAU,aAAa,YAAY,yBAAyB,CAAC;AAEjE,WACE,oBAAC,eAAY,KAAK,wBACf,6BAAmB,OAAO,IACzB,oBAAC,oBAAkC,KAAK,oBAAoB,kBAAkB,WAAvD,UAAgE,IAEvF,oBAAC,eAA6B,KAAK,oBAAoB,aAAa,WAAlD,UAA2D,GAEjF;AAAA,EAEJ,CAAC;AACH;","names":["Element"]}
+{"version":3,"sources":["../../../../../src/runtimes/react/components/Element.tsx"],"sourcesContent":["'use client'\n\nimport { Ref, forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef } from 'react'\nimport { Element as ElementDataOrRef, isElementReference } from '../../../state/react-page'\nimport { ElementImperativeHandle } from '../element-imperative-handle'\nimport { useDispatch } from '../hooks/use-dispatch'\nimport { useDocumentKey } from '../hooks/use-document-key'\nimport { useDisableRegisterElement } from '../hooks/use-disable-register-element'\nimport { mountComponentEffect, registerComponentHandleEffect } from '../../../state/actions'\nimport { ElementReference } from './ElementReference'\nimport { ElementData } from './ElementData'\nimport { FindDomNode } from '../find-dom-node'\n\ntype ElementProps = {\n  element: ElementDataOrRef\n}\n\nexport const Element = memo(\n  forwardRef(function Element(\n    { element }: ElementProps,\n    ref: Ref<ElementImperativeHandle>,\n  ): JSX.Element {\n    const elementKey = element.key\n    const dispatch = useDispatch()\n    const documentKey = useDocumentKey()\n    const useFindDomNodeRef = useRef(true)\n    const imperativeHandleRef = useRef(new ElementImperativeHandle())\n    const findDomNodeCallbackRef = useCallback((current: (() => Element | Text | null) | null) => {\n      if (useFindDomNodeRef.current === true) {\n        imperativeHandleRef.current.callback(() => current?.() ?? null)\n      }\n    }, [])\n    const elementCallbackRef = useCallback((current: unknown | null) => {\n      useFindDomNodeRef.current = false\n\n      imperativeHandleRef.current.callback(() => current)\n    }, [])\n    const isRegisterElementDisabled = useDisableRegisterElement()\n\n    useImperativeHandle(ref, () => imperativeHandleRef.current, [])\n\n    useEffect(() => {\n      if (documentKey == null || isRegisterElementDisabled) return\n\n      return dispatch(\n        registerComponentHandleEffect(documentKey, elementKey, imperativeHandleRef.current),\n      )\n    }, [dispatch, documentKey, elementKey, isRegisterElementDisabled])\n\n    useEffect(() => {\n      if (documentKey == null || isRegisterElementDisabled) return\n\n      return dispatch(mountComponentEffect(documentKey, elementKey))\n    }, [dispatch, documentKey, elementKey, isRegisterElementDisabled])\n\n    return (\n      <FindDomNode ref={findDomNodeCallbackRef}>\n        {isElementReference(element) ? (\n          <ElementReference key={elementKey} ref={elementCallbackRef} elementReference={element} />\n        ) : (\n          <ElementData key={elementKey} ref={elementCallbackRef} elementData={element} />\n        )}\n      </FindDomNode>\n    )\n  }),\n)\n"],"mappings":";AA0DU;AAxDV,SAAc,YAAY,MAAM,aAAa,WAAW,qBAAqB,cAAc;AAC3F,SAAsC,0BAA0B;AAChE,SAAS,+BAA+B;AACxC,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,iCAAiC;AAC1C,SAAS,sBAAsB,qCAAqC;AACpE,SAAS,wBAAwB;AACjC,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAMrB,MAAM,UAAU;AAAA,EACrB,WAAW,SAASA,SAClB,EAAE,QAAQ,GACV,KACa;AACb,UAAM,aAAa,QAAQ;AAC3B,UAAM,WAAW,YAAY;AAC7B,UAAM,cAAc,eAAe;AACnC,UAAM,oBAAoB,OAAO,IAAI;AACrC,UAAM,sBAAsB,OAAO,IAAI,wBAAwB,CAAC;AAChE,UAAM,yBAAyB,YAAY,CAAC,YAAkD;AAC5F,UAAI,kBAAkB,YAAY,MAAM;AACtC,4BAAoB,QAAQ,SAAS,MAAM,UAAU,KAAK,IAAI;AAAA,MAChE;AAAA,IACF,GAAG,CAAC,CAAC;AACL,UAAM,qBAAqB,YAAY,CAAC,YAA4B;AAClE,wBAAkB,UAAU;AAE5B,0BAAoB,QAAQ,SAAS,MAAM,OAAO;AAAA,IACpD,GAAG,CAAC,CAAC;AACL,UAAM,4BAA4B,0BAA0B;AAE5D,wBAAoB,KAAK,MAAM,oBAAoB,SAAS,CAAC,CAAC;AAE9D,cAAU,MAAM;AACd,UAAI,eAAe,QAAQ;AAA2B;AAEtD,aAAO;AAAA,QACL,8BAA8B,aAAa,YAAY,oBAAoB,OAAO;AAAA,MACpF;AAAA,IACF,GAAG,CAAC,UAAU,aAAa,YAAY,yBAAyB,CAAC;AAEjE,cAAU,MAAM;AACd,UAAI,eAAe,QAAQ;AAA2B;AAEtD,aAAO,SAAS,qBAAqB,aAAa,UAAU,CAAC;AAAA,IAC/D,GAAG,CAAC,UAAU,aAAa,YAAY,yBAAyB,CAAC;AAEjE,WACE,oBAAC,eAAY,KAAK,wBACf,6BAAmB,OAAO,IACzB,oBAAC,oBAAkC,KAAK,oBAAoB,kBAAkB,WAAvD,UAAgE,IAEvF,oBAAC,eAA6B,KAAK,oBAAoB,aAAa,WAAlD,UAA2D,GAEjF;AAAA,EAEJ,CAAC;AACH;","names":["Element"]}

package/dist/esm/runtimes/react/components/ElementData.js

@@ -2,17 +2,38 @@ import { jsx } from "react/jsx-runtime";
 import { createElement } from "react";
 import { Suspense, forwardRef, memo } from "react";
 import { useComponent } from "../hooks/use-component";
-import { suppressRefWarning } from "../utils/suppress-ref-warning";
 import { FallbackComponent } from "../../../components/shared/FallbackComponent";
 import { PropsValue } from "../controls";
+function hasTypeofSymbol(Component, symbol) {
+  return Component && Component.type && Component.$$typeof?.toString() === `Symbol(${symbol})`;
+}
+function isMemoComponent(Component) {
+  return hasTypeofSymbol(Component, "react.memo");
+}
+function unwrapIfMemo(Component) {
+  return isMemoComponent(Component) ? Component.type : Component;
+}
+function isForwardRef(Component) {
+  return hasTypeofSymbol(Component, "react.forward_ref");
+}
+function isClassComponent(Component) {
+  return typeof Component === "function" && Component.prototype && Component.prototype.isReactComponent;
+}
+function isLazyComponent(Component) {
+  return hasTypeofSymbol(Component, "react.lazy");
+}
+function canAcceptRef(Component) {
+  return isClassComponent(Component) || isForwardRef(Component) || // will try to pass a ref to all lazy components since we can't know if they accept refs without loading them
+  isLazyComponent(Component);
+}
 const ElementData = memo(
   forwardRef(function ElementData2({ elementData }, ref) {
     const Component = useComponent(elementData.type);
-    suppressRefWarning(`\`ForwardRef(${ElementData2.name})\``);
+    const forwardRef2 = canAcceptRef(unwrapIfMemo(Component));
     if (Component == null) {
       return /* @__PURE__ */ jsx(FallbackComponent, { ref, text: "Component not found" });
     }
-    return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(PropsValue, { element: elementData, children: (props) => /* @__PURE__ */ createElement(Component, { ...props, key: elementData.key, ref }) }) });
+    return /* @__PURE__ */ jsx(Suspense, { children: /* @__PURE__ */ jsx(PropsValue, { element: elementData, children: (props) => forwardRef2 ? /* @__PURE__ */ createElement(Component, { ...props, key: elementData.key, ref }) : /* @__PURE__ */ createElement(Component, { ...props, key: elementData.key }) }) });
   })
 );
 export {

package/dist/esm/runtimes/react/components/ElementData.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/components/ElementData.tsx"],"sourcesContent":["import { Ref, Suspense, forwardRef, memo } from 'react'\nimport { ElementData as ReactPageElementData } from '../../../state/react-page'\nimport { useComponent } from '../hooks/use-component'\nimport { suppressRefWarning } from '../utils/suppress-ref-warning'\nimport { FallbackComponent } from '../../../components/shared/FallbackComponent'\nimport { PropsValue } from '../controls'\n\ntype ElementDataProps = {\n  elementData: ReactPageElementData\n}\n\nexport const ElementData = memo(\n  forwardRef(function ElementData(\n    { elementData }: ElementDataProps,\n    ref: Ref<unknown>,\n  ): JSX.Element {\n    const Component = useComponent(elementData.type)\n\n    suppressRefWarning(`\\`ForwardRef(${ElementData.name})\\``)\n\n    if (Component == null) {\n      return <FallbackComponent ref={ref as Ref<HTMLDivElement>} text=\"Component not found\" />\n    }\n\n    return (\n      <Suspense>\n        <PropsValue element={elementData}>\n          {props => <Component {...props} key={elementData.key} ref={ref} />}\n        </PropsValue>\n      </Suspense>\n    )\n  }),\n)\n"],"mappings":"AAqBa;AAMO;AA3BpB,SAAc,UAAU,YAAY,YAAY;AAEhD,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,yBAAyB;AAClC,SAAS,kBAAkB;AAMpB,MAAM,cAAc;AAAA,EACzB,WAAW,SAASA,aAClB,EAAE,YAAY,GACd,KACa;AACb,UAAM,YAAY,aAAa,YAAY,IAAI;AAE/C,uBAAmB,gBAAgBA,aAAY,IAAI,KAAK;AAExD,QAAI,aAAa,MAAM;AACrB,aAAO,oBAAC,qBAAkB,KAAiC,MAAK,uBAAsB;AAAA,IACxF;AAEA,WACE,oBAAC,YACC,8BAAC,cAAW,SAAS,aAClB,qBAAS,8BAAC,aAAW,GAAG,OAAO,KAAK,YAAY,KAAK,KAAU,GAClE,GACF;AAAA,EAEJ,CAAC;AACH;","names":["ElementData"]}
+{"version":3,"sources":["../../../../../src/runtimes/react/components/ElementData.tsx"],"sourcesContent":["import { Ref, Suspense, forwardRef, memo } from 'react'\nimport { ElementData as ReactPageElementData } from '../../../state/react-page'\nimport { useComponent } from '../hooks/use-component'\nimport { FallbackComponent } from '../../../components/shared/FallbackComponent'\nimport { PropsValue } from '../controls'\n\ntype ElementDataProps = {\n  elementData: ReactPageElementData\n}\n\nfunction hasTypeofSymbol(Component: any, symbol: string) {\n  return Component && Component.type && Component.$$typeof?.toString() === `Symbol(${symbol})`\n}\n\nfunction isMemoComponent(Component: any) {\n  return hasTypeofSymbol(Component, 'react.memo')\n}\n\nfunction unwrapIfMemo(Component: any) {\n  return isMemoComponent(Component) ? Component.type : Component\n}\n\nfunction isForwardRef(Component: any) {\n  return hasTypeofSymbol(Component, 'react.forward_ref')\n}\n\nfunction isClassComponent(Component: any) {\n  return (\n    typeof Component === 'function' && Component.prototype && Component.prototype.isReactComponent\n  )\n}\n\nfunction isLazyComponent(Component: any) {\n  return hasTypeofSymbol(Component, 'react.lazy')\n}\n\nfunction canAcceptRef(Component: any) {\n  return (\n    isClassComponent(Component) ||\n    isForwardRef(Component) ||\n    // will try to pass a ref to all lazy components since we can't know if they accept refs without loading them\n    isLazyComponent(Component)\n  )\n}\n\nexport const ElementData = memo(\n  forwardRef(function ElementData(\n    { elementData }: ElementDataProps,\n    ref: Ref<unknown>,\n  ): JSX.Element {\n    const Component = useComponent(elementData.type)\n    const forwardRef = canAcceptRef(unwrapIfMemo(Component))\n\n    if (Component == null) {\n      return <FallbackComponent ref={ref as Ref<HTMLDivElement>} text=\"Component not found\" />\n    }\n\n    return (\n      <Suspense>\n        <PropsValue element={elementData}>\n          {props =>\n            forwardRef ? (\n              <Component {...props} key={elementData.key} ref={ref} />\n            ) : (\n              <Component {...props} key={elementData.key} />\n            )\n          }\n        </PropsValue>\n      </Suspense>\n    )\n  }),\n)\n"],"mappings":"AAsDa;AAQC;AA9Dd,SAAc,UAAU,YAAY,YAAY;AAEhD,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,kBAAkB;AAM3B,SAAS,gBAAgB,WAAgB,QAAgB;AACvD,SAAO,aAAa,UAAU,QAAQ,UAAU,UAAU,SAAS,MAAM,UAAU,MAAM;AAC3F;AAEA,SAAS,gBAAgB,WAAgB;AACvC,SAAO,gBAAgB,WAAW,YAAY;AAChD;AAEA,SAAS,aAAa,WAAgB;AACpC,SAAO,gBAAgB,SAAS,IAAI,UAAU,OAAO;AACvD;AAEA,SAAS,aAAa,WAAgB;AACpC,SAAO,gBAAgB,WAAW,mBAAmB;AACvD;AAEA,SAAS,iBAAiB,WAAgB;AACxC,SACE,OAAO,cAAc,cAAc,UAAU,aAAa,UAAU,UAAU;AAElF;AAEA,SAAS,gBAAgB,WAAgB;AACvC,SAAO,gBAAgB,WAAW,YAAY;AAChD;AAEA,SAAS,aAAa,WAAgB;AACpC,SACE,iBAAiB,SAAS,KAC1B,aAAa,SAAS;AAAA,EAEtB,gBAAgB,SAAS;AAE7B;AAEO,MAAM,cAAc;AAAA,EACzB,WAAW,SAASA,aAClB,EAAE,YAAY,GACd,KACa;AACb,UAAM,YAAY,aAAa,YAAY,IAAI;AAC/C,UAAMC,cAAa,aAAa,aAAa,SAAS,CAAC;AAEvD,QAAI,aAAa,MAAM;AACrB,aAAO,oBAAC,qBAAkB,KAAiC,MAAK,uBAAsB;AAAA,IACxF;AAEA,WACE,oBAAC,YACC,8BAAC,cAAW,SAAS,aAClB,qBACCA,cACE,8BAAC,aAAW,GAAG,OAAO,KAAK,YAAY,KAAK,KAAU,IAEtD,8BAAC,aAAW,GAAG,OAAO,KAAK,YAAY,KAAK,GAGlD,GACF;AAAA,EAEJ,CAAC;AACH;","names":["ElementData","forwardRef"]}

package/dist/esm/runtimes/react/controls/checkbox.js

@@ -1,11 +1,5 @@
-import { match } from "ts-pattern";
-import {
-  CheckboxControlDataTypeKey,
-  CheckboxControlDataTypeValueV1
-} from "@makeswift/controls";
 function useCheckboxControlValue(data, definition) {
-  const value = match(data).with({ [CheckboxControlDataTypeKey]: CheckboxControlDataTypeValueV1 }, (val) => val.value).otherwise((val) => val) ?? definition.config.defaultValue;
-  return value;
+  return definition.fromData(data) ?? definition.config.defaultValue;
 }
 export {
   useCheckboxControlValue

package/dist/esm/runtimes/react/controls/checkbox.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/controls/checkbox.ts"],"sourcesContent":["import { match } from 'ts-pattern'\nimport {\n  CheckboxControlData,\n  CheckboxControlDataTypeKey,\n  CheckboxControlDataTypeValueV1,\n  CheckboxControlDefinition,\n} from '@makeswift/controls'\n\nexport type CheckboxControlValue<T extends CheckboxControlDefinition> =\n  undefined extends T['config']['defaultValue'] ? boolean | undefined : boolean\n\nexport function useCheckboxControlValue<T extends CheckboxControlDefinition>(\n  data: CheckboxControlData | undefined,\n  definition: T,\n): CheckboxControlValue<T> {\n  const value: boolean | undefined =\n    match(data)\n      .with({ [CheckboxControlDataTypeKey]: CheckboxControlDataTypeValueV1 }, val => val.value)\n      .otherwise(val => val) ?? definition.config.defaultValue\n\n  return value as CheckboxControlValue<T>\n}\n"],"mappings":"AAAA,SAAS,aAAa;AACtB;AAAA,EAEE;AAAA,EACA;AAAA,OAEK;AAKA,SAAS,wBACd,MACA,YACyB;AACzB,QAAM,QACJ,MAAM,IAAI,EACP,KAAK,EAAE,CAAC,0BAA0B,GAAG,+BAA+B,GAAG,SAAO,IAAI,KAAK,EACvF,UAAU,SAAO,GAAG,KAAK,WAAW,OAAO;AAEhD,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/controls/checkbox.ts"],"sourcesContent":["import { type DataType, type ResolvedValueType } from '@makeswift/controls'\n\nimport { CheckboxDefinition } from '../../../controls'\n\nexport function useCheckboxControlValue(\n  data: DataType<CheckboxDefinition> | undefined,\n  definition: CheckboxDefinition,\n): ResolvedValueType<CheckboxDefinition> {\n  return definition.fromData(data) ?? definition.config.defaultValue\n}\n"],"mappings":"AAIO,SAAS,wBACd,MACA,YACuC;AACvC,SAAO,WAAW,SAAS,IAAI,KAAK,WAAW,OAAO;AACxD;","names":[]}

package/dist/esm/runtimes/react/controls/color.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/controls/color.ts"],"sourcesContent":["import Color from 'color'\nimport { ColorControlData, ColorControlDefinition } from '@makeswift/controls'\nimport { useSwatch } from '../hooks/makeswift-api'\n\nexport type ColorControlValue<T extends ColorControlDefinition> =\n  undefined extends T['config']['defaultValue'] ? string | undefined : string\n\nexport function useColorValue<T extends ColorControlDefinition>(\n  data: ColorControlData | undefined,\n  definition: T,\n): ColorControlValue<any> {\n  const swatchId = data?.swatchId ?? null\n  const swatch = useSwatch(swatchId)\n  const alpha = data?.alpha ?? 1\n\n  if (swatch == null) {\n    const { defaultValue } = definition.config\n\n    if (defaultValue === undefined) return undefined as ColorControlValue<T>\n\n    let defaultColor\n    try {\n      defaultColor = Color(definition.config.defaultValue)\n    } catch {\n      defaultColor = Color()\n    }\n\n    return defaultColor.rgb().string()\n  }\n\n  return Color({ h: swatch.hue, s: swatch.saturation, l: swatch.lightness })\n    .alpha(alpha)\n    .rgb()\n    .string()\n}\n"],"mappings":"AAAA,OAAO,WAAW;AAElB,SAAS,iBAAiB;AAKnB,SAAS,cACd,MACA,YACwB;AACxB,QAAM,WAAW,MAAM,YAAY;AACnC,QAAM,SAAS,UAAU,QAAQ;AACjC,QAAM,QAAQ,MAAM,SAAS;AAE7B,MAAI,UAAU,MAAM;AAClB,UAAM,EAAE,aAAa,IAAI,WAAW;AAEpC,QAAI,iBAAiB;AAAW,aAAO;AAEvC,QAAI;AACJ,QAAI;AACF,qBAAe,MAAM,WAAW,OAAO,YAAY;AAAA,IACrD,QAAQ;AACN,qBAAe,MAAM;AAAA,IACvB;AAEA,WAAO,aAAa,IAAI,EAAE,OAAO;AAAA,EACnC;AAEA,SAAO,MAAM,EAAE,GAAG,OAAO,KAAK,GAAG,OAAO,YAAY,GAAG,OAAO,UAAU,CAAC,EACtE,MAAM,KAAK,EACX,IAAI,EACJ,OAAO;AACZ;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/controls/color.ts"],"sourcesContent":["import Color from 'color'\n\nimport { type DataType, type ResolvedValueType } from '@makeswift/controls'\n\nimport { ColorDefinition } from '../../../controls'\n\nimport { useSwatch } from '../hooks/makeswift-api'\n\nexport function useColorValue(\n  data: DataType<ColorDefinition> | undefined,\n  definition: ColorDefinition,\n): ResolvedValueType<ColorDefinition> {\n  const swatchId = data?.swatchId ?? null\n  const swatch = useSwatch(swatchId)\n  const alpha = data?.alpha ?? 1\n\n  if (swatch == null) {\n    const { defaultValue } = definition.config\n\n    if (defaultValue === undefined) return undefined\n\n    let defaultColor\n    try {\n      defaultColor = Color(definition.config.defaultValue)\n    } catch {\n      defaultColor = Color()\n    }\n\n    return defaultColor.rgb().string()\n  }\n\n  return Color({ h: swatch.hue, s: swatch.saturation, l: swatch.lightness })\n    .alpha(alpha)\n    .rgb()\n    .string()\n}\n"],"mappings":"AAAA,OAAO,WAAW;AAMlB,SAAS,iBAAiB;AAEnB,SAAS,cACd,MACA,YACoC;AACpC,QAAM,WAAW,MAAM,YAAY;AACnC,QAAM,SAAS,UAAU,QAAQ;AACjC,QAAM,QAAQ,MAAM,SAAS;AAE7B,MAAI,UAAU,MAAM;AAClB,UAAM,EAAE,aAAa,IAAI,WAAW;AAEpC,QAAI,iBAAiB;AAAW,aAAO;AAEvC,QAAI;AACJ,QAAI;AACF,qBAAe,MAAM,WAAW,OAAO,YAAY;AAAA,IACrD,QAAQ;AACN,qBAAe,MAAM;AAAA,IACvB;AAEA,WAAO,aAAa,IAAI,EAAE,OAAO;AAAA,EACnC;AAEA,SAAO,MAAM,EAAE,GAAG,OAAO,KAAK,GAAG,OAAO,YAAY,GAAG,OAAO,UAAU,CAAC,EACtE,MAAM,KAAK,EACX,IAAI,EACJ,OAAO;AACZ;","names":[]}

package/dist/esm/runtimes/react/controls/combobox.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/controls/combobox.ts"],"sourcesContent":["import {\n  ComboboxControlData,\n  ComboboxControlDefinition,\n  ComboboxControlDefinitionOption,\n} from '../../../controls'\n\nexport type ComboboxControlValue<T extends ComboboxControlDefinition> =\n  | ComboboxControlDefinitionOption<T>\n  | undefined\n\nexport function useComboboxControlValue<T extends ComboboxControlDefinition>(\n  data: ComboboxControlData<T> | undefined,\n): ComboboxControlValue<T> {\n  return data?.value\n}\n"],"mappings":"AAUO,SAAS,wBACd,MACyB;AACzB,SAAO,MAAM;AACf;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/controls/combobox.ts"],"sourcesContent":["import { type DataType, type ResolvedValueType } from '@makeswift/controls'\n\nimport { ComboboxDefinition } from '../../../controls'\n\nexport function useComboboxControlValue(\n  data: DataType<ComboboxDefinition> | undefined,\n): ResolvedValueType<ComboboxDefinition> {\n  return data?.value\n}\n"],"mappings":"AAIO,SAAS,wBACd,MACuC;AACvC,SAAO,MAAM;AACf;","names":[]}