@makeswift/runtime 0.9.2 → 0.9.4

package/dist/index.cjs.js

@@ -41,15 +41,13 @@ var dynamic = require("next/dynamic");
 var reactPage = require("./react-page.cjs.js");
 var actions = require("./actions.cjs.js");
 var jsxRuntime = require("react/jsx-runtime");
-var textInput = require("./text-input.cjs.js");
+var typography = require("./typography.cjs.js");
 var combobox = require("./combobox.cjs.js");
-var select = require("./select.cjs.js");
 require("slate");
 var shim = require("use-sync-external-store/shim");
 var redux = require("redux");
 var thunk = require("redux-thunk");
 var types = require("./types.cjs.js");
-var deepEqual = require("./deepEqual.cjs.js");
 var state_breakpoints = require("./state/breakpoints.cjs.js");
 var boxModels = require("./box-models.cjs.js");
 var ColorHelper = require("color");
@@ -149,6 +147,43 @@ function BodySnippet({
   }, [code, cleanup]);
   return null;
 }
+function is(x, y) {
+  if (x === y)
+    return x !== 0 || y !== 0 || 1 / x === 1 / y;
+  return x !== x && y !== y;
+}
+const { hasOwnProperty: hasOwnProperty$1 } = Object.prototype;
+const shallowEqual = (a, b) => {
+  if (is(a, b))
+    return true;
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null)
+    return false;
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length)
+    return false;
+  for (let i = 0; i < keysA.length; i += 1) {
+    if (!hasOwnProperty$1.call(b, keysA[i]) || !is(a[keysA[i]], b[keysA[i]]))
+      return false;
+  }
+  return true;
+};
+const { hasOwnProperty } = Object.prototype;
+const deepEqual = (a, b) => {
+  if (shallowEqual(a, b))
+    return true;
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null)
+    return false;
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length)
+    return false;
+  for (let i = 0; i < keysA.length; i += 1) {
+    if (!hasOwnProperty.call(b, keysA[i]) || !deepEqual(a[keysA[i]], b[keysA[i]]))
+      return false;
+  }
+  return true;
+};
 function getInitialState(serializedState = {
   Swatch: [],
   File: [],
@@ -182,7 +217,7 @@ function reducer$1(state = getInitialState(), action) {
     }
     case actions.ActionTypes.CHANGE_API_RESOURCE: {
       const existingApiResource = getAPIResource$1(state, action.payload.resource.__typename, action.payload.resource.id);
-      if (deepEqual.deepEqual(existingApiResource, action.payload.resource))
+      if (deepEqual(existingApiResource, action.payload.resource))
         return state;
       return new Map(state).set(action.payload.resource.__typename, new Map(state.get(action.payload.resource.__typename)).set(action.payload.resource.id, action.payload.resource));
     }
@@ -573,7 +608,7 @@ function Page$1({
       return;
     const oldSnippets = snippets.map(filterUsedSnippetProperties);
     const newSnippets = cachedPage.snippets.map(filterUsedSnippetProperties);
-    if (deepEqual.deepEqual(newSnippets, oldSnippets))
+    if (deepEqual(newSnippets, oldSnippets))
       return;
     setSnippets(cachedPage.snippets);
   }, [cachedPage]);
@@ -924,7 +959,7 @@ Received "${apiKey}" instead.`);
     while (current = remaining.pop()) {
       let getResourcesFromElementDescriptors = function(elementDescriptors2, props) {
         Object.entries(elementDescriptors2).forEach(([propName, descriptor]) => {
-          reactPage.getElementSwatchIds(descriptor, props[propName]).forEach((swatchId) => {
+          reactPage.getSwatchIds(descriptor, props[propName]).forEach((swatchId) => {
             swatchIds.add(swatchId);
           });
           reactPage.getFileIds(descriptor, props[propName]).forEach((fileId) => fileIds.add(fileId));
@@ -937,34 +972,6 @@ Received "${apiKey}" instead.`);
               remaining.push(child);
             }
           });
-          if (descriptor.type === reactPage.ShapeControlType) {
-            const prop = props[propName];
-            if (prop == null)
-              return;
-            getResourcesFromElementDescriptors(descriptor.config.type, prop);
-          }
-          if (descriptor.type === reactPage.ListControlType) {
-            const prop = props[propName];
-            if (prop == null)
-              return;
-            prop.forEach((item) => {
-              getResourcesFromElementDescriptors({ propName: descriptor.config.type }, { propName: item.value });
-            });
-          }
-          if (descriptor.type === reactPage.Types.Shape) {
-            const prop = props[propName];
-            if (prop == null)
-              return;
-            getResourcesFromElementDescriptors(descriptor.options.type, prop);
-          }
-          if (descriptor.type === reactPage.Types.List) {
-            const prop = props[propName];
-            if (prop == null)
-              return;
-            prop.forEach((item) => {
-              getResourcesFromElementDescriptors({ propName: descriptor.options.type }, { propName: item.value });
-            });
-          }
         });
       };
       let element2;
