@tamagui/web 1.5.22 → 1.5.24

package/dist/cjs/helpers/expandStyles.js

@@ -22,6 +22,7 @@ __export(expandStyles_exports, {
   fixStyles: () => fixStyles
 });
 module.exports = __toCommonJS(expandStyles_exports);
+var import_constants = require("@tamagui/constants");
 var import_config = require("../config.js");
 var import_expandStyle = require("./expandStyle.js");
 var import_normalizeShadow = require("./normalizeShadow");
@@ -60,12 +61,13 @@ function fixStyles(style) {
     }
   }
 }
+const nativeStyle = import_constants.isWeb ? null : "borderStyle";
 const borderDefaults = {
   borderWidth: "borderStyle",
-  borderBottomWidth: "borderBottomStyle",
-  borderTopWidth: "borderTopStyle",
-  borderLeftWidth: "borderLeftStyle",
-  borderRightWidth: "borderRightStyle"
+  borderBottomWidth: nativeStyle || "borderBottomStyle",
+  borderTopWidth: nativeStyle || "borderTopStyle",
+  borderLeftWidth: nativeStyle || "borderLeftStyle",
+  borderRightWidth: nativeStyle || "borderRightStyle"
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/helpers/expandStyles.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "sourcesContent": ["import { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;AAC1B,yBAA4B;AAC5B,6BAAgC;AAChC,wCAA2C;AAC3C,+BAAkC;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,aAAS,yBAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,4CAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,UAAM,8DAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,UAAM,gCAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\n\nimport { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\n// native doesn't support specific border edge style\nconst nativeStyle = isWeb ? null : 'borderStyle'\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: nativeStyle || 'borderBottomStyle',\n  borderTopWidth: nativeStyle || 'borderTopStyle',\n  borderLeftWidth: nativeStyle || 'borderLeftStyle',\n  borderRightWidth: nativeStyle || 'borderRightStyle',\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB;AAEtB,oBAA0B;AAC1B,yBAA4B;AAC5B,6BAAgC;AAChC,wCAA2C;AAC3C,+BAAkC;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,aAAS,yBAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,4CAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,UAAM,8DAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,UAAM,gCAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAGA,MAAM,cAAc,yBAAQ,OAAO;AACnC,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
   "names": []
 }

package/dist/cjs/views/Theme.js

@@ -38,16 +38,16 @@ function Theme(props) {
     props.children,
     (child) => (0, import_react.cloneElement)(child, { ["data-themeable"]: true })
   ) : props.children;
-  return useThemedChildren(themeState, children, props);
+  return useThemedChildren(themeState, children, props, isRoot);
 }
-function useThemedChildren(themeState, children, options) {
+function useThemedChildren(themeState, children, options, isRoot = false) {
   const { themeManager, isNewTheme, className, theme } = themeState;
   const { shallow, forceClassName } = options;
   const hasEverThemed = (0, import_useServerHooks.useServerRef)(false);
   if (isNewTheme) {
     hasEverThemed.current = true;
   }
-  if (isNewTheme || hasEverThemed.current || forceClassName) {
+  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {
     let next = import_react.Children.toArray(children);
     if (shallow && themeManager) {
       next = next.map((child) => {
@@ -69,6 +69,7 @@ function useThemedChildren(themeState, children, options) {
       };
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: `${className || ""} _dsp_contents`, style: colorStyle, children: wrapped });
     }
+    return wrapped;
   }
   return children;
 }

package/dist/cjs/views/Theme.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  }\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n  }\n\n  return children\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkDc;AAlDd,uBAAsB;AACtB,mBAAuD;AAEvD,4BAAiC;AACjC,iCAAoC;AACpC,4BAA6B;AAC7B,sBAA2D;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,iBAAa,sCAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,sBAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,cAC5B,2BAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,KAAK;AACtD;AAEO,SAAS,kBACd,YACA,UACA,SAKA;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,oBAAgB,oCAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,gBAAgB;AAEzD,QAAI,OAAO,sBAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,mBAAO,6BAAe,KAAK,QACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,4CAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,4CAAC,+CAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,0BAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,iBAAa,wCAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,4CAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props, isRoot)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  },\n  isRoot = false\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n\n    return wrapped\n  }\n\n  return children\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmDc;AAnDd,uBAAsB;AACtB,mBAAuD;AAEvD,4BAAiC;AACjC,iCAAoC;AACpC,4BAA6B;AAC7B,sBAA2D;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,iBAAa,sCAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,sBAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,cAC5B,2BAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D;AAEO,SAAS,kBACd,YACA,UACA,SAKA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,oBAAgB,oCAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,kBAAkB,QAAQ;AAEnE,QAAI,OAAO,sBAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,mBAAO,6BAAe,KAAK,QACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,4CAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,4CAAC,+CAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,0BAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,iBAAa,wCAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,4CAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/expandStyles.js

