react-native-unistyles 3.0.0-rc.1 → 3.0.0-rc.3

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/server/getServerUnistyles.tsx

@@ -1,6 +1,6 @@
 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'
@@ -12,8 +12,8 @@ export const getServerUnistyles = ({ includeRNWStyles = true }: ServerUnistylesS
 
     // @ts-ignore
     const rnwStyle: string | null = includeRNWStyles ? (StyleSheet?.getSheet().textContent ?? '') : null
-    const css = UnistylesWeb.registry.css.getStyles()
-    const state = UnistylesWeb.registry.css.getState()
+    const css = unistyles.services.registry.css.getStyles()
+    const state = unistyles.services.registry.css.getState()
 
     return (
         <>

package/src/server/hydrateServerUnistyles.ts

@@ -1,4 +1,4 @@
-import { UnistylesWeb } from '../web'
+import * as unistyles from '../web/services'
 import { error, isServer } from '../web/utils'
 
 declare global {
@@ -12,6 +12,7 @@ export const hydrateServerUnistyles = () => {
     if (isServer()) {
         throw error('Server styles should only be hydrated on the client')
     }
-    UnistylesWeb.registry.css.hydrate(window.__UNISTYLES_STATE__)
+
+    unistyles.services.registry.css.hydrate(window.__UNISTYLES_STATE__)
     document.querySelector('#unistyles-script')?.remove()
 }

package/src/server/resetServerUnistyles.ts

@@ -1,9 +1,10 @@
-import { UnistylesWeb } from '../web'
+import * as unistyles from '../web/services'
 import { error, isServer } from '../web/utils'
 
 export const resetServerUnistyles = () => {
     if (!isServer()) {
         throw error('Server styles should only be reset on the server')
     }
-    UnistylesWeb.registry.reset()
-}
+
+    unistyles.services.registry.reset()
+}

package/src/specs/NativePlatform/NativePlatform.nitro.ts

@@ -19,7 +19,8 @@ export enum UnistyleDependency {
     FontScale = 11,
     StatusBar = 12,
     NavigationBar = 13,
-    Ime = 14
+    Ime = 14,
+    Rtl = 15
 }
 
 export interface UnistylesNativeMiniRuntime {

package/src/utils.ts

@@ -41,3 +41,28 @@ export const copyComponentProperties = (Component: any, UnistylesComponent: any)
 
     return UnistylesComponent
 }
+
+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))?]/
+
+export const isUnistylesMq = (mq: string) => IS_UNISTYLES_REGEX.test(mq)
+
+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 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/web/convert/index.ts

@@ -1,21 +1,19 @@
 import type { UnistylesValues } from '../../types'
 import { deepMergeObjects } from '../../utils'
+import type { UnistylesRuntime } from '../runtime'
 import { getBoxShadow, getFilterStyle, getTransformStyle } from './object'
 import { isPseudo } from './pseudo'
 import { getBoxShadowStyle, getTextShadowStyle } from './shadow'
 import { getStyle } from './style'
 import { isBoxShadow, isFilter, isShadow, isTextShadow, isTransform } from './utils'
 
