@tamagui/web 1.57.2 → 1.57.4

package/dist/esm/helpers/createPropMapper.js

@@ -0,0 +1,429 @@
+import { isAndroid, isWeb } from "@tamagui/constants";
+import { getConfig } from "../config";
+import { isDevTools } from "../constants/isDevTools";
+import { getVariableValue, isVariable } from "../createVariable";
+import { expandStyle } from "./expandStyle";
+import { expandStyles } from "./expandStyles";
+import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
+import { isObj } from "./isObj";
+import { mergeProps } from "./mergeProps";
+import { pseudoDescriptors } from "./pseudoDescriptors";
+const createPropMapper = (staticConfig) => {
+  const variants = staticConfig.variants || {};
+  const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, false)[0];
+  let conf;
+  const mapper = (key, value, theme, propsIn, state, languageContext, avoidDefaultProps = false, debug) => {
+    conf ||= getConfig();
+    if (!(process.env.TAMAGUI_TARGET === "native" && isAndroid)) {
+      if (key === "elevationAndroid") {
+        return;
+      }
+    }
+    const props = state.fallbackProps || propsIn;
+    const returnVariablesAs = state.resolveVariablesAs === "value" ? "value" : "auto";
+    let fontFamily = props[conf.inverseShorthands.fontFamily] || props.fontFamily || defaultProps.fontFamily || propsIn.fontFamily || `$${conf.defaultFont}`;
+    if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed)) {
+      console.warn(
+        `Warning: no fontFamily "${fontFamily}" found in config: ${Object.keys(
+          conf.fontsParsed
+        ).join(", ")}`
+      );
+    }
+    const variantValue = resolveVariants(
+      key,
+      value,
+      props,
+      defaultProps,
+      theme,
+      variants,
+      fontFamily,
+      conf,
+      returnVariablesAs,
+      staticConfig,
+      "",
+      languageContext,
+      avoidDefaultProps,
+      debug
+    );
+    if (variantValue) {
+      return variantValue;
+    }
+    let shouldReturn = value !== void 0 && value !== null;
+    if (key in conf.shorthands) {
+      shouldReturn = true;
+      key = conf.shorthands[key];
+    }
+    if (value) {
+      if (value[0] === "$") {
+        value = getToken(
+          key,
+          value,
+          conf,
+          theme,
+          fontFamily,
+          languageContext,
+          returnVariablesAs,
+          debug
+        );
+      } else if (isVariable(value)) {
+        value = resolveVariableValue(key, value, returnVariablesAs);
+      }
+    }
+    if (shouldReturn) {
+      return expandStyle(key, value) || [[key, value]];
+    }
+  };
+  return mapper;
+};
+const resolveVariants = (key, value, props, defaultProps, theme, variants, fontFamily, conf, returnVariablesAs, staticConfig, parentVariantKey, languageContext, avoidDefaultProps = false, debug) => {
+  if (!(key in variants) || value === void 0) {
+    return;
+  }
+  let variantValue = getVariantDefinition(variants[key], key, value, conf);
+  if (process.env.NODE_ENV === "development" && debug === "verbose") {
+    console.log("resolve variant", { key, value, variantValue });
+  }
+  if (!variantValue) {
+    if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
+      if (typeof value !== "boolean") {
+        const name = staticConfig.componentName || "[UnnamedComponent]";
+        console.warn(
+          `No variant found: ${name} has variant "${key}", but no matching value "${value}"`
+        );
+      }
+    }
+    return;
+  }
+  if (typeof variantValue === "function") {
+    const fn = variantValue;
+    variantValue = fn(
+      value,
+      getVariantExtras(
+        props,
+        languageContext,
+        theme,
+        defaultProps,
+        avoidDefaultProps,
+        fontFamily
+      )
+    );
+    if (process.env.NODE_ENV === "development") {
+      if (debug === "verbose") {
+        console.log("expanded functional variant", {
+          variant: fn,
+          response: variantValue
+        });
+      }
+    }
+  }
+  let fontFamilyResult;
+  if (isObj(variantValue)) {
+    const fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
+    if (fontFamilyUpdate) {
+      fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf);
+    }
+    variantValue = resolveTokensAndVariants(
+      key,
+      variantValue,
+      props,
+      defaultProps,
+      theme,
+      variants,
+      fontFamilyResult || fontFamily,
+      conf,
+      returnVariablesAs,
+      staticConfig,
+      parentVariantKey,
+      languageContext,
+      avoidDefaultProps,
+      debug
+    );
+  }
+  if (variantValue) {
+    const next = Object.entries(expandStyles(variantValue));
+    if (fontFamilyResult && fontFamilyResult[0] === "$") {
+      fontFamilyCache.set(next, getVariableValue(fontFamilyResult));
+    }
+    return next;
+  }
+};
+function getFontFamilyFromNameOrVariable(input, conf) {
+  if (isVariable(input)) {
+    const val = variableToFontNameCache.get(input);
+    if (val) {
+      return val;
+    } else {
+      for (const key in conf.fontsParsed) {
+        const familyVariable = conf.fontsParsed[key].family;
+        if (isVariable(familyVariable)) {
+          variableToFontNameCache.set(familyVariable, key);
+          if (familyVariable === input) {
+            return key;
+          }
+        }
+      }
+    }
+  } else if (typeof input === "string") {
+    if ((input == null ? void 0 : input[0]) === "$") {
+      return input;
+    } else {
+      if (process.env.NODE_ENV === "development") {
+        console.log("[tamagui] should map back", input);
+      }
+    }
+  }
+}
+const variableToFontNameCache = /* @__PURE__ */ new WeakMap();
+const fontFamilyCache = /* @__PURE__ */ new WeakMap();
+const getPropMappedFontFamily = (expanded) => {
+  return expanded && fontFamilyCache.get(expanded);
+};
+const resolveTokensAndVariants = (key, value, props, defaultProps, theme, variants, fontFamily, conf, returnVariablesAs, staticConfig, parentVariantKey, languageContext, avoidDefaultProps, debug) => {
+  var _a;
+  const res = {};
+  for (const rKey in value) {
+    const fKey = conf.shorthands[rKey] || rKey;
+    const val = value[rKey];
+    if (fKey in variants) {
+      if (parentVariantKey && parentVariantKey === key) {
+        res[fKey] = val;
+      } else {
+        const variantOut = resolveVariants(
+          fKey,
+          val,
+          props,
+          defaultProps,
+          theme,
+          variants,
+          fontFamily,
+          conf,
+          returnVariablesAs,
+          staticConfig,
+          key,
+          languageContext,
+          avoidDefaultProps,
+          debug
+        );
+        if (variantOut) {
+          for (const [key2, val2] of variantOut) {
+            if (val2 == null)
+              continue;
+            if (key2 in pseudoDescriptors) {
+              res[key2] ??= {};
+              Object.assign(res[key2], val2);
+            } else {
+              res[key2] = val2;
+            }
+          }
+        }
+      }
+      continue;
+    }
+    if (isVariable(val)) {
+      res[fKey] = !isWeb || returnVariablesAs === "value" ? val.val : val.variable;
+      continue;
+    }
+    if (typeof val === "string") {
+      const fVal = val[0] === "$" ? getToken(
+        fKey,
+        val,
+        conf,
+        theme,
+        fontFamily,
+        languageContext,
+        returnVariablesAs,
+        debug
+      ) : val;
+      res[fKey] = fVal;
+      continue;
+    }
+    if (isObj(val)) {
+      res[fKey] ??= {};
+      Object.assign(
+        res[fKey],
+        resolveTokensAndVariants(
+          fKey,
+          val,
+          props,
+          defaultProps,
+          theme,
+          variants,
+          fontFamily,
+          conf,
+          returnVariablesAs,
+          staticConfig,
+          key,
+          languageContext,
+          avoidDefaultProps,
+          debug
+        )
+      );
+    } else {
+      res[fKey] = val;
+    }
+    if (process.env.NODE_ENV === "development") {
+      if (debug) {
+        if (((_a = res[fKey]) == null ? void 0 : _a[0]) === "$") {
+          console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey], theme);
+        }
+      }
+    }
+  }
+  return res;
+};
+const tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
+  name,
+  spreadName: `...${name}`
+}));
+function getVariantDefinition(variant, key, value, conf) {
+  if (typeof variant === "function") {
+    return variant;
+  }
+  if (variant[value]) {
+    return variant[value];
+  }
+  const { tokensParsed } = conf;
+  for (const { name, spreadName } of tokenCats) {
+    if (spreadName in variant && value in tokensParsed[name]) {
+      return variant[spreadName];
+    }
+  }
+  const fontSizeVariant = variant["...fontSize"];
+  if (fontSizeVariant && conf.fontSizeTokens.has(value)) {
+    return fontSizeVariant;
+  }
+  return variant[`:${typeof value}`] || variant["..."] || variant["...size"];
+}
+const fontShorthand = {
+  fontSize: "size",
+  fontWeight: "weight"
+};
+const getToken = (key, value, conf, theme, fontFamily, languageContext, resolveAs, debug) => {
+  var _a, _b, _c;
+  const tokensParsed = conf.tokensParsed;
+  let valOrVar;
+  let hasSet = false;
+  if (value in theme) {
+    if (process.env.NODE_ENV === "development" && debug === "verbose") {
+      console.log(`Getting theme value for ${key} from ${value} = ${theme[value].val}`);
+    }
+    valOrVar = theme[value];
+    hasSet = true;
+  } else {
+    if (value in conf.specificTokens) {
+      hasSet = true;
+      valOrVar = conf.specificTokens[value];
+    } else {
+      switch (key) {
+        case "fontFamily": {
+          const fontsParsed = languageContext ? getFontsForLanguage(conf.fontsParsed, languageContext) : conf.fontsParsed;
+          valOrVar = ((_a = fontsParsed[value]) == null ? void 0 : _a.family) || value;
+          hasSet = true;
+          break;
+        }
+        case "fontSize":
+        case "lineHeight":
+        case "letterSpacing":
+        case "fontWeight": {
+          if (fontFamily) {
+            const fontsParsed = languageContext ? getFontsForLanguage(conf.fontsParsed, languageContext) : conf.fontsParsed;
+            valOrVar = ((_c = (_b = fontsParsed[fontFamily]) == null ? void 0 : _b[fontShorthand[key] || key]) == null ? void 0 : _c[value]) || value;
+            hasSet = true;
+          }
+          break;
+        }
+      }
+      for (const cat in tokenCategories) {
+        if (key in tokenCategories[cat]) {
+          const res = tokensParsed[cat][value];
+          if (res) {
+            valOrVar = res;
+            hasSet = true;
+          }
+        }
+      }
+      if (!hasSet) {
+        const spaceVar = tokensParsed.space[value];
+        if (spaceVar) {
+          valOrVar = spaceVar;
+          hasSet = true;
+        }
+      }
+    }
+  }
+  if (hasSet) {
+    const out = resolveVariableValue(key, valOrVar, resolveAs);
+    if (process.env.NODE_ENV === "development" && isDevTools && debug === "verbose") {
+      console.groupCollapsed("  \uFE52 propMap", key, out);
+      console.log({ valOrVar, theme, hasSet, resolveAs }, theme[key]);
+      console.groupEnd();
+    }
+    return out;
+  }
+  if (process.env.NODE_ENV === "development") {
+    if (value && value[0] === "$") {
+      return;
+    }
+  }
+  if (process.env.NODE_ENV === "development" && isDevTools && debug === "verbose") {
+    console.groupCollapsed("  \uFE52 propMap (val)", key, value);
+    console.log({ valOrVar, theme, hasSet, resolveAs }, theme[key]);
+    console.groupEnd();
+  }
+  return value;
+};
+function resolveVariableValue(key, valOrVar, resolveAs = "auto") {
+  if (isVariable(valOrVar)) {
+    if (resolveAs === "variable") {
+      return valOrVar;
+    }
+    if (resolveAs === "non-color-value") {
+      if (isWeb) {
+        if (key in tokenCategories.color) {
+          return valOrVar.variable;
+        }
+      }
+      return valOrVar.val;
+    }
+    if (!isWeb || resolveAs === "value") {
+      return valOrVar.val;
+    }
+    return valOrVar.variable;
+  }
+  return valOrVar;
+}
+const tokenCategories = {
+  radius: {
+    borderRadius: true,
+    borderTopLeftRadius: true,
+    borderTopRightRadius: true,
+    borderBottomLeftRadius: true,
+    borderBottomRightRadius: true
+  },
+  size: {
+    width: true,
+    height: true,
+    minWidth: true,
+    minHeight: true,
+    maxWidth: true,
+    maxHeight: true
+  },
+  zIndex: {
+    zIndex: true
+  },
+  color: {
+    color: true,
+    backgroundColor: true,
+    borderColor: true,
+    borderBottomColor: true,
+    borderTopColor: true,
+    borderLeftColor: true,
+    borderRightColor: true
+  }
+};
+export {
+  createPropMapper,
+  getFontFamilyFromNameOrVariable,
+  getPropMappedFontFamily
+};
+//# sourceMappingURL=createPropMapper.js.map

