react-native-unistyles 3.0.0-nightly-20250127 → 3.0.0-nightly-20250131

package/plugin/consts.js

@@ -0,0 +1,63 @@
+const REACT_NATIVE_COMPONENT_NAMES = [
+    'ActivityIndicator',
+    'View',
+    'Text',
+    'Image',
+    'ImageBackground',
+    'KeyboardAvoidingView',
+    'Pressable',
+    'ScrollView',
+    'FlatList',
+    'SectionList',
+    'Switch',
+    'TextInput',
+    'RefreshControl',
+    'TouchableHighlight',
+    'TouchableOpacity',
+    'VirtualizedList',
+    'Animated'
+    // Modal - there is no exposed native handle
+    // TouchableWithoutFeedback - can't accept a ref
+]
+
+// auto replace RN imports to Unistyles imports under these paths
+// our implementation simply borrows 'ref' to register it in ShadowRegistry
+// so we won't affect anyone's implementation
+const REPLACE_WITH_UNISTYLES_PATHS = [
+    'react-native-reanimated/src/component',
+    'react-native-gesture-handler/src/components'
+]
+
+// this is more powerful API as it allows to convert unmatched imports to Unistyles
+// { path: string, imports: Array<{ name: string, isDefault: boolean, path: string, mapTo: string }> }
+// path => node_modules path
+// imports:
+// name? <- target import name if isDefault is false
+// isDefault <- is the import default?
+// path <- path to the target import
+// mapTo <- name of the Unistyles component
+const REPLACE_WITH_UNISTYLES_EXOTIC_PATHS = []
+
+// this list will additionally detect React Native direct imports
+const NATIVE_COMPONENTS_PATHS = {
+    imports: [
+        {
+            name: 'NativeText',
+            isDefault: false,
+            path: 'react-native/Libraries/Text/TextNativeComponent',
+            mapTo: 'NativeText'
+        },
+        {
+            isDefault: true,
+            path: 'react-native/Libraries/Components/View/ViewNativeComponent',
+            mapTo: 'NativeView'
+        }
+    ]
+}
+
+module.exports = {
+    NATIVE_COMPONENTS_PATHS,
+    REACT_NATIVE_COMPONENT_NAMES,
+    REPLACE_WITH_UNISTYLES_PATHS,
+    REPLACE_WITH_UNISTYLES_EXOTIC_PATHS
+}

package/plugin/exotic.js

@@ -0,0 +1,54 @@
+function handleExoticImport(t, path, state, exoticImport) {
+    const specifiers = path.node.specifiers
+    const source = path.node.source
+
+    if (path.node.importKind !== 'value') {
+        return
+    }
+
+    specifiers.forEach(specifier => {
+        for (const rule of exoticImport.imports) {
+            const hasMatchingImportType = (!rule.isDefault && t.isImportSpecifier(specifier)) || (rule.isDefault && t.isImportDefaultSpecifier(specifier))
+            const hasMatchingImportName = rule.isDefault || (!rule.isDefault && rule.name === specifier.local.name)
+            const hasMatchingPath = rule.path === source.value
+
+            if (!hasMatchingImportType || !hasMatchingImportName || !hasMatchingPath) {
+                continue
+            }
+
+            if (t.isImportDefaultSpecifier(specifier)) {
+                const newImport = t.importDeclaration(
+                    [t.importDefaultSpecifier(t.identifier(specifier.local.name))],
+                    t.stringLiteral(state.opts.isLocal
+                        ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${rule.mapTo}`)
+                        : `react-native-unistyles/components/native/${rule.mapTo}`
+                    )
+                )
+
+                path.replaceWith(newImport)
+            } else {
+                const newImport = t.importDeclaration(
+                    [t.importSpecifier(t.identifier(rule.mapTo), t.identifier(rule.mapTo))],
+                    t.stringLiteral(state.opts.isLocal
+                        ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${rule.mapTo}`)
+                        : `react-native-unistyles/components/native/${rule.mapTo}`
+                    )
+                )
+
+                path.node.specifiers = specifiers.filter(s => s !== specifier)
+
+                if (path.node.specifiers.length === 0) {
+                    path.replaceWith(newImport)
+                } else {
+                    path.insertBefore(newImport)
+                }
+            }
+
+            return
+        }
+    })
+}
+
+module.exports = {
+    handleExoticImport
+}

package/plugin/index.d.ts