-export const convertUnistyles = (value: UnistylesValues) => {
+export const convertUnistyles = (value: UnistylesValues, runtime: UnistylesRuntime) => {
     // Flag to mark if textShadow is already created
     let hasTextShadow = false
     // Flag to mark if boxShadow is already created
     let hasShadow = false
 
-    const stylesArray = Object.entries({
-        ...value,
-        ...value._web
-    }).flatMap(([unistylesKey, unistylesValue]) => {
+    const stylesArray = Object.entries(value).flatMap(([unistylesKey, unistylesValue]) => {
         // Keys to omit
         if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
             return []
@@ -23,7 +21,7 @@ export const convertUnistyles = (value: UnistylesValues) => {
 
         // Pseudo classes :hover, :before etc.
         if (isPseudo(unistylesKey)) {
-            const flattenValues = convertUnistyles(unistylesValue as UnistylesValues)
+            const flattenValues = convertUnistyles(unistylesValue as UnistylesValues, runtime)
 
             return { [unistylesKey]: flattenValues }
         }
@@ -51,7 +49,7 @@ export const convertUnistyles = (value: UnistylesValues) => {
         }
 
         if (isFilter(unistylesKey, unistylesValue)) {
-            return getFilterStyle(unistylesValue)
+            return getFilterStyle(unistylesValue, runtime)
         }
 
         if (isBoxShadow(unistylesKey, unistylesValue)) {

package/src/web/convert/object/filter.ts

@@ -1,6 +1,6 @@
 import type { DropShadowValue } from 'react-native'
-import { isUnistylesMq } from '../../../mq'
-import { UnistylesWeb } from '../../index'
+import { isUnistylesMq } from '../../../utils'
+import type { UnistylesRuntime } from '../../runtime'
 import { hyphenate } from '../../utils'
 import type { Filters } from '../types'
 import { normalizeColor, normalizeNumericValue } from '../utils'
@@ -12,7 +12,7 @@ const getDropShadowStyle = (dropShadow: DropShadowValue) => {
     return `${normalizeColor(String(color))} ${normalizeNumericValue(offsetX)} ${normalizeNumericValue(offsetY)} ${normalizeNumericValue(standardDeviation)}`
 }
 
-export const getFilterStyle = (filters: Array<Filters>) => {
+export const getFilterStyle = (filters: Array<Filters>, runtime: UnistylesRuntime) => {
     const restFilters = filters.filter(filter => Object.keys(filter)[0] !== 'dropShadow')
     const dropShadow = (() => {
         const dropShadowValue = filters.find(filter => Object.keys(filter)[0] === 'dropShadow')?.dropShadow as Record<string, any>
@@ -21,7 +21,7 @@ export const getFilterStyle = (filters: Array<Filters>) => {
             return []
         }
 
-        const breakpoints = Object.keys(dropShadowValue).filter(key => Object.keys(UnistylesWeb.runtime.breakpoints).includes(key) || isUnistylesMq(key))
+        const breakpoints = Object.keys(dropShadowValue).filter(key => Object.keys(runtime.breakpoints).includes(key) || isUnistylesMq(key))
         const breakpointsDropShadow = Object.fromEntries(breakpoints.map(breakpoint => [breakpoint, getDropShadowStyle(dropShadowValue[breakpoint])]))
 
         if (breakpoints.length === 0) {

package/src/web/create.ts

@@ -1,5 +1,5 @@
 import type { StyleSheet, StyleSheetWithSuperPowers } from '../types/stylesheet'
-import { UnistylesWeb } from './index'
+import * as unistyles from './services'
 import { assignSecrets, error, isServer, removeInlineStyles } from './utils'
 
 type Variants = Record<string, string | boolean | undefined>
@@ -10,13 +10,13 @@ export const create = (stylesheet: StyleSheetWithSuperPowers<StyleSheet>, id?: s
     }
 
     // For SSR
-    if (!UnistylesWeb.state.isInitialized && !isServer()) {
+    if (!unistyles.services.state.isInitialized && !isServer()) {
         const config = window?.__UNISTYLES_STATE__?.config
 
-        config && UnistylesWeb.state.init(config)
+        config && unistyles.services.state.init(config)
     }
 
-    const computedStylesheet = UnistylesWeb.registry.getComputedStylesheet(stylesheet)
+    const computedStylesheet = unistyles.services.registry.getComputedStylesheet(stylesheet)
     const addSecrets = (value: any, key: string, args = undefined as Array<any> | undefined, variants = {} as Variants) => assignSecrets(value, {
         __uni__key: key,
         __uni__stylesheet: stylesheet,

package/src/web/css/core.ts

@@ -8,7 +8,7 @@ export const convertToCSS = (hash: string, value: Record<string, any>, state: CS
 
             Object.entries(styleValue).forEach(([pseudoStyleKey, pseudoStyleValue]) => {
                 if (typeof pseudoStyleValue === 'object' && pseudoStyleValue !== null) {
-                    const allBreakpoints = Object.keys(pseudoStyleValue)
+                    const allBreakpoints = Object.keys(styleValue)
                     Object.entries(pseudoStyleValue).forEach(([breakpointStyleKey, breakpointStyleValue]) => {
                         const mediaQuery = getMediaQuery(pseudoStyleKey, allBreakpoints)
 
@@ -34,7 +34,7 @@ export const convertToCSS = (hash: string, value: Record<string, any>, state: CS
         }
 
         if (typeof styleValue === 'object') {
-            const allBreakpoints = Object.keys(styleValue)
+            const allBreakpoints = Object.keys(value)
             Object.entries(styleValue).forEach(([breakpointStyleKey, breakpointStyleValue]) => {
                 const mediaQuery = getMediaQuery(styleKey, allBreakpoints)
 

package/src/web/css/state.ts

@@ -61,7 +61,7 @@ export class CSSState {
     }
 
     add = (hash: string, values: UnistylesValues) => {
-        convertToCSS(hash, convertUnistyles(values), this)
+        convertToCSS(hash, convertUnistyles(values, this.services.runtime), this)
 
         if (this.styleTag) {
             this.styleTag.innerText = this.getStyles()

package/src/web/index.ts

@@ -3,22 +3,10 @@ import type { StyleSheet as NativeStyleSheet } from '../specs/StyleSheet'
 import type { Runtime as NativeUnistylesRuntime } from '../specs/UnistylesRuntime'
 import { deepMergeObjects } from '../utils'
 import { create } from './create'
-import { UnistylesServices } from './services'
-import { isServer } from './utils'
+import * as unistyles from './services'
 
-declare global {
-    // @ts-ignore
-    var __unistyles__: UnistylesServices
-}
-
-if (isServer() && !globalThis.__unistyles__) {
-    // @ts-ignore
-    globalThis.__unistyles__ = new UnistylesServices()
-}
-
-export const UnistylesWeb = isServer() ? globalThis.__unistyles__ : new UnistylesServices()
 export const StyleSheet = {
-    configure: UnistylesWeb.state.init,
+    configure: unistyles.services.state.init,
     create: create,
     absoluteFill: {
         position: 'absolute',
@@ -39,8 +27,8 @@ export const StyleSheet = {
     hairlineWidth: 1
 } as unknown as typeof NativeStyleSheet
 
-export const UnistylesRuntime = UnistylesWeb.runtime as unknown as typeof NativeUnistylesRuntime
-export const UnistylesShadowRegistry = UnistylesWeb.shadowRegistry as unknown as typeof NativeUnistylesShadowRegistry
+export const UnistylesRuntime = unistyles.services.runtime as unknown as typeof NativeUnistylesRuntime
+export const UnistylesShadowRegistry = unistyles.services.shadowRegistry as unknown as typeof NativeUnistylesShadowRegistry
 
 export * from './mock'
 

package/src/web/services.ts

@@ -3,8 +3,9 @@ import { UnistylesRegistry } from './registry'
 import { UnistylesRuntime } from './runtime'
 import { UnistylesShadowRegistry } from './shadowRegistry'
 import { UnistylesState } from './state'
+import { isServer } from './utils'
 
-export class UnistylesServices {
+class UnistylesServices {
     runtime: UnistylesRuntime
     registry: UnistylesRegistry
     shadowRegistry: UnistylesShadowRegistry
@@ -26,3 +27,15 @@ export class UnistylesServices {
         this.services.listener = this.listener
     }
 }
+
+declare global {
+    // @ts-ignore
+    var __unistyles__: UnistylesServices
+}
+
+if (isServer() && !globalThis.__unistyles__) {
+    // @ts-ignore
+    globalThis.__unistyles__ = new UnistylesServices()
+}
+
+export const services = isServer() ? globalThis.__unistyles__ : new UnistylesServices()

package/src/web/shadowRegistry.ts

@@ -1,4 +1,4 @@
-import { UnistyleDependency } from '../specs'
+import { UnistyleDependency } from '../specs/NativePlatform/NativePlatform.nitro'
 import type { UnistylesTheme, UnistylesValues } from '../types'
 import { deepMergeObjects } from '../utils'
 import type { UnistylesServices } from './types'
@@ -37,6 +37,11 @@ export class UnistylesShadowRegistry {
                     return unistyle
                 }
 
+                // Animated styles - shouldn't be processed
+                if (Object.keys(secrets).length === 0) {
+                    return {}
+                }
+
                 const { __uni__key, __uni__stylesheet, __uni__args = [], __uni_variants: variants } = secrets
                 const newComputedStylesheet = this.services.registry.getComputedStylesheet(__uni__stylesheet, scopedTheme)
                 const style = newComputedStylesheet[__uni__key] as (UnistylesValues | ((...args: any) => UnistylesValues))
@@ -52,7 +57,10 @@ export class UnistylesShadowRegistry {
                     this.services.registry.addDependenciesToStylesheet(__uni__stylesheet, dependencies)
                 }
 
-                return resultWithVariants as UnistylesValues
+                return {
+                    ...resultWithVariants,
+                    ...resultWithVariants._web
+                } as UnistylesValues
             })
 
             return deepMergeObjects(...allStyles)

package/src/web/utils/createUnistylesRef.ts

@@ -1,22 +1,26 @@
 import type React from 'react'
-import type { Nullable } from '../../types'
-import { UnistylesWeb } from '../index'
+import type { Nullable, UnistylesValues } from '../../types'
+import * as unistyles from '../services'
 import { isServer } from './common'
 
-type ClassNames = {
-    hash: string
-}
+type Styles = readonly [
+    {
+        hash: string
+    },
+    Array<UnistylesValues>
+]
 
-export const createUnistylesRef = <T>(classNames?: ClassNames, forwardedRef?: React.ForwardedRef<T>) => {
+export const createUnistylesRef = <T>(styles?: Styles, forwardedRef?: React.ForwardedRef<T>) => {
     const storedRef = { current: null as Nullable<T> }
+    const [classNames] = styles ?? []
 
     return isServer() ? undefined : (ref: Nullable<T>) => {
         if (!ref) {
-            UnistylesWeb.shadowRegistry.remove(storedRef, classNames?.hash)
+            unistyles.services.shadowRegistry.remove(storedRef, classNames?.hash)
         }
 
         storedRef.current = ref
-        UnistylesWeb.shadowRegistry.add(ref, classNames?.hash)
+        unistyles.services.shadowRegistry.add(ref, classNames?.hash)
 
         if (typeof forwardedRef === 'function') {
             return forwardedRef(ref)

package/src/web/utils/index.ts

@@ -1,3 +1,2 @@
 export * from './common'
 export * from './unistyle'
-export * from './createUnistylesRef'