@tamagui/core 1.0.1-beta.227 → 1.0.1-beta.228

package/package.json

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

package/src/createComponent.tsx

@@ -146,8 +146,6 @@ export function createComponent<
       props = propsIn
     }
 
-    // time`mergeProps`
-
     const debugProp = props['debug'] as DebugProp
     const { Component, isText, isZStack } = staticConfig
     const componentName = props.componentName || staticConfig.componentName
@@ -283,8 +281,6 @@ export function createComponent<
     elementType = Component || elementType
     const isStringElement = typeof elementType === 'string'
 
-    // time`setupStateConf`
-
     const isExiting = presence?.[0] === false
     const splitStyles = useSplitStyles(
       props,
@@ -304,8 +300,6 @@ export function createComponent<
       debugProp
     )
 
-    // time`splitStyles`
-
     const hostRef = useServerRef<TamaguiElement>(null)
 
     // animation setup
@@ -369,34 +363,26 @@ export function createComponent<
       }
     }
 
-    // time`animations`
-
     // media queries
     useIsomorphicLayoutEffect(() => {
-      if (!mediaKeys.length) return
-      const disposers: any[] = []
-      for (const key of mediaKeys) {
-        disposers.push(
-          addMediaQueryListener(key, (next: boolean) => {
-            setState((prev) => {
-              if (prev.mediaState![key] !== next) {
-                return {
-                  ...prev,
-                  mediaState: getMediaStateObject({
-                    ...prev.mediaState,
-                    [key]: next,
-                  }),
-                }
+      const disposers = mediaKeys.map((key) => {
+        return addMediaQueryListener(key, (next: boolean) => {
+          setState((prev) => {
+            if (prev.mediaState![key] !== next) {
+              return {
+                ...prev,
+                mediaState: getMediaStateObject({
+                  ...prev.mediaState,
+                  [key]: next,
+                }),
               }
-              return prev
-            })
+            }
+            return prev
           })
-        )
-      }
+        })
+      })
       return () => {
-        for (const disposer of disposers) {
-          disposer()
-        }
+        disposers.forEach((d) => d())
       }
     }, [mediaKeys.join(',')])
 
@@ -563,8 +549,6 @@ export function createComponent<
       })
     }
 
-    // time`webHooks`
-
     const unPress = useCallback(() => {
       setStateShallow({
         press: false,
@@ -782,8 +766,6 @@ export function createComponent<
           }
         : null
 
-    // time`events`
-
     let space = spaceProp
 
     // find space by media query
@@ -906,8 +888,6 @@ export function createComponent<
       }
     }
 
-    // time`done`
-
     return content
   })
 

package/src/createVariable.ts

@@ -39,7 +39,7 @@ export function variableToString(vrble?: any, getValue = false) {
 }
 
 export function isVariable(v: Variable | any): v is Variable {
-  return !!(v && v[IS_VAR])
+  return v && typeof v === 'object' && IS_VAR in v
 }
 
 export function getVariable(nameOrVariable: Variable | string) {

package/src/helpers/ThemeManager.test.tsx

@@ -477,4 +477,21 @@ describe('ThemeManager', () => {
     )
     expect(child.state.name).toBe('dark_yellow_Button')
   })
+
+  test(`Component name + name finds one up when component name missing`, () => {
+    const parent = new ThemeManager(
+      {
+        name: 'dark_red_alt1',
+      },
+      'root'
+    )
+    const child = new ThemeManager(
+      {
+        name: 'alt2',
+        componentName: 'Missing',
+      },
+      parent
+    )
+    expect(child.state.name).toBe('dark_red_alt2')
+  })
 })

package/src/helpers/ThemeManager.tsx

@@ -176,9 +176,10 @@ function getState(
     ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)
     : parentName
   const max = base.length
-  const min = componentName
-    ? max // component themes don't search upwards
-    : 0
+  const min =
+    componentName && !nextName
+      ? max // component name only don't search upwards
+      : 0
 
   // prettier-ignore
   // eslint-disable-next-line no-console

package/src/helpers/createPropMapper.ts

@@ -35,6 +35,8 @@ export const createPropMapper = (staticConfig: StaticConfigParsed) => {
   // temp remove classnames
   const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, false)[0]
 
