react-native-unistyles 3.0.0-beta.8 → 3.0.0-experimental-2025051401

package/src/core/createUnistylesElement.tsx

@@ -1,45 +1,44 @@
 import React from 'react'
+import type { ViewStyle } from 'react-native'
 import type { UnistylesValues } from '../types'
 import { copyComponentProperties } from '../utils'
-import { UnistylesShadowRegistry } from '../web'
 import { isServer } from '../web/utils'
+import { createUnistylesRef } from '../web/utils/createUnistylesRef'
 import { getClassName } from './getClassname'
 import { maybeWarnAboutMultipleUnistyles } from './warn'
 
+const STYLE_PROPS = ['style', 'contentContainerStyle', 'columnWrapperStyle'] as const
+
 type ComponentProps = {
-    style?: UnistylesValues | Array<UnistylesValues>
+    [K in typeof STYLE_PROPS[number]]?: UnistylesValues
+}
+
+const buildUnistylesProps = (Component: any, props: ComponentProps, forwardedRef: React.ForwardedRef<unknown>) => {
+    const componentStyleProps = STYLE_PROPS.filter(styleProp => styleProp in props)
+    const classNames = Object.fromEntries(componentStyleProps.map(styleProp => [styleProp, getClassName(props[styleProp])]))
+    const refs = componentStyleProps.map(styleProp => {
+        return createUnistylesRef(
+            classNames[styleProp],
+            styleProp === 'style' ? forwardedRef : undefined
+        )
+    })
+
+    componentStyleProps.forEach(styleProp => {
+        maybeWarnAboutMultipleUnistyles(props[styleProp] as ViewStyle, Component.displayName)
+    })
+
+    return {
+        ...classNames,
+        ref: isServer() ? undefined : (componentRef: any) => refs.forEach(ref => ref?.(componentRef))
+    }
 }
 
 export const createUnistylesElement = (Component: any) => {
     const UnistylesComponent = React.forwardRef<unknown, ComponentProps>((props, forwardedRef) => {
-        let storedRef: HTMLElement | null = null
-        const classNames = getClassName(props.style)
-
         return (
             <Component
                 {...props}
-                style={classNames}
-                ref={isServer() ? undefined : (ref: HTMLElement | null) => {
-                    // @ts-ignore we don't know the type of the component
-                    maybeWarnAboutMultipleUnistyles(props.style, Component.displayName)
-
-                    if (!ref) {
-                        // @ts-expect-error hidden from TS
-                        UnistylesShadowRegistry.remove(storedRef, classNames?.hash)
-                    }
-
-                    storedRef = ref
-                    // @ts-expect-error hidden from TS
-                    UnistylesShadowRegistry.add(ref, classNames?.hash)
-
-                    if (typeof forwardedRef === 'function') {
-                        return forwardedRef(ref)
-                    }
-
-                    if (forwardedRef) {
-                        forwardedRef.current = ref
-                    }
-                }}
+                {...buildUnistylesProps(Component, props, forwardedRef)}
             />
         )
     })

package/src/core/createUnistylesImageBackground.tsx

@@ -27,17 +27,23 @@ export const createUnistylesImageBackground = (Component: typeof ImageBackground
             <Component
                 {...props}
                 ref={ref => {
-                    passForwardedRef(props, ref, forwardedRef)
-
-                    return () => {
-                        // @ts-ignore
-                        UnistylesShadowRegistry.remove(ref)
-
-                        if (storedImageRef.current) {
-                            // @ts-ignore
-                            UnistylesShadowRegistry.remove(storedImageRef.current)
+                    return passForwardedRef(
+                        ref,
+                        forwardedRef,
+                        () => {
+                            // @ts-expect-error - this is hidden from TS
+                            UnistylesShadowRegistry.add(ref, props.style)
+                        },
+                        () => {
+                            // @ts-expect-error - this is hidden from TS
+                            UnistylesShadowRegistry.remove(ref)
+
+                            if (storedImageRef.current) {
+                                // @ts-expect-error - this is hidden from TS
+                                UnistylesShadowRegistry.remove(storedImageRef.current)
+                            }
                         }
-                    }
+                    )
                 }}
                 imageRef={ref => {
                     if (ref) {

package/src/core/getClassname.ts

@@ -1,14 +1,25 @@
 import type { UnistylesValues } from '../types'
-import { UnistylesWeb } from '../web'
+import * as unistyles from '../web/services'
+import { checkForAnimated } from '../web/utils'
 
-export const getClassName = (unistyle: UnistylesValues | undefined | Array<UnistylesValues>) => {
+export const getClassName = (unistyle: UnistylesValues | undefined | Array<UnistylesValues>, forChild?: boolean) => {
     if (!unistyle) {
         return undefined
     }
 
-    const { hash, injectedClassName } = UnistylesWeb.shadowRegistry.addStyles(
-        Array.isArray(unistyle) ? unistyle.flat(Number.POSITIVE_INFINITY) : [unistyle]
+    const flattenedStyles = Array.isArray(unistyle) ? unistyle.flat(Number.POSITIVE_INFINITY) : [unistyle]
+    const animatedStyles = flattenedStyles.filter(checkForAnimated)
+    const regularStyles = flattenedStyles.filter(style => !checkForAnimated(style))
+
+    const { hash, injectedClassName } = unistyles.services.shadowRegistry.addStyles(
+        regularStyles,
+        forChild
     )
 
-    return hash ? { $$css: true, hash, injectedClassName } : undefined
+    return hash
+        ? [
+            { $$css: true, hash, injectedClassName },
+            animatedStyles,
+        ] as const
+        : undefined
 }

package/src/core/passForwardRef.ts

@@ -1,10 +1,10 @@
 import React from 'react'
-import { UnistylesShadowRegistry } from '../specs'
 
 export const passForwardedRef = <T>(
-    props: any,
     ref: T,
-    forwardedRef: React.ForwardedRef<T>
+    forwardedRef: React.ForwardedRef<T>,
+    onMount?: () => void,
+    onUnmount?: () => void
 ) => {
     const passForwardedRef = () => {
         if (typeof forwardedRef === 'function') {
@@ -19,10 +19,10 @@ export const passForwardedRef = <T>(
     }
     const forwardedRefReturnFn = passForwardedRef()
 
-    // @ts-expect-error hidden from TS
-    UnistylesShadowRegistry.add(ref, props.style)
+    onMount?.()
 
     return () => {
         forwardedRefReturnFn?.()
+        onUnmount?.()
     }
 }

package/src/core/useProxifiedUnistyles/listener.ts

@@ -1,10 +1,10 @@
 import { UnistyleDependency } from '../../specs'
-import { UnistylesWeb } from '../../web'
+import * as unistyles from '../../web/services'
 import type { ListenerProps } from './types'
 
 export const listener = ({ dependencies, updateTheme, updateRuntime }: ListenerProps) => {
-    const disposeTheme = UnistylesWeb.listener.addListeners(dependencies.filter(dependency => dependency === UnistyleDependency.Theme), updateTheme)
-    const disposeRuntime = UnistylesWeb.listener.addListeners(dependencies.filter(dependency => dependency !== UnistyleDependency.Theme), updateRuntime)
+    const disposeTheme = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency === UnistyleDependency.Theme), updateTheme)
+    const disposeRuntime = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency !== UnistyleDependency.Theme), updateRuntime)
 
     return () => {
         disposeTheme()

package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts

@@ -24,6 +24,7 @@ const RTDependencyMap = {
     statusBar: UnistyleDependency.StatusBar,
     pixelRatio: UnistyleDependency.PixelRatio,
     themeName: UnistyleDependency.ThemeName,
+    rtl: UnistyleDependency.Rtl
 } satisfies Partial<Record<keyof UnistylesMiniRuntime, UnistyleDependency>>
 
 export const useProxifiedUnistyles = (forcedTheme?: UnistylesTheme) => {
@@ -63,6 +64,22 @@ export const useProxifiedUnistyles = (forcedTheme?: UnistylesTheme) => {
     })
     const proxifiedRuntime = new Proxy(getMiniRuntime(), {
         get: (target, prop) => {
+            if (prop === 'insets') {
+                return new Proxy(target.insets, {
+                    get: (target, prop) => {
+                        if (prop === 'ime') {
+                            dependencies.add(UnistyleDependency.Ime)
+
+                            return target[prop as keyof typeof target]
+                        }
+
+                        dependencies.add(UnistyleDependency.Insets)
+
+                        return target[prop as keyof typeof target]
+                    }
+                })
+            }
+
             if (prop in RTDependencyMap) {
                 dependencies.add(RTDependencyMap[prop as keyof typeof RTDependencyMap])
             }

package/src/core/withUnistyles/withUnistyles.native.tsx

@@ -1,11 +1,10 @@
 import React, { forwardRef, useEffect, type ComponentType, useRef } from 'react'
 import { type UnistyleDependency, UnistylesShadowRegistry } from '../../specs'
 import type { UnistylesTheme } from '../../types'
-import type { PartialBy } from '../../types/common'
 import { deepMergeObjects } from '../../utils'
 import { useProxifiedUnistyles } from '../useProxifiedUnistyles'
 import { maybeWarnAboutMultipleUnistyles } from '../warn'
-import type { Mappings, SupportedStyleProps } from './types'
+import type { Mappings } from './types'
 
 // @ts-expect-error
 type GenericComponentProps<P> = ComponentProps<P>
@@ -24,7 +23,7 @@ type MappedSecrets = {
 
 export const withUnistyles = <TComponent, TMappings extends GenericComponentProps<TComponent>>(Component: TComponent, mappings?: Mappings<TMappings>) => {
     type TProps = GenericComponentProps<TComponent>
-    type PropsWithUnistyles = PartialBy<TProps, keyof TMappings | SupportedStyleProps> & {
+    type PropsWithUnistyles = Partial<TProps> & {
         uniProps?: Mappings<TProps>
     }
     const getSecrets = (styleProps: Record<string, any> = {}): MappedSecrets => {
@@ -43,7 +42,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
                     unistyleKey
                         ? style[unistyleKey]
                         : {
-                            uni__getStyles: () => styleProps,
+                            uni__getStyles: () => style,
                             uni__dependencies: [],
                         }
                 ])

package/src/core/withUnistyles/withUnistyles.tsx

@@ -1,11 +1,10 @@
 import React, { type ComponentType, forwardRef, type ComponentProps, type ComponentRef } from 'react'
 import type { UnistylesValues } from '../../types'
-import type { PartialBy } from '../../types/common'
 import { deepMergeObjects } from '../../utils'
 import { getClassName } from '../getClassname'
 import { useProxifiedUnistyles } from '../useProxifiedUnistyles'
 import { maybeWarnAboutMultipleUnistyles } from '../warn'
-import type { Mappings, SupportedStyleProps } from './types'
+import type { Mappings } from './types'
 
 // @ts-expect-error
 type GenericComponentProps<T> = ComponentProps<T>
@@ -14,7 +13,7 @@ type GenericComponentRef<T> = ComponentRef<T>
 
 export const withUnistyles = <TComponent, TMappings extends GenericComponentProps<TComponent>>(Component: TComponent, mappings?: Mappings<TMappings>) => {
     type TProps = GenericComponentProps<TComponent>
-    type PropsWithUnistyles = PartialBy<TProps, keyof TMappings | SupportedStyleProps> & {
+    type PropsWithUnistyles = Partial<TProps> & {
         uniProps?: Mappings<TProps>
     }
     type UnistyleStyles = {
@@ -24,17 +23,27 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
 
     return forwardRef<GenericComponentRef<TComponent>, PropsWithUnistyles>((props, ref) => {
         const narrowedProps = props as PropsWithUnistyles & UnistyleStyles
-        const styleClassNames = getClassName(narrowedProps.style)
+        const styleClassNames = getClassName(narrowedProps.style, true)
         const contentContainerStyleClassNames = getClassName(narrowedProps.contentContainerStyle)
         const { proxifiedRuntime, proxifiedTheme } = useProxifiedUnistyles()
 
         const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {}
         const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {}
 
+
+        const emptyStyles = narrowedProps.style
+            ? Object.fromEntries(
+                  Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style))
+                      .filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_"))
+                      .map(([key]) => [key, undefined])
+              )
+            : undefined
+
         const combinedProps = {
             ...deepMergeObjects(mappingsProps, unistyleProps, props),
             ...narrowedProps.style ? {
-                style: styleClassNames,
+                // Override default component styles with undefined values to reset them
+                style: emptyStyles
             } : {},
             ...narrowedProps.contentContainerStyle ? {
                 contentContainerStyle: contentContainerStyleClassNames,
@@ -47,7 +56,15 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`)
 
         const NativeComponent = Component as ComponentType
+        const [classNames] = styleClassNames ?? []
 
-        return <NativeComponent {...combinedProps} ref={ref} />
+        return (
+            <div
+                className={classNames?.hash}
+                style={{ display: 'contents' }}
+            >
+                <NativeComponent {...combinedProps} ref={ref} />
+            </div>
+        )
     })
 }

package/src/hooks/useMedia.native.ts

@@ -1,6 +1,6 @@
 import { useEffect, useLayoutEffect, useState } from 'react'
-import { isUnistylesMq, isValidMq, parseMq } from '../mq'
 import { StyleSheet, UnistyleDependency, UnistylesRuntime } from '../specs'
+import { isUnistylesMq, isValidMq, parseMq } from '../utils'
 
 export const useMedia = (config: { mq: symbol }) => {
     const computeIsVisible = (): boolean => {

package/src/hooks/useMedia.ts

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import { isUnistylesMq, isValidMq, parseMq } from '../mq'
+import { isUnistylesMq, isValidMq, parseMq } from '../utils'
 
 export const useMedia = (config: { mq: symbol }) => {
     const disposeRef = useRef(() => {})

package/src/mocks.ts

@@ -0,0 +1,217 @@
+import type { UnistylesBreakpoints, UnistylesThemes } from './global'
+import type { UnistylesNavigationBar } from './specs/NavigtionBar'
+import type { UnistylesStatusBar } from './specs/StatusBar'
+import type { UnistylesConfig, UnistylesStyleSheet } from './specs/StyleSheet'
+import type { UnistylesRuntimePrivate } from './specs/UnistylesRuntime'
+import type { ColorScheme, Orientation } from './specs/types'
+import type { IOSContentSizeCategory, UnistylesTheme } from './types'
+
+type Registry = {
+    themes: UnistylesThemes
+    breakpoints: UnistylesBreakpoints
+}
+
+jest.mock('react-native-nitro-modules', () => ({
+    NitroModules: {
+        createHybridObject: () => ({
+            add: () => {},
+            init: () => {},
+            createHybridStatusBar: () => ({
+                setStyle: () => {},
+            }),
+            createHybridNavigationBar: () => {},
+        })
+    }
+}))
+
+jest.mock('react-native-unistyles', () => {
+    const React = require('react')
+    const _REGISTRY: Registry = {
+        themes: {},
+        breakpoints: {}
+    }
+    const miniRuntime = {
+        themeName: undefined,
+        breakpoint: undefined,
+        hasAdaptiveThemes: false,
+        colorScheme: 'unspecified' as ColorScheme,
+        contentSizeCategory: 'Medium' as IOSContentSizeCategory,
+        insets: {
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            ime: 0
+        },
+        pixelRatio: 1,
+        fontScale: 1,
+        rtl: false,
+        isLandscape: false,
+        isPortrait: true,
+        navigationBar: {
+            width: 0,
+            height: 0
+        },
+        screen: {
+            width: 0,
+            height: 0
+        },
+        statusBar: {
+            width: 0,
+            height: 0
+        }
+    }
+    const unistylesRuntime = {
+        colorScheme: 'unspecified' as ColorScheme,
+        contentSizeCategory: 'Medium' as IOSContentSizeCategory,
+        orientation: 'portrait' as Orientation,
+        breakpoints: {},
+        dispose: () => { },
+        equals: () => false,
+        name: 'UnistylesRuntimeMock',
+        miniRuntime: miniRuntime,
+        statusBar: {
+            height: 0,
+            width: 0,
+            name: 'StatusBarMock',
+            equals: () => false,
+            setHidden: () => { },
+            setStyle: () => { }
+        },
+        navigationBar: {
+            height: 0,
+            width: 0,
+            name: 'NavigationBarMock',
+            equals: () => false,
+            setHidden: () => { },
+            dispose: () => { }
+        },
+        fontScale: 1,
+        hasAdaptiveThemes: false,
+        pixelRatio: 0,
+        rtl: false,
+        getTheme: () => {
+            return {} as UnistylesTheme
+        },
+        setTheme: () => {},
+        updateTheme: () => {},
+        setRootViewBackgroundColor: () => {},
+        _setRootViewBackgroundColor: () => {},
+        createHybridStatusBar: () => {
+            return {} as UnistylesStatusBar
+        },
+        createHybridNavigationBar: () => {
+            return {} as UnistylesNavigationBar
+        },
+        setAdaptiveThemes: () => {},
+        setImmersiveMode: () => {},
+        insets: {
+            top: 0,
+            left: 0,
+            right: 0,
+            bottom: 0,
+            ime: 0
+        },
+        screen: {
+            width: 0,
+            height: 0
+        },
+        breakpoint: undefined
+    } satisfies UnistylesRuntimePrivate
+
+    return {
+        Hide: () => null,
+        Display: () => null,
+        ScopedTheme: () => null,
+        withUnistyles: <TComponent,>(Component: TComponent, mapper?: (theme: UnistylesTheme, runtime: typeof miniRuntime) => TComponent) => (props: any) =>
+            React.createElement(Component, {
+                ...mapper?.((Object.values(_REGISTRY.themes).at(0) ?? {}) as UnistylesTheme, miniRuntime),
+                ...props
+            }),
+        mq: {
+            only: {
+                width: () => ({
+                    and: {
+                        height: () => ({})
+                    }
+                }),
+                height: () => ({
+                    and: {
+                        width: () => ({})
+                    }
+                })
+            },
+            width: () => ({
+                and: {
+                    height: () => ({})
+                }
+            }),
+            height: () => ({
+                and: {
+                    width: () => ({})
+                }
+            })
+        },
+        useUnistyles: () => ({
+            theme: Object.values(_REGISTRY.themes).at(0) ?? {},
+            rt: unistylesRuntime
+        }),
+        StyleSheet: {
+            absoluteFillObject: {
+                position: 'absolute',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            },
+            absoluteFill: {
+                position: 'absolute',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0
+            } as unknown as UnistylesStyleSheet['absoluteFill'],
+            compose: (styles: any) => {
+                return styles
+            },
+            flatten: (styles: any) => {
+                return styles
+            },
+            create: (styles: any) => {
+                if (typeof styles === 'function') {
+                    return {
+                        ...styles(Object.values(_REGISTRY.themes).at(0) ?? {}, miniRuntime),
+                        useVariants: () => {}
+                    }
+                }
+
+                return {
+                    ...styles,
+                    useVariants: () => {}
+                }
+            },
+            configure: (config: UnistylesConfig) => {
+                if (config.breakpoints) {
+                    _REGISTRY.breakpoints = config.breakpoints
+                }
+
+                if (config.themes) {
+                    _REGISTRY.themes = config.themes
+                }
+            },
+            jsMethods: {
+                processColor: () => null
+            },
+            hairlineWidth: 1,
+            unid: -1,
+            addChangeListener: () => () => {},
+            init: () => {},
+            name: 'StyleSheetMock',
+            dispose: () => {},
+            equals: () => false
+        } satisfies UnistylesStyleSheet,
+        UnistylesRuntime: unistylesRuntime
+    }
+})
+
+

package/src/mq.ts

@@ -2,10 +2,6 @@ import type { UnistylesBreakpoints } from './global'
 import { UnistylesRuntime } from './specs'
 import type { Nullable } from './types'
 
-const IS_UNISTYLES_REGEX = /:([hw])\[(\d+)(?:,\s*(\d+|Infinity))?]/
-const UNISTYLES_WIDTH_REGEX = /:(w)\[(\d+)(?:,\s*(\d+|Infinity))?]/
-const UNISTYLES_HEIGHT_REGEX = /:(h)\[(\d+)(?:,\s*(\d+|Infinity))?]/
-
 type MQValue = keyof UnistylesBreakpoints | number
 
 type MQHandler = {
@@ -62,23 +58,3 @@ export const mq: MQHandler = {
     })
 }
 
-export const parseMq = (mq: string) => {
-    const [, width, fromW, toW] = UNISTYLES_WIDTH_REGEX.exec(mq) || []
-    const [, height, fromH, toH] = UNISTYLES_HEIGHT_REGEX.exec(mq) || []
-
-    return {
-        minWidth: !width || fromW === 'Infinity' ? undefined : Number(fromW),
-        maxWidth: !width || toW === 'Infinity' ? undefined : Number(toW),
-        minHeight: !height || fromH === 'Infinity' ? undefined : Number(fromH),
-        maxHeight: !height || toH === 'Infinity' ? undefined : Number(toH),
-    }
-}
-
-export const isUnistylesMq = (mq: string) => IS_UNISTYLES_REGEX.test(mq)
-
-export const isValidMq = (parsedMQ: ReturnType<typeof parseMq>) => {
-    const isWidthValid = parsedMQ.minWidth === undefined || parsedMQ.maxWidth === undefined || parsedMQ.minWidth <= parsedMQ.maxWidth
-    const isHeightValid = parsedMQ.minHeight === undefined || parsedMQ.maxHeight === undefined || parsedMQ.minHeight <= parsedMQ.maxHeight
-
-    return isWidthValid && isHeightValid
-}

package/src/reanimated/index.ts

@@ -0,0 +1 @@
+export { useAnimatedTheme } from './useAnimatedTheme'

package/src/reanimated/useAnimatedTheme.native.ts

@@ -0,0 +1,21 @@
+import { useEffect } from 'react'
+import { type SharedValue, useSharedValue } from 'react-native-reanimated'
+import { StyleSheet, UnistyleDependency, UnistylesRuntime } from '../specs'
+import type { UnistylesTheme } from '../types'
+
+export const useAnimatedTheme = () => {
+    const theme = useSharedValue(UnistylesRuntime.getTheme())
+
+    useEffect(() => {
+        // @ts-ignore this is hidden from TS
+        const dispose = StyleSheet.addChangeListener(changedDependencies => {
+            if (changedDependencies.includes(UnistyleDependency.Theme)) {
+                theme.set(UnistylesRuntime.getTheme())
+            }
+        })
+
+        return () => dispose()
+    }, [])
+
+    return theme as SharedValue<UnistylesTheme>
+}

package/src/reanimated/useAnimatedTheme.ts

@@ -0,0 +1,19 @@
+import { useEffect } from 'react'
+import { type SharedValue, useSharedValue } from 'react-native-reanimated'
+import { UnistyleDependency, UnistylesRuntime } from '../specs'
+import type { UnistylesTheme } from '../types'
+import { services } from '../web/services'
+
+export const useAnimatedTheme = () => {
+    const theme = useSharedValue(UnistylesRuntime.getTheme())
+
+    useEffect(() => {
+        const dispose = services.listener.addListeners([UnistyleDependency.Theme], () => theme.set(UnistylesRuntime.getTheme()))
+
+        return () => {
+            dispose()
+        }
+    }, [])
+
+    return theme as SharedValue<UnistylesTheme>
+}

package/src/server/getServerUnistyles.tsx

@@ -1,21 +1,26 @@
 import React from 'react'
 import { StyleSheet } from 'react-native'
-import { UnistylesWeb } from '../web'
+import * as unistyles from '../web/services'
 import { error, isServer } from '../web/utils'
+import { serialize } from './serialize'
 import { DefaultServerUnistylesSettings, type ServerUnistylesSettings } from './types'
 
 export const getServerUnistyles = ({ includeRNWStyles = true }: ServerUnistylesSettings = DefaultServerUnistylesSettings) => {
     if (!isServer()) {
         throw error('Server styles should only be read on the server')
     }
+
     // @ts-ignore
     const rnwStyle: string | null = includeRNWStyles ? (StyleSheet?.getSheet().textContent ?? '') : null
-    const css = UnistylesWeb.registry.css.getStyles()
-    const state = UnistylesWeb.registry.css.getState()
-    return <>
-        {rnwStyle && <style id='rnw-style'>{rnwStyle}</style>}
-        <style id='unistyles-web'>{css}</style>
-        {/* biome-ignore lint/security/noDangerouslySetInnerHtml: Needs the json quotes to be unescaped */}
-        <script id='unistyles-script' dangerouslySetInnerHTML={{ __html: `window.__UNISTYLES_STATE__ = ${JSON.stringify(state)}`}} />
-    </>
-}
+    const css = unistyles.services.registry.css.getStyles()
+    const state = unistyles.services.registry.css.getState()
+
+    return (
+        <>
+            {rnwStyle && <style id='rnw-style'>{rnwStyle}</style>}
+            <style id='unistyles-web'>{css}</style>
+            {/* biome-ignore lint/security/noDangerouslySetInnerHtml: Needs the json quotes to be unescaped */}
+            <script id='unistyles-script' defer dangerouslySetInnerHTML={{ __html: `window.__UNISTYLES_STATE__ = ${serialize(state)}`}} />
+        </>
+    )
+}