@tamagui/core 1.0.1-beta.188 → 1.0.1-beta.189

package/src/hooks/useMedia.tsx

@@ -1,6 +1,7 @@
 import { useIsomorphicLayoutEffect } from '@tamagui/constants'
 import { startTransition, useEffect, useMemo, useState } from 'react'
 
+import { getConfig } from '../config'
 import { matchMedia } from '../helpers/matchMedia'
 import {
   MediaQueries,
@@ -10,7 +11,6 @@ import {
   TamaguiInternalConfig,
 } from '../types'
 import { useSafeRef } from './useSafeRef'
-import { getConfig } from '..'
 
 export const mediaState: MediaQueryState =
   // development time safeguard
@@ -55,10 +55,9 @@ export const getMedia = () => {
 // for SSR capture it at time of startup
 let currentMediaState: MediaQueryState | null
 let initialMediaState: MediaQueryState | null
-// fairly concurrent mode sketchy but such an edge case ok for now
-let hasFinishedInitialRender = false
-export const getCurrentMediaState = () => {
-  if (getConfig().disableSSR || hasFinishedInitialRender) {
+
+export const getInitialMediaState = () => {
+  if (getConfig().disableSSR) {
     return currentMediaState || {}
   }
   return initialMediaState || {}
@@ -132,21 +131,12 @@ function setupMediaListeners() {
   })
 }
 
-const onIdle =
-  typeof requestIdleCallback === 'undefined' ? (cb) => setTimeout(cb, 100) : requestIdleCallback
-
 export function useMediaQueryListeners(config: TamaguiInternalConfig) {
   if (config.disableSSR) {
     return
   }
-
   useEffect(() => {
     setupMediaListeners()
-
-    onIdle(() => {
-      hasFinishedInitialRender = true
-    })
-
     return unlisten
   }, [])
 }
@@ -154,7 +144,7 @@ export function useMediaQueryListeners(config: TamaguiInternalConfig) {
 export function useMedia(): {
   [key in MediaQueryKey]: boolean
 } {
-  const [state, setState] = useState(getCurrentMediaState())
+  const [state, setState] = useState<MediaQueryState>(initialMediaState || {})
   const keys = useSafeRef({} as Record<string, boolean>)
 
   function updateState() {

package/src/index.ts

@@ -18,7 +18,6 @@ export type { RNWTextProps, RNWViewProps } from './types-rnw'
 export { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } from './config'
 
 export * from './constants/constants'
-export * from '@tamagui/constants'
 export { createDOMProps } from '@tamagui/rnw'
 
 export * from './helpers/calc'
@@ -62,7 +61,6 @@ export {
 } from './hooks/useMedia'
 export * from './hooks/usePressable'
 export * from './hooks/useTheme'
-export * from './hooks/useIsSSR'
 export * from './hooks/useUnmountEffect'
 export * from './hooks/useSafeRef'
 
@@ -78,5 +76,8 @@ export * from './views/FontLanguage'
 export * from './views/TamaguiProvider'
 
 export * from '@tamagui/use-force-update'
+export * from '@tamagui/use-did-finish-ssr'
 export * from '@tamagui/use-event'
+export * from '@tamagui/compose-refs'
 export * from '@tamagui/helpers'
+export * from '@tamagui/constants'

package/types/hooks/useMedia.d.ts

@@ -5,7 +5,7 @@ export declare function addMediaQueryListener(key: MediaQueryKey, cb: MediaListe
 export declare function removeMediaQueryListener(key: MediaQueryKey, cb: MediaListener): void;
 export declare const mediaQueryConfig: MediaQueries;
 export declare const getMedia: () => MediaQueryState;
-export declare const getCurrentMediaState: () => MediaQueryState;
+export declare const getInitialMediaState: () => MediaQueryState;
 export declare const configureMedia: (config: TamaguiInternalConfig) => void;
 export declare function useMediaQueryListeners(config: TamaguiInternalConfig): void;
 export declare function useMedia(): {

package/types/index.d.ts

@@ -15,7 +15,6 @@ export * from './types';
 export type { RNWTextProps, RNWViewProps } from './types-rnw';
 export { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } from './config';
 export * from './constants/constants';
-export * from '@tamagui/constants';
 export { createDOMProps } from '@tamagui/rnw';
 export * from './helpers/calc';
 export * from './helpers/useShallowSetState';
@@ -45,7 +44,6 @@ export * from './hooks/useIsTouchDevice';
 export { configureMedia, getMedia, mediaState, useMedia, useMediaPropsActive, mediaObjectToString, addMediaQueryListener, removeMediaQueryListener, mediaQueryConfig, } from './hooks/useMedia';
 export * from './hooks/usePressable';
 export * from './hooks/useTheme';
-export * from './hooks/useIsSSR';
 export * from './hooks/useUnmountEffect';
 export * from './hooks/useSafeRef';
 export * from './views/Slot';
@@ -59,6 +57,9 @@ export * from './views/ThemeReset';
 export * from './views/FontLanguage';
 export * from './views/TamaguiProvider';
 export * from '@tamagui/use-force-update';
+export * from '@tamagui/use-did-finish-ssr';
 export * from '@tamagui/use-event';
+export * from '@tamagui/compose-refs';
 export * from '@tamagui/helpers';
+export * from '@tamagui/constants';
 //# sourceMappingURL=index.d.ts.map

package/src/hooks/useIsSSR.tsx

@@ -1,25 +0,0 @@
-import { isServer, isWeb, useIsomorphicLayoutEffect } from '@tamagui/constants'
-import { useState } from 'react'
-
-import { startTransition } from '../helpers/startTransition'
-
-// because any change before first useEffect causes hydration / mismatch issues
-
-export const useIsSSR = (props?: { immediate?: boolean }) => {
-  const [val, setVal] = useState(true)
-
-  if (isWeb && !isServer) {
-    useIsomorphicLayoutEffect(() => {
-      // could also have a global tamagui `config.immediateSSRTransition`
-      if (props?.immediate) {
-        setVal(false)
-      } else {
-        startTransition(() => {
-          setVal(false)
-        })
-      }
-    }, [])
-  }
-
-  return val
-}