@tamagui/core 1.0.1-beta.199 → 1.0.1-beta.200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.0.1-beta.199",
+  "version": "1.0.1-beta.200",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -28,23 +28,23 @@
   ],
   "dependencies": {
     "@expo/match-media": "^0.3.0",
-    "@tamagui/compose-refs": "^1.0.1-beta.199",
-    "@tamagui/constants": "^1.0.1-beta.199",
-    "@tamagui/helpers": "^1.0.1-beta.199",
-    "@tamagui/normalize-css-color-lite": "^1.0.1-beta.199",
-    "@tamagui/react-native-use-pressable": "^1.0.1-beta.199",
-    "@tamagui/react-native-use-responder-events": "^1.0.1-beta.199",
-    "@tamagui/types-react-native": "^1.0.1-beta.199",
-    "@tamagui/use-did-finish-ssr": "^1.0.1-beta.199",
-    "@tamagui/use-event": "^1.0.1-beta.199",
-    "@tamagui/use-force-update": "^1.0.1-beta.199"
+    "@tamagui/compose-refs": "^1.0.1-beta.200",
+    "@tamagui/constants": "^1.0.1-beta.200",
+    "@tamagui/helpers": "^1.0.1-beta.200",
+    "@tamagui/normalize-css-color-lite": "^1.0.1-beta.200",
+    "@tamagui/react-native-use-pressable": "^1.0.1-beta.200",
+    "@tamagui/react-native-use-responder-events": "^1.0.1-beta.200",
+    "@tamagui/types-react-native": "^1.0.1-beta.200",
+    "@tamagui/use-did-finish-ssr": "^1.0.1-beta.200",
+    "@tamagui/use-event": "^1.0.1-beta.200",
+    "@tamagui/use-force-update": "^1.0.1-beta.200"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.199",
+    "@tamagui/build": "^1.0.1-beta.200",
     "@types/node": "^16.11.9",
     "@types/react": "^18.0.15",
     "@types/react-native": "^0.69.2",

package/src/createComponent.tsx

@@ -61,6 +61,8 @@ import { Slot, mergeEvent } from './views/Slot'
 import { wrapThemeManagerContext } from './views/Theme'
 
 React['keep']
+// this appears to fix expo / babel not picking this up sometimes? really odd
+process.env.TAMAGUI_TARGET
 
 /**
  * All things that need one-time setup after createTamagui is called
@@ -258,7 +260,7 @@ export function createComponent<
         // eslint-disable-next-line no-console
         console.groupCollapsed('initial props/state')
         // eslint-disable-next-line no-console
-        console.log('props', propsIn)
+        console.log('propsIn', propsIn, 'turned into', props, 'order', Object.keys(props))
         // eslint-disable-next-line no-console
         console.log('splitStyles', splitStyles)
         // eslint-disable-next-line no-console
@@ -383,10 +385,10 @@ export function createComponent<
               if (prev.mediaState![key] !== next) {
                 return {
                   ...prev,
-                  mediaState: {
+                  mediaState: getMediaStateObject({
                     ...prev.mediaState,
                     [key]: next,
-                  },
+                  }),
                 }
               }
               return prev
@@ -805,8 +807,7 @@ export function createComponent<
     // find space by media query
     if (state.mediaState && mediaKeys.length) {
       for (const key in state.mediaState) {
-        if (!state.mediaState[key]) continue
-        if (props[key] && props[key].space !== undefined) {
+        if (state.mediaState[key] && props[key] && props[key].space !== undefined) {
           space = props[key].space
         }
       }
@@ -957,7 +958,7 @@ export function createComponent<
           pressIn: false,
           focus: false,
           mounted: false,
-          mediaState: getInitialMediaState(),
+          mediaState: getMediaStateObject(getInitialMediaState()),
         }
         defaultComponentStateMounted = {
           ...defaultComponentState,
@@ -1454,3 +1455,6 @@ const styleDisplayContents = {
 const dontComposePressabilityKeys = {
   onClick: true,
 }
+
+const getMediaStateObject = (obj: Object) =>
+  Object.fromEntries(Object.entries(obj).flatMap(([k, v]) => (v ? [[`$${k}`, v]] : [])))

package/src/helpers/createPropMapper.ts

@@ -339,7 +339,7 @@ const resolveTokensAndVariants: StyleResolver = (
         )
       } else {
         // nullish values cant be tokens, need no extra parsing
-        res[fKey] = value[fKey]
+        res[fKey] = val
       }
     }
     if (process.env.NODE_ENV === 'development') {

package/src/helpers/expandStyles.ts

@@ -1,7 +1,6 @@
 import { isWeb } from '@tamagui/constants'
 
 import { getConfig } from '../config'
-import { CreateShorthands } from '../types'
 import { expandStyle } from './expandStyle'
 import { colorToRGBA, normalizeColor } from './normalizeColor'
 import { normalizeValueWithProperty } from './normalizeValueWithProperty.js'

package/src/helpers/normalizeValueWithProperty.ts

@@ -13,7 +13,7 @@ export function normalizeValueWithProperty(value: any, property?: string): any {
     return value
   }
   const cached = cache[value]
-  if (cached) {
+  if (cached !== undefined) {
     return cached
   }
   let res = value

package/types/helpers/expandStyles.d.ts

@@ -9,11 +9,11 @@ export declare const defaultOffset: {
  *   2. Normalizes various inconsistent styles to be more consistent
  *   3. Expands react-native shorthands, ie paddingHorizontal => paddingLeft, paddingRight
  */
-export declare function expandStyles(style: Record<string, any>, config?: import("../types").TamaguiInternalConfig<import("../types").CreateTokens<import("../types").VariableVal>, {
-    [key: string]: Partial<import("../types").TamaguiBaseTheme> & {
-        [key: string]: import("../types").VariableVal;
+export declare function expandStyles(style: Record<string, any>, config?: import("..").TamaguiInternalConfig<import("..").CreateTokens<import("..").VariableVal>, {
+    [key: string]: Partial<import("..").TamaguiBaseTheme> & {
+        [key: string]: import("..").VariableVal;
     };
-}, import("../types").GenericShorthands, {
+}, import("..").GenericShorthands, {
     [key: string]: {
         [key: string]: string | number;
     };
@@ -21,6 +21,6 @@ export declare function expandStyles(style: Record<string, any>, config?: import
     [key: string]: string | any[] | {
         [key: string]: any;
     };
-}, import("../types").GenericFonts>): Record<string, any>;
+}, import("..").GenericFonts>): Record<string, any>;
 export declare function fixStyles(style: Record<string, any>): void;
 //# sourceMappingURL=expandStyles.d.ts.map