package/dist/esm/helpers/createPropMapper.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/createPropMapper.ts"],
+  "mappings": "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",
+  "names": ["key", "val"]
+}

package/dist/esm/helpers/extendStaticConfig.js

@@ -0,0 +1,67 @@
+import { stylePropsView } from "@tamagui/helpers";
+import { createPropMapper } from "./createPropMapper";
+import { mergeProps } from "./mergeProps";
+function extendStaticConfig(config, parent) {
+  if (!(parent && "staticConfig" in parent)) {
+    return parseStaticConfig(config);
+  }
+  const parentStaticConfig = parent.staticConfig;
+  const variants = mergeVariants(parentStaticConfig.variants, config.variants);
+  const parentNames = [...parentStaticConfig.parentNames || []];
+  if (parentStaticConfig.componentName) {
+    parentNames.push(parentStaticConfig.componentName);
+  }
+  const deoptProps = config.deoptProps || /* @__PURE__ */ new Set();
+  const defaultProps = mergeProps(parentStaticConfig.defaultProps, {
+    ...config.defaultProps,
+    ...config.defaultVariants
+  })[0];
+  return parseStaticConfig({
+    ...parentStaticConfig,
+    ...config,
+    parentStaticConfig,
+    deoptProps,
+    variants,
+    parentNames,
+    validStyles: config.validStyles ? {
+      ...parentStaticConfig.validStyles,
+      ...config.validStyles
+    } : parentStaticConfig.validStyles || stylePropsView,
+    defaultProps
+  });
+}
+const mergeVariants = (parentVariants, ourVariants) => {
+  const variants = {
+    ...parentVariants
+  };
+  if (ourVariants) {
+    for (const key in ourVariants) {
+      if (key in variants) {
+        variants[key] = {
+          ...variants[key],
+          ...ourVariants[key]
+        };
+      } else {
+        variants[key] = ourVariants[key];
+      }
+    }
+  }
+  return variants;
+};
+const parseStaticConfig = (config) => {
+  const parsed = {
+    defaultProps: {},
+    ...config,
+    parsed: true
+  };
+  return {
+    ...parsed,
+    propMapper: createPropMapper(parsed)
+  };
+};
+export {
+  extendStaticConfig,
+  mergeVariants,
+  parseStaticConfig
+};
+//# sourceMappingURL=extendStaticConfig.js.map

