@tamagui/web 1.22.3 → 1.22.5

package/src/helpers/extendStaticConfig.ts

@@ -1,6 +1,11 @@
 import { stylePropsView } from '@tamagui/helpers'
 
-import type { StaticConfig, StaticConfigParsed, StylableComponent } from '../types.js'
+import type {
+  GenericVariantDefinitions,
+  StaticConfig,
+  StaticConfigParsed,
+  StylableComponent,
+} from '../types.js'
 import { createPropMapper } from './createPropMapper.js'
 import { mergeProps } from './mergeProps.js'
 
@@ -13,25 +18,9 @@ export function extendStaticConfig(
   }
 
   const parentStaticConfig = parent.staticConfig as StaticConfig
-  const variants = {
-    ...parentStaticConfig.variants,
-  }
 
   // merge variants... can we type this?
-  if (config.variants) {
-    for (const key in config.variants) {
-      if (variants[key]) {
-        variants[key] = {
-          ...variants[key],
-          ...config.variants[key],
-        }
-      } else {
-        variants[key] = config.variants[key]
-      }
-    }
-  }
-
-  // console.log('variants', variants)
+  const variants = mergeVariants(parentStaticConfig.variants, config.variants)
 
   // include our own
   const parentNames = [...(parentStaticConfig.parentNames || [])]
@@ -40,15 +29,11 @@ export function extendStaticConfig(
   }
 
   const deoptProps = config.deoptProps || new Set<string>()
-  // deoptProps.add('style')
 
-  const defaultProps = mergeProps(
-    { ...parentStaticConfig.defaultProps },
-    {
-      ...config.defaultVariants,
-      ...config.defaultProps,
-    }
-  )[0]
+  const defaultProps = mergeProps(parentStaticConfig.defaultProps, {
+    ...config.defaultProps,
+    ...config.defaultVariants,
+  })[0]
 
   return parseStaticConfig({
     ...parentStaticConfig,
@@ -67,6 +52,30 @@ export function extendStaticConfig(
   })
 }
 