@@ -984,8 +991,8 @@ Received "${apiKey}" instead.`);
       getResourcesFromElementDescriptors(elementDescriptors, element2.props);
     }
     const typographies = await this.getTypographies([...typographyIds]);
-    typographies.forEach((typography) => {
-      typography == null ? void 0 : typography.style.forEach((style) => {
+    typographies.forEach((typography2) => {
+      typography2 == null ? void 0 : typography2.style.forEach((style) => {
         var _a;
         const swatchId = (_a = style.value.color) == null ? void 0 : _a.swatchId;
         if (swatchId != null)
@@ -1020,7 +1027,7 @@ Received "${apiKey}" instead.`);
         var _a;
         return {
           id,
-          value: (_a = typographies.find((typography) => (typography == null ? void 0 : typography.id) === id)) != null ? _a : null
+          value: (_a = typographies.find((typography2) => (typography2 == null ? void 0 : typography2.id) === id)) != null ? _a : null
         };
       }),
       [types.APIResourceType.Table]: [...tableIds].map((id) => {
@@ -1147,7 +1154,7 @@ async function fonts(_req, res, { getFonts } = {}) {
   const fonts2 = (_a = await (getFonts == null ? void 0 : getFonts())) != null ? _a : [];
   return res.json(fonts2);
 }
-const version = "0.9.2";
+const version = "0.9.4";
 async function handler(req, res, { apiKey, unstable_siteVersions }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
@@ -2551,12 +2558,12 @@ function useFiles(fileIds) {
 function useTypography(typographyId) {
   const client = useMakeswiftClient();
   const readTypography = () => typographyId == null ? null : client.readTypography(typographyId);
-  const typography = shim.useSyncExternalStore(client.subscribe, readTypography, readTypography);
+  const typography2 = shim.useSyncExternalStore(client.subscribe, readTypography, readTypography);
   React.useEffect(() => {
     if (typographyId != null)
       client.fetchTypography(typographyId).catch(console.error);
   }, [client, typographyId]);
-  return typography;
+  return typography2;
 }
 function useGlobalElement(globalElementId) {
   const client = useMakeswiftClient();
@@ -2969,7 +2976,7 @@ function useFormattedStyle(styleControlData, controlDefinition, control) {
         return;
       const element = document.querySelector(`.${guid}`);
       const measuredBoxModel = element == null ? null : boxModels.getBox(element);
-      if (!deepEqual.deepEqual(currentBoxModel, measuredBoxModel)) {
+      if (!deepEqual(currentBoxModel, measuredBoxModel)) {
         currentBoxModel = measuredBoxModel;
         control.changeBoxModel(currentBoxModel);
       }
@@ -3122,7 +3129,7 @@ function useNumber(numberControlData, controlDefinition) {
   return numberControlData != null ? numberControlData : controlDefinition.config.defaultValue;
 }
 const Text = forwardNextDynamicRef((patch) => dynamic__default["default"](() => patch(Promise.resolve().then(function() {
-  return require("./index.cjs9.js");
+  return require("./index.cjs8.js");
 }))));
 function useRichText(data, control) {
   const textCallbackRef = React.useCallback((handle) => {
@@ -3138,7 +3145,7 @@ function useRichText(data, control) {
   });
 }
 const EditableText = forwardNextDynamicRef((patch) => dynamic__default["default"](() => patch(Promise.resolve().then(function() {
-  return require("./index.cjs10.js");
+  return require("./index.cjs9.js");
 }))));
 const ReadOnlyText = forwardNextDynamicRef((patch) => dynamic__default["default"](() => patch(Promise.resolve().then(function() {
   return require("./ReadOnlyTextV2.cjs.js");
@@ -3179,7 +3186,7 @@ function pollBoxModel({
   let currentBoxModel = null;
   const handleAnimationFrameRequest = () => {
     const measuredBoxModel = boxModels.getBox(element);
-    if (!deepEqual.deepEqual(currentBoxModel, measuredBoxModel)) {
+    if (!deepEqual(currentBoxModel, measuredBoxModel)) {
       currentBoxModel = measuredBoxModel;
       onBoxModelChange(currentBoxModel);
     }
@@ -3377,6 +3384,138 @@ function useTextAreaValue(data, definition) {
 function useTextInputValue(data, definition) {
   return data != null ? data : definition.config.defaultValue;
 }
+function isNonNullable(value) {
+  return value != null;
+}
+function typographyFragementToTypographyControlData(typography2) {
+  if (typography2 == null)
+    return void 0;
+  return {
+    id: typography2.id,
+    style: typography2.style.map(({ deviceId, value }) => {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+      return {
+        deviceId,
+        value: {
+          fontFamily: (_a = value.fontFamily) != null ? _a : void 0,
+          lineHeight: (_b = value.lineHeight) != null ? _b : void 0,
+          letterSpacing: (_c = value.letterSpacing) != null ? _c : void 0,
+          fontWeight: (_d = value.fontWeight) != null ? _d : void 0,
+          textAlign: (_e = value.textAlign) != null ? _e : void 0,
+          uppercase: (_f = value.uppercase) != null ? _f : void 0,
+          underline: (_g = value.underline) != null ? _g : void 0,
+          strikethrough: (_h = value.strikethrough) != null ? _h : void 0,
+          italic: (_i = value.italic) != null ? _i : void 0,
+          fontSize: (_j = value.fontSize) != null ? _j : void 0,
+          color: (_k = value.color) != null ? _k : void 0
+        }
+      };
+    })
+  };
+}
+function getTypographyStyleSwatchIds(style) {
+  var _a;
+  return (_a = style == null ? void 0 : style.map((override) => override.value).flatMap((typographyStyle) => {
+    var _a2;
+    return (_a2 = typographyStyle.color) == null ? void 0 : _a2.swatchId;
+  }).filter(isNonNullable)) != null ? _a : [];
+}
+const withColor = (swatches) => (deviceRawTypographyValue) => {
+  var _b, _c;
+  const { value, deviceId } = deviceRawTypographyValue;
+  if (value.color == null) {
+    const _a = value, { color } = _a, nextValue = __objRest(_a, ["color"]);
+    return {
+      deviceId,
+      value: nextValue
+    };
+  }
+  return {
+    deviceId,
+    value: __spreadProps(__spreadValues({}, value), {
+      color: {
+        swatch: swatches.find((s) => {
+          var _a2;
+          return s && s.id === ((_a2 = value.color) == null ? void 0 : _a2.swatchId);
+        }),
+        alpha: (_c = (_b = value.color) == null ? void 0 : _b.alpha) != null ? _c : void 0
+      }
+    })
+  };
+};
+const getDeviceId = ({ deviceId }) => deviceId;
+function useEnhancedTypography(value) {
+  var _a, _b, _c;
+  const typography2 = typographyFragementToTypographyControlData(useTypography((_a = value == null ? void 0 : value.id) != null ? _a : null));
+  const source = (_b = typography2 == null ? void 0 : typography2.style) != null ? _b : [];
+  const override = (_c = value == null ? void 0 : value.style) != null ? _c : [];
+  const breakpoints = useBreakpoints();
+  const swatchIds = [
+    ...getTypographyStyleSwatchIds(value == null ? void 0 : value.style),
+    ...getTypographyStyleSwatchIds(typography2 == null ? void 0 : typography2.style)
+  ];
+  const swatches = useSwatches(swatchIds).filter(isNonNullable);
+  const enhancedSource = source.map(withColor(swatches));
+  const enhancedOverride = override.map(withColor(swatches));
+  const devices = [
+    ...new Set(enhancedSource.map(getDeviceId).concat(enhancedOverride.map(getDeviceId)))
+  ];
+  return devices.map((deviceId) => {
+    var _a2, _b2;
+    const deviceSource = (_a2 = state_breakpoints.findBreakpointOverride(breakpoints, enhancedSource, deviceId)) == null ? void 0 : _a2.value;
+    const deviceOverride = (_b2 = state_breakpoints.findBreakpointOverride(breakpoints, enhancedOverride, deviceId, (v) => v)) == null ? void 0 : _b2.value;
+    if (deviceSource && deviceOverride) {
+      return {
+        deviceId,
+        value: __spreadValues(__spreadValues({}, deviceSource), deviceOverride)
+      };
+    } else if (deviceOverride) {
+      return {
+        deviceId,
+        value: deviceOverride
+      };
+    } else if (deviceSource) {
+      return {
+        deviceId,
+        value: deviceSource
+      };
+    }
+    return null;
+  }).filter(isNonNullable);
+}
+function useTypographyClassName(value) {
+  return reactPage.useStyle(useResponsiveStyle([value], ([value2]) => {
+    if (value2 === void 0)
+      return {};
+    let styles = {};
+    if (value2.color != null)
+      styles.color = colorToString(value2.color);
+    if (value2.fontFamily != null)
+      styles.fontFamily = value2.fontFamily;
+    if (value2.fontSize != null && value2.fontSize.value != null && value2.fontSize.unit != null)
+      styles.fontSize = `${value2.fontSize.value}${value2.fontSize.unit}`;
+    if (value2.fontWeight != null)
+      styles.fontWeight = value2.fontWeight;
+    if (value2.lineHeight != null)
+      styles.lineHeight = value2.lineHeight;
+    if (value2.letterSpacing != null)
+      styles.letterSpacing = `${value2.letterSpacing / 10}em`;
+    if (value2.uppercase != null)
+      styles.textTransform = value2.uppercase === true ? "uppercase" : "initial";
+    if (value2.underline != null || value2.strikethrough != null)
+      styles.textDecoration = [
+        Boolean(value2.underline) && "underline",
+        Boolean(value2.strikethrough) && "line-through"
+      ].filter(Boolean).join(" ");
+    if (value2.italic != null)
+      styles.fontStyle = value2.italic === true ? "italic" : "initial";
+    return styles;
+  }, state_breakpoints.shallowMergeFallbacks));
+}
+function useTypographyValue(data) {
+  const enhancedTypography = useEnhancedTypography(data);
+  return useTypographyClassName(enhancedTypography);
+}
 function ControlValue({
   data,
   definition,
@@ -3384,31 +3523,31 @@ function ControlValue({
   control
 }) {
   switch (definition.type) {
-    case textInput.CheckboxControlType:
+    case typography.CheckboxControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useCheckboxControlValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case textInput.NumberControlType:
+    case typography.NumberControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useNumber,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case textInput.TextInputControlType:
+    case typography.TextInputControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useTextInputValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case textInput.TextAreaControlType:
+    case typography.TextAreaControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useTextAreaValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case select.SelectControlType:
+    case typography.SelectControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useSelectControlValue,
         parameters: [data, definition],
@@ -3420,7 +3559,7 @@ function ControlValue({
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case select.IconRadioGroupControlType:
+    case typography.IconRadioGroupControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useIconRadioGroupValue,
         parameters: [data, definition],
@@ -3489,6 +3628,12 @@ function ControlValue({
         parameters: [data, definition, control],
         children: (value) => children(value)
       }, definition.type);
+    case typography.TypographyControlType:
+      return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
+        hook: useTypographyValue,
+        parameters: [data],
+        children: (value) => children(value)
+      }, definition.type);
     default:
       return children(data);
   }
@@ -3530,19 +3675,20 @@ function PropsValue({
   return Object.entries(propControllerDescriptorsRef.current).reduceRight((renderFn, [propName, descriptor]) => (propsValue) => {
     var _a2, _b, _c, _d;
     switch (descriptor.type) {
-      case textInput.CheckboxControlType:
-      case textInput.NumberControlType:
-      case textInput.TextInputControlType:
-      case textInput.TextAreaControlType:
-      case select.SelectControlType:
+      case typography.CheckboxControlType:
+      case typography.NumberControlType:
+      case typography.TextInputControlType:
+      case typography.TextAreaControlType:
+      case typography.SelectControlType:
       case reactPage.ColorControlType:
-      case select.IconRadioGroupControlType:
+      case typography.IconRadioGroupControlType:
       case reactPage.ImageControlType:
       case combobox.ComboboxControlType:
       case reactPage.ShapeControlType:
       case reactPage.ListControlType:
       case reactPage.LinkControlType:
       case reactPage.StyleV2ControlType:
+      case typography.TypographyControlType:
         return /* @__PURE__ */ jsxRuntime.jsx(ControlValue, {
           definition: descriptor,
           data: props[propName],
@@ -4068,6 +4214,7 @@ exports.Shapes = Shapes;
 exports.Sizes = Sizes;
 exports.StoreContext = StoreContext;
 exports.colorToString = colorToString;
+exports.deepEqual = deepEqual;
 exports.forwardNextDynamicRef = forwardNextDynamicRef;
 exports.getServerSideProps = getServerSideProps;
 exports.getStaticPaths = getStaticPaths;
@@ -4078,6 +4225,7 @@ exports.useBoxShadow = useBoxShadow;
 exports.useBreakpoints = useBreakpoints;
 exports.useBuilderEditMode = useBuilderEditMode;
 exports.useElementId = useElementId;
+exports.useEnhancedTypography = useEnhancedTypography;
 exports.useFile = useFile;
 exports.useFiles = useFiles;
 exports.useFormContext = useFormContext;
@@ -4093,5 +4241,5 @@ exports.useResponsiveTextStyle = useResponsiveTextStyle;
 exports.useResponsiveWidth = useResponsiveWidth;
 exports.useSwatches = useSwatches;
 exports.useTable = useTable;
-exports.useTypography = useTypography;
+exports.useTypographyClassName = useTypographyClassName;
 //# sourceMappingURL=index.cjs.js.map