package/dist/esm/helpers/extendStaticConfig.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/extendStaticConfig.ts"],
+  "mappings": "AAAA,SAAS,sBAAsB;AAQ/B,SAAS,wBAAwB;AACjC,SAAS,kBAAkB;AAEpB,SAAS,mBACd,QACA,QACA;AACA,MAAI,EAAE,UAAU,kBAAkB,SAAS;AACzC,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,qBAAqB,OAAO;AAGlC,QAAM,WAAW,cAAc,mBAAmB,UAAU,OAAO,QAAQ;AAG3E,QAAM,cAAc,CAAC,GAAI,mBAAmB,eAAe,CAAC,CAAE;AAC9D,MAAI,mBAAmB,eAAe;AACpC,gBAAY,KAAK,mBAAmB,aAAa;AAAA,EACnD;AAEA,QAAM,aAAa,OAAO,cAAc,oBAAI,IAAY;AAExD,QAAM,eAAe,WAAW,mBAAmB,cAAc;AAAA,IAC/D,GAAG,OAAO;AAAA,IACV,GAAG,OAAO;AAAA,EACZ,CAAC,EAAE,CAAC;AAEJ,SAAO,kBAAkB;AAAA,IACvB,GAAG;AAAA,IACH,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,OAAO,cAChB;AAAA,MACE,GAAG,mBAAmB;AAAA,MACtB,GAAG,OAAO;AAAA,IACZ,IACA,mBAAmB,eAAe;AAAA,IACtC;AAAA,EACF,CAAC;AACH;AAEO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,EACL;AAEA,MAAI,aAAa;AACf,eAAW,OAAO,aAAa;AAC7B,UAAI,OAAO,UAAU;AACnB,iBAAS,GAAG,IAAI;AAAA,UACd,GAAG,SAAS,GAAG;AAAA,UACf,GAAG,YAAY,GAAG;AAAA,QACpB;AAAA,MACF,OAAO;AACL,iBAAS,GAAG,IAAI,YAAY,GAAG;AAAA,MACjC;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,QAAM,SAAS;AAAA,IACb,cAAc,CAAC;AAAA,IACf,GAAG;AAAA,IACH,QAAQ;AAAA,EACV;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,iBAAiB,MAA4B;AAAA,EAC3D;AACF;",
+  "names": []
+}