+export const mergeVariants = (
+  parentVariants?: GenericVariantDefinitions,
+  ourVariants?: GenericVariantDefinitions
+) => {
+  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
+}
+
 export const parseStaticConfig = (config: Partial<StaticConfig>): StaticConfigParsed => {
   const parsed = {
     defaultProps: {},

package/src/helpers/getStylesAtomic.ts

@@ -103,8 +103,8 @@ const presetHashes = {
 
 export function styleToCSS(style: Record<string, any>) {
   // box-shadow
-  if ('shadowRadius' in style) {
-    const { shadowOffset, shadowRadius, shadowColor } = style
+  const { shadowOffset, shadowRadius, shadowColor } = style
+  if (style.shadowRadius) {
     const offset = shadowOffset || defaultOffset
     const shadow = `${normalizeValueWithProperty(
       offset.width
@@ -118,12 +118,8 @@ export function styleToCSS(style: Record<string, any>) {
   }
 
   // text-shadow
-  if (
-    'textShadowColor' in style ||
-    'textShadowOffset' in style ||
-    'textShadowRadius' in style
-  ) {
-    const { textShadowColor, textShadowOffset, textShadowRadius } = style
+  const { textShadowColor, textShadowOffset, textShadowRadius } = style
+  if (textShadowColor || textShadowOffset || textShadowRadius) {
     const { height, width } = textShadowOffset || defaultOffset
     const radius = textShadowRadius || 0
     const color = normalizeValueWithProperty(textShadowColor, 'textShadowColor')

package/src/helpers/mergeProps.ts

@@ -18,7 +18,7 @@ type AnyRecord = Record<string, any>
 
 export const mergeProps = (
   a: Object,
-  b: Object,
+  b?: Object,
   leaveOutClassNames = false,
   inverseShorthands?: AnyRecord
 ) => {
@@ -27,8 +27,10 @@ export const mergeProps = (
   for (const key in a) {
     mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands)
   }
-  for (const key in b) {
-    mergeProp(out, outCns, b, undefined, key, leaveOutClassNames, inverseShorthands)
+  if (b) {
+    for (const key in b) {
+      mergeProp(out, outCns, b, undefined, key, leaveOutClassNames, inverseShorthands)
+    }
   }
   return [out, outCns] as const
 }

package/src/styled.tsx

@@ -1,6 +1,7 @@
 import { stylePropsAll } from '@tamagui/helpers'
 
 import { createComponent } from './createComponent.js'
+import { mergeVariants } from './helpers/extendStaticConfig.js'
 import { ReactNativeStaticConfigs } from './setupReactNative.js'
 import type {
   GetProps,
@@ -77,7 +78,7 @@ export function styled<
     !!parentStaticConfig &&
     !(parentStaticConfig.isReactNative || parentStaticConfig.isHOC)
 
-  const Component: any = isPlainStyledComponent
+  let Component: any = isPlainStyledComponent
     ? ComponentIn
     : parentStaticConfig?.Component || ComponentIn
 
@@ -98,6 +99,17 @@ export function styled<
         ...defaultProps
       } = options
 
+      // TODO why is this breaking native but fixing web
+      // if (process.env.TAMAGUI_TARGET === 'web') {
+      //   if (parentStaticConfig) {
+      //     defaultProps = {
+      //       ...parentStaticConfig.defaultProps,
+      //       ...defaultProps,
+      //       ...defaultVariants,
+      //     }
+      //   }
+      // }
+
       if (defaultVariants) {
         defaultProps = {
           ...defaultVariants,
@@ -105,6 +117,10 @@ export function styled<
         }
       }
 
+      if (parentStaticConfig?.isHOC) {
+        variants = mergeVariants(parentStaticConfig.variants, variants)
+      }
+
       const nativeConf =
         (isReactNative && ReactNativeStaticConfigs.get(Component)) || null
 

package/types/createComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAWN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAgC3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,wDA81BpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}
+{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAWN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EAErB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,wDAq1BpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}

package/types/helpers/extendStaticConfig.d.ts

@@ -1,4 +1,11 @@
-import type { StaticConfig, StaticConfigParsed, StylableComponent } from '../types.js';
+import type { GenericVariantDefinitions, StaticConfig, StaticConfigParsed, StylableComponent } from '../types.js';
 export declare function extendStaticConfig(config: Partial<StaticConfig>, parent?: StylableComponent): StaticConfigParsed;
+export declare const mergeVariants: (parentVariants?: GenericVariantDefinitions, ourVariants?: GenericVariantDefinitions) => {
+    [x: string]: {
+        [key: string]: ((a: any, b: any) => any) | {
+            [key: string]: any;
+        };
+    };
+};
 export declare const parseStaticConfig: (config: Partial<StaticConfig>) => StaticConfigParsed;
 //# sourceMappingURL=extendStaticConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"extendStaticConfig.d.ts","sourceRoot":"","sources":["../../src/helpers/extendStaticConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAItF,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAC7B,MAAM,CAAC,EAAE,iBAAiB,sBA2D3B;AAED,eAAO,MAAM,iBAAiB,WAAY,QAAQ,YAAY,CAAC,KAAG,kBAUjE,CAAA"}
+{"version":3,"file":"extendStaticConfig.d.ts","sourceRoot":"","sources":["../../src/helpers/extendStaticConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,yBAAyB,EACzB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,aAAa,CAAA;AAIpB,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAC7B,MAAM,CAAC,EAAE,iBAAiB,sBAuC3B;AAED,eAAO,MAAM,aAAa,oBACP,yBAAyB,gBAC5B,yBAAyB;;;;;;CAoBxC,CAAA;AAED,eAAO,MAAM,iBAAiB,WAAY,QAAQ,YAAY,CAAC,KAAG,kBAUjE,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAc,MAAM,kBAAkB,CAAA;AAG1D,OAAO,KAAK,EAAyB,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG9E,OAAO,EAAE,gBAAgB,EAAqB,MAAM,wBAAwB,CAAA;AAW5E,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,iBAgB7D;AAID,eAAO,MAAM,oBAAoB,YACtB,oBAAoB,WACpB,gBAAgB,KACxB,WAAW,EAoDb,CAAA;AAMD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAoCpD"}
+{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAc,MAAM,kBAAkB,CAAA;AAG1D,OAAO,KAAK,EAAyB,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG9E,OAAO,EAAE,gBAAgB,EAAqB,MAAM,wBAAwB,CAAA;AAW5E,wBAAgB,eAAe,CAAC,QAAQ,EAAE,oBAAoB,iBAgB7D;AAID,eAAO,MAAM,oBAAoB,YACtB,oBAAoB,WACpB,gBAAgB,KACxB,WAAW,EAoDb,CAAA;AAMD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAgCpD"}

package/types/helpers/mergeProps.d.ts

@@ -12,6 +12,6 @@
  *   - shorthands can be expanded before merging
  */
 type AnyRecord = Record<string, any>;
-export declare const mergeProps: (a: Object, b: Object, leaveOutClassNames?: boolean, inverseShorthands?: AnyRecord) => readonly [AnyRecord, AnyRecord];
+export declare const mergeProps: (a: Object, b?: Object, leaveOutClassNames?: boolean, inverseShorthands?: AnyRecord) => readonly [AnyRecord, AnyRecord];
 export {};
 //# sourceMappingURL=mergeProps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEpC,eAAO,MAAM,UAAU,MAClB,MAAM,KACN,MAAM,oDAEW,SAAS,oCAW9B,CAAA"}
+{"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../src/helpers/mergeProps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AAEpC,eAAO,MAAM,UAAU,MAClB,MAAM,MACL,MAAM,oDAEU,SAAS,oCAa9B,CAAA"}

package/types/styled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,YAAY,CAAA;AAEnB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAExG,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,uiCA2IhD"}
+{"version":3,"file":"styled.d.ts","sourceRoot":"","sources":["../src/styled.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,YAAY,CAAA;AAEnB,KAAK,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CACzE,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,QAAQ,CAAC,CAAC,CAAC,CAAA;AAEf,KAAK,eAAe,CAAC,CAAC,SAAS,iBAAiB,IAAI,CAAC,SAAS,gBAAgB,CAC5E,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,CACR,GACG,CAAC,GACD,EAAE,CAAA;AAEN,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC/C;KACG,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GACnE,GAAG,GACH,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;CACnC,GACD,SAAS,CAAA;AAEb,wBAAgB,MAAM,CACpB,eAAe,SAAS,iBAAiB,EACzC,QAAQ,SAAS,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,GAAG,kBAAkB,CAAC,eAAe,CAAC,GAAG,IAAI,EAExG,WAAW,EAAE,eAAe,EAE5B,OAAO,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG;IACpC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC/B,eAAe,CAAC,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAA;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,EACD,uBAAuB,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,uiCA0JhD"}