@makeswift/runtime 0.28.10-canary.10 → 0.28.10-canary.12

package/dist/cjs/runtimes/react/controls/rich-text-v2/EditableTextV2/usePresetValue.js

@@ -27,7 +27,7 @@ var import_controls = require("@makeswift/controls");
 var import_breakpoints = require("../../../../../state/modules/breakpoints");
 var import_use_breakpoints = require("../../../hooks/use-breakpoints");
 var import_controls2 = require("../../../../../controls");
-function usePresetValue(definition) {
+function usePresetValue(config) {
   const breakpoints = (0, import_use_breakpoints.useBreakpoints)();
   return (0, import_react.useMemo)(
     () => [
@@ -35,8 +35,8 @@ function usePresetValue(definition) {
         type: import_controls.Slate.BlockType.Default,
         children: [
           {
-            text: definition.config.defaultValue ?? "",
-            ...definition.config.mode === import_controls2.RichText.Mode.Inline ? {} : {
+            text: config.defaultValue ?? "",
+            ...config.mode === import_controls2.RichText.Mode.Inline ? {} : {
               typography: {
                 style: [
                   {
@@ -60,7 +60,7 @@ function usePresetValue(definition) {
         ]
       }
     ],
-    [definition.config.mode, definition.config.defaultValue, breakpoints]
+    [config.mode, config.defaultValue, breakpoints]
   );
 }
 const defaultValue = [

package/dist/cjs/runtimes/react/controls/rich-text-v2/EditableTextV2/usePresetValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/runtimes/react/controls/rich-text-v2/EditableTextV2/usePresetValue.tsx"],"sourcesContent":["import { useMemo } from 'react'\nimport { Descendant } from 'slate'\nimport { Slate, getBaseBreakpoint } from '@makeswift/controls'\n\nimport { DefaultBreakpointID } from '../../../../../state/modules/breakpoints'\nimport { useBreakpoints } from '../../../hooks/use-breakpoints'\nimport { RichTextV2Definition, RichText } from '../../../../../controls'\n\nexport function usePresetValue(definition: RichTextV2Definition): Descendant[] {\n  const breakpoints = useBreakpoints()\n  return useMemo(\n    () => [\n      {\n        type: Slate.BlockType.Default,\n        children: [\n          {\n            text: definition.config.defaultValue ?? '',\n            ...(definition.config.mode === RichText.Mode.Inline\n              ? {}\n              : {\n                  typography: {\n                    style: [\n                      {\n                        deviceId: getBaseBreakpoint(breakpoints).id,\n                        value: {\n                          fontWeight: 400,\n                          fontSize: { value: 18, unit: 'px' },\n                          lineHeight: 1.5,\n                        },\n                      },\n                      ...(breakpoints.some(({ id }) => id === DefaultBreakpointID.Mobile)\n                        ? [\n                            {\n                              deviceId: DefaultBreakpointID.Mobile,\n                              value: { fontSize: { value: 16, unit: 'px' } },\n                            },\n                          ]\n                        : []),\n                    ],\n                  },\n                }),\n          },\n        ],\n      },\n    ],\n    [definition.config.mode, definition.config.defaultValue, breakpoints],\n  )\n}\n\nexport const defaultValue = [\n  {\n    type: Slate.BlockType.Default,\n    children: [\n      {\n        text: '',\n      },\n    ],\n  },\n]\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAExB,sBAAyC;AAEzC,yBAAoC;AACpC,6BAA+B;AAC/B,IAAAA,mBAA+C;AAExC,SAAS,eAAe,YAAgD;AAC7E,QAAM,kBAAc,uCAAe;AACnC,aAAO;AAAA,IACL,MAAM;AAAA,MACJ;AAAA,QACE,MAAM,sBAAM,UAAU;AAAA,QACtB,UAAU;AAAA,UACR;AAAA,YACE,MAAM,WAAW,OAAO,gBAAgB;AAAA,YACxC,GAAI,WAAW,OAAO,SAAS,0BAAS,KAAK,SACzC,CAAC,IACD;AAAA,cACE,YAAY;AAAA,gBACV,OAAO;AAAA,kBACL;AAAA,oBACE,cAAU,mCAAkB,WAAW,EAAE;AAAA,oBACzC,OAAO;AAAA,sBACL,YAAY;AAAA,sBACZ,UAAU,EAAE,OAAO,IAAI,MAAM,KAAK;AAAA,sBAClC,YAAY;AAAA,oBACd;AAAA,kBACF;AAAA,kBACA,GAAI,YAAY,KAAK,CAAC,EAAE,GAAG,MAAM,OAAO,uCAAoB,MAAM,IAC9D;AAAA,oBACE;AAAA,sBACE,UAAU,uCAAoB;AAAA,sBAC9B,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,MAAM,KAAK,EAAE;AAAA,oBAC/C;AAAA,kBACF,IACA,CAAC;AAAA,gBACP;AAAA,cACF;AAAA,YACF;AAAA,UACN;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,IACA,CAAC,WAAW,OAAO,MAAM,WAAW,OAAO,cAAc,WAAW;AAAA,EACtE;AACF;AAEO,MAAM,eAAe;AAAA,EAC1B;AAAA,IACE,MAAM,sBAAM,UAAU;AAAA,IACtB,UAAU;AAAA,MACR;AAAA,QACE,MAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACF;","names":["import_controls"]}
+{"version":3,"sources":["../../../../../../../src/runtimes/react/controls/rich-text-v2/EditableTextV2/usePresetValue.tsx"],"sourcesContent":["import { useMemo } from 'react'\nimport { Descendant } from 'slate'\n\nimport { type ConfigType, Slate, getBaseBreakpoint } from '@makeswift/controls'\n\nimport { DefaultBreakpointID } from '../../../../../state/modules/breakpoints'\nimport { useBreakpoints } from '../../../hooks/use-breakpoints'\nimport { RichTextV2Definition, RichText } from '../../../../../controls'\n\nexport function usePresetValue(config: ConfigType<RichTextV2Definition>): Descendant[] {\n  const breakpoints = useBreakpoints()\n  return useMemo(\n    () => [\n      {\n        type: Slate.BlockType.Default,\n        children: [\n          {\n            text: config.defaultValue ?? '',\n            ...(config.mode === RichText.Mode.Inline\n              ? {}\n              : {\n                  typography: {\n                    style: [\n                      {\n                        deviceId: getBaseBreakpoint(breakpoints).id,\n                        value: {\n                          fontWeight: 400,\n                          fontSize: { value: 18, unit: 'px' },\n                          lineHeight: 1.5,\n                        },\n                      },\n                      ...(breakpoints.some(({ id }) => id === DefaultBreakpointID.Mobile)\n                        ? [\n                            {\n                              deviceId: DefaultBreakpointID.Mobile,\n                              value: { fontSize: { value: 16, unit: 'px' } },\n                            },\n                          ]\n                        : []),\n                    ],\n                  },\n                }),\n          },\n        ],\n      },\n    ],\n    [config.mode, config.defaultValue, breakpoints],\n  )\n}\n\nexport const defaultValue = [\n  {\n    type: Slate.BlockType.Default,\n    children: [\n      {\n        text: '',\n      },\n    ],\n  },\n]\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAGxB,sBAA0D;AAE1D,yBAAoC;AACpC,6BAA+B;AAC/B,IAAAA,mBAA+C;AAExC,SAAS,eAAe,QAAwD;AACrF,QAAM,kBAAc,uCAAe;AACnC,aAAO;AAAA,IACL,MAAM;AAAA,MACJ;AAAA,QACE,MAAM,sBAAM,UAAU;AAAA,QACtB,UAAU;AAAA,UACR;AAAA,YACE,MAAM,OAAO,gBAAgB;AAAA,YAC7B,GAAI,OAAO,SAAS,0BAAS,KAAK,SAC9B,CAAC,IACD;AAAA,cACE,YAAY;AAAA,gBACV,OAAO;AAAA,kBACL;AAAA,oBACE,cAAU,mCAAkB,WAAW,EAAE;AAAA,oBACzC,OAAO;AAAA,sBACL,YAAY;AAAA,sBACZ,UAAU,EAAE,OAAO,IAAI,MAAM,KAAK;AAAA,sBAClC,YAAY;AAAA,oBACd;AAAA,kBACF;AAAA,kBACA,GAAI,YAAY,KAAK,CAAC,EAAE,GAAG,MAAM,OAAO,uCAAoB,MAAM,IAC9D;AAAA,oBACE;AAAA,sBACE,UAAU,uCAAoB;AAAA,sBAC9B,OAAO,EAAE,UAAU,EAAE,OAAO,IAAI,MAAM,KAAK,EAAE;AAAA,oBAC/C;AAAA,kBACF,IACA,CAAC;AAAA,gBACP;AAAA,cACF;AAAA,YACF;AAAA,UACN;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,IACA,CAAC,OAAO,MAAM,OAAO,cAAc,WAAW;AAAA,EAChD;AACF;AAEO,MAAM,eAAe;AAAA,EAC1B;AAAA,IACE,MAAM,sBAAM,UAAU;AAAA,IACtB,UAAU;AAAA,MACR;AAAA,QACE,MAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACF;","names":["import_controls"]}

package/dist/cjs/runtimes/react/controls/rich-text-v2/ReadOnlyTextV2.js

@@ -28,11 +28,10 @@ var import_rich_text_v2 = require("../../../../controls/rich-text-v2");
 var import_use_style = require("../../use-style");
 var import_utils = require("../../../../slate/utils");
 var import_control = require("../control");
-const ReadOnlyTextV2 = (0, import_react.forwardRef)(function ReadOnlyText({ text, definition }, ref) {
-  const descendantsAsString = (0, import_utils.toText)(
-    text?.descendants ?? [],
-    definition?.config.mode ?? import_rich_text_v2.RichText.Mode.Block
-  );
+const ReadOnlyTextV2 = (0, import_react.forwardRef)(function ReadOnlyText({ text, config }, ref) {
+  const descendants = (0, import_react.useMemo)(() => text?.descendants ?? [], [text?.descendants]);
+  const plugins = (0, import_react.useMemo)(() => config ? new import_rich_text_v2.RichTextV2Definition(config).plugins : [], [config]);
+  const descendantsAsString = (0, import_utils.toText)(descendants, config?.mode ?? import_rich_text_v2.RichText.Mode.Block);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     "div",
     {
@@ -47,13 +46,7 @@ const ReadOnlyTextV2 = (0, import_react.forwardRef)(function ReadOnlyText({ text
         whiteSpace: "pre-wrap",
         wordWrap: "break-word"
       },
-      children: descendantsAsString === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Placeholder, {}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        Descendants,
-        {
-          plugins: definition?.config.plugins ?? [],
-          descendants: text?.descendants ?? []
-        }
-      )
+      children: descendantsAsString === "" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Placeholder, {}) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Descendants, { plugins, descendants })
     }
   );
 });
@@ -79,7 +72,7 @@ function LeafComponent({ plugins, ...props }) {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: leaf.className, children: leaf.text === "" ? "\uFEFF" : leaf.text });
   }
   const renderLeaf = plugins.reduce(
-    (renderFn, plugin) => (props2) => {
+    (renderFn, plugin) => function RenderLeafPlugin(props2) {
       const { control, renderLeaf: renderLeaf2 } = plugin;
       if (control?.definition == null || renderLeaf2 == null)
         return renderFn(props2);
@@ -96,13 +89,20 @@ function ElementComponent({ plugins, ...props }) {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Descendants, { descendants: props2.element.children, plugins });
   }
   const renderElement = plugins.reduce(
-    (renderFn, plugin) => (props2) => {
+    (renderFn, plugin) => function RenderElementPlugin(props2) {
       const { control, renderElement: renderElement2 } = plugin;
       if (control?.definition == null || renderElement2 == null)
         return renderFn(props2);
       if (control.getElementValue == null)
         return renderElement2(renderFn, void 0)(props2);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_control.ControlValue, { definition: control.definition, data: control.getElementValue(props2.element), children: (value) => renderElement2(renderFn, value)(props2) });
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        import_control.ControlValue,
+        {
+          definition: control.definition,
+          data: control.getElementValue(props2.element),
+          children: (value) => renderElement2(renderFn, value)(props2)
+        }
+      );
     },
     initialRenderElement
   );

package/dist/cjs/runtimes/react/controls/rich-text-v2/ReadOnlyTextV2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/ReadOnlyTextV2.tsx"],"sourcesContent":["import { ForwardedRef, forwardRef, ReactNode } from 'react'\nimport { Descendant, Element, Text } from 'slate'\nimport { RenderElementProps, RenderLeafProps } from 'slate-react'\n\nimport { RichTextV2Definition, RichText } from '../../../../controls/rich-text-v2'\nimport { useStyle } from '../../use-style'\nimport { toText } from '../../../../slate/utils'\nimport { RichTextV2Plugin } from '../../../../controls/rich-text-v2/plugin'\nimport { RichTextDataV2 } from '../../../../controls/rich-text-v2'\n\nimport { ControlValue } from '../control'\n\ntype Props = {\n  text: RichTextDataV2 | undefined\n  definition: RichTextV2Definition | undefined\n}\n\nconst ReadOnlyTextV2 = forwardRef(function ReadOnlyText(\n  { text, definition }: Props,\n  ref: ForwardedRef<HTMLDivElement>,\n) {\n  const descendantsAsString = toText(\n    text?.descendants ?? [],\n    definition?.config.mode ?? RichText.Mode.Block,\n  )\n\n  return (\n    <div\n      ref={ref}\n      style={{\n        /**\n         * These are the default styles that Slate uses for its editable div.\n         * https://github.com/ianstormtaylor/slate/blob/4bd15ed3950e3a0871f5d0ecb391bb637c05e59d/packages/slate-react/src/components/editable.tsx\n         * Search for `disableDefaultStyles`\n         */\n        position: 'relative',\n        whiteSpace: 'pre-wrap',\n        wordWrap: 'break-word',\n      }}\n    >\n      {descendantsAsString === '' ? (\n        <Placeholder />\n      ) : (\n        <Descendants\n          plugins={definition?.config.plugins ?? []}\n          descendants={text?.descendants ?? []}\n        />\n      )}\n    </div>\n  )\n})\n\nexport default ReadOnlyTextV2\n\nfunction Placeholder({ text = 'Write some text...' }: { text?: string }) {\n  return (\n    <span\n      className={useStyle({\n        display: 'inline-block',\n        width: 0,\n        maxWidth: '100%',\n        whiteSpace: 'nowrap',\n        opacity: 0.333,\n        verticalAlign: 'text-top',\n      })}\n    >\n      {text}\n    </span>\n  )\n}\n\ntype LeafProps = {\n  leaf: Text\n  plugins: RichTextV2Plugin[]\n}\n\nexport function LeafComponent({ plugins, ...props }: LeafProps) {\n  function initialRenderLeaf({ leaf }: RenderLeafProps): ReactNode {\n    return <span className={leaf.className}>{leaf.text === '' ? '\\uFEFF' : leaf.text}</span>\n  }\n\n  const renderLeaf = plugins.reduce(\n    (renderFn, plugin) => (props: RenderLeafProps) => {\n      const { control, renderLeaf } = plugin\n\n      if (control?.definition == null || renderLeaf == null) return renderFn(props)\n\n      if (control.getLeafValue == null) return renderLeaf(renderFn, undefined)(props)\n\n      return (\n        <ControlValue definition={control.definition} data={control.getLeafValue(props.leaf)}>\n          {value => renderLeaf(renderFn, value)(props)}\n        </ControlValue>\n      )\n    },\n    initialRenderLeaf,\n  )\n\n  return renderLeaf({ attributes: {} as any, leaf: props.leaf, children: null, text: props.leaf })\n}\n\ntype ElementProps = {\n  descendant: Element\n  plugins: RichTextV2Plugin[]\n}\n\nfunction ElementComponent({ plugins, ...props }: ElementProps) {\n  function initialRenderElement(props: RenderElementProps): ReactNode {\n    return <Descendants descendants={props.element.children} plugins={plugins} />\n  }\n\n  const renderElement = plugins.reduce(\n    (renderFn, plugin) => (props: RenderElementProps) => {\n      const { control, renderElement } = plugin\n\n      if (control?.definition == null || renderElement == null) return renderFn(props)\n\n      if (control.getElementValue == null) return renderElement(renderFn, undefined)(props)\n\n      return (\n        <ControlValue definition={control.definition} data={control.getElementValue(props.element)}>\n          {value => renderElement(renderFn, value)(props)}\n        </ControlValue>\n      )\n    },\n    initialRenderElement,\n  )\n\n  return renderElement({ attributes: {} as any, children: null, element: props.descendant })\n}\n\n// reimplemented from slate source for code splitting\nfunction isText(node: Descendant): node is Text {\n  if (typeof node === 'object' && 'text' in node) return true\n\n  return false\n}\n\nfunction Descendants({\n  descendants,\n  plugins,\n}: {\n  plugins: RichTextV2Plugin[]\n  descendants: Descendant[]\n}) {\n  return (\n    <>\n      {descendants.map((descendant, index) => {\n        if (isText(descendant)) {\n          return <LeafComponent key={index} plugins={plugins} leaf={descendant} />\n        }\n\n        return <ElementComponent key={index} descendant={descendant} plugins={plugins} />\n      })}\n    </>\n  )\n}\n"],"mappings":"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","names":["props","renderLeaf","renderElement"]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/ReadOnlyTextV2.tsx"],"sourcesContent":["import { type ReactNode, type ForwardedRef, forwardRef, useMemo } from 'react'\nimport { type Descendant, type Element, type Text } from 'slate'\nimport { type RenderElementProps, type RenderLeafProps } from 'slate-react'\n\nimport { type ConfigType } from '@makeswift/controls'\n\nimport {\n  type RichTextDataV2,\n  RichTextV2Definition,\n  RichText,\n} from '../../../../controls/rich-text-v2'\nimport { useStyle } from '../../use-style'\nimport { toText } from '../../../../slate/utils'\nimport { RichTextV2Plugin } from '../../../../controls/rich-text-v2/plugin'\n\nimport { ControlValue } from '../control'\n\ntype Props = {\n  text: RichTextDataV2 | undefined\n  config: ConfigType<RichTextV2Definition> | undefined\n}\n\nconst ReadOnlyTextV2 = forwardRef(function ReadOnlyText(\n  { text, config }: Props,\n  ref: ForwardedRef<HTMLDivElement>,\n) {\n  const descendants = useMemo(() => text?.descendants ?? [], [text?.descendants])\n  const plugins = useMemo(() => (config ? new RichTextV2Definition(config).plugins : []), [config])\n  const descendantsAsString = toText(descendants, config?.mode ?? RichText.Mode.Block)\n\n  return (\n    <div\n      ref={ref}\n      style={{\n        /**\n         * These are the default styles that Slate uses for its editable div.\n         * https://github.com/ianstormtaylor/slate/blob/4bd15ed3950e3a0871f5d0ecb391bb637c05e59d/packages/slate-react/src/components/editable.tsx\n         * Search for `disableDefaultStyles`\n         */\n        position: 'relative',\n        whiteSpace: 'pre-wrap',\n        wordWrap: 'break-word',\n      }}\n    >\n      {descendantsAsString === '' ? (\n        <Placeholder />\n      ) : (\n        <Descendants plugins={plugins} descendants={descendants} />\n      )}\n    </div>\n  )\n})\n\nexport default ReadOnlyTextV2\n\nfunction Placeholder({ text = 'Write some text...' }: { text?: string }) {\n  return (\n    <span\n      className={useStyle({\n        display: 'inline-block',\n        width: 0,\n        maxWidth: '100%',\n        whiteSpace: 'nowrap',\n        opacity: 0.333,\n        verticalAlign: 'text-top',\n      })}\n    >\n      {text}\n    </span>\n  )\n}\n\ntype LeafProps = {\n  leaf: Text\n  plugins: RichTextV2Plugin[]\n}\n\nexport function LeafComponent({ plugins, ...props }: LeafProps) {\n  function initialRenderLeaf({ leaf }: RenderLeafProps): ReactNode {\n    return <span className={leaf.className}>{leaf.text === '' ? '\\uFEFF' : leaf.text}</span>\n  }\n\n  const renderLeaf = plugins.reduce(\n    (renderFn, plugin) =>\n      function RenderLeafPlugin(props: RenderLeafProps) {\n        const { control, renderLeaf } = plugin\n\n        if (control?.definition == null || renderLeaf == null) return renderFn(props)\n\n        if (control.getLeafValue == null) return renderLeaf(renderFn, undefined)(props)\n\n        return (\n          <ControlValue definition={control.definition} data={control.getLeafValue(props.leaf)}>\n            {value => renderLeaf(renderFn, value)(props)}\n          </ControlValue>\n        )\n      },\n    initialRenderLeaf,\n  )\n\n  return renderLeaf({ attributes: {} as any, leaf: props.leaf, children: null, text: props.leaf })\n}\n\ntype ElementProps = {\n  descendant: Element\n  plugins: RichTextV2Plugin[]\n}\n\nfunction ElementComponent({ plugins, ...props }: ElementProps) {\n  function initialRenderElement(props: RenderElementProps): ReactNode {\n    return <Descendants descendants={props.element.children} plugins={plugins} />\n  }\n\n  const renderElement = plugins.reduce(\n    (renderFn, plugin) =>\n      function RenderElementPlugin(props: RenderElementProps) {\n        const { control, renderElement } = plugin\n\n        if (control?.definition == null || renderElement == null) return renderFn(props)\n\n        if (control.getElementValue == null) return renderElement(renderFn, undefined)(props)\n\n        return (\n          <ControlValue\n            definition={control.definition}\n            data={control.getElementValue(props.element)}\n          >\n            {value => renderElement(renderFn, value)(props)}\n          </ControlValue>\n        )\n      },\n    initialRenderElement,\n  )\n\n  return renderElement({ attributes: {} as any, children: null, element: props.descendant })\n}\n\n// reimplemented from slate source for code splitting\nfunction isText(node: Descendant): node is Text {\n  if (typeof node === 'object' && 'text' in node) return true\n\n  return false\n}\n\nfunction Descendants({\n  descendants,\n  plugins,\n}: {\n  plugins: RichTextV2Plugin[]\n  descendants: Descendant[]\n}) {\n  return (\n    <>\n      {descendants.map((descendant, index) => {\n        if (isText(descendant)) {\n          return <LeafComponent key={index} plugins={plugins} leaf={descendant} />\n        }\n\n        return <ElementComponent key={index} descendant={descendant} plugins={plugins} />\n      })}\n    </>\n  )\n}\n"],"mappings":"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","names":["props","renderLeaf","renderElement"]}

package/dist/cjs/runtimes/react/controls/rich-text-v2/index.js

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -11,13 +15,15 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var rich_text_v2_exports = {};
+__export(rich_text_v2_exports, {
+  renderRichTextV2: () => import_render_rich_text_v2.renderRichTextV2
+});
 module.exports = __toCommonJS(rich_text_v2_exports);
-__reExport(rich_text_v2_exports, require("./rich-text-v2"), module.exports);
+var import_render_rich_text_v2 = require("./render-rich-text-v2");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./rich-text-v2")
+  renderRichTextV2
 });
 //# sourceMappingURL=index.js.map

package/dist/cjs/runtimes/react/controls/rich-text-v2/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/index.ts"],"sourcesContent":["export * from './rich-text-v2'\n"],"mappings":";;;;;;;;;;;;;;;AAAA;AAAA;AAAA,iCAAc,2BAAd;","names":[]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/index.ts"],"sourcesContent":["import { type ReactNode } from 'react'\n\nimport { RichTextV2Definition } from '../../../../controls/rich-text-v2'\n\nexport type RichTextV2ControlValue = ReactNode\nexport type Descriptors = { text?: RichTextV2Definition }\n\nexport { renderRichTextV2 } from './render-rich-text-v2'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,iCAAiC;","names":[]}

package/dist/cjs/runtimes/react/controls/rich-text-v2/render-rich-text-v2.js

@@ -0,0 +1,50 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var render_rich_text_v2_exports = {};
+__export(render_rich_text_v2_exports, {
+  renderRichTextV2: () => renderRichTextV2
+});
+module.exports = __toCommonJS(render_rich_text_v2_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_rich_text_v2 = require("../../../../controls/rich-text-v2");
+var import_rich_text_v2_value = require("./rich-text-v2-value");
+const ReadOnlyTextV1 = (0, import_react.lazy)(() => Promise.resolve().then(() => __toESM(require("../rich-text/ReadOnlyText"))));
+function renderRichTextV2({
+  data,
+  config,
+  control
+}) {
+  return import_rich_text_v2.RichTextV2Definition.isV1Data(data) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReadOnlyTextV1, { text: data }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_rich_text_v2_value.RichTextV2Value, { data, config, instanceKey: control?.instanceKey });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  renderRichTextV2
+});
+//# sourceMappingURL=render-rich-text-v2.js.map

package/dist/cjs/runtimes/react/controls/rich-text-v2/render-rich-text-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/render-rich-text-v2.tsx"],"sourcesContent":["import { type ReactNode, lazy } from 'react'\n\nimport { type DataType, type ConfigType } from '@makeswift/controls'\n\nimport { RichTextV2Control, RichTextV2Definition } from '../../../../controls/rich-text-v2'\n\nimport { RichTextV2Value } from './rich-text-v2-value'\n\nconst ReadOnlyTextV1 = lazy(() => import('../rich-text/ReadOnlyText'))\n\nexport function renderRichTextV2({\n  data,\n  config,\n  control,\n}: {\n  data: DataType<RichTextV2Definition> | undefined\n  config: ConfigType<RichTextV2Definition>\n  control: RichTextV2Control | null\n}): ReactNode {\n  // See `renderSlot` comments\n  return RichTextV2Definition.isV1Data(data) ? (\n    <ReadOnlyTextV1 text={data} />\n  ) : (\n    <RichTextV2Value data={data} config={config} instanceKey={control?.instanceKey} />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAqBI;AArBJ,mBAAqC;AAIrC,0BAAwD;AAExD,gCAAgC;AAEhC,MAAM,qBAAiB,mBAAK,MAAM,6CAAO,2BAA2B,GAAC;AAE9D,SAAS,iBAAiB;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AACF,GAIc;AAEZ,SAAO,yCAAqB,SAAS,IAAI,IACvC,4CAAC,kBAAe,MAAM,MAAM,IAE5B,4CAAC,6CAAgB,MAAY,QAAgB,aAAa,SAAS,aAAa;AAEpF;","names":[]}

package/dist/cjs/runtimes/react/controls/rich-text-v2/{rich-text-v2.js → rich-text-v2-value.js}

@@ -1,4 +1,5 @@
 "use strict";
+"use client";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,30 +27,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var rich_text_v2_exports = {};
-__export(rich_text_v2_exports, {
-  renderRichTextV2: () => renderRichTextV2
+var rich_text_v2_value_exports = {};
+__export(rich_text_v2_value_exports, {
+  RichTextV2Value: () => RichTextV2Value
 });
-module.exports = __toCommonJS(rich_text_v2_exports);
+module.exports = __toCommonJS(rich_text_v2_value_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_rich_text_v2 = require("../../../../controls/rich-text-v2");
 var import_use_is_read_only = require("../../hooks/use-is-read-only");
 const EditableText = (0, import_react.lazy)(() => Promise.resolve().then(() => __toESM(require("./EditableTextV2"))));
 const ReadOnlyText = (0, import_react.lazy)(() => Promise.resolve().then(() => __toESM(require("./ReadOnlyTextV2"))));
-const ReadOnlyTextV1 = (0, import_react.lazy)(() => Promise.resolve().then(() => __toESM(require("../rich-text/ReadOnlyText"))));
-function renderRichTextV2(data, definition, control) {
-  return import_rich_text_v2.RichTextV2Definition.isV1Data(data) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReadOnlyTextV1, { text: data }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RichTextV2, { data, definition, control });
-}
-function RichTextV2({
+function RichTextV2Value({
   data,
-  definition,
-  control
+  config,
+  instanceKey
 }) {
-  return (0, import_use_is_read_only.useIsReadOnly)() ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReadOnlyText, { text: data, definition }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(EditableText, { text: data, definition, control });
+  return (0, import_use_is_read_only.useIsReadOnly)() ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ReadOnlyText, { text: data, config }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(EditableText, { text: data, config, instanceKey });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  renderRichTextV2
+  RichTextV2Value
 });
-//# sourceMappingURL=rich-text-v2.js.map
+//# sourceMappingURL=rich-text-v2-value.js.map

package/dist/cjs/runtimes/react/controls/rich-text-v2/rich-text-v2-value.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../src/runtimes/react/controls/rich-text-v2/rich-text-v2-value.tsx"],"sourcesContent":["'use client'\n\nimport { lazy } from 'react'\n\nimport { type ControlInstanceKey, type ConfigType } from '@makeswift/controls'\n\nimport { type RichTextDataV2, RichTextV2Definition } from '../../../../controls/rich-text-v2'\n\nimport { useIsReadOnly } from '../../hooks/use-is-read-only'\n\nconst EditableText = lazy(() => import('./EditableTextV2'))\nconst ReadOnlyText = lazy(() => import('./ReadOnlyTextV2'))\n\nexport function RichTextV2Value({\n  data,\n  config,\n  instanceKey,\n}: {\n  data: RichTextDataV2 | undefined\n  config: ConfigType<RichTextV2Definition>\n  instanceKey: ControlInstanceKey | undefined\n}) {\n  return useIsReadOnly() ? (\n    <ReadOnlyText text={data} config={config} />\n  ) : (\n    <EditableText text={data} config={config} instanceKey={instanceKey} />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBI;AArBJ,mBAAqB;AAMrB,8BAA8B;AAE9B,MAAM,mBAAe,mBAAK,MAAM,6CAAO,kBAAkB,GAAC;AAC1D,MAAM,mBAAe,mBAAK,MAAM,6CAAO,kBAAkB,GAAC;AAEnD,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,aAAO,uCAAc,IACnB,4CAAC,gBAAa,MAAM,MAAM,QAAgB,IAE1C,4CAAC,gBAAa,MAAM,MAAM,QAAgB,aAA0B;AAExE;","names":[]}

package/dist/esm/api/graphql-api-client.js

@@ -4,7 +4,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.28.10-canary.10"
+      "makeswift-runtime-version": "0.28.10-canary.12"
     });
   }
   async getUnversionedResources({

package/dist/esm/api/rest-api-client.js

@@ -163,7 +163,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.10-canary.10"
+      "makeswift-runtime-version": "0.28.10-canary.12"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

package/dist/esm/api-handler/handlers/manifest.js

@@ -8,7 +8,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return ApiResponse.json({
-    version: "0.28.10-canary.10",
+    version: "0.28.10-canary.12",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/esm/controls/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controls/index.ts"],"sourcesContent":["export * from './control'\n\nexport {\n  ControlDefinition,\n  ControlDefinitionVisitor,\n  Checkbox,\n  CheckboxDefinition,\n  Code,\n  CodeDefinition,\n  Color,\n  ColorDefinition,\n  Combobox,\n  ComboboxDefinition,\n  isDependsOnConfig,\n  isProvidesConfig,\n  isContextValue,\n  unstable_ContextValue,\n  type ProvidesConfig,\n  type DependsOnConfig,\n  type AnyContextValue,\n  type ContextValueDependencies,\n  type ContextValues,\n  Font,\n  FontDefinition,\n  unstable_Gallery,\n  unstable_GalleryDefinition,\n  type GalleryOption,\n  type GalleryPage,\n  Group,\n  GroupDefinition,\n  GroupControl,\n  IconRadioGroup,\n  IconRadioGroupDefinition,\n  type IconRadioGroupIcon,\n  Image,\n  ImageDefinition,\n  List,\n  ListDefinition,\n  ListControl,\n  Number,\n  NumberDefinition,\n  Select,\n  SelectDefinition,\n  Shape,\n  ShapeDefinition,\n  ShapeControl,\n  Slider,\n  SliderDefinition,\n  Style,\n  StyleDefinition,\n  type StyleProperty,\n  StyleControl,\n  TextInput,\n  TextInputDefinition,\n  TextArea,\n  TextAreaDefinition,\n  unstable_Typography,\n  unstable_TypographyDefinition,\n} from '@makeswift/controls'\n\nexport { Link, LinkDefinition } from './link'\nexport { RichTextV1Definition, RichTextV1Control } from './rich-text'\nexport { RichText, RichTextV2Definition, RichTextV2Control } from './rich-text-v2'\nexport { Slot, SlotDefinition, SlotControl } from './slot'\nexport { unstable_StyleV2, StyleV2Definition, StyleV2Control } from './style-v2/style-v2'\n"],"mappings":"AAAA,cAAc;AAEd;AAAA,EACE;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,EAMA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;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,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,MAAM,sBAAsB;AACrC,SAAS,sBAAsB,yBAAyB;AACxD,SAAS,UAAU,sBAAsB,yBAAyB;AAClE,SAAS,MAAM,gBAAgB,mBAAmB;AAClD,SAAS,kBAAkB,mBAAmB,sBAAsB;","names":[]}
+{"version":3,"sources":["../../../src/controls/index.ts"],"sourcesContent":["export * from './control'\n\nexport {\n  ControlDefinition,\n  ControlDefinitionVisitor,\n  Checkbox,\n  CheckboxDefinition,\n  Code,\n  CodeDefinition,\n  Color,\n  ColorDefinition,\n  Combobox,\n  ComboboxDefinition,\n  isDependsOnConfig,\n  isProvidesConfig,\n  isContextValue,\n  unstable_ContextValue,\n  type ProvidesConfig,\n  type DependsOnConfig,\n  type AnyContextValue,\n  type ContextValueDependencies,\n  type ContextValues,\n  type ContextValue,\n  Font,\n  FontDefinition,\n  unstable_Gallery,\n  unstable_GalleryDefinition,\n  type GalleryOption,\n  type GalleryPage,\n  Group,\n  GroupDefinition,\n  GroupControl,\n  IconRadioGroup,\n  IconRadioGroupDefinition,\n  type IconRadioGroupIcon,\n  Image,\n  ImageDefinition,\n  List,\n  ListDefinition,\n  ListControl,\n  Number,\n  NumberDefinition,\n  Select,\n  SelectDefinition,\n  Shape,\n  ShapeDefinition,\n  ShapeControl,\n  Slider,\n  SliderDefinition,\n  Style,\n  StyleDefinition,\n  type StyleProperty,\n  StyleControl,\n  TextInput,\n  TextInputDefinition,\n  TextArea,\n  TextAreaDefinition,\n  unstable_Typography,\n  unstable_TypographyDefinition,\n} from '@makeswift/controls'\n\nexport { Link, LinkDefinition } from './link'\nexport { RichTextV1Definition, RichTextV1Control } from './rich-text'\nexport { RichText, RichTextV2Definition, RichTextV2Control } from './rich-text-v2'\nexport { Slot, SlotDefinition, SlotControl } from './slot'\nexport { unstable_StyleV2, StyleV2Definition, StyleV2Control } from './style-v2/style-v2'\n"],"mappings":"AAAA,cAAc;AAEd;AAAA,EACE;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,EAOA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;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,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,MAAM,sBAAsB;AACrC,SAAS,sBAAsB,yBAAyB;AACxD,SAAS,UAAU,sBAAsB,yBAAyB;AAClE,SAAS,MAAM,gBAAgB,mBAAmB;AAClD,SAAS,kBAAkB,mBAAmB,sBAAsB;","names":[]}

package/dist/esm/controls/rich-text-v2/rich-text-v2.js

@@ -18,12 +18,13 @@ import { Plugin } from "./plugin";
 import { RichTextV2Control } from "./control";
 import { getTranslatableData } from "./translations/get-translations";
 class Definition extends BaseRichTextDefinition {
+  plugins;
   constructor({ mode, defaultValue }, plugins) {
     super({
       mode,
-      defaultValue: defaultValue ?? (mode === Definition.Mode.Inline ? "Edit this text" : Definition.generateParagraph()),
-      plugins: plugins ?? (mode === Definition.Mode.Inline ? [InlineModePlugin()] : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin(), LinkPlugin()])
+      defaultValue: defaultValue ?? (mode === Definition.Mode.Inline ? "Edit this text" : Definition.generateParagraph())
     });
+    this.plugins = plugins ?? (mode === Definition.Mode.Inline ? [InlineModePlugin()] : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin(), LinkPlugin()]);
   }
   static generateParagraph() {
     return ipsum(3);
@@ -32,13 +33,13 @@ class Definition extends BaseRichTextDefinition {
     if (data.type !== Definition.type) {
       throw new Error(`RichText: expected type ${Definition.type}, got ${data.type}`);
     }
-    const { config } = Definition.fullSchema({
+    const { config, plugins } = Definition.fullSchema({
       pluginDef: SerializationSchema.deserializedRecord
     }).definition.parse(data);
-    const { plugins, ...userConfig } = config;
+    const { plugins: configPlugins, ...userConfig } = config;
     return new RichTextV2Definition(
       userConfig,
-      plugins.map(
+      (plugins ?? configPlugins ?? []).map(
         ({ control }) => control ? { control: { definition: deserializeCallback(control?.definition) } } : {}
       )
     );
@@ -50,21 +51,31 @@ class Definition extends BaseRichTextDefinition {
         definition: pluginDef
       }).optional()
     });
-    const config = baseSchema.userConfig.extend({
-      defaultValue: z.string(),
-      plugins: z.array(plugin)
+    const plugins = z.array(plugin);
+    const config = Definition.configSchema().extend({
+      // plugins have been moved from config to the definition itself; keeping
+      // the field here as optional so we can deserialize definitions coming from
+      // older runtimes
+      plugins: plugins.optional()
     });
     return {
       ...baseSchema,
       config,
       definition: z.object({
         type: baseSchema.type,
+        // marked as optional for backward compatibility with older runtimes
+        plugins: plugins.optional(),
         config
       })
     };
   }
+  static configSchema() {
+    return super.schema.userConfig.extend({
+      defaultValue: z.string()
+    });
+  }
   get configSchema() {
-    return Definition.fullSchema({ pluginDef: z.any() }).config;
+    return Definition.configSchema();
   }
   createInstance(args) {
     return new RichTextV2Control(this, args);
@@ -72,7 +83,7 @@ class Definition extends BaseRichTextDefinition {
   resolveValue(data, _resolver, _stylesheet, control) {
     const stableValue = StableValue({
       name: Definition.type,
-      read: () => renderRichTextV2(data, this, control ?? null)
+      read: () => renderRichTextV2({ data, config: this.config, control: control ?? null })
     });
     return {
       ...stableValue,
@@ -83,10 +94,10 @@ class Definition extends BaseRichTextDefinition {
   getTranslatableData(data) {
     if (data == null)
       return null;
-    return getTranslatableData(Definition.dataToNodes(data), this.config.plugins);
+    return getTranslatableData(Definition.dataToNodes(data), this.plugins);
   }
   get pluginControls() {
-    return this.config.plugins.map((plugin) => plugin.control).filter(isNotNil);
+    return this.plugins.map((plugin) => plugin.control).filter(isNotNil);
   }
   pluginControlAt(index) {
     return this.pluginControls[index];

package/dist/esm/controls/rich-text-v2/rich-text-v2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/controls/rich-text-v2/rich-text-v2.ts"],"sourcesContent":["import { ReactNode } from 'react'\nimport { z } from 'zod'\n// @ts-expect-error: there are no types for 'corporate-ipsum'\nimport ipsum from 'corporate-ipsum'\n\nimport {\n  RichTextDefinition as BaseRichTextDefinition,\n  isNotNil,\n  ControlDefinition,\n  SerializationSchema,\n  StableValue,\n  type Data,\n  type Resolvable,\n  type ControlInstanceArgs,\n  type DeserializedRecord,\n  type SchemaType,\n  type SchemaTypeAny,\n  type RichTextPluginControl,\n  type ResourceResolver,\n  type Stylesheet,\n  type RichTextMode,\n} from '@makeswift/controls'\n\nimport { LinkPlugin } from '../../slate/LinkPlugin'\nimport { InlinePlugin } from '../../slate/InlinePlugin'\nimport { TextAlignPlugin } from '../../slate/TextAlignPlugin'\nimport { BlockPlugin } from '../../slate/BlockPlugin'\nimport { TypographyPlugin } from '../../slate/TypographyPlugin'\nimport { InlineModePlugin } from '../../slate/InlineModePlugin'\nimport { toText } from '../../slate/utils'\n\nimport { renderRichTextV2 } from '../../runtimes/react/controls/rich-text-v2'\n\nimport { RichTextV2Plugin, Plugin } from './plugin'\nimport { RichTextV2Control } from './control'\nimport { getTranslatableData } from './translations/get-translations'\n\ntype DataType = z.infer<typeof Definition.schema.data>\ntype DataV2Type = z.infer<typeof Definition.schema.dataV2>\ntype InstanceType = RichTextV2Control\ntype UserConfig = z.infer<typeof Definition.schema.userConfig>\ntype Config = UserConfig & {\n  defaultValue: string\n  plugins: RichTextV2Plugin[]\n}\n\nclass Definition extends BaseRichTextDefinition<ReactNode, Config, InstanceType> {\n  constructor({ mode, defaultValue }: UserConfig, plugins?: RichTextV2Plugin[]) {\n    super({\n      mode,\n      defaultValue:\n        defaultValue ??\n        (mode === Definition.Mode.Inline ? 'Edit this text' : Definition.generateParagraph()),\n      plugins:\n        plugins ??\n        (mode === Definition.Mode.Inline\n          ? [InlineModePlugin()]\n          : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin(), LinkPlugin()]),\n    })\n  }\n\n  static generateParagraph(): string {\n    return ipsum(3)\n  }\n\n  static deserialize(\n    data: DeserializedRecord,\n    deserializeCallback: (r: DeserializedRecord) => ControlDefinition,\n  ): RichTextV2Definition {\n    if (data.type !== Definition.type) {\n      throw new Error(`RichText: expected type ${Definition.type}, got ${data.type}`)\n    }\n\n    const { config } = Definition.fullSchema({\n      pluginDef: SerializationSchema.deserializedRecord,\n    }).definition.parse(data)\n\n    const { plugins, ...userConfig } = config\n\n    return new RichTextV2Definition(\n      userConfig,\n      plugins.map(({ control }) =>\n        control ? { control: { definition: deserializeCallback(control?.definition) } } : {},\n      ),\n    )\n  }\n\n  static fullSchema<S extends SchemaTypeAny>({ pluginDef }: { pluginDef: S }) {\n    const baseSchema = super.schema\n    const plugin = z.object({\n      control: z\n        .object({\n          definition: pluginDef,\n        })\n        .optional(),\n    })\n\n    const config = baseSchema.userConfig.extend({\n      defaultValue: z.string(),\n      plugins: z.array(plugin),\n    })\n\n    return {\n      ...baseSchema,\n      config,\n      definition: z.object({\n        type: baseSchema.type,\n        config,\n      }),\n    }\n  }\n\n  get configSchema(): SchemaType<Config> {\n    return Definition.fullSchema({ pluginDef: z.any() as SchemaType<ControlDefinition> }).config\n  }\n\n  createInstance(args: ControlInstanceArgs) {\n    return new RichTextV2Control(this, args)\n  }\n\n  resolveValue(\n    data: DataType | undefined,\n    _resolver: ResourceResolver,\n    _stylesheet: Stylesheet,\n    control?: InstanceType,\n  ): Resolvable<ReactNode | undefined> {\n    const stableValue = StableValue({\n      name: Definition.type,\n      read: () => renderRichTextV2(data, this, control ?? null),\n    })\n\n    return {\n      ...stableValue,\n      triggerResolve: async () => {},\n    }\n  }\n\n  getTranslatableData(data: DataType | undefined): Data {\n    if (data == null) return null\n    return getTranslatableData(Definition.dataToNodes(data), this.config.plugins)\n  }\n\n  get pluginControls(): RichTextPluginControl[] {\n    return this.config.plugins.map(plugin => plugin.control).filter(isNotNil)\n  }\n\n  pluginControlAt(index: number): RichTextPluginControl | undefined {\n    return this.pluginControls[index]\n  }\n\n  toText(data: DataType | undefined): string {\n    if (data == null) return ''\n    return toText(Definition.dataToNodes(data), this.config.mode ?? Definition.Mode.Block)\n  }\n}\n\nexport class RichTextV2Definition extends Definition {}\n\nexport function RichText(config?: UserConfig): RichTextV2Definition {\n  return new RichTextV2Definition(config ?? {})\n}\n\nRichText.Mode = Definition.Mode\nRichText.isV1Data = Definition.isV1Data\nRichText.dataToNodes = Definition.dataToNodes\nRichText.Plugin = Plugin\n\nexport { RichTextMode as RichTextV2Mode, type DataV2Type as RichTextDataV2, RichTextV2Control }\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/controls/rich-text-v2/rich-text-v2.ts"],"sourcesContent":["import { ReactNode } from 'react'\nimport { z } from 'zod'\n// @ts-expect-error: there are no types for 'corporate-ipsum'\nimport ipsum from 'corporate-ipsum'\n\nimport {\n  RichTextDefinition as BaseRichTextDefinition,\n  isNotNil,\n  ControlDefinition,\n  SerializationSchema,\n  StableValue,\n  type Data,\n  type Resolvable,\n  type ControlInstanceArgs,\n  type DeserializedRecord,\n  type SchemaType,\n  type SchemaTypeAny,\n  type RichTextPluginControl,\n  type ResourceResolver,\n  type Stylesheet,\n  type RichTextMode,\n} from '@makeswift/controls'\n\nimport { LinkPlugin } from '../../slate/LinkPlugin'\nimport { InlinePlugin } from '../../slate/InlinePlugin'\nimport { TextAlignPlugin } from '../../slate/TextAlignPlugin'\nimport { BlockPlugin } from '../../slate/BlockPlugin'\nimport { TypographyPlugin } from '../../slate/TypographyPlugin'\nimport { InlineModePlugin } from '../../slate/InlineModePlugin'\nimport { toText } from '../../slate/utils'\n\nimport { renderRichTextV2 } from '../../runtimes/react/controls/rich-text-v2'\n\nimport { RichTextV2Plugin, Plugin } from './plugin'\nimport { RichTextV2Control } from './control'\nimport { getTranslatableData } from './translations/get-translations'\n\ntype DataType = z.infer<typeof Definition.schema.data>\ntype DataV2Type = z.infer<typeof Definition.schema.dataV2>\ntype InstanceType = RichTextV2Control\ntype UserConfig = z.infer<typeof Definition.schema.userConfig>\ntype Config = UserConfig & {\n  defaultValue: string\n}\n\nclass Definition extends BaseRichTextDefinition<ReactNode, Config, InstanceType> {\n  readonly plugins: RichTextV2Plugin[]\n\n  constructor({ mode, defaultValue }: UserConfig, plugins?: RichTextV2Plugin[]) {\n    super({\n      mode,\n      defaultValue:\n        defaultValue ??\n        (mode === Definition.Mode.Inline ? 'Edit this text' : Definition.generateParagraph()),\n    })\n\n    // The built-in plugin set is currently determined entirely by `mode` and\n    // has remained stable across runtime versions, so it does not need to be\n    // stored in the internal config. When that changes, we should:\n    //  - introduce a plugin registry\n    //  - have the config carry the IDs of selected plugins\n    //  - use the current inline and block plugin sets as defaults when\n    //    deserializing a legacy config that does not include plugin IDs\n    this.plugins =\n      plugins ??\n      (mode === Definition.Mode.Inline\n        ? [InlineModePlugin()]\n        : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin(), LinkPlugin()])\n  }\n\n  static generateParagraph(): string {\n    return ipsum(3)\n  }\n\n  static deserialize(\n    data: DeserializedRecord,\n    deserializeCallback: (r: DeserializedRecord) => ControlDefinition,\n  ): RichTextV2Definition {\n    if (data.type !== Definition.type) {\n      throw new Error(`RichText: expected type ${Definition.type}, got ${data.type}`)\n    }\n\n    const { config, plugins } = Definition.fullSchema({\n      pluginDef: SerializationSchema.deserializedRecord,\n    }).definition.parse(data)\n\n    const { plugins: configPlugins, ...userConfig } = config\n\n    return new RichTextV2Definition(\n      userConfig,\n      (plugins ?? configPlugins ?? []).map(({ control }) =>\n        control ? { control: { definition: deserializeCallback(control?.definition) } } : {},\n      ),\n    )\n  }\n\n  static fullSchema<S extends SchemaTypeAny>({ pluginDef }: { pluginDef: S }) {\n    const baseSchema = super.schema\n    const plugin = z.object({\n      control: z\n        .object({\n          definition: pluginDef,\n        })\n        .optional(),\n    })\n\n    const plugins = z.array(plugin)\n\n    const config = Definition.configSchema().extend({\n      // plugins have been moved from config to the definition itself; keeping\n      // the field here as optional so we can deserialize definitions coming from\n      // older runtimes\n      plugins: plugins.optional(),\n    })\n\n    return {\n      ...baseSchema,\n      config,\n      definition: z.object({\n        type: baseSchema.type,\n        // marked as optional for backward compatibility with older runtimes\n        plugins: plugins.optional(),\n        config,\n      }),\n    }\n  }\n\n  static configSchema() {\n    return super.schema.userConfig.extend({\n      defaultValue: z.string(),\n    })\n  }\n\n  get configSchema(): SchemaType<Config> {\n    return Definition.configSchema()\n  }\n\n  createInstance(args: ControlInstanceArgs) {\n    return new RichTextV2Control(this, args)\n  }\n\n  resolveValue(\n    data: DataType | undefined,\n    _resolver: ResourceResolver,\n    _stylesheet: Stylesheet,\n    control?: InstanceType,\n  ): Resolvable<ReactNode | undefined> {\n    const stableValue = StableValue({\n      name: Definition.type,\n      read: () => renderRichTextV2({ data, config: this.config, control: control ?? null }),\n    })\n\n    return {\n      ...stableValue,\n      triggerResolve: async () => {},\n    }\n  }\n\n  getTranslatableData(data: DataType | undefined): Data {\n    if (data == null) return null\n    return getTranslatableData(Definition.dataToNodes(data), this.plugins)\n  }\n\n  get pluginControls(): RichTextPluginControl[] {\n    return this.plugins.map(plugin => plugin.control).filter(isNotNil)\n  }\n\n  pluginControlAt(index: number): RichTextPluginControl | undefined {\n    return this.pluginControls[index]\n  }\n\n  toText(data: DataType | undefined): string {\n    if (data == null) return ''\n    return toText(Definition.dataToNodes(data), this.config.mode ?? Definition.Mode.Block)\n  }\n}\n\nexport class RichTextV2Definition extends Definition {}\n\nexport function RichText(config?: UserConfig): RichTextV2Definition {\n  return new RichTextV2Definition(config ?? {})\n}\n\nRichText.Mode = Definition.Mode\nRichText.isV1Data = Definition.isV1Data\nRichText.dataToNodes = Definition.dataToNodes\nRichText.Plugin = Plugin\n\nexport { RichTextMode as RichTextV2Mode, type DataV2Type as RichTextDataV2, RichTextV2Control }\n"],"mappings":"AACA,SAAS,SAAS;AAElB,OAAO,WAAW;AAElB;AAAA,EACE,sBAAsB;AAAA,EACtB;AAAA,EAEA;AAAA,EACA;AAAA,OAWK;AAEP,SAAS,kBAAkB;AAC3B,SAAS,oBAAoB;AAC7B,SAAS,uBAAuB;AAChC,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AACjC,SAAS,wBAAwB;AACjC,SAAS,cAAc;AAEvB,SAAS,wBAAwB;AAEjC,SAA2B,cAAc;AACzC,SAAS,yBAAyB;AAClC,SAAS,2BAA2B;AAUpC,MAAM,mBAAmB,uBAAwD;AAAA,EACtE;AAAA,EAET,YAAY,EAAE,MAAM,aAAa,GAAe,SAA8B;AAC5E,UAAM;AAAA,MACJ;AAAA,MACA,cACE,iBACC,SAAS,WAAW,KAAK,SAAS,mBAAmB,WAAW,kBAAkB;AAAA,IACvF,CAAC;AASD,SAAK,UACH,YACC,SAAS,WAAW,KAAK,SACtB,CAAC,iBAAiB,CAAC,IACnB,CAAC,YAAY,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,aAAa,GAAG,WAAW,CAAC;AAAA,EAC3F;AAAA,EAEA,OAAO,oBAA4B;AACjC,WAAO,MAAM,CAAC;AAAA,EAChB;AAAA,EAEA,OAAO,YACL,MACA,qBACsB;AACtB,QAAI,KAAK,SAAS,WAAW,MAAM;AACjC,YAAM,IAAI,MAAM,2BAA2B,WAAW,IAAI,SAAS,KAAK,IAAI,EAAE;AAAA,IAChF;AAEA,UAAM,EAAE,QAAQ,QAAQ,IAAI,WAAW,WAAW;AAAA,MAChD,WAAW,oBAAoB;AAAA,IACjC,CAAC,EAAE,WAAW,MAAM,IAAI;AAExB,UAAM,EAAE,SAAS,eAAe,GAAG,WAAW,IAAI;AAElD,WAAO,IAAI;AAAA,MACT;AAAA,OACC,WAAW,iBAAiB,CAAC,GAAG;AAAA,QAAI,CAAC,EAAE,QAAQ,MAC9C,UAAU,EAAE,SAAS,EAAE,YAAY,oBAAoB,SAAS,UAAU,EAAE,EAAE,IAAI,CAAC;AAAA,MACrF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,OAAO,WAAoC,EAAE,UAAU,GAAqB;AAC1E,UAAM,aAAa,MAAM;AACzB,UAAM,SAAS,EAAE,OAAO;AAAA,MACtB,SAAS,EACN,OAAO;AAAA,QACN,YAAY;AAAA,MACd,CAAC,EACA,SAAS;AAAA,IACd,CAAC;AAED,UAAM,UAAU,EAAE,MAAM,MAAM;AAE9B,UAAM,SAAS,WAAW,aAAa,EAAE,OAAO;AAAA;AAAA;AAAA;AAAA,MAI9C,SAAS,QAAQ,SAAS;AAAA,IAC5B,CAAC;AAED,WAAO;AAAA,MACL,GAAG;AAAA,MACH;AAAA,MACA,YAAY,EAAE,OAAO;AAAA,QACnB,MAAM,WAAW;AAAA;AAAA,QAEjB,SAAS,QAAQ,SAAS;AAAA,QAC1B;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,OAAO,eAAe;AACpB,WAAO,MAAM,OAAO,WAAW,OAAO;AAAA,MACpC,cAAc,EAAE,OAAO;AAAA,IACzB,CAAC;AAAA,EACH;AAAA,EAEA,IAAI,eAAmC;AACrC,WAAO,WAAW,aAAa;AAAA,EACjC;AAAA,EAEA,eAAe,MAA2B;AACxC,WAAO,IAAI,kBAAkB,MAAM,IAAI;AAAA,EACzC;AAAA,EAEA,aACE,MACA,WACA,aACA,SACmC;AACnC,UAAM,cAAc,YAAY;AAAA,MAC9B,MAAM,WAAW;AAAA,MACjB,MAAM,MAAM,iBAAiB,EAAE,MAAM,QAAQ,KAAK,QAAQ,SAAS,WAAW,KAAK,CAAC;AAAA,IACtF,CAAC;AAED,WAAO;AAAA,MACL,GAAG;AAAA,MACH,gBAAgB,YAAY;AAAA,MAAC;AAAA,IAC/B;AAAA,EACF;AAAA,EAEA,oBAAoB,MAAkC;AACpD,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,oBAAoB,WAAW,YAAY,IAAI,GAAG,KAAK,OAAO;AAAA,EACvE;AAAA,EAEA,IAAI,iBAA0C;AAC5C,WAAO,KAAK,QAAQ,IAAI,YAAU,OAAO,OAAO,EAAE,OAAO,QAAQ;AAAA,EACnE;AAAA,EAEA,gBAAgB,OAAkD;AAChE,WAAO,KAAK,eAAe,KAAK;AAAA,EAClC;AAAA,EAEA,OAAO,MAAoC;AACzC,QAAI,QAAQ;AAAM,aAAO;AACzB,WAAO,OAAO,WAAW,YAAY,IAAI,GAAG,KAAK,OAAO,QAAQ,WAAW,KAAK,KAAK;AAAA,EACvF;AACF;AAEO,MAAM,6BAA6B,WAAW;AAAC;AAE/C,SAAS,SAAS,QAA2C;AAClE,SAAO,IAAI,qBAAqB,UAAU,CAAC,CAAC;AAC9C;AAEA,SAAS,OAAO,WAAW;AAC3B,SAAS,WAAW,WAAW;AAC/B,SAAS,cAAc,WAAW;AAClC,SAAS,SAAS;","names":[]}

package/dist/esm/controls/serialization/base/visitor.js

@@ -13,8 +13,7 @@ class BaseControlSerializationVisitor extends ControlSerializationVisitor {
     super([serializeDefinitionPlugin, ...plugins]);
   }
   visitRichTextV2(def) {
-    const { plugins, ...config } = def.config;
-    const pluginDefs = plugins.map(
+    const pluginDefs = def.plugins.map(
       ({ control }) => control ? {
         control: {
           definition: control.definition,
@@ -27,7 +26,10 @@ class BaseControlSerializationVisitor extends ControlSerializationVisitor {
       } : {}
     );
     const serialized = serializeObject(
-      { config: { ...config, plugins: pluginDefs } },
+      // Continue serializing plugins as part of the config for the time being
+      // for builder compatibility; the current runtime accept plugins either in
+      // the config or at the definition level -- see `RichTextV2Definition.fullSchema`
+      { config: { ...def.config, plugins: pluginDefs } },
       this.serializationPlugins
     );
     return { ...serialized, type: RichTextV2Definition.type };

package/dist/esm/controls/serialization/base/visitor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/controls/serialization/base/visitor.ts"],"sourcesContent":["import {\n  ControlDefinition,\n  SerializedRecord,\n  serializeObject,\n  SerializationPlugin,\n  ControlSerializationVisitor,\n} from '@makeswift/controls'\n\nimport { RichTextV2Definition } from '../../rich-text-v2'\n\nexport class BaseControlSerializationVisitor extends ControlSerializationVisitor {\n  constructor(plugins: SerializationPlugin<any>[]) {\n    const serializeDefinitionPlugin: SerializationPlugin<ControlDefinition> = {\n      match: (val: unknown) => val instanceof ControlDefinition,\n      serialize: (val: ControlDefinition) => val.accept(this),\n    }\n\n    super([serializeDefinitionPlugin, ...plugins])\n  }\n\n  visitRichTextV2(def: RichTextV2Definition): SerializedRecord {\n    const { plugins, ...config } = def.config\n\n    // serialize only the plugin control definition, if any\n    const pluginDefs = plugins.map(({ control }) =>\n      control\n        ? {\n            control: {\n              definition: control.definition,\n              // FIXME: remove getValue/onChange stubs once we released a version of the builder\n              // built against the runtime where these can be optional\n              getValue: () => undefined,\n              onChange: () => {},\n            },\n          }\n        : {},\n    )\n\n    const serialized = serializeObject(\n      { config: { ...config, plugins: pluginDefs } },\n      this.serializationPlugins,\n    ) as SerializedRecord\n\n    return { ...serialized, type: RichTextV2Definition.type }\n  }\n}\n"],"mappings":"AAAA;AAAA,EACE;AAAA,EAEA;AAAA,EAEA;AAAA,OACK;AAEP,SAAS,4BAA4B;AAE9B,MAAM,wCAAwC,4BAA4B;AAAA,EAC/E,YAAY,SAAqC;AAC/C,UAAM,4BAAoE;AAAA,MACxE,OAAO,CAAC,QAAiB,eAAe;AAAA,MACxC,WAAW,CAAC,QAA2B,IAAI,OAAO,IAAI;AAAA,IACxD;AAEA,UAAM,CAAC,2BAA2B,GAAG,OAAO,CAAC;AAAA,EAC/C;AAAA,EAEA,gBAAgB,KAA6C;AAC3D,UAAM,EAAE,SAAS,GAAG,OAAO,IAAI,IAAI;AAGnC,UAAM,aAAa,QAAQ;AAAA,MAAI,CAAC,EAAE,QAAQ,MACxC,UACI;AAAA,QACE,SAAS;AAAA,UACP,YAAY,QAAQ;AAAA;AAAA;AAAA,UAGpB,UAAU,MAAM;AAAA,UAChB,UAAU,MAAM;AAAA,UAAC;AAAA,QACnB;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAEA,UAAM,aAAa;AAAA,MACjB,EAAE,QAAQ,EAAE,GAAG,QAAQ,SAAS,WAAW,EAAE;AAAA,MAC7C,KAAK;AAAA,IACP;AAEA,WAAO,EAAE,GAAG,YAAY,MAAM,qBAAqB,KAAK;AAAA,EAC1D;AACF;","names":[]}
+{"version":3,"sources":["../../../../../src/controls/serialization/base/visitor.ts"],"sourcesContent":["import {\n  ControlDefinition,\n  SerializedRecord,\n  serializeObject,\n  SerializationPlugin,\n  ControlSerializationVisitor,\n} from '@makeswift/controls'\n\nimport { RichTextV2Definition } from '../../rich-text-v2'\n\nexport class BaseControlSerializationVisitor extends ControlSerializationVisitor {\n  constructor(plugins: SerializationPlugin<any>[]) {\n    const serializeDefinitionPlugin: SerializationPlugin<ControlDefinition> = {\n      match: (val: unknown) => val instanceof ControlDefinition,\n      serialize: (val: ControlDefinition) => val.accept(this),\n    }\n\n    super([serializeDefinitionPlugin, ...plugins])\n  }\n\n  visitRichTextV2(def: RichTextV2Definition): SerializedRecord {\n    // serialize only the plugin control definition, if any\n    const pluginDefs = def.plugins.map(({ control }) =>\n      control\n        ? {\n            control: {\n              definition: control.definition,\n              // FIXME: remove getValue/onChange stubs once we released a version of the builder\n              // built against the runtime where these can be optional\n              getValue: () => undefined,\n              onChange: () => {},\n            },\n          }\n        : {},\n    )\n\n    const serialized = serializeObject(\n      // Continue serializing plugins as part of the config for the time being\n      // for builder compatibility; the current runtime accept plugins either in\n      // the config or at the definition level -- see `RichTextV2Definition.fullSchema`\n      { config: { ...def.config, plugins: pluginDefs } },\n      this.serializationPlugins,\n    ) as SerializedRecord\n\n    return { ...serialized, type: RichTextV2Definition.type }\n  }\n}\n"],"mappings":"AAAA;AAAA,EACE;AAAA,EAEA;AAAA,EAEA;AAAA,OACK;AAEP,SAAS,4BAA4B;AAE9B,MAAM,wCAAwC,4BAA4B;AAAA,EAC/E,YAAY,SAAqC;AAC/C,UAAM,4BAAoE;AAAA,MACxE,OAAO,CAAC,QAAiB,eAAe;AAAA,MACxC,WAAW,CAAC,QAA2B,IAAI,OAAO,IAAI;AAAA,IACxD;AAEA,UAAM,CAAC,2BAA2B,GAAG,OAAO,CAAC;AAAA,EAC/C;AAAA,EAEA,gBAAgB,KAA6C;AAE3D,UAAM,aAAa,IAAI,QAAQ;AAAA,MAAI,CAAC,EAAE,QAAQ,MAC5C,UACI;AAAA,QACE,SAAS;AAAA,UACP,YAAY,QAAQ;AAAA;AAAA;AAAA,UAGpB,UAAU,MAAM;AAAA,UAChB,UAAU,MAAM;AAAA,UAAC;AAAA,QACnB;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAEA,UAAM,aAAa;AAAA;AAAA;AAAA;AAAA,MAIjB,EAAE,QAAQ,EAAE,GAAG,IAAI,QAAQ,SAAS,WAAW,EAAE;AAAA,MACjD,KAAK;AAAA,IACP;AAEA,WAAO,EAAE,GAAG,YAAY,MAAM,qBAAqB,KAAK;AAAA,EAC1D;AACF;","names":[]}

package/dist/esm/controls/visitors/merge-translations-visitor.js

@@ -11,7 +11,7 @@ class ReactMergeTranslationsVisitor extends MergeTranslationsVisitor {
       descendants: mergeTranslatedNodes(
         descendants,
         translatedData,
-        def.config.plugins
+        def.plugins
       )
     };
   }

package/dist/esm/controls/visitors/merge-translations-visitor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/controls/visitors/merge-translations-visitor.ts"],"sourcesContent":["import { Data, DataType, MergeTranslationsVisitor } from '@makeswift/controls'\n\nimport { RichTextV2Definition } from '../rich-text-v2'\nimport { RichTextTranslationDto } from '../rich-text-v2/translations/translations-core'\nimport { mergeTranslatedNodes } from '../rich-text-v2/translations/merge-translations'\n\nexport class ReactMergeTranslationsVisitor extends MergeTranslationsVisitor {\n  visitRichTextV2(\n    def: RichTextV2Definition,\n    data: DataType<RichTextV2Definition> | undefined,\n    translatedData: Data,\n  ): Data {\n    if (data == null || translatedData == null) return data\n\n    const { descendants, ...rest } = RichTextV2Definition.normalizeData(data)\n\n    return {\n      ...rest,\n      descendants: mergeTranslatedNodes(\n        descendants,\n        translatedData as RichTextTranslationDto,\n        def.config.plugins,\n      ),\n    }\n  }\n}\n"],"mappings":"AAAA,SAAyB,gCAAgC;AAEzD,SAAS,4BAA4B;AAErC,SAAS,4BAA4B;AAE9B,MAAM,sCAAsC,yBAAyB;AAAA,EAC1E,gBACE,KACA,MACA,gBACM;AACN,QAAI,QAAQ,QAAQ,kBAAkB;AAAM,aAAO;AAEnD,UAAM,EAAE,aAAa,GAAG,KAAK,IAAI,qBAAqB,cAAc,IAAI;AAExE,WAAO;AAAA,MACL,GAAG;AAAA,MACH,aAAa;AAAA,QACX;AAAA,QACA;AAAA,QACA,IAAI,OAAO;AAAA,MACb;AAAA,IACF;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/controls/visitors/merge-translations-visitor.ts"],"sourcesContent":["import { Data, DataType, MergeTranslationsVisitor } from '@makeswift/controls'\n\nimport { RichTextV2Definition } from '../rich-text-v2'\nimport { RichTextTranslationDto } from '../rich-text-v2/translations/translations-core'\nimport { mergeTranslatedNodes } from '../rich-text-v2/translations/merge-translations'\n\nexport class ReactMergeTranslationsVisitor extends MergeTranslationsVisitor {\n  visitRichTextV2(\n    def: RichTextV2Definition,\n    data: DataType<RichTextV2Definition> | undefined,\n    translatedData: Data,\n  ): Data {\n    if (data == null || translatedData == null) return data\n\n    const { descendants, ...rest } = RichTextV2Definition.normalizeData(data)\n\n    return {\n      ...rest,\n      descendants: mergeTranslatedNodes(\n        descendants,\n        translatedData as RichTextTranslationDto,\n        def.plugins,\n      ),\n    }\n  }\n}\n"],"mappings":"AAAA,SAAyB,gCAAgC;AAEzD,SAAS,4BAA4B;AAErC,SAAS,4BAA4B;AAE9B,MAAM,sCAAsC,yBAAyB;AAAA,EAC1E,gBACE,KACA,MACA,gBACM;AACN,QAAI,QAAQ,QAAQ,kBAAkB;AAAM,aAAO;AAEnD,UAAM,EAAE,aAAa,GAAG,KAAK,IAAI,qBAAqB,cAAc,IAAI;AAExE,WAAO;AAAA,MACL,GAAG;AAAA,MACH,aAAa;AAAA,QACX;AAAA,QACA;AAAA,QACA,IAAI;AAAA,MACN;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/dist/esm/runtimes/react/controls/rich-text/ReadOnlyText.js

@@ -1,3 +1,4 @@
+"use client";
 import { Fragment, jsx } from "react/jsx-runtime";
 import { cx } from "@emotion/css";
 import { forwardRef } from "react";