@@ -1,43 +1,89 @@
+type RemapImport = {
+    name?: string,
+    isDefault: boolean,
+    path: string,
+    mapTo: string
+}
+
+type RemapConfig = {
+    path: string,
+    imports: Array<RemapImport>
+}
+
 export interface UnistylesPluginOptions {
     /**
      * Example: "src" or "apps/mobile"
      * Add this option if some of your components don't have `react-native-unistyles` import.
      * Babel plugin will automatically process all files under this root.
      */
-    autoProcessRoot?: string
-
-  /**
-   * Example: ['@codemask/styles']
-   * Enable this option if you want to process only files containing specific imports.
-   */
-  autoProcessImports?: string[]
-
-  /**
-   * Example: ['external-library/components']
-   * Enable this option to process some 3rd party components under `node_modules`.
-   * Under these paths we will replace `react-native` imports with `react-native-unistyles` factories that will borrow components refs [read more](https://www.unistyl.es/v3/other/babel-plugin#3-component-factory-borrowing-ref).
-   *
-   * Defaults to:
-   *
-   * ```ts
-   * ['react-native-reanimated/src/component', 'react-native-gesture-handler/src/components']
-   * ```
-   */
-  autoProcessPaths?: string[];
-
-  /**
-   * In order to list detected dependencies by the Babel plugin you can enable the `debug` flag.
-   * It will `console.log` name of the file and component with Unistyles dependencies.
-   */
-  debug?: boolean;
-
-  /**
-   * Only applicable for Unistyles monorepo for
-   * path resolution, don't use it!
-   */
-  isLocal?: boolean;
+    autoProcessRoot?: string,
+
+    /**
+    * Example: ['@codemask/styles']
+    * Enable this option if you want to process only files containing specific imports.
+    */
+    autoProcessImports?: Array<string>,
+
+    /**
+     * Example: [{
+     *     path: "node_modules/custom-library/components",
+     *     imports: [
+     *         {
+     *             name: "NativeText",
+     *             isDefault: false,
+     *             path: "react-native/Libraries/Text/TextNativeComponent",
+     *             mapTo: "NativeText"
+     *         },
+     *         {
+     *             isDefault: true,
+     *             path: "react-native/Libraries/Components/View/ViewNativeComponent",
+     *             mapTo: "NativeView"
+     *         }
+     *     ]
+     * }]
+     *
+     * Will map:
+     *      import { NativeText } from "react-native/Libraries/Text/TextNativeComponent"
+     *      to Unistyles "NativeText"
+     *
+     *      import View from "react-native/Libraries/Components/View/ViewNativeComponent"
+     *      to Unistyles "NativeView"
+     *
+     * This is the most powerful way of remapping imports. If 3rd party library uses imports different from `react-native` we can remap them to `react-native-unistyles` factories.
+     * Internally we do that for raw RCTView and RCTText components.
+     *
+     * path -> must be within node_modules folder
+     * imports.name is Optional if library used export default
+     * imports.mapTo - name of the component from react-native-unistyles/src/components/native
+     */
+    autoRemapImports?: Array<RemapConfig>,
+
+    /**
+    * Example: ['external-library/components']
+    * Enable this option to process some 3rd party components under `node_modules`.
+    * Under these paths we will replace `react-native` imports with `react-native-unistyles` factories that will borrow components refs [read more](https://www.unistyl.es/v3/other/babel-plugin#3-component-factory-borrowing-ref).
+    *
+    * Defaults to:
+    *
+    * ```ts
+    * ['react-native-reanimated/src/component', 'react-native-gesture-handler/src/components']
+    * ```
+    */
+    autoProcessPaths?: Array<string>,
+
+    /**
+    * In order to list detected dependencies by the Babel plugin you can enable the `debug` flag.
+    * It will `console.log` name of the file and component with Unistyles dependencies.
+    */
+    debug?: boolean,
+
+    /**
+    * Only applicable for Unistyles monorepo for
+    * path resolution, don't use it!
+    */
+    isLocal?: boolean
 }
 
 export interface UnistylesPluginPass {
-  opts: UnistylesPluginOptions;
+    opts: UnistylesPluginOptions
 }

package/plugin/index.js

@@ -1,36 +1,9 @@
 const { addUnistylesImport, isInsideNodeModules } = require('./import')
 const { hasStringRef } = require('./ref')