@@ -1,3 +1,4 @@
+import { isWeb } from "@tamagui/constants";
 import { getConfig } from "../config.js";
 import { expandStyle } from "./expandStyle.js";
 import { normalizeShadow } from "./normalizeShadow";
@@ -36,12 +37,13 @@ function fixStyles(style) {
     }
   }
 }
+const nativeStyle = isWeb ? null : "borderStyle";
 const borderDefaults = {
   borderWidth: "borderStyle",
-  borderBottomWidth: "borderBottomStyle",
-  borderTopWidth: "borderTopStyle",
-  borderLeftWidth: "borderLeftStyle",
-  borderRightWidth: "borderRightStyle"
+  borderBottomWidth: nativeStyle || "borderBottomStyle",
+  borderTopWidth: nativeStyle || "borderTopStyle",
+  borderLeftWidth: nativeStyle || "borderLeftStyle",
+  borderRightWidth: nativeStyle || "borderRightStyle"
 };
 export {
   expandStyles,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "sourcesContent": ["import { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\n}\n"],
-  "mappings": "AAAA,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\n\nimport { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\n// native doesn't support specific border edge style\nconst nativeStyle = isWeb ? null : 'borderStyle'\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: nativeStyle || 'borderBottomStyle',\n  borderTopWidth: nativeStyle || 'borderTopStyle',\n  borderLeftWidth: nativeStyle || 'borderLeftStyle',\n  borderRightWidth: nativeStyle || 'borderRightStyle',\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAGA,MAAM,cAAc,QAAQ,OAAO;AACnC,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
   "names": []
 }

package/dist/esm/helpers/expandStyles.mjs

@@ -1,3 +1,4 @@
+import { isWeb } from "@tamagui/constants";
 import { getConfig } from "../config.js";
 import { expandStyle } from "./expandStyle.js";
 import { normalizeShadow } from "./normalizeShadow";
@@ -36,12 +37,13 @@ function fixStyles(style) {
     }
   }
 }