package/dist/esm/helpers/getSplitStyles.js

@@ -54,11 +54,6 @@ let conf;
 const PROP_SPLIT = "-";
 const getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
   var _a, _b, _c, _d, _e, _f, _g;
-  let time;
-  if (!process.env.TAMAGUI_IS_CORE_NODE && process.env.NODE_ENV === "development" && debug === "profile") {
-    const timer = require("@tamagui/timer").timer();
-    time = timer.start();
-  }
   conf = conf || getConfig();
   const { shorthands } = conf;
   const {
@@ -103,8 +98,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     context,
     debug
   };
-  if (process.env.NODE_ENV === "development" && time)
-    time`style:setup`;
   if (process.env.NODE_ENV === "development" && debug && debug !== "profile" && isClient) {
     console.groupCollapsed("getSplitStyles (collapsed)");
     console.log({
@@ -141,11 +134,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       }
     }
   }
-  if (process.env.NODE_ENV === "development" && time)
-    time`style:loop:start`;
   for (const keyOg in props) {
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:start1`;
     let keyInit = keyOg;
     let valInit = props[keyOg];
     if (keyInit in shorthands) {
@@ -157,22 +146,22 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       continue;
     if (keyInit in skipProps && !isHOC) {
       if (keyInit === "group") {
-        const identifier = `t_group_${valInit}`;
-        const containerCSS = {
-          identifier,
-          property: "container",
-          rules: [
-            `.${identifier} { container-name: ${valInit}; container-type: inline-size; }`
-          ]
-        };
-        addStyleToInsertRules(rulesToInsert, containerCSS);
+        if (process.env.TAMAGUI_TARGET === "web") {
+          const identifier = `t_group_${valInit}`;
+          const containerCSS = {
+            identifier,
+            property: "container",
+            rules: [
+              `.${identifier} { container-name: ${valInit}; container-type: inline-size; }`
+            ]
+          };
+          addStyleToInsertRules(rulesToInsert, containerCSS);
+        }
       }
       continue;
     }
     const valInitType = typeof valInit;
     styleState.curProps[keyInit] = valInit;
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:set-cur-prop`;
     if (process.env.TAMAGUI_TARGET === "web") {
       if (valInitType === "string" && valInit[0] === "_") {
         if (keyInit in validStyleProps || keyInit.includes("-")) {
@@ -237,8 +226,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
         continue;
       }
     }
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:accessibility-map`;
     if (keyInit === "dataSet") {
       for (const keyInit2 in valInit) {
         viewProps[`data-${hyphenate(keyInit2)}`] = valInit[keyInit2];
@@ -402,11 +389,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       continue;
     }
     const avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit;
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:setup`;
     const expanded = avoidPropMap ? [[keyInit, valInit]] : propMapper(keyInit, valInit, styleState);
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:propMapper`;
     const next = getPropMappedFontFamily(expanded);
     if (next) {
       styleState.fontFamily = next;
@@ -437,11 +420,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     }
     if (!expanded)
       continue;
-    if (process.env.NODE_ENV === "development" && time)
-      time`style:loop:pre-expand`;
     for (const [key, val] of expanded) {
-      if (process.env.NODE_ENV === "development" && time)
-        time`style:loop:expand:start`;
       if (val == null)
         continue;
       if (key in usedKeys)
@@ -450,8 +429,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       isMedia = !isPseudo && !isValidStyleKeyInit && isMediaKey(key);
       isMediaOrPseudo = isMedia || isPseudo;
       isVariant = variants && key in variants;
-      if (process.env.NODE_ENV === "development" && time)
-        time`style:loop:expand:is-checks`;
       if ((inlineProps == null ? void 0 : inlineProps.has(key)) || IS_STATIC && (inlineWhenUnflattened == null ? void 0 : inlineWhenUnflattened.has(key))) {
         viewProps[key] = props[key] ?? val;
       }
@@ -739,8 +716,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       console.groupEnd();
     }
   }
-  if (process.env.NODE_ENV === "development" && time)
-    time`style:loop`;
   if (props.style) {
     mergeStyleProp(styleState, props.style);
   }
@@ -861,8 +836,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       }
     }
   }
-  if (process.env.NODE_ENV === "development" && time)
-    time`style:after-loop`;
   const result = {
     space,
     hasMedia,
@@ -877,8 +850,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     pseudoGroups,
     mediaGroups
   };
-  if (process.env.NODE_ENV === "development" && time)
-    time`style:create-result`;
   if (process.env.TAMAGUI_TARGET === "native") {
     if (style.fontFamily) {
       const faceInfo = (_e = getFont(style.fontFamily)) == null ? void 0 : _e.face;
@@ -920,10 +891,6 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       console.groupEnd();
     }
   }
-  if (process.env.NODE_ENV === "development" && time) {
-    time`rest`;
-    time.print();
-  }
   return result;
 };
 function mergeClassName(transforms, classNames, key, val, isMediaOrPseudo = false, isInsertingNow = false) {