+  let conf: TamaguiInternalConfig
+
   const mapper: PropMapper = (
     key,
     value,
@@ -45,10 +47,7 @@ export const createPropMapper = (staticConfig: StaticConfigParsed) => {
     avoidDefaultProps = false,
     debug
   ) => {
-    const conf = getConfig()
-    if (!conf) {
-      throw new Error(`No tamagui config setup`)
-    }
+    conf ||= getConfig()
 
     const props = state.fallbackProps || propsIn
     const returnVariablesAs = getReturnVariablesAs(props, state)
@@ -85,7 +84,7 @@ export const createPropMapper = (staticConfig: StaticConfigParsed) => {
     let shouldReturn = value !== undefined && value !== null
 
     // handle shorthands
-    if (conf.shorthands[key]) {
+    if (key in conf.shorthands) {
       shouldReturn = true
       key = conf.shorthands[key]
     }

package/src/helpers/getSplitStyles.tsx

@@ -204,6 +204,16 @@ export const getSplitStyles: StyleSplitter = (
   debug
 ) => {
   conf = conf || getConfig()
+  const { shorthands } = conf
+  const {
+    defaultVariants,
+    variants,
+    propMapper,
+    isReactNative,
+    deoptProps,
+    inlineProps,
+    inlineWhenUnflattened,
+  } = staticConfig
   const validStyleProps = staticConfig.isText ? stylePropsText : validStyles
   const mediaKeys: string[] = []
   const viewProps: GetStyleResult['viewProps'] = {}
@@ -252,7 +262,7 @@ export const getSplitStyles: StyleSplitter = (
         const isMedia = mediaOrPseudo[0] === '_'
         const isPseudo = mediaOrPseudo[0] === '0'
         const isMediaOrPseudo = isMedia || isPseudo
-        let fullKey = conf.shorthands[shorthand]
+        let fullKey = shorthands[shorthand]
         if (isMedia) {
           // is media
           let mediaShortKey = mediaOrPseudo.slice(1)
@@ -286,13 +296,13 @@ export const getSplitStyles: StyleSplitter = (
     const valInit = props[keyInit]
 
     // normalize shorthands up front
-    const expandedKey = conf.shorthands[keyInit]
+    const expandedKey = keyInit in shorthands
     if (expandedKey) {
-      keyInit = expandedKey
+      keyInit = shorthands[keyInit]
     }
 
-    if (usedKeys[keyInit]) continue
-    if (skipProps[keyInit]) continue
+    if (keyInit in usedKeys) continue
+    if (keyInit in skipProps) continue
     if (!isWeb && keyInit.startsWith('data-')) continue
 
     if (validStyleProps[keyInit] || keyInit.includes('-')) {
@@ -341,14 +351,14 @@ export const getSplitStyles: StyleSplitter = (
         ) {
           viewProps.disabled = true
         }
-        if (!staticConfig.variants?.disabled) {
+        if (!variants?.disabled) {
           continue
         }
       }
 
       if (keyInit === 'testID') {
         usedKeys[keyInit] = 1
-        if (staticConfig.isReactNative) {
+        if (isReactNative) {
           viewProps.testId = valInit
         } else {
           viewProps['data-testid'] = valInit
@@ -358,7 +368,7 @@ export const getSplitStyles: StyleSplitter = (
 
       if (keyInit === 'id' || keyInit === 'nativeID') {
         usedKeys[keyInit] = 1
-        if (staticConfig.isReactNative) {
+        if (isReactNative) {
           viewProps.nativeID = valInit
         } else {
           viewProps.id = valInit
@@ -368,7 +378,7 @@ export const getSplitStyles: StyleSplitter = (
 
       let didUseKeyInit = true
 
-      if (staticConfig.isReactNative) {
+      if (isReactNative) {
         didUseKeyInit = false
         // pass along to react-native-web
         if (accessibilityDirectMap[keyInit] || keyInit.startsWith('accessibility')) {
@@ -468,10 +478,10 @@ export const getSplitStyles: StyleSplitter = (
     }
 
     if (
-      (staticConfig.defaultVariants && keyInit in staticConfig.defaultVariants) ||
+      (defaultVariants && keyInit in defaultVariants) ||
       // may want to just: not compile styled() into classnames, always do this, and always pass in all values in extras.props
       // but we'd want to add styled({ extracted: true }) or something at compile time to save on parsing a bit...
-      (state.keepVariantsAsProps && staticConfig.variants && keyInit in staticConfig.variants)
+      (state.keepVariantsAsProps && variants && keyInit in variants)
     ) {
       viewProps[keyInit] = valInit
     }
@@ -489,9 +499,9 @@ export const getSplitStyles: StyleSplitter = (
     if (
       !isMedia &&
       !isPseudo &&
-      !staticConfig.variants?.[keyInit] &&
+      !variants?.[keyInit] &&
       !validStyleProps[keyInit] &&
-      !conf.shorthands[keyInit]
+      !shorthands[keyInit]
     ) {
       // web-only, exclude all other accessibility props not handled above
       if (isWeb && keyInit.includes('ccessibility')) {
@@ -510,16 +520,7 @@ export const getSplitStyles: StyleSplitter = (
     const expanded =
       isMedia || isPseudo
         ? [[keyInit, valInit]]
-        : staticConfig.propMapper(
-            keyInit,
-            valInit,
-            theme,
-            props,
-            state,
-            languageContext,
-            undefined,
-            debug
-          )
+        : propMapper(keyInit, valInit, theme, props, state, languageContext, undefined, debug)
 
     if (!fontFamily) {
       fontFamily = getPropMappedFontFamily(expanded)
@@ -547,11 +548,7 @@ export const getSplitStyles: StyleSplitter = (
         continue
       }
 
-      if (
-        staticConfig.deoptProps?.has(key) ||
-        staticConfig.inlineProps?.has(key) ||
-        staticConfig.inlineWhenUnflattened?.has(key)
-      ) {
+      if (deoptProps?.has(key) || inlineProps?.has(key) || inlineWhenUnflattened?.has(key)) {
         usedKeys[key] = 1
         viewProps[key] = props[key] ?? val
       }
@@ -689,7 +686,7 @@ export const getSplitStyles: StyleSplitter = (
       }
 
       // pass to view props
-      if (!staticConfig.variants || !(key in staticConfig.variants)) {
+      if (!variants || !(key in variants)) {
         if (!skipProps[key]) {
           viewProps[key] = val
           usedKeys[key] = 1

package/src/helpers/timer.ts

@@ -0,0 +1,9 @@
+const timer = require('@tamagui/timer').timer()
+
+setTimeout(() => {
+  timer.print()
+}, 2000)
+
+export const time = timer.start({
+  quiet: true,
+})

package/types/helpers/timer.d.ts

@@ -0,0 +1,2 @@
+export declare const time: any;
+//# sourceMappingURL=timer.d.ts.map