@makeswift/runtime 0.1.0 → 0.1.3

package/dist/index.cjs3.js

@@ -63,7 +63,7 @@ const Link = React.forwardRef(function Link2(_a, ref) {
   const page = usePage(link && link.type === "OPEN_PAGE" ? link.payload.pageId : null);
   const elementKey = (link == null ? void 0 : link.type) === "SCROLL_TO_ELEMENT" ? (_a2 = link.payload.elementIdConfig) == null ? void 0 : _a2.elementKey : null;
   const elementId = next.useElementId(elementKey);
-  let href = "";
+  let href = "#";
   let target;
   let block;
   if (link) {

package/dist/index.cjs3.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs3.js","sources":["../src/components/hooks/usePage.ts","../src/components/shared/Link/index.tsx"],"sourcesContent":["import { useQuery } from '../../api/react'\nimport { PAGE_PATHNAMES_BY_ID } from '../utils/queries'\n\ntype Page = {\n  id: string\n  pathname: string\n}\n\nexport function usePage(pageId: string | null | undefined): Page | null | undefined {\n  const { error, data = {} } = useQuery(PAGE_PATHNAMES_BY_ID, {\n    skip: pageId == null,\n    variables: { ids: [pageId] },\n  })\n\n  if (pageId == null || error != null) return null\n\n  const { pagePathnamesById: [page] = [] } = data\n\n  return page\n}\n","import { ComponentPropsWithoutRef, forwardRef, MouseEvent } from 'react'\nimport scrollIntoView from 'scroll-into-view-if-needed'\nimport NextLink from 'next/link'\n\nimport { LinkValue as LinkPropControllerValue } from '../../../prop-controllers/descriptors'\nimport { usePage } from '../../hooks'\nimport { useElementId } from '../../../runtimes/react'\n\ntype BaseProps = {\n  link?: LinkPropControllerValue\n  onClick?: (event: MouseEvent<HTMLAnchorElement>) => unknown\n}\n\ntype Props = BaseProps & Omit<ComponentPropsWithoutRef<'a'>, keyof BaseProps>\n\nexport const Link = forwardRef<HTMLAnchorElement, Props>(function Link(\n  { link, onClick = () => {}, ...restOfProps }: Props,\n  ref,\n) {\n  const page = usePage(link && link.type === 'OPEN_PAGE' ? link.payload.pageId : null)\n  const elementKey =\n    link?.type === 'SCROLL_TO_ELEMENT' ? link.payload.elementIdConfig?.elementKey : null\n  const elementId = useElementId(elementKey)\n\n  let href = ''\n  let target: '_blank' | '_self' | undefined\n  let block: 'start' | 'center' | 'end' | undefined\n\n  if (link) {\n    switch (link.type) {\n      case 'OPEN_PAGE': {\n        if (page) href = `/${page.pathname}`\n\n        target = link.payload.openInNewTab ? '_blank' : '_self'\n\n        break\n      }\n\n      case 'OPEN_URL': {\n        href = link.payload.url\n\n        target = link.payload.openInNewTab ? '_blank' : '_self'\n\n        break\n      }\n\n      case 'SEND_EMAIL': {\n        const { to, subject = '', body = '' } = link.payload\n\n        if (to != null) href = `mailto:${to}?subject=${subject}&body=${body}`\n\n        break\n      }\n\n      case 'CALL_PHONE': {\n        href = `tel:${link.payload.phoneNumber}`\n\n        break\n      }\n\n      case 'SCROLL_TO_ELEMENT': {\n        href = `#${elementId ?? ''}`\n        block = link.payload.block\n\n        break\n      }\n\n      default:\n        throw new RangeError(`Invalid link type \"${(link as any).type}.\"`)\n    }\n  }\n\n  function handleClick(event: MouseEvent<HTMLAnchorElement>) {\n    onClick(event)\n\n    if (event.defaultPrevented) return\n\n    /**\n     * When we introduced `next/link` instead of just `a` element slate no longer prevented link from navigating within\n     * content mode. This is a hack to compensate for what would be expected as slate's default behavior.\n     * On upgrade of slate this can be reevaluated.\n     */\n    if (event.currentTarget.isContentEditable) return event.preventDefault()\n\n    if (link && link.type === 'SCROLL_TO_ELEMENT') {\n      let hash: string | undefined\n\n      try {\n        hash = new URL(`http://www.example.com/${href}`).hash\n      } catch (error) {\n        console.error(`Link received invalid href: ${href}`, error)\n      }\n\n      if (href != null && href === hash) {\n        event.preventDefault()\n        const view = event.view as unknown as Window\n\n        scrollIntoView(view.document.querySelector(hash)!, {\n          behavior: 'smooth',\n          block,\n        })\n\n        if (view.location.hash !== hash) view.history.pushState({}, '', hash)\n      }\n    }\n  }\n\n  return (\n    <NextLink href={href}>\n      {/* eslint-disable-next-line */}\n      <a {...restOfProps} ref={ref} target={target} onClick={handleClick} />\n    </NextLink>\n  )\n})\n"],"names":["useQuery","PAGE_PATHNAMES_BY_ID","Link","forwardRef","ref","link","onClick","restOfProps","page","usePage","type","payload","pageId","elementKey","elementIdConfig","elementId","useElementId","href","target","block","pathname","openInNewTab","url","to","subject","body","phoneNumber","RangeError","handleClick","event","defaultPrevented","currentTarget","isContentEditable","preventDefault","hash","URL","error","view","scrollIntoView","document","querySelector","behavior","location","history","pushState","NextLink"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,iBAAiB,QAA4D;AAClF,QAAM,EAAE,OAAO,OAAO,CAAC,MAAMA,KAAAA,SAASC,KAAAA,sBAAsB;AAAA,IAC1D,MAAM,UAAU;AAAA,IAChB,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE;AAAA,EAAA,CAC5B;AAEG,MAAA,UAAU,QAAQ,SAAS;AAAa,WAAA;AAE5C,QAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAO,MAAA;AAEpC,SAAA;AACT;ACJaC,MAAAA,OAAOC,MAAAA,WAAqC,eACvD,IACAC,KACA;AAFA,eAAEC;AAAAA;AAAAA,IAAMC,UAAU,MAAM;AAAA,IAAE;AAAA,MAA1B,IAA+BC,wBAA/B,IAA+BA;AAAAA,IAA7BF;AAAAA,IAAMC;AAAAA;;AAGFE,QAAAA,OAAOC,QAAQJ,QAAQA,KAAKK,SAAS,cAAcL,KAAKM,QAAQC,SAAS,IAA3D;AACpB,QAAMC,aACJR,8BAAMK,UAAS,sBAAsBL,YAAKM,QAAQG,oBAAbT,oBAA8BQ,aAAa;AAC5EE,QAAAA,YAAYC,kBAAaH,UAAD;AAE1BI,MAAAA,OAAO;AACPC,MAAAA;AACAC,MAAAA;AAEJ,MAAId,MAAM;AACAA,YAAAA,KAAKK;AAAAA,WACN,aAAa;AACZF,YAAAA;AAAMS,iBAAQ,IAAGT,KAAKY;AAEjBf,iBAAAA,KAAKM,QAAQU,eAAe,WAAW;AAEhD;AAAA,MACD;AAAA,WAEI,YAAY;AACfJ,eAAOZ,KAAKM,QAAQW;AAEXjB,iBAAAA,KAAKM,QAAQU,eAAe,WAAW;AAEhD;AAAA,MACD;AAAA,WAEI,cAAc;AACX,cAAA;AAAA,UAAEE;AAAAA,UAAIC,UAAU;AAAA,UAAIC,OAAO;AAAA,YAAOpB,KAAKM;AAE7C,YAAIY,MAAM;AAAc,iBAAA,UAASA,cAAcC,gBAAgBC;AAE/D;AAAA,MACD;AAAA,WAEI,cAAc;AACT,eAAA,OAAMpB,KAAKM,QAAQe;AAE3B;AAAA,MACD;AAAA,WAEI,qBAAqB;AACxBT,eAAQ,IAAGF,gCAAa;AACxBI,gBAAQd,KAAKM,QAAQQ;AAErB;AAAA,MACD;AAAA;AAGO,cAAA,IAAIQ,WAAY,sBAAsBtB,KAAaK,QAAnD;AAAA;AAAA,EAEX;AAEQkB,uBAAYC,OAAsC;AACzDvB,YAAQuB,KAAD;AAEHA,QAAAA,MAAMC;AAAkB;AAOxBD,QAAAA,MAAME,cAAcC;AAAmB,aAAOH,MAAMI;AAEpD5B,QAAAA,QAAQA,KAAKK,SAAS,qBAAqB;AACzCwB,UAAAA;AAEA,UAAA;AACFA,eAAO,IAAIC,IAAK,0BAAyBlB,MAAlC,EAA0CiB;AAAAA,eAC1CE;AACCA,gBAAAA,MAAO,+BAA8BnB,QAAQmB,KAArD;AAAA,MACD;AAEGnB,UAAAA,QAAQ,QAAQA,SAASiB,MAAM;AACjCL,cAAMI,eAAN;AACMI,cAAAA,OAAOR,MAAMQ;AAEnBC,gCAAAA,WAAeD,KAAKE,SAASC,cAAcN,IAA5B,GAAoC;AAAA,UACjDO,UAAU;AAAA,UACVtB;AAAAA,QAAAA,CAFY;AAKVkB,YAAAA,KAAKK,SAASR,SAASA;AAAMG,eAAKM,QAAQC,UAAU,IAAI,IAAIV,IAA/B;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAED,wCACGW,kBAAAA,YAAD;AAAA,IAAU;AAAA,IAAV,+EAEStC;MAAa;AAAA,MAAU;AAAA,MAAgB,SAASqB;AAAAA,IAAAA,EAAvD;AAAA,EAAA,CAHJ;AAMD,CAlG6B;;;"}
+{"version":3,"file":"index.cjs3.js","sources":["../src/components/hooks/usePage.ts","../src/components/shared/Link/index.tsx"],"sourcesContent":["import { useQuery } from '../../api/react'\nimport { PAGE_PATHNAMES_BY_ID } from '../utils/queries'\n\ntype Page = {\n  id: string\n  pathname: string\n}\n\nexport function usePage(pageId: string | null | undefined): Page | null | undefined {\n  const { error, data = {} } = useQuery(PAGE_PATHNAMES_BY_ID, {\n    skip: pageId == null,\n    variables: { ids: [pageId] },\n  })\n\n  if (pageId == null || error != null) return null\n\n  const { pagePathnamesById: [page] = [] } = data\n\n  return page\n}\n","import { ComponentPropsWithoutRef, forwardRef, MouseEvent } from 'react'\nimport scrollIntoView from 'scroll-into-view-if-needed'\nimport NextLink from 'next/link'\n\nimport { LinkValue as LinkPropControllerValue } from '../../../prop-controllers/descriptors'\nimport { usePage } from '../../hooks'\nimport { useElementId } from '../../../runtimes/react'\n\ntype BaseProps = {\n  link?: LinkPropControllerValue\n  onClick?: (event: MouseEvent<HTMLAnchorElement>) => unknown\n}\n\ntype Props = BaseProps & Omit<ComponentPropsWithoutRef<'a'>, keyof BaseProps>\n\nexport const Link = forwardRef<HTMLAnchorElement, Props>(function Link(\n  { link, onClick = () => {}, ...restOfProps }: Props,\n  ref,\n) {\n  const page = usePage(link && link.type === 'OPEN_PAGE' ? link.payload.pageId : null)\n  const elementKey =\n    link?.type === 'SCROLL_TO_ELEMENT' ? link.payload.elementIdConfig?.elementKey : null\n  const elementId = useElementId(elementKey)\n\n  let href = '#'\n  let target: '_blank' | '_self' | undefined\n  let block: 'start' | 'center' | 'end' | undefined\n\n  if (link) {\n    switch (link.type) {\n      case 'OPEN_PAGE': {\n        if (page) href = `/${page.pathname}`\n\n        target = link.payload.openInNewTab ? '_blank' : '_self'\n\n        break\n      }\n\n      case 'OPEN_URL': {\n        href = link.payload.url\n\n        target = link.payload.openInNewTab ? '_blank' : '_self'\n\n        break\n      }\n\n      case 'SEND_EMAIL': {\n        const { to, subject = '', body = '' } = link.payload\n\n        if (to != null) href = `mailto:${to}?subject=${subject}&body=${body}`\n\n        break\n      }\n\n      case 'CALL_PHONE': {\n        href = `tel:${link.payload.phoneNumber}`\n\n        break\n      }\n\n      case 'SCROLL_TO_ELEMENT': {\n        href = `#${elementId ?? ''}`\n        block = link.payload.block\n\n        break\n      }\n\n      default:\n        throw new RangeError(`Invalid link type \"${(link as any).type}.\"`)\n    }\n  }\n\n  function handleClick(event: MouseEvent<HTMLAnchorElement>) {\n    onClick(event)\n\n    if (event.defaultPrevented) return\n\n    /**\n     * When we introduced `next/link` instead of just `a` element slate no longer prevented link from navigating within\n     * content mode. This is a hack to compensate for what would be expected as slate's default behavior.\n     * On upgrade of slate this can be reevaluated.\n     */\n    if (event.currentTarget.isContentEditable) return event.preventDefault()\n\n    if (link && link.type === 'SCROLL_TO_ELEMENT') {\n      let hash: string | undefined\n\n      try {\n        hash = new URL(`http://www.example.com/${href}`).hash\n      } catch (error) {\n        console.error(`Link received invalid href: ${href}`, error)\n      }\n\n      if (href != null && href === hash) {\n        event.preventDefault()\n        const view = event.view as unknown as Window\n\n        scrollIntoView(view.document.querySelector(hash)!, {\n          behavior: 'smooth',\n          block,\n        })\n\n        if (view.location.hash !== hash) view.history.pushState({}, '', hash)\n      }\n    }\n  }\n\n  return (\n    <NextLink href={href}>\n      {/* eslint-disable-next-line */}\n      <a {...restOfProps} ref={ref} target={target} onClick={handleClick} />\n    </NextLink>\n  )\n})\n"],"names":["useQuery","PAGE_PATHNAMES_BY_ID","Link","forwardRef","ref","link","onClick","restOfProps","page","usePage","type","payload","pageId","elementKey","elementIdConfig","elementId","useElementId","href","target","block","pathname","openInNewTab","url","to","subject","body","phoneNumber","RangeError","handleClick","event","defaultPrevented","currentTarget","isContentEditable","preventDefault","hash","URL","error","view","scrollIntoView","document","querySelector","behavior","location","history","pushState","NextLink"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,iBAAiB,QAA4D;AAClF,QAAM,EAAE,OAAO,OAAO,CAAC,MAAMA,KAAAA,SAASC,KAAAA,sBAAsB;AAAA,IAC1D,MAAM,UAAU;AAAA,IAChB,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE;AAAA,EAAA,CAC5B;AAEG,MAAA,UAAU,QAAQ,SAAS;AAAa,WAAA;AAE5C,QAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAO,MAAA;AAEpC,SAAA;AACT;ACJaC,MAAAA,OAAOC,MAAAA,WAAqC,eACvD,IACAC,KACA;AAFA,eAAEC;AAAAA;AAAAA,IAAMC,UAAU,MAAM;AAAA,IAAE;AAAA,MAA1B,IAA+BC,wBAA/B,IAA+BA;AAAAA,IAA7BF;AAAAA,IAAMC;AAAAA;;AAGFE,QAAAA,OAAOC,QAAQJ,QAAQA,KAAKK,SAAS,cAAcL,KAAKM,QAAQC,SAAS,IAA3D;AACpB,QAAMC,aACJR,8BAAMK,UAAS,sBAAsBL,YAAKM,QAAQG,oBAAbT,oBAA8BQ,aAAa;AAC5EE,QAAAA,YAAYC,kBAAaH,UAAD;AAE1BI,MAAAA,OAAO;AACPC,MAAAA;AACAC,MAAAA;AAEJ,MAAId,MAAM;AACAA,YAAAA,KAAKK;AAAAA,WACN,aAAa;AACZF,YAAAA;AAAMS,iBAAQ,IAAGT,KAAKY;AAEjBf,iBAAAA,KAAKM,QAAQU,eAAe,WAAW;AAEhD;AAAA,MACD;AAAA,WAEI,YAAY;AACfJ,eAAOZ,KAAKM,QAAQW;AAEXjB,iBAAAA,KAAKM,QAAQU,eAAe,WAAW;AAEhD;AAAA,MACD;AAAA,WAEI,cAAc;AACX,cAAA;AAAA,UAAEE;AAAAA,UAAIC,UAAU;AAAA,UAAIC,OAAO;AAAA,YAAOpB,KAAKM;AAE7C,YAAIY,MAAM;AAAc,iBAAA,UAASA,cAAcC,gBAAgBC;AAE/D;AAAA,MACD;AAAA,WAEI,cAAc;AACT,eAAA,OAAMpB,KAAKM,QAAQe;AAE3B;AAAA,MACD;AAAA,WAEI,qBAAqB;AACxBT,eAAQ,IAAGF,gCAAa;AACxBI,gBAAQd,KAAKM,QAAQQ;AAErB;AAAA,MACD;AAAA;AAGO,cAAA,IAAIQ,WAAY,sBAAsBtB,KAAaK,QAAnD;AAAA;AAAA,EAEX;AAEQkB,uBAAYC,OAAsC;AACzDvB,YAAQuB,KAAD;AAEHA,QAAAA,MAAMC;AAAkB;AAOxBD,QAAAA,MAAME,cAAcC;AAAmB,aAAOH,MAAMI;AAEpD5B,QAAAA,QAAQA,KAAKK,SAAS,qBAAqB;AACzCwB,UAAAA;AAEA,UAAA;AACFA,eAAO,IAAIC,IAAK,0BAAyBlB,MAAlC,EAA0CiB;AAAAA,eAC1CE;AACCA,gBAAAA,MAAO,+BAA8BnB,QAAQmB,KAArD;AAAA,MACD;AAEGnB,UAAAA,QAAQ,QAAQA,SAASiB,MAAM;AACjCL,cAAMI,eAAN;AACMI,cAAAA,OAAOR,MAAMQ;AAEnBC,gCAAAA,WAAeD,KAAKE,SAASC,cAAcN,IAA5B,GAAoC;AAAA,UACjDO,UAAU;AAAA,UACVtB;AAAAA,QAAAA,CAFY;AAKVkB,YAAAA,KAAKK,SAASR,SAASA;AAAMG,eAAKM,QAAQC,UAAU,IAAI,IAAIV,IAA/B;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAED,wCACGW,kBAAAA,YAAD;AAAA,IAAU;AAAA,IAAV,+EAEStC;MAAa;AAAA,MAAU;AAAA,MAAgB,SAASqB;AAAAA,IAAAA,EAAvD;AAAA,EAAA,CAHJ;AAMD,CAlG6B;;;"}

package/dist/index.es.js

@@ -836,29 +836,57 @@ class Document$1 extends NextDocument {
   }
 }
 const REVALIDATE_SECONDS = 1;
+function getApiOrigin() {
+  var _a;
+  const apiOriginString = (_a = process["env"].MAKESWIFT_API_HOST) != null ? _a : "https://api.makeswift.com";
+  try {
+    const url = new URL(apiOriginString);
+    return url.origin;
+  } catch (error) {
+    const errorMessage = `"MAKESWIFT_API_HOST" environment variable must be a valid URL. Expected something like "https://api.makeswift.com" but instead received "${apiOriginString}".`;
+    throw new Error(errorMessage);
+  }
+}
+const uuidRegExp = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
+function getApiKey() {
+  const apiKey = process["env"].MAKESWIFT_SITE_API_KEY;
+  if (apiKey == null) {
+    const errorMessage = '"MAKESWIFT_SITE_API_KEY" environment variable must be set. Please add your site API key to your `.env.local` file. More info: https://www.makeswift.com/docs/guides/manual-setup#add-environment-variables';
+    throw new Error(errorMessage);
+  }
+  if (!uuidRegExp.test(apiKey)) {
+    const errorMEssage = `Invalid Makeswift site API key "${apiKey}". Please check your \`.env.local\` file for the "MAKESWIFT_SITE_API_KEY" environment variable. More info: https://www.makeswift.com/docs/guides/manual-setup#add-environment-variables`;
+    throw new Error(errorMEssage);
+  }
+  return apiKey;
+}
 async function getServerSideProps({
   query: {
     pageId
   }
 }) {
-  const url = `${process["env"].MAKESWIFT_API_HOST}/v0/preview-page-data?id=${pageId}`;
+  const url = `${getApiOrigin()}/v0/preview-page-data?id=${pageId}`;
   const res = await fetch(url, {
     headers: {
-      "x-api-key": process["env"].MAKESWIFT_SITE_API_KEY
+      "x-api-key": getApiKey()
     }
   });
-  if (res.status !== 200) {
+  if (res.status === 404) {
     console.error(await res.json());
     return {
       notFound: true
     };
   }
+  if (!res.ok) {
+    const json = await res.json();
+    throw new Error(json.message);
+  }
   const page = await res.json();
   if (page == null)
     return {
       notFound: true
     };
-  const makeswiftApiEndpoint = `${process["env"].MAKESWIFT_API_HOST}/graphql`;
+  const makeswiftApiEndpoint = `${getApiOrigin()}/graphql`;
   const client = new MakeswiftClient({
     uri: makeswiftApiEndpoint
   });
@@ -884,26 +912,30 @@ async function getStaticProps({
   const {
     path = []
   } = params;
-  const url = `${process["env"].MAKESWIFT_API_HOST}/v0/live-page-data?path=${path.join("/")}`;
+  const url = `${getApiOrigin()}/v0/live-page-data?path=${path.join("/")}`;
   const res = await fetch(url, {
     headers: {
-      "x-api-key": process["env"].MAKESWIFT_SITE_API_KEY
+      "x-api-key": getApiKey()
     }
   });
-  if (res.status !== 200) {
+  if (res.status === 404) {
     console.error(await res.json());
     return {
       notFound: true,
       revalidate: REVALIDATE_SECONDS
     };
   }
+  if (!res.ok) {
+    const json = await res.json();
+    throw new Error(json.message);
+  }
   const page = await res.json();
   if (page == null)
     return {
       notFound: true,
       revalidate: REVALIDATE_SECONDS
     };
-  const makeswiftApiEndpoint = `${process["env"].MAKESWIFT_API_HOST}/graphql`;
+  const makeswiftApiEndpoint = `${getApiOrigin()}/graphql`;
   const client = new MakeswiftClient({
     uri: makeswiftApiEndpoint
   });
@@ -1503,9 +1535,7 @@ function useFormContext() {
 }
 const { Provider } = Context$1;
 function registerComponent$6(runtime) {
-  return runtime.registerComponent(forwardNextDynamicRef((patch) => dynamic(() => patch(import("./Form.es.js").then(function(n) {
-    return n.a;
-  })))), {
+  return runtime.registerComponent(forwardNextDynamicRef((patch) => dynamic(() => patch(import("./Form.es.js")))), {
     type: "./components/Form/index.js",
     label: "Form",
     icon: "Form40",
@@ -2387,10 +2417,11 @@ function useStyleControlCssObject(style, controlDefinition) {
     style == null ? void 0 : style.margin,
     style == null ? void 0 : style.padding,
     useBorder(style == null ? void 0 : style.border),
-    style == null ? void 0 : style.borderRadius
-  ], ([width, margin, padding, border, borderRadius]) => {
-    var _a, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
-    return __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, properties.includes(StyleControlProperty.Width) && {
+    style == null ? void 0 : style.borderRadius,
+    style == null ? void 0 : style.textStyle
+  ], ([width, margin, padding, border, borderRadius, textStyle]) => {
+    var _a, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+    return __spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, properties.includes(StyleControlProperty.Width) && {
       width: (_a = widthToString(width)) != null ? _a : "100%"
     }), properties.includes(StyleControlProperty.Margin) && {
       marginTop: (_b = marginToString(margin == null ? void 0 : margin.marginTop)) != null ? _b : 0,
@@ -2412,7 +2443,10 @@ function useStyleControlCssObject(style, controlDefinition) {
       borderTopRightRadius: (_o = borderRadiusToString(borderRadius == null ? void 0 : borderRadius.borderTopRightRadius)) != null ? _o : 0,
       borderBottomRightRadius: (_p = borderRadiusToString(borderRadius == null ? void 0 : borderRadius.borderBottomRightRadius)) != null ? _p : 0,
       borderBottomLeftRadius: (_q = borderRadiusToString(borderRadius == null ? void 0 : borderRadius.borderBottomLeftRadius)) != null ? _q : 0
-    });
+    }), properties.includes(StyleControlProperty.TextStyle) && __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues({}, (textStyle == null ? void 0 : textStyle.fontFamily) && { fontFamily: textStyle.fontFamily }), (textStyle == null ? void 0 : textStyle.letterSpacing) && { letterSpacing: textStyle.letterSpacing }), (textStyle == null ? void 0 : textStyle.fontSize) && { fontSize: fontSizeToString(textStyle.fontSize) }), (textStyle == null ? void 0 : textStyle.fontWeight) && { fontWeight: textStyle.fontWeight }), {
+      textTransform: (_r = textStyle == null ? void 0 : textStyle.textTransform) != null ? _r : [],
+      fontStyle: (_s = textStyle == null ? void 0 : textStyle.fontStyle) != null ? _s : []
+    }));
   }));
   function widthToString(widthProperty) {
     if (widthProperty == null)
@@ -2442,6 +2476,9 @@ function useStyleControlCssObject(style, controlDefinition) {
       return null;
     return `${borderRadius.value}${borderRadius.unit}`;
   }
+  function fontSizeToString(fontSize) {
+    return `${fontSize.value}${fontSize.unit}`;
+  }
 }
 const useInsertionEffectSpecifier = "useInsertionEffect";
 const useInsertionEffect = (_e = React[useInsertionEffectSpecifier]) != null ? _e : React.useLayoutEffect;
@@ -2830,17 +2867,17 @@ function useDispatch() {
   const store = useContext(Context);
   return store.dispatch;
 }
-function useSuppressRefWarning(ownerName) {
-  const originalErrorRef = useRef(console.error);
-  const patchedRef = useRef(false);
-  if (patchedRef.current === false) {
+const originalError = console.error;
+let patched = false;
+function suppressRefWarning(ownerName) {
+  if (patched === false) {
     console.error = (...args) => {
       if (typeof args[0] === "string" && args[0].includes("Function components cannot be given refs.") && args[0].includes(`Check the render method of \`${ownerName}\`.`)) {
         return;
       }
-      return originalErrorRef.current(...args);
+      return originalError(...args);
     };
-    patchedRef.current = true;
+    patched = true;
   }
 }
 const ElementData = memo(forwardRef(function ElementData2({
@@ -2850,7 +2887,7 @@ const ElementData = memo(forwardRef(function ElementData2({
   const [handle, setHandle] = useState(null);
   const [foundDomNode, setFoundDomNode] = useState(null);
   useImperativeHandle(ref, () => handle != null ? handle : foundDomNode, [handle, foundDomNode]);
-  useSuppressRefWarning(`\`ForwardRef(${ElementData2.name})\``);
+  suppressRefWarning(`\`ForwardRef(${ElementData2.name})\``);
   if (Component2 == null) {
     return /* @__PURE__ */ jsx(FallbackComponent, {
       ref,
@@ -2959,5 +2996,5 @@ const DocumentReference = memo(forwardRef(function DocumentReference2({
     document: document2
   });
 }));
-export { Alignments as A, TYPOGRAPHIES_BY_ID as B, Contrasts as C, DocumentReference as D, Element as E, SWATCHES_BY_ID as F, shallowMergeFallbacks as G, join as H, getDevice as I, getDeviceMediaQuery as J, isNonNullable as K, FILES_BY_ID as L, PAGE_PATHNAMES_BY_ID as M, useElementId as N, deepEqual as O, PageProvider as P, MakeswiftClient as Q, RuntimeProvider as R, SITE_FONTS_QUERY as S, TABLE_BY_ID as T, Document$1 as U, getServerSideProps as V, getStaticProps as W, getStaticPaths as X, Page as Y, forwardNextDynamicRef as Z, ReactRuntime as a, usePageId as b, DEFAULT_BOX_ANIMATE_TYPE as c, DEFAULT_BOX_ANIMATE_DELAY as d, DEFAULT_BOX_ANIMATE_DURATION as e, DEFAULT_ITEM_ANIMATE_TYPE as f, DEFAULT_ITEM_ANIMATE_DELAY as g, DEFAULT_ITEM_ANIMATE_DURATION as h, DEFAULT_ITEM_STAGGER_DURATION as i, useBorder as j, useResponsiveColor as k, useFile as l, PAGE_SNIPPETS_QUERY as m, Page$1 as n, colorToString as o, useIsomorphicLayoutEffect as p, useQuery as q, responsiveWidth as r, Shapes as s, Sizes as t, useIsInBuilder as u, useFormContext as v, useMutation as w, Provider as x, DEVICES as y, findDeviceOverride as z };
+export { Alignments as A, TYPOGRAPHIES_BY_ID as B, Contrasts as C, DocumentReference as D, Element as E, SWATCHES_BY_ID as F, shallowMergeFallbacks as G, join as H, getDevice as I, getDeviceMediaQuery as J, isNonNullable as K, FILES_BY_ID as L, PAGE_PATHNAMES_BY_ID as M, useElementId as N, deepEqual as O, PageProvider as P, MakeswiftClient as Q, RuntimeProvider as R, SITE_FONTS_QUERY as S, TABLE_BY_ID as T, Document$1 as U, getServerSideProps as V, getStaticProps as W, getStaticPaths as X, Page as Y, forwardNextDynamicRef as Z, ReactRuntime as a, usePageId as b, DEFAULT_BOX_ANIMATE_TYPE as c, DEFAULT_BOX_ANIMATE_DELAY as d, DEFAULT_BOX_ANIMATE_DURATION as e, DEFAULT_ITEM_ANIMATE_TYPE as f, DEFAULT_ITEM_ANIMATE_DELAY as g, DEFAULT_ITEM_ANIMATE_DURATION as h, DEFAULT_ITEM_STAGGER_DURATION as i, useBorder as j, useResponsiveColor as k, useFile as l, PAGE_SNIPPETS_QUERY as m, Page$1 as n, colorToString as o, useIsomorphicLayoutEffect as p, Shapes as q, responsiveWidth as r, Sizes as s, useFormContext as t, useIsInBuilder as u, useQuery as v, useMutation as w, Provider as x, DEVICES as y, findDeviceOverride as z };
 //# sourceMappingURL=index.es.js.map