@tamagui/core 1.0.1-beta.210 → 1.0.1-beta.212

package/src/createTamagui.ts

@@ -195,10 +195,13 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     tokensParsed,
     parsed: true,
     getCSS: () => `
+.is_Text .is_Text { display: inline-flex; }
+._dsp_contents { display: contents; }
 ${themeConfig.css}
 ${getAllRules().join('\n')}
-.is_Text .is_Text { display: inline-flex; }
 `,
+    // const tokens = [...getToken(tokens.size[0])]
+    // .spacer-sm + ._dsp_contents._dsp-sm-hidden { margin-left: -var(--${}) }
   }
 
   configureMedia(config)

package/src/helpers/getSplitStyles.tsx

@@ -1,5 +1,6 @@
 import { isClient, isRSC, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
 import { stylePropsText, stylePropsTransform, validPseudoKeys, validStyles } from '@tamagui/helpers'
+import { timer } from '@tamagui/timer'
 import type { ViewStyle } from '@tamagui/types-react-native'
 import { useInsertionEffect } from 'react'
 
@@ -600,7 +601,7 @@ export const getSplitStyles: StyleSplitter = (
               mergeClassName(transforms, classNames, fullKey, out.identifier, true)
             }
           }
-        } else if (mediaState[mediaKeyShort]) {
+        } else if (mediaState[mediaKey]) {
           for (const key in mediaStyle) {
             const didMerge = mergeMediaByImportance(style, key, mediaStyle[key], usedKeys)
             if (didMerge && key === 'fontFamily') {
@@ -799,30 +800,19 @@ function mergeClassName(
  *
  * and to avoid re-creating it over and over, use a WeakMap
  */
-const propProxies = new WeakMap()
-function getSubStyleProxiedProps(defaultProps: Object, baseProps: Object, specificProps: Object) {
-  if (!specificProps) {
-    // functional variants may want to eventually do something like:
-    // have a hooks-like rule (no conditionals)
-    // then we run them once on compile with a proxy to capture the keys accessed
-    // then add those keys to `inlineProps` so we know we must inline them
-    // for now this will trigger because compiled away
-    // right now also we don't pass in any pre-extracted styled() props but we should pass them in..
-    return baseProps
-  }
+const cache = new WeakMap()
+function getSubStyleProps(defaultProps: Object, baseProps: Object, specificProps: Object) {
+  const key = specificProps || baseProps
   // can cache based only on specific it's always referentially consistent with base
-  if (propProxies.has(specificProps)) {
-    return propProxies.get(specificProps)
+  if (cache.has(key)) {
+    return cache.get(key)
   }
-  const next = createProxy(specificProps, {
-    has(_, key) {
-      return key in defaultProps || key in specificProps || key in baseProps
-    },
-    get(_, key) {
-      return defaultProps[key] ?? specificProps[key] ?? baseProps[key]
-    },
-  })
-  propProxies.set(specificProps, next)
+  const next = {
+    ...defaultProps,
+    ...baseProps,
+    ...specificProps,
+  }
+  cache.set(key, next)
   return next
 }
 
@@ -845,7 +835,7 @@ export const getSubStyle = (
       key,
       val,
       theme,
-      getSubStyleProxiedProps(staticConfig.defaultProps, props, props[subKey]),
+      getSubStyleProps(staticConfig.defaultProps, props, props[subKey]),
       state,
       languageContext,
       avoidDefaultProps

package/src/helpers/useShallowSetState.tsx

@@ -1,13 +1,21 @@
 import React, { useCallback } from 'react'
 
 export function useShallowSetState<State extends Object>(
-  setter: React.Dispatch<React.SetStateAction<State>>
+  setter: React.Dispatch<React.SetStateAction<State>>,
+  debug?: boolean | 'verbose',
+  debugName?: string
 ) {
   return useCallback(
     (next: Partial<State>) => {
       setter((prev) => {
         for (const key in next) {
           if (prev[key] !== next[key]) {
+            if (process.env.NODE_ENV === 'development') {
+              if (debug === 'verbose') {
+                // eslint-disable-next-line no-console
+                console.warn(`update ${debugName}`, next)
+              }
+            }
             return { ...prev, ...next }
           }
         }

package/src/styled.tsx

@@ -136,7 +136,6 @@ export function styled<
         ...nativeConf,
       }
 
-      // TODO compiler doesn't have logic to include children, de-opt (see EnsureFlexed for test usage)
       // bail on non className views as well
       if (defaultProps.children || !acceptsClassName) {
         conf.neverFlatten = true

package/src/types.tsx

@@ -385,7 +385,7 @@ export type GenericFont<Key extends number | string = number | string> = {
   transform?: Partial<{ [key in Key]: TextStyle['textTransform'] | Variable }>
   color?: Partial<{ [key in Key]: string | Variable }>
   // for native use only, lets you map to alternative fonts
-  face?: { [key in FontWeightSteps]: { normal?: string; italic?: string } }
+  face?: Partial<{ [key in FontWeightSteps]: { normal?: string; italic?: string } }>
 }
 
 // media
@@ -1229,7 +1229,6 @@ export type TamaguiComponentState = {
   focus: boolean
   mounted: boolean
   mediaState?: null | Record<string, boolean>
-  hasAnimation?: boolean
   animation?: null | {
     style?: any
     avoidClasses?: boolean

package/types/helpers/useShallowSetState.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare function useShallowSetState<State extends Object>(setter: React.Dispatch<React.SetStateAction<State>>): (next: Partial<State>) => void;
+export declare function useShallowSetState<State extends Object>(setter: React.Dispatch<React.SetStateAction<State>>, debug?: boolean | 'verbose', debugName?: string): (next: Partial<State>) => void;
 //# sourceMappingURL=useShallowSetState.d.ts.map

package/types/types.d.ts

@@ -238,12 +238,12 @@ export declare type GenericFont<Key extends number | string = number | string> =
     color?: Partial<{
         [key in Key]: string | Variable;
     }>;
-    face?: {
+    face?: Partial<{
         [key in FontWeightSteps]: {
             normal?: string;
             italic?: string;
         };
-    };
+    }>;
 };
 export declare type MediaQueryObject = {
     [key: string]: string | number | string;
@@ -559,7 +559,6 @@ export declare type TamaguiComponentState = {
     focus: boolean;
     mounted: boolean;
     mediaState?: null | Record<string, boolean>;
-    hasAnimation?: boolean;
     animation?: null | {
         style?: any;
         avoidClasses?: boolean;