react-native-unistyles 2.0.0-alpha.14 → 2.0.0-alpha.16

package/src/utils/variants.ts

@@ -1,37 +1,61 @@
-import type { Optional, CustomNamedStyles, NestedStyle } from '../types'
+import type { Optional, StyleSheet, NestedStyle } from '../types'
 
-const getKeyForVariant = (value: Record<string, NestedStyle>, variant?: string): Optional<string> => {
-    if (variant && variant in value) {
-        return variant
-    }
+const getKeysForVariants = (
+    value: Record<string, NestedStyle>,
+    variants: Array<[string, Optional<string>]>
+): Array<[string, string]> => {
+    // case for no specified variants by user, we should fallback to 'default'
+    if (!variants.length) {
+        return Object
+            .entries(value)
+            .map(([key, value]) => {
+                if ('default' in value) {
+                    return [key, 'default']
+                }
 
-    if ('default' in value) {
-        return 'default'
+                return undefined
+            })
+            .filter(Boolean) as Array<[string, string]>
     }
 
-    return undefined
+    return variants
+        .map(([variantKey, variantValue]) => {
+            const variantStyle = value[variantKey]
+
+            if (variantStyle && variantValue && variantValue in variantStyle) {
+                return [variantKey, variantValue]
+            }
+
+            if (variantStyle && 'default' in variantStyle) {
+                return [variantKey, 'default']
+            }
+
+            return undefined
+        })
+        .filter(Boolean) as Array<[string, string]>
 }
 
-export const getStyleWithVariant = <T>(
-    style: CustomNamedStyles<T>,
-    variant?: string
+export const getStyleWithVariants = (
+    style: StyleSheet,
+    variantValues?: Record<string, Optional<string>>
 ) => {
     if (!('variants' in style)) {
         return style
     }
 
-    const variantKey = getKeyForVariant(
+    const keys = getKeysForVariants(
         style.variants as Record<string, NestedStyle>,
-        variant
+        Object.entries(variantValues || {})
     )
-    const variantValue = variantKey
-        ? (style.variants as Record<string, NestedStyle>)[variantKey]
-        : {}
+
+    const variantsValues = keys
+        .map(([key, nestedKey]) => ((style.variants as Record<string, Record<string, NestedStyle>>)[key] as Record<string, NestedStyle>)[nestedKey])
+        .reduce((acc, styles) => ({ ...acc, ...styles }), {})
 
     const { variants, ...otherStyles } = style
 
     return {
         ...otherStyles,
-        ...variantValue
+        ...variantsValues
     }
 }

package/lib/module/types/mq.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=mq.js.map

package/lib/typescript/src/types/mq.d.ts

@@ -1,3 +0,0 @@
-import { MQSymbol } from '../utils';
-export type MediaQuery = typeof MQSymbol;
-//# sourceMappingURL=mq.d.ts.map

package/lib/typescript/src/types/mq.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mq.d.ts","sourceRoot":"","sources":["../../../../src/types/mq.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,MAAM,UAAU,GAAG,OAAO,QAAQ,CAAA"}

package/src/types/mq.ts

@@ -1,3 +0,0 @@
-import { MQSymbol } from '../utils'
-
-export type MediaQuery = typeof MQSymbol