-const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles, isKindOfStyleSheet } = require('./stylesheet')
+const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles, isKindOfStyleSheet, addThemeDependencyToMemberExpression } = require('./stylesheet')
 const { extractVariants } = require('./variants')
-
-const reactNativeComponentNames = [
-    'ActivityIndicator',
-    'View',
-    'Text',
-    'Image',
-    'ImageBackground',
-    'KeyboardAvoidingView',
-    'Pressable',
-    'ScrollView',
-    'FlatList',
-    'SectionList',
-    'Switch',
-    'TextInput',
-    'RefreshControl',
-    'TouchableHighlight',
-    'TouchableOpacity',
-    'VirtualizedList',
-    // Modal - there is no exposed native handle
-    // TouchableWithoutFeedback - can't accept a ref
-]
-
-// auto replace RN imports to Unistyles imports under these paths
-// our implementation simply borrows 'ref' to register it in ShadowRegistry
-// so we won't affect anyone's implementation
-const REPLACE_WITH_UNISTYLES_PATHS = [
-    'react-native-reanimated/src/component',
-    'react-native-gesture-handler/src/components'
-]
+const { REACT_NATIVE_COMPONENT_NAMES, REPLACE_WITH_UNISTYLES_PATHS, REPLACE_WITH_UNISTYLES_EXOTIC_PATHS, NATIVE_COMPONENTS_PATHS } = require('./consts')
+const { handleExoticImport } = require('./exotic')
 
 module.exports = function ({ types: t }) {
     return {
@@ -107,6 +80,14 @@ module.exports = function ({ types: t }) {
             },
             /** @param {import('./index').UnistylesPluginPass} state */
             ImportDeclaration(path, state) {
+                const exoticImport = REPLACE_WITH_UNISTYLES_EXOTIC_PATHS
+                    .concat(state.opts.autoRemapImports ?? [])
+                    .find(exotic => state.filename.includes(exotic.path))
+
+                if (exoticImport) {
+                    return handleExoticImport(t, path, state, exoticImport)
+                }
+
                 if (isInsideNodeModules(state) && !state.file.replaceWithUnistyles) {
                     return
                 }
@@ -123,12 +104,16 @@ module.exports = function ({ types: t }) {
 
                 if (importSource === 'react-native') {
                     path.node.specifiers.forEach(specifier => {
-                        if (specifier.imported && reactNativeComponentNames.includes(specifier.imported.name)) {
+                        if (specifier.imported && REACT_NATIVE_COMPONENT_NAMES.includes(specifier.imported.name)) {
                             state.reactNativeImports[specifier.local.name] = specifier.imported.name
                         }
                     })
                 }
 
+                if (importSource.includes('react-native/Libraries')) {
+                    handleExoticImport(t, path, state, NATIVE_COMPONENTS_PATHS)
+                }
+
                 if (!state.file.forceProcessing && Array.isArray(state.opts.autoProcessImports)) {
                     state.file.forceProcessing = state.opts.autoProcessImports.includes(importSource)
                 }
@@ -198,6 +183,13 @@ module.exports = function ({ types: t }) {
                             if (t.isObjectProperty(property)) {
                                 const propertyValues = getUnistyles(t, property)
 
+                                // maybe user used inlined theme? ({ container: theme.components.container })
+                                if (propertyValues.length === 0 && t.isMemberExpression(property.value)) {
+                                    if (property.value.object.object.name === themeLocalName) {
+                                        addThemeDependencyToMemberExpression(t, property)
+                                    }
+                                }
+
                                 propertyValues.forEach(propertyValue => {
                                     analyzeDependencies(t, state, property.key.name, propertyValue, themeLocalName, miniRuntimeLocalName)
                                 })

package/plugin/stylesheet.js

@@ -219,10 +219,21 @@ function getUnistyles(t, property) {
     return []
 }
 
+function addThemeDependencyToMemberExpression(t, path) {
+    path.value = t.objectExpression([
+        t.spreadElement(path.value),
+        t.objectProperty(
+            t.identifier('uni__dependencies'),
+            t.arrayExpression([t.numericLiteral(UnistyleDependency.Theme)])
+        )
+    ])
+}
+
 module.exports = {
     isUnistylesStyleSheet,
     analyzeDependencies,
     addStyleSheetTag,
     getUnistyles,
-    isKindOfStyleSheet
+    isKindOfStyleSheet,
+    addThemeDependencyToMemberExpression
 }

package/plugin/variants.js

@@ -15,7 +15,7 @@ function extractVariants(t, path, state) {
         return (
             t.isIdentifier(variant.expression.callee.object, { name: calleeName }) &&
             t.isIdentifier(variant.expression.callee.property, { name: 'useVariants' }) &&
-            t.isObjectExpression(variant.expression.arguments[0])
+            variant.expression.arguments.length === 1
         )
     })
 

package/src/components/native/Animated.tsx

@@ -0,0 +1,17 @@
+import { Animated as RNAnimated } from 'react-native'
+import { View } from './View'
+import { Text } from './Text'
+import { FlatList } from './FlatList'
+import { Image } from './Image'
+import { ScrollView } from './ScrollView'
+import { SectionList } from './SectionList'
+
+export const Animated = {
+    ...RNAnimated,
+    View: RNAnimated.createAnimatedComponent(View),
+    Text: RNAnimated.createAnimatedComponent(Text),
+    FlatList: RNAnimated.createAnimatedComponent(FlatList),
+    Image: RNAnimated.createAnimatedComponent(Image),
+    ScrollView: RNAnimated.createAnimatedComponent(ScrollView),
+    SectionList: RNAnimated.createAnimatedComponent(SectionList)
+}

package/src/components/native/ImageBackground.tsx

@@ -5,13 +5,14 @@ import type { UnistylesValues } from '../../types'
 import { getClassName } from '../../core'
 import { isServer } from '../../web/utils'
 import { UnistylesShadowRegistry } from '../../web'
+import { copyComponentProperties } from '../../utils'
 
 type Props = {
     style?: UnistylesValues
     imageStyle?: UnistylesValues
 }
 
-export const ImageBackground = forwardRef<unknown, Props>((props, forwardedRef) => {
+const UnistylesImageBackground = forwardRef<unknown, Props>((props, forwardedRef) => {
     let storedRef: NativeImageBackground | null = null
     let storedImageRef: NativeImageBackground | null = null
     const styleClassNames = getClassName(props.style)
@@ -54,3 +55,5 @@ export const ImageBackground = forwardRef<unknown, Props>((props, forwardedRef)
         />
     )
 })
+
+export const ImageBackground = copyComponentProperties(NativeImageBackground, UnistylesImageBackground)

package/src/components/native/NativeText.native.tsx

@@ -0,0 +1,12 @@
+import type { TextProps } from 'react-native'
+import { type ComponentType, createElement, forwardRef } from 'react'
+import { createUnistylesElement } from '../../core'
+
+// credits to @hirbod
+const LeanText = forwardRef((props, ref) => {
+    return createElement('RCTText', { ...props, ref })
+}) as ComponentType<TextProps>
+
+LeanText.displayName = 'RCTText'
+
+export const NativeText = createUnistylesElement(LeanText)

package/src/components/native/NativeText.tsx

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

package/src/components/native/NativeView.native.tsx

@@ -0,0 +1,13 @@
+import type { ViewProps } from 'react-native'
+import { type ComponentType, createElement, forwardRef } from 'react'
+import { createUnistylesElement } from '../../core'
+
+// credits to @hirbod
+const LeanView = forwardRef((props, ref) => {
+    return createElement('RCTView', { ...props, ref })
+}) as ComponentType<ViewProps>
+
+LeanView.displayName = 'RCTView'
+
+// this will match default export from react-native
+export default createUnistylesElement(LeanView)

package/src/components/native/NativeView.tsx

@@ -0,0 +1,3 @@
+import { View } from './View'
+
+export default View

package/src/components/native/Pressable.native.tsx

@@ -8,6 +8,22 @@ type PressableProps = Props & {
     variants?: Record<string, string | boolean>
 }
 
+const getStyles = (styleProps: Record<string, any> = {}) => {
+    const unistyleKey = Object
+        .keys(styleProps)
+        .find(key => key.startsWith('unistyles-'))
+
+    if (!unistyleKey) {
+        return styleProps
+    }
+
+    return {
+        // styles without C++ state
+        ...styleProps[unistyleKey].uni__getStyles(),
+        [unistyleKey]: styleProps[unistyleKey].uni__getStyles()
+    }
+}
+
 export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ...props }, forwardedRef) => {
     const storedRef = useRef<View | null>()
 
@@ -28,7 +44,7 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
                     ? style({ pressed: false })
                     : style
 
-                // @ts-expect-error web types are not compatible with RN styles
+                // @ts-expect-error - this is hidden from TS
                 UnistylesShadowRegistry.add(ref, unistyles)
 
                 if (ref) {
@@ -40,12 +56,14 @@ export const Pressable = forwardRef<View, PressableProps>(({ variants, style, ..
             style={state => {
                 const unistyles = typeof style === 'function'
                     ? style(state)
-                    : style
+                    : getStyles(style as unknown as Record<string, any>)
 
                 if (!storedRef.current) {
                     return unistyles
                 }
 
+                // @ts-expect-error - this is hidden from TS
+                UnistylesShadowRegistry.remove(storedRef.current)
                 // @ts-expect-error - this is hidden from TS
                 UnistylesShadowRegistry.add(storedRef.current, unistyles)
 

package/src/core/createUnistylesElement.native.tsx

@@ -2,6 +2,7 @@ import React, { useLayoutEffect, useRef } from 'react'
 import { UnistylesShadowRegistry } from '../specs'
 import { passForwardedRef } from './passForwardRef'
 import { maybeWarnAboutMultipleUnistyles } from './warn'
+import { copyComponentProperties } from '../utils'
 
 const getNativeRef = (Component: any, ref: any) => {
     switch (Component.name) {
@@ -16,31 +17,35 @@ const getNativeRef = (Component: any, ref: any) => {
     }
 }
 
-export const createUnistylesElement = (Component: any) => React.forwardRef((props, forwardedRef) => {
-    const storedRef = useRef<unknown>(null)
+export const createUnistylesElement = (Component: any) => {
+    const UnistylesComponent = React.forwardRef((props, forwardedRef) => {
+        const storedRef = useRef<unknown>(null)
 
-    useLayoutEffect(() => {
-        return () => {
-            if (storedRef.current) {
-                // @ts-ignore
-                UnistylesShadowRegistry.remove(storedRef.current)
+        useLayoutEffect(() => {
+            return () => {
+                if (storedRef.current) {
+                    // @ts-ignore
+                    UnistylesShadowRegistry.remove(storedRef.current)
+                }
             }
-        }
-    }, [])
+        }, [])
 
-    return (
-        <Component
-            {...props}
-            ref={(ref: unknown) => {
-                if (ref) {
-                    storedRef.current = getNativeRef(Component, ref)
-                }
+        return (
+            <Component
+                {...props}
+                ref={(ref: unknown) => {
+                    if (ref) {
+                        storedRef.current = getNativeRef(Component, ref)
+                    }
 
-                passForwardedRef(props, ref, forwardedRef)
+                    passForwardedRef(props, ref, forwardedRef)
 
-                // @ts-ignore we don't know the type of the component
-                maybeWarnAboutMultipleUnistyles(props.style, Component.displayName)
-            }}
-        />
-    )
-})
+                    // @ts-ignore we don't know the type of the component
+                    maybeWarnAboutMultipleUnistyles(props.style, Component.displayName)
+                }}
+            />
+        )
+    })
+
+    return copyComponentProperties(Component, UnistylesComponent)
+}

package/src/core/createUnistylesElement.tsx

@@ -4,40 +4,45 @@ import { getClassName } from './getClassname'
 import { isServer } from '../web/utils'
 import { UnistylesShadowRegistry } from '../web'
 import { maybeWarnAboutMultipleUnistyles } from './warn'
+import { copyComponentProperties } from '../utils'
 
 type ComponentProps = {
     style?: UnistylesValues | Array<UnistylesValues>
 }
 
-export const createUnistylesElement = (Component: any) => React.forwardRef<unknown, ComponentProps>((props, forwardedRef) => {
-    let storedRef: HTMLElement | null = null
-    const classNames = getClassName(props.style)
+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)
+        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) {
+                    if (!ref) {
+                        // @ts-expect-error hidden from TS
+                        UnistylesShadowRegistry.remove(storedRef, classNames?.hash)
+                    }
+
+                    storedRef = 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
-                }
-            }}
-        />
-    )
-})
+                    UnistylesShadowRegistry.add(ref, classNames?.hash)
+
+                    if (typeof forwardedRef === 'function') {
+                        return forwardedRef(ref)
+                    }
+
+                    if (forwardedRef) {
+                        forwardedRef.current = ref
+                    }
+                }}
+            />
+        )
+    })
+
+    return copyComponentProperties(Component, UnistylesComponent)
+}