+const nativeStyle = isWeb ? null : "borderStyle";
 const borderDefaults = {
   borderWidth: "borderStyle",
-  borderBottomWidth: "borderBottomStyle",
-  borderTopWidth: "borderTopStyle",
-  borderLeftWidth: "borderLeftStyle",
-  borderRightWidth: "borderRightStyle"
+  borderBottomWidth: nativeStyle || "borderBottomStyle",
+  borderTopWidth: nativeStyle || "borderTopStyle",
+  borderLeftWidth: nativeStyle || "borderLeftStyle",
+  borderRightWidth: nativeStyle || "borderRightStyle"
 };
 export {
   expandStyles,

package/dist/esm/helpers/expandStyles.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "sourcesContent": ["import { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: 'borderBottomStyle',\n  borderTopWidth: 'borderTopStyle',\n  borderLeftWidth: 'borderLeftStyle',\n  borderRightWidth: 'borderRightStyle',\n}\n"],
-  "mappings": "AAAA,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB;AAAA,EACnB,gBAAgB;AAAA,EAChB,iBAAiB;AAAA,EACjB,kBAAkB;AACpB;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\n\nimport { getConfig } from '../config.js'\nimport { expandStyle } from './expandStyle.js'\nimport { normalizeShadow } from './normalizeShadow'\nimport { normalizeValueWithProperty } from './normalizeValueWithProperty.js'\nimport { pseudoDescriptors } from './pseudoDescriptors.js'\n\nlet shorthands: Record<string, string> | null = null\n\n/**\n * This is what you want to run before Object.assign() a style onto another.\n * It does the following:\n *   1. Turns user shorthands into longhands, ie px = paddingHorizontal\n *   2. Normalizes various inconsistent styles to be more consistent\n *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight\n */\n\nexport function expandStyles(style: Record<string, any>, config = getConfig()) {\n  const res: Record<string, any> = {}\n\n  for (let key in style) {\n    shorthands = shorthands || (config ? config.shorthands : null)\n    if (shorthands) {\n      key = shorthands[key] || key\n    }\n    if (key in pseudoDescriptors) {\n      res[key] = expandStyles(style[key])\n      continue\n    }\n    const val = normalizeValueWithProperty(style[key], key)\n    // expand react-native shorthands\n    const out = expandStyle(key, val)\n    if (out) {\n      Object.assign(res, Object.fromEntries(out))\n    } else {\n      res[key] = val\n    }\n  }\n\n  fixStyles(res)\n\n  return res\n}\n\nexport function fixStyles(style: Record<string, any>) {\n  if (\n    style.shadowRadius ||\n    style.shadowColor ||\n    style.shadowOpacity ||\n    style.shadowOffset\n  ) {\n    Object.assign(style, normalizeShadow(style))\n  }\n\n  // TODO could be native-only\n  // ensure border style set by default to solid\n  for (const key in borderDefaults) {\n    if (key in style && !style[borderDefaults[key]]) {\n      style[borderDefaults[key]] = 'solid'\n    }\n  }\n}\n\n// native doesn't support specific border edge style\nconst nativeStyle = isWeb ? null : 'borderStyle'\nconst borderDefaults = {\n  borderWidth: 'borderStyle',\n  borderBottomWidth: nativeStyle || 'borderBottomStyle',\n  borderTopWidth: nativeStyle || 'borderTopStyle',\n  borderLeftWidth: nativeStyle || 'borderLeftStyle',\n  borderRightWidth: nativeStyle || 'borderRightStyle',\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,iBAAiB;AAC1B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;AAElC,IAAI,aAA4C;AAUzC,SAAS,aAAa,OAA4B,SAAS,UAAU,GAAG;AAC7E,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,iBAAa,eAAe,SAAS,OAAO,aAAa;AACzD,QAAI,YAAY;AACd,YAAM,WAAW,GAAG,KAAK;AAAA,IAC3B;AACA,QAAI,OAAO,mBAAmB;AAC5B,UAAI,GAAG,IAAI,aAAa,MAAM,GAAG,CAAC;AAClC;AAAA,IACF;AACA,UAAM,MAAM,2BAA2B,MAAM,GAAG,GAAG,GAAG;AAEtD,UAAM,MAAM,YAAY,KAAK,GAAG;AAChC,QAAI,KAAK;AACP,aAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC;AAAA,IAC5C,OAAO;AACL,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,YAAU,GAAG;AAEb,SAAO;AACT;AAEO,SAAS,UAAU,OAA4B;AACpD,MACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,cACN;AACA,WAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAAA,EAC7C;AAIA,aAAW,OAAO,gBAAgB;AAChC,QAAI,OAAO,SAAS,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG;AAC/C,YAAM,eAAe,GAAG,CAAC,IAAI;AAAA,IAC/B;AAAA,EACF;AACF;AAGA,MAAM,cAAc,QAAQ,OAAO;AACnC,MAAM,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
   "names": []
 }

package/dist/esm/views/Theme.js

@@ -14,16 +14,16 @@ function Theme(props) {
     props.children,
     (child) => cloneElement(child, { ["data-themeable"]: true })
   ) : props.children;
-  return useThemedChildren(themeState, children, props);
+  return useThemedChildren(themeState, children, props, isRoot);
 }
-function useThemedChildren(themeState, children, options) {
+function useThemedChildren(themeState, children, options, isRoot = false) {
   const { themeManager, isNewTheme, className, theme } = themeState;
   const { shallow, forceClassName } = options;
   const hasEverThemed = useServerRef(false);
   if (isNewTheme) {
     hasEverThemed.current = true;
   }
-  if (isNewTheme || hasEverThemed.current || forceClassName) {
+  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {
     let next = Children.toArray(children);
     if (shallow && themeManager) {
       next = next.map((child) => {
@@ -45,6 +45,7 @@ function useThemedChildren(themeState, children, options) {
       };
       return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents`, style: colorStyle, children: wrapped });
     }
+    return wrapped;
   }
   return children;
 }

package/dist/esm/views/Theme.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  }\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n  }\n\n  return children\n}\n"],
-  "mappings": "AAkDc;AAlDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,KAAK;AACtD;AAEO,SAAS,kBACd,YACA,UACA,SAKA;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,gBAAgB;AAEzD,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props, isRoot)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  },\n  isRoot = false\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n\n    return wrapped\n  }\n\n  return children\n}\n"],
+  "mappings": "AAmDc;AAnDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D;AAEO,SAAS,kBACd,YACA,UACA,SAKA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,kBAAkB,QAAQ;AAEnE,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": []
 }

package/dist/esm/views/Theme.mjs

@@ -14,16 +14,16 @@ function Theme(props) {
     props.children,
     (child) => cloneElement(child, { ["data-themeable"]: true })
   ) : props.children;
-  return useThemedChildren(themeState, children, props);
+  return useThemedChildren(themeState, children, props, isRoot);
 }
-function useThemedChildren(themeState, children, options) {
+function useThemedChildren(themeState, children, options, isRoot = false) {
   const { themeManager, isNewTheme, className, theme } = themeState;
   const { shallow, forceClassName } = options;
   const hasEverThemed = useServerRef(false);
   if (isNewTheme) {
     hasEverThemed.current = true;
   }
-  if (isNewTheme || hasEverThemed.current || forceClassName) {
+  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {
     let next = Children.toArray(children);
     if (shallow && themeManager) {
       next = next.map((child) => {
@@ -45,6 +45,7 @@ function useThemedChildren(themeState, children, options) {
       };
       return /* @__PURE__ */ jsx("span", { className: `${className || ""} _dsp_contents`, style: colorStyle, children: wrapped });
     }
+    return wrapped;
   }
   return children;
 }

package/dist/esm/views/Theme.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  }\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n  }\n\n  return children\n}\n"],
-  "mappings": "AAkDc;AAlDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,KAAK;AACtD;AAEO,SAAS,kBACd,YACA,UACA,SAKA;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,gBAAgB;AAEzD,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAAA,EACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport { Children, cloneElement, isValidElement } from 'react'\n\nimport { variableToString } from '../createVariable.js'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext.js'\nimport { useServerRef } from '../hooks/useServerHooks.js'\nimport { ChangedThemeResponse, useChangeThemeEffect } from '../hooks/useTheme.js'\nimport type { ThemeProps } from '../types.js'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) return props.children\n  const isRoot = !!props['_isRoot']\n  const themeState = useChangeThemeEffect(props, isRoot)\n  const children = props['data-themeable']\n    ? Children.map(props.children, (child) =>\n        cloneElement(child, { ['data-themeable']: true })\n      )\n    : props.children\n\n  return useThemedChildren(themeState, children, props, isRoot)\n}\n\nexport function useThemedChildren(\n  themeState: ChangedThemeResponse,\n  children: any,\n  options: {\n    forceClassName?: boolean\n    shallow?: boolean\n    passPropsToChildren?: boolean\n  },\n  isRoot = false\n) {\n  const { themeManager, isNewTheme, className, theme } = themeState\n  const { shallow, forceClassName } = options\n  const hasEverThemed = useServerRef(false)\n  if (isNewTheme) {\n    hasEverThemed.current = true\n  }\n\n  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {\n    // be sure to memoize shouldReset to avoid reparenting\n    let next = Children.toArray(children)\n\n    // each children of these children wont get the theme\n    if (shallow && themeManager) {\n      next = next.map((child) => {\n        return isValidElement(child)\n          ? cloneElement(\n              child,\n              undefined,\n              <Theme name={themeManager.state.parentName}>\n                {(child as any).props.children}\n              </Theme>\n            )\n          : child\n      })\n    }\n\n    // tried this but themes css doesn't fully like it\n    // if (shouldAttachClassName && options.passPropsToChildren) {\n    //   next = next.map((child: any) => {\n    //     const childStyle = child.props?.style\n    //     console.log('pass it down', className, child.props.className || '')\n    //     const newProps = {\n    //       className: (child.props.className || '') + ' ' + className,\n    //       style: Array.isArray(childStyle)\n    //         ? [colorStyle, ...childStyle]\n    //         : {\n    //             ...colorStyle,\n    //             ...childStyle,\n    //           },\n    //     }\n    //     return isValidElement(child) ? cloneElement(child as any, newProps) : child\n    //   })\n    // }\n\n    const wrapped = (\n      <ThemeManagerContext.Provider value={themeManager}>\n        {next}\n      </ThemeManagerContext.Provider>\n    )\n\n    if (forceClassName === false) {\n      return wrapped\n    }\n\n    if (isWeb && !options.passPropsToChildren) {\n      // in order to provide currentColor, set color by default\n      const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''\n      const colorStyle = {\n        color: themeColor,\n      }\n\n      return (\n        <span className={`${className || ''} _dsp_contents`} style={colorStyle}>\n          {wrapped}\n        </span>\n      )\n    }\n\n    return wrapped\n  }\n\n  return children\n}\n"],
+  "mappings": "AAmDc;AAnDd,SAAS,aAAa;AACtB,SAAS,UAAU,cAAc,sBAAsB;AAEvD,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAAS,oBAAoB;AAC7B,SAA+B,4BAA4B;AAGpD,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM;AAAS,WAAO,MAAM;AAChC,QAAM,SAAS,CAAC,CAAC,MAAM,SAAS;AAChC,QAAM,aAAa,qBAAqB,OAAO,MAAM;AACrD,QAAM,WAAW,MAAM,gBAAgB,IACnC,SAAS;AAAA,IAAI,MAAM;AAAA,IAAU,CAAC,UAC5B,aAAa,OAAO,EAAE,CAAC,gBAAgB,GAAG,KAAK,CAAC;AAAA,EAClD,IACA,MAAM;AAEV,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D;AAEO,SAAS,kBACd,YACA,UACA,SAKA,SAAS,OACT;AACA,QAAM,EAAE,cAAc,YAAY,WAAW,MAAM,IAAI;AACvD,QAAM,EAAE,SAAS,eAAe,IAAI;AACpC,QAAM,gBAAgB,aAAa,KAAK;AACxC,MAAI,YAAY;AACd,kBAAc,UAAU;AAAA,EAC1B;AAEA,MAAI,cAAc,cAAc,WAAW,kBAAkB,QAAQ;AAEnE,QAAI,OAAO,SAAS,QAAQ,QAAQ;AAGpC,QAAI,WAAW,cAAc;AAC3B,aAAO,KAAK,IAAI,CAAC,UAAU;AACzB,eAAO,eAAe,KAAK,IACvB;AAAA,UACE;AAAA,UACA;AAAA,UACA,oBAAC,SAAM,MAAM,aAAa,MAAM,YAC5B,gBAAc,MAAM,UACxB;AAAA,QACF,IACA;AAAA,MACN,CAAC;AAAA,IACH;AAoBA,UAAM,UACJ,oBAAC,oBAAoB,UAApB,EAA6B,OAAO,cAClC,gBACH;AAGF,QAAI,mBAAmB,OAAO;AAC5B,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,CAAC,QAAQ,qBAAqB;AAEzC,YAAM,aAAa,SAAS,aAAa,iBAAiB,MAAM,KAAK,IAAI;AACzE,YAAM,aAAa;AAAA,QACjB,OAAO;AAAA,MACT;AAEA,aACE,oBAAC,UAAK,WAAW,GAAG,aAAa,oBAAoB,OAAO,YACzD,mBACH;AAAA,IAEJ;AAEA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.5.22",
+  "version": "1.5.24",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,19 +27,19 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "^1.5.22",
-    "@tamagui/constants": "^1.5.22",
-    "@tamagui/helpers": "^1.5.22",
-    "@tamagui/normalize-css-color": "^1.5.22",
-    "@tamagui/use-did-finish-ssr": "^1.5.22",
-    "@tamagui/use-event": "^1.5.22",
-    "@tamagui/use-force-update": "^1.5.22"
+    "@tamagui/compose-refs": "^1.5.24",
+    "@tamagui/constants": "^1.5.24",
+    "@tamagui/helpers": "^1.5.24",
+    "@tamagui/normalize-css-color": "^1.5.24",
+    "@tamagui/use-did-finish-ssr": "^1.5.24",
+    "@tamagui/use-event": "^1.5.24",
+    "@tamagui/use-force-update": "^1.5.24"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.5.22",
+    "@tamagui/build": "^1.5.24",
     "@testing-library/react": "^13.4.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/helpers/expandStyles.ts

@@ -1,3 +1,5 @@
+import { isWeb } from '@tamagui/constants'
+
 import { getConfig } from '../config.js'
 import { expandStyle } from './expandStyle.js'
 import { normalizeShadow } from './normalizeShadow'
@@ -60,10 +62,12 @@ export function fixStyles(style: Record<string, any>) {
   }
 }
 
+// native doesn't support specific border edge style
+const nativeStyle = isWeb ? null : 'borderStyle'
 const borderDefaults = {
   borderWidth: 'borderStyle',
-  borderBottomWidth: 'borderBottomStyle',
-  borderTopWidth: 'borderTopStyle',
-  borderLeftWidth: 'borderLeftStyle',
-  borderRightWidth: 'borderRightStyle',
+  borderBottomWidth: nativeStyle || 'borderBottomStyle',
+  borderTopWidth: nativeStyle || 'borderTopStyle',
+  borderLeftWidth: nativeStyle || 'borderLeftStyle',
+  borderRightWidth: nativeStyle || 'borderRightStyle',
 }

package/src/views/Theme.tsx

@@ -18,7 +18,7 @@ export function Theme(props: ThemeProps) {
       )
     : props.children
 
-  return useThemedChildren(themeState, children, props)
+  return useThemedChildren(themeState, children, props, isRoot)
 }
 
 export function useThemedChildren(
@@ -28,7 +28,8 @@ export function useThemedChildren(
     forceClassName?: boolean
     shallow?: boolean
     passPropsToChildren?: boolean
-  }
+  },
+  isRoot = false
 ) {
   const { themeManager, isNewTheme, className, theme } = themeState
   const { shallow, forceClassName } = options
@@ -37,7 +38,7 @@ export function useThemedChildren(
     hasEverThemed.current = true
   }
 
-  if (isNewTheme || hasEverThemed.current || forceClassName) {
+  if (isNewTheme || hasEverThemed.current || forceClassName || isRoot) {
     // be sure to memoize shouldReset to avoid reparenting
     let next = Children.toArray(children)
 
@@ -97,6 +98,8 @@ export function useThemedChildren(
         </span>
       )
     }
+
+    return wrapped
   }
 
   return children

package/types/helpers/expandStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyles.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;;;;;;;;;;;;sCAAc,uBAyB5E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAiBnD"}
+{"version":3,"file":"expandStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/expandStyles.ts"],"names":[],"mappings":"AAUA;;;;;;GAMG;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;;;;;;;;;;;;sCAAc,uBAyB5E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAiBnD"}

package/types/views/Theme.d.ts

@@ -5,5 +5,5 @@ export declare function useThemedChildren(themeState: ChangedThemeResponse, chil
     forceClassName?: boolean;
     shallow?: boolean;
     passPropsToChildren?: boolean;
-}): any;
+}, isRoot?: boolean): any;
 //# sourceMappingURL=Theme.d.ts.map

package/types/views/Theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,sBAAsB,CAAA;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OAYtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE;IACP,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,OAwEF"}
+{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,sBAAsB,CAAA;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OAYtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE;IACP,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,EACD,MAAM,UAAQ,OA0Ef"}