react-native-unistyles 3.0.0-alpha.4 → 3.0.0-alpha.40
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +7 -0
- package/Unistyles.podspec +1 -1
- package/android/CMakeLists.txt +19 -45
- package/android/build.gradle +6 -5
- package/android/src/main/cxx/NativeUnistylesModule.cpp +71 -0
- package/android/src/main/cxx/NativeUnistylesModule.h +42 -0
- package/android/src/main/cxx/cpp-adapter.cpp +8 -86
- package/android/src/main/java/com/unistyles/Equatable.kt +61 -0
- package/android/src/main/java/com/unistyles/NativePlatform+android.kt +285 -0
- package/android/src/main/java/com/unistyles/NativePlatform+insets.kt +152 -0
- package/android/src/main/java/com/unistyles/NativePlatform+listener.kt +59 -0
- package/android/src/main/java/com/unistyles/UnistylesModule.kt +51 -0
- package/android/src/main/java/com/unistyles/UnistylesPackage.kt +16 -14
- package/cxx/NativePlatform.h +11 -0
- package/cxx/common/Constants.h +3 -0
- package/cxx/common/Helpers.h +140 -5
- package/cxx/core/HostStyle.cpp +10 -6
- package/cxx/core/HostStyle.h +4 -0
- package/cxx/core/StyleSheet.h +0 -2
- package/cxx/core/StyleSheetRegistry.cpp +9 -17
- package/cxx/core/StyleSheetRegistry.h +3 -4
- package/cxx/core/Unistyle.h +8 -11
- package/cxx/core/UnistyleData.h +23 -0
- package/cxx/core/UnistyleWrapper.h +108 -13
- package/cxx/core/UnistylesCommitHook.cpp +14 -15
- package/cxx/core/UnistylesCommitHook.h +6 -11
- package/cxx/core/UnistylesCommitShadowNode.h +13 -0
- package/cxx/core/UnistylesMountHook.cpp +28 -0
- package/cxx/core/UnistylesMountHook.h +27 -0
- package/cxx/core/UnistylesRegistry.cpp +119 -83
- package/cxx/core/UnistylesRegistry.h +16 -14
- package/cxx/core/UnistylesState.cpp +29 -8
- package/cxx/core/UnistylesState.h +5 -2
- package/cxx/hybridObjects/HybridNavigationBar.cpp +0 -4
- package/cxx/hybridObjects/HybridNavigationBar.h +3 -4
- package/cxx/hybridObjects/HybridShadowRegistry.cpp +16 -11
- package/cxx/hybridObjects/HybridStatusBar.cpp +0 -4
- package/cxx/hybridObjects/HybridStatusBar.h +3 -4
- package/cxx/hybridObjects/HybridStyleSheet.cpp +154 -23
- package/cxx/hybridObjects/HybridStyleSheet.h +27 -5
- package/cxx/hybridObjects/HybridUnistylesRuntime.cpp +96 -14
- package/cxx/hybridObjects/HybridUnistylesRuntime.h +19 -3
- package/cxx/parser/Parser.cpp +226 -175
- package/cxx/parser/Parser.h +11 -15
- package/cxx/shadowTree/ShadowLeafUpdate.h +2 -1
- package/cxx/shadowTree/ShadowTrafficController.h +71 -0
- package/cxx/shadowTree/ShadowTreeManager.cpp +23 -18
- package/cxx/shadowTree/ShadowTreeManager.h +3 -2
- package/ios/Equatable.swift +2 -1
- package/ios/NativePlatform+ios.swift +21 -7
- package/ios/NativePlatform+keyboard.swift +83 -0
- package/ios/NativePlatformListener+ios.swift +37 -24
- package/ios/Unistyles.h +1 -0
- package/ios/UnistylesModuleOnLoad.h +8 -2
- package/ios/UnistylesModuleOnLoad.mm +9 -1
- package/lib/commonjs/components/Display.js +18 -0
- package/lib/commonjs/components/Display.js.map +1 -0
- package/lib/commonjs/components/Hide.js +18 -0
- package/lib/commonjs/components/Hide.js.map +1 -0
- package/lib/commonjs/components/index.js +20 -0
- package/lib/commonjs/components/index.js.map +1 -0
- package/lib/commonjs/components/useMedia.js +59 -0
- package/lib/commonjs/components/useMedia.js.map +1 -0
- package/lib/commonjs/components/useMedia.web.js +43 -0
- package/lib/commonjs/components/useMedia.web.js.map +1 -0
- package/lib/commonjs/core/createUnistylesComponent.js +79 -0
- package/lib/commonjs/core/createUnistylesComponent.js.map +1 -0
- package/lib/commonjs/core/createUnistylesComponent.native.js +82 -0
- package/lib/commonjs/core/createUnistylesComponent.native.js.map +1 -0
- package/lib/commonjs/core/index.js +13 -0
- package/lib/commonjs/core/index.js.map +1 -0
- package/lib/commonjs/index.js +21 -11
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/mq.js +25 -12
- package/lib/commonjs/mq.js.map +1 -1
- package/lib/commonjs/specs/NativePlatform/NativePlatform.nitro.js +1 -0
- package/lib/commonjs/specs/NativePlatform/NativePlatform.nitro.js.map +1 -1
- package/lib/commonjs/specs/NavigtionBar/index.js +0 -15
- package/lib/commonjs/specs/NavigtionBar/index.js.map +1 -1
- package/lib/commonjs/specs/ShadowRegistry/index.js +10 -6
- package/lib/commonjs/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/commonjs/specs/StatusBar/index.js +0 -5
- package/lib/commonjs/specs/StatusBar/index.js.map +1 -1
- package/lib/commonjs/specs/StyleSheet/index.js +1 -0
- package/lib/commonjs/specs/StyleSheet/index.js.map +1 -1
- package/lib/commonjs/specs/UnistylesRuntime/index.js +1 -3
- package/lib/commonjs/specs/UnistylesRuntime/index.js.map +1 -1
- package/lib/commonjs/specs/index.js +7 -0
- package/lib/commonjs/specs/index.js.map +1 -1
- package/lib/commonjs/specs/index.web.js +1 -1
- package/lib/commonjs/types/stylesheet.js.map +1 -1
- package/lib/commonjs/utils.js +26 -0
- package/lib/commonjs/utils.js.map +1 -0
- package/lib/commonjs/web/convert/index.js +79 -0
- package/lib/commonjs/web/convert/index.js.map +1 -0
- package/lib/commonjs/web/convert/module.d.js +2 -0
- package/lib/commonjs/web/convert/module.d.js.map +1 -0
- package/lib/commonjs/web/convert/object/boxShadow.js +59 -0
- package/lib/commonjs/web/convert/object/boxShadow.js.map +1 -0
- package/lib/commonjs/web/convert/object/filter.js +42 -0
- package/lib/commonjs/web/convert/object/filter.js.map +1 -0
- package/lib/commonjs/web/convert/object/index.js +39 -0
- package/lib/commonjs/web/convert/object/index.js.map +1 -0
- package/lib/commonjs/web/convert/object/objectStyle.js +56 -0
- package/lib/commonjs/web/convert/object/objectStyle.js.map +1 -0
- package/lib/commonjs/web/convert/object/transform.js +27 -0
- package/lib/commonjs/web/convert/object/transform.js.map +1 -0
- package/lib/commonjs/web/convert/pseudo.js +10 -0
- package/lib/commonjs/web/convert/pseudo.js.map +1 -0
- package/lib/commonjs/web/convert/shadow/boxShadow.js +62 -0
- package/lib/commonjs/web/convert/shadow/boxShadow.js.map +1 -0
- package/lib/commonjs/web/convert/shadow/getShadowBreakpoints.js +38 -0
- package/lib/commonjs/web/convert/shadow/getShadowBreakpoints.js.map +1 -0
- package/lib/commonjs/web/convert/shadow/index.js +28 -0
- package/lib/commonjs/web/convert/shadow/index.js.map +1 -0
- package/lib/commonjs/web/convert/shadow/textShadow.js +59 -0
- package/lib/commonjs/web/convert/shadow/textShadow.js.map +1 -0
- package/lib/commonjs/web/convert/style.js +93 -0
- package/lib/commonjs/web/convert/style.js.map +1 -0
- package/lib/commonjs/web/convert/types.js +9 -0
- package/lib/commonjs/web/convert/types.js.map +1 -0
- package/lib/commonjs/web/convert/utils.js +59 -0
- package/lib/commonjs/web/convert/utils.js.map +1 -0
- package/lib/commonjs/web/create.js +49 -0
- package/lib/commonjs/web/create.js.map +1 -0
- package/lib/commonjs/web/index.js +60 -0
- package/lib/commonjs/web/index.js.map +1 -0
- package/lib/commonjs/web/listener.js +61 -0
- package/lib/commonjs/web/listener.js.map +1 -0
- package/lib/commonjs/web/mock.js +27 -0
- package/lib/commonjs/web/mock.js.map +1 -0
- package/lib/commonjs/web/registry.js +172 -0
- package/lib/commonjs/web/registry.js.map +1 -0
- package/lib/commonjs/web/runtime.js +173 -0
- package/lib/commonjs/web/runtime.js.map +1 -0
- package/lib/commonjs/web/shadowRegistry.js +142 -0
- package/lib/commonjs/web/shadowRegistry.js.map +1 -0
- package/lib/commonjs/web/state.js +73 -0
- package/lib/commonjs/web/state.js.map +1 -0
- package/lib/commonjs/web/utils/common.js +39 -0
- package/lib/commonjs/web/utils/common.js.map +1 -0
- package/lib/commonjs/web/utils/index.js +28 -0
- package/lib/commonjs/web/utils/index.js.map +1 -0
- package/lib/commonjs/web/utils/unistyle.js +85 -0
- package/lib/commonjs/web/utils/unistyle.js.map +1 -0
- package/lib/commonjs/web/variants/getVariants.js +39 -0
- package/lib/commonjs/web/variants/getVariants.js.map +1 -0
- package/lib/commonjs/web/variants/index.js +28 -0
- package/lib/commonjs/web/variants/index.js.map +1 -0
- package/lib/commonjs/web/variants/useVariants.js +59 -0
- package/lib/commonjs/web/variants/useVariants.js.map +1 -0
- package/lib/module/components/Display.js +13 -0
- package/lib/module/components/Display.js.map +1 -0
- package/lib/module/components/Hide.js +13 -0
- package/lib/module/components/Hide.js.map +1 -0
- package/lib/module/components/index.js +5 -0
- package/lib/module/components/index.js.map +1 -0
- package/lib/module/components/useMedia.js +54 -0
- package/lib/module/components/useMedia.js.map +1 -0
- package/lib/module/components/useMedia.web.js +38 -0
- package/lib/module/components/useMedia.web.js.map +1 -0
- package/lib/module/core/createUnistylesComponent.js +72 -0
- package/lib/module/core/createUnistylesComponent.js.map +1 -0
- package/lib/module/core/createUnistylesComponent.native.js +75 -0
- package/lib/module/core/createUnistylesComponent.native.js.map +1 -0
- package/lib/module/core/index.js +4 -0
- package/lib/module/core/index.js.map +1 -0
- package/lib/module/index.js +2 -9
- package/lib/module/index.js.map +1 -1
- package/lib/module/mq.js +21 -11
- package/lib/module/mq.js.map +1 -1
- package/lib/module/specs/NativePlatform/NativePlatform.nitro.js +1 -0
- package/lib/module/specs/NativePlatform/NativePlatform.nitro.js.map +1 -1
- package/lib/module/specs/NavigtionBar/index.js +0 -10
- package/lib/module/specs/NavigtionBar/index.js.map +1 -1
- package/lib/module/specs/ShadowRegistry/index.js +10 -6
- package/lib/module/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/module/specs/StatusBar/index.js +1 -6
- package/lib/module/specs/StatusBar/index.js.map +1 -1
- package/lib/module/specs/StyleSheet/index.js +1 -0
- package/lib/module/specs/StyleSheet/index.js.map +1 -1
- package/lib/module/specs/UnistylesRuntime/index.js +1 -3
- package/lib/module/specs/UnistylesRuntime/index.js.map +1 -1
- package/lib/module/specs/index.js +2 -1
- package/lib/module/specs/index.js.map +1 -1
- package/lib/module/specs/index.web.js +1 -1
- package/lib/module/specs/index.web.js.map +1 -1
- package/lib/module/types/stylesheet.js.map +1 -1
- package/lib/module/utils.js +21 -0
- package/lib/module/utils.js.map +1 -0
- package/lib/module/web/convert/index.js +74 -0
- package/lib/module/web/convert/index.js.map +1 -0
- package/lib/module/web/convert/module.d.js +2 -0
- package/lib/module/web/convert/module.d.js.map +1 -0
- package/lib/module/web/convert/object/boxShadow.js +54 -0
- package/lib/module/web/convert/object/boxShadow.js.map +1 -0
- package/lib/module/web/convert/object/filter.js +37 -0
- package/lib/module/web/convert/object/filter.js.map +1 -0
- package/lib/module/web/convert/object/index.js +6 -0
- package/lib/module/web/convert/object/index.js.map +1 -0
- package/lib/module/web/convert/object/objectStyle.js +51 -0
- package/lib/module/web/convert/object/objectStyle.js.map +1 -0
- package/lib/module/web/convert/object/transform.js +22 -0
- package/lib/module/web/convert/object/transform.js.map +1 -0
- package/lib/module/web/convert/pseudo.js +5 -0
- package/lib/module/web/convert/pseudo.js.map +1 -0
- package/lib/module/web/convert/shadow/boxShadow.js +57 -0
- package/lib/module/web/convert/shadow/boxShadow.js.map +1 -0
- package/lib/module/web/convert/shadow/getShadowBreakpoints.js +33 -0
- package/lib/module/web/convert/shadow/getShadowBreakpoints.js.map +1 -0
- package/lib/module/web/convert/shadow/index.js +5 -0
- package/lib/module/web/convert/shadow/index.js.map +1 -0
- package/lib/module/web/convert/shadow/textShadow.js +54 -0
- package/lib/module/web/convert/shadow/textShadow.js.map +1 -0
- package/lib/module/web/convert/style.js +88 -0
- package/lib/module/web/convert/style.js.map +1 -0
- package/lib/module/web/convert/types.js +5 -0
- package/lib/module/web/convert/types.js.map +1 -0
- package/lib/module/web/convert/utils.js +45 -0
- package/lib/module/web/convert/utils.js.map +1 -0
- package/lib/module/web/create.js +44 -0
- package/lib/module/web/create.js.map +1 -0
- package/lib/module/web/index.js +26 -0
- package/lib/module/web/index.js.map +1 -0
- package/lib/module/web/listener.js +57 -0
- package/lib/module/web/listener.js.map +1 -0
- package/lib/module/web/mock.js +23 -0
- package/lib/module/web/mock.js.map +1 -0
- package/lib/module/web/registry.js +168 -0
- package/lib/module/web/registry.js.map +1 -0
- package/lib/module/web/runtime.js +169 -0
- package/lib/module/web/runtime.js.map +1 -0
- package/lib/module/web/shadowRegistry.js +138 -0
- package/lib/module/web/shadowRegistry.js.map +1 -0
- package/lib/module/web/state.js +69 -0
- package/lib/module/web/state.js.map +1 -0
- package/lib/module/web/utils/common.js +28 -0
- package/lib/module/web/utils/common.js.map +1 -0
- package/lib/module/web/utils/index.js +5 -0
- package/lib/module/web/utils/index.js.map +1 -0
- package/lib/module/web/utils/unistyle.js +72 -0
- package/lib/module/web/utils/unistyle.js.map +1 -0
- package/lib/module/web/variants/getVariants.js +34 -0
- package/lib/module/web/variants/getVariants.js.map +1 -0
- package/lib/module/web/variants/index.js +5 -0
- package/lib/module/web/variants/index.js.map +1 -0
- package/lib/module/web/variants/useVariants.js +54 -0
- package/lib/module/web/variants/useVariants.js.map +1 -0
- package/lib/typescript/src/components/Display.d.ts +7 -0
- package/lib/typescript/src/components/Display.d.ts.map +1 -0
- package/lib/typescript/src/components/Hide.d.ts +7 -0
- package/lib/typescript/src/components/Hide.d.ts.map +1 -0
- package/lib/typescript/src/components/index.d.ts +3 -0
- package/lib/typescript/src/components/index.d.ts.map +1 -0
- package/lib/typescript/src/components/useMedia.d.ts +6 -0
- package/lib/typescript/src/components/useMedia.d.ts.map +1 -0
- package/lib/typescript/src/components/useMedia.web.d.ts +6 -0
- package/lib/typescript/src/components/useMedia.web.d.ts.map +1 -0
- package/lib/typescript/src/core/createUnistylesComponent.d.ts +8 -0
- package/lib/typescript/src/core/createUnistylesComponent.d.ts.map +1 -0
- package/lib/typescript/src/core/createUnistylesComponent.native.d.ts +8 -0
- package/lib/typescript/src/core/createUnistylesComponent.native.d.ts.map +1 -0
- package/lib/typescript/src/core/index.d.ts +2 -0
- package/lib/typescript/src/core/index.d.ts.map +1 -0
- package/lib/typescript/src/index.d.ts +3 -0
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/mq.d.ts +8 -0
- package/lib/typescript/src/mq.d.ts.map +1 -1
- package/lib/typescript/src/specs/NativePlatform/NativePlatform.nitro.d.ts +7 -5
- package/lib/typescript/src/specs/NativePlatform/NativePlatform.nitro.d.ts.map +1 -1
- package/lib/typescript/src/specs/NavigtionBar/UnistylesNavigationBar.nitro.d.ts +0 -1
- package/lib/typescript/src/specs/NavigtionBar/UnistylesNavigationBar.nitro.d.ts.map +1 -1
- package/lib/typescript/src/specs/NavigtionBar/index.d.ts +1 -10
- package/lib/typescript/src/specs/NavigtionBar/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/ShadowRegistry/index.d.ts +4 -4
- package/lib/typescript/src/specs/ShadowRegistry/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/ShadowRegistry/types.d.ts +3 -0
- package/lib/typescript/src/specs/ShadowRegistry/types.d.ts.map +1 -1
- package/lib/typescript/src/specs/StatusBar/UnistylesStatusBar.nitro.d.ts +0 -1
- package/lib/typescript/src/specs/StatusBar/UnistylesStatusBar.nitro.d.ts.map +1 -1
- package/lib/typescript/src/specs/StatusBar/index.d.ts +2 -4
- package/lib/typescript/src/specs/StatusBar/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/StyleSheet/UnistylesStyleSheet.nitro.d.ts +3 -1
- package/lib/typescript/src/specs/StyleSheet/UnistylesStyleSheet.nitro.d.ts.map +1 -1
- package/lib/typescript/src/specs/StyleSheet/index.d.ts +3 -1
- package/lib/typescript/src/specs/StyleSheet/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/UnistylesRuntime/UnistylesRuntime.nitro.d.ts +1 -1
- package/lib/typescript/src/specs/UnistylesRuntime/UnistylesRuntime.nitro.d.ts.map +1 -1
- package/lib/typescript/src/specs/UnistylesRuntime/index.d.ts +3 -1
- package/lib/typescript/src/specs/UnistylesRuntime/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/index.d.ts +4 -2
- package/lib/typescript/src/specs/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/index.web.d.ts +1 -1
- package/lib/typescript/src/specs/index.web.d.ts.map +1 -1
- package/lib/typescript/src/types/breakpoints.d.ts +11 -11
- package/lib/typescript/src/types/breakpoints.d.ts.map +1 -1
- package/lib/typescript/src/types/common.d.ts +1 -0
- package/lib/typescript/src/types/common.d.ts.map +1 -1
- package/lib/typescript/src/types/index.d.ts +1 -1
- package/lib/typescript/src/types/index.d.ts.map +1 -1
- package/lib/typescript/src/types/stylesheet.d.ts +6 -4
- package/lib/typescript/src/types/stylesheet.d.ts.map +1 -1
- package/lib/typescript/src/types/variants.d.ts +4 -1
- package/lib/typescript/src/types/variants.d.ts.map +1 -1
- package/lib/typescript/src/utils.d.ts +2 -0
- package/lib/typescript/src/utils.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/index.d.ts +3 -0
- package/lib/typescript/src/web/convert/index.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/object/boxShadow.d.ts +9 -0
- package/lib/typescript/src/web/convert/object/boxShadow.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/object/filter.d.ts +3 -0
- package/lib/typescript/src/web/convert/object/filter.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/object/index.d.ts +4 -0
- package/lib/typescript/src/web/convert/object/index.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/object/objectStyle.d.ts +5 -0
- package/lib/typescript/src/web/convert/object/objectStyle.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/object/transform.d.ts +3 -0
- package/lib/typescript/src/web/convert/object/transform.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/pseudo.d.ts +6 -0
- package/lib/typescript/src/web/convert/pseudo.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/shadow/boxShadow.d.ts +8 -0
- package/lib/typescript/src/web/convert/shadow/boxShadow.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/shadow/getShadowBreakpoints.d.ts +2 -0
- package/lib/typescript/src/web/convert/shadow/getShadowBreakpoints.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/shadow/index.d.ts +3 -0
- package/lib/typescript/src/web/convert/shadow/index.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/shadow/textShadow.d.ts +8 -0
- package/lib/typescript/src/web/convert/shadow/textShadow.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/style.d.ts +2 -0
- package/lib/typescript/src/web/convert/style.d.ts.map +1 -0
- package/lib/typescript/{web → src/web}/convert/types.d.ts +8 -2
- package/lib/typescript/src/web/convert/types.d.ts.map +1 -0
- package/lib/typescript/src/web/convert/utils.d.ts +12 -0
- package/lib/typescript/src/web/convert/utils.d.ts.map +1 -0
- package/lib/typescript/src/web/create.d.ts +1443 -0
- package/lib/typescript/{web → src/web}/create.d.ts.map +1 -1
- package/lib/typescript/src/web/index.d.ts +1459 -0
- package/lib/typescript/{web → src/web}/index.d.ts.map +1 -1
- package/lib/typescript/{web/listener → src/web}/listener.d.ts +5 -2
- package/lib/typescript/src/web/listener.d.ts.map +1 -0
- package/lib/typescript/src/web/mock.d.ts +5 -0
- package/lib/typescript/src/web/mock.d.ts.map +1 -0
- package/lib/typescript/src/web/registry.d.ts +24 -0
- package/lib/typescript/src/web/registry.d.ts.map +1 -0
- package/lib/typescript/{web → src/web}/runtime.d.ts +11 -10
- package/lib/typescript/src/web/runtime.d.ts.map +1 -0
- package/lib/typescript/src/web/shadowRegistry.d.ts +17 -0
- package/lib/typescript/src/web/shadowRegistry.d.ts.map +1 -0
- package/lib/typescript/src/web/state.d.ts +18 -0
- package/lib/typescript/src/web/state.d.ts.map +1 -0
- package/lib/typescript/src/web/utils/common.d.ts +8 -0
- package/lib/typescript/src/web/utils/common.d.ts.map +1 -0
- package/lib/typescript/src/web/utils/index.d.ts +3 -0
- package/lib/typescript/src/web/utils/index.d.ts.map +1 -0
- package/lib/typescript/src/web/utils/unistyle.d.ts +20 -0
- package/lib/typescript/src/web/utils/unistyle.d.ts.map +1 -0
- package/lib/typescript/src/web/variants/getVariants.d.ts +3 -0
- package/lib/typescript/src/web/variants/getVariants.d.ts.map +1 -0
- package/lib/typescript/src/web/variants/index.d.ts +3 -0
- package/lib/typescript/src/web/variants/index.d.ts.map +1 -0
- package/lib/typescript/src/web/variants/useVariants.d.ts +3 -0
- package/lib/typescript/src/web/variants/useVariants.d.ts.map +1 -0
- package/nitrogen/generated/android/c++/JColorScheme.hpp +1 -1
- package/nitrogen/generated/android/c++/JFunc_void_UnistylesNativeMiniRuntime.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.hpp +69 -0
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp +35 -34
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp +15 -6
- package/nitrogen/generated/android/c++/JOrientation.hpp +1 -1
- package/nitrogen/generated/android/c++/JUnistyleDependency.hpp +4 -1
- package/nitrogen/generated/android/c++/JUnistylesNativeMiniRuntime.hpp +9 -7
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Dimensions.kt +1 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/{Func_void_std__vector_UnistyleDependency_.kt → Func_void_UnistylesNativeMiniRuntime.kt} +6 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.kt +46 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt +25 -13
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Insets.kt +1 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistyleDependency.kt +2 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistylesNativeMiniRuntime.kt +3 -1
- package/nitrogen/generated/android/unistyles+autolinking.cmake +13 -1
- package/nitrogen/generated/android/unistyles+autolinking.gradle +2 -0
- package/nitrogen/generated/android/{UnistylesOnLoad.cpp → unistylesOnLoad.cpp} +6 -4
- package/nitrogen/generated/android/{UnistylesOnLoad.hpp → unistylesOnLoad.hpp} +1 -1
- package/nitrogen/generated/ios/Unistyles+autolinking.rb +6 -4
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp +25 -0
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp +73 -38
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp +0 -29
- package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp +8 -8
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift +4 -16
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpecCxx.swift +156 -115
- package/nitrogen/generated/ios/swift/UnistyleDependency.swift +4 -0
- package/nitrogen/generated/ios/swift/UnistylesNativeMiniRuntime.swift +16 -5
- package/nitrogen/generated/shared/c++/ColorScheme.hpp +2 -2
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.cpp +2 -2
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp +6 -3
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.cpp +0 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp +3 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.cpp +1 -0
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp +5 -0
- package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp +3 -0
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.cpp +0 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp +3 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.cpp +2 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp +10 -4
- package/nitrogen/generated/shared/c++/Orientation.hpp +2 -2
- package/nitrogen/generated/shared/c++/UnistyleDependency.hpp +2 -1
- package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp +10 -9
- package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp +9 -8
- package/package.json +20 -30
- package/plugin/common.js +31 -3
- package/plugin/index.js +107 -18
- package/plugin/ref.js +129 -13
- package/plugin/style.js +189 -22
- package/plugin/stylesheet.js +53 -3
- package/plugin/variants.js +33 -0
- package/src/components/Display.tsx +12 -0
- package/src/components/Hide.tsx +12 -0
- package/src/components/index.ts +2 -0
- package/src/components/useMedia.ts +64 -0
- package/src/components/useMedia.web.ts +47 -0
- package/src/core/createUnistylesComponent.native.tsx +83 -0
- package/src/core/createUnistylesComponent.tsx +84 -0
- package/src/core/index.ts +1 -0
- package/src/index.ts +3 -12
- package/src/mq.ts +27 -9
- package/src/specs/NativePlatform/NativePlatform.nitro.ts +7 -5
- package/src/specs/NavigtionBar/UnistylesNavigationBar.nitro.ts +0 -1
- package/src/specs/NavigtionBar/index.ts +1 -25
- package/src/specs/ShadowRegistry/index.ts +16 -10
- package/src/specs/ShadowRegistry/types.ts +4 -1
- package/src/specs/StatusBar/UnistylesStatusBar.nitro.ts +0 -1
- package/src/specs/StatusBar/index.ts +2 -12
- package/src/specs/StyleSheet/UnistylesStyleSheet.nitro.ts +4 -1
- package/src/specs/StyleSheet/index.ts +6 -1
- package/src/specs/UnistylesRuntime/UnistylesRuntime.nitro.ts +1 -1
- package/src/specs/UnistylesRuntime/index.ts +5 -4
- package/src/specs/index.ts +6 -2
- package/src/specs/index.web.ts +1 -1
- package/src/types/breakpoints.ts +25 -13
- package/src/types/common.ts +1 -0
- package/src/types/index.ts +1 -1
- package/src/types/stylesheet.ts +7 -5
- package/src/types/variants.ts +7 -1
- package/src/utils.ts +22 -0
- package/{web → src/web}/convert/index.ts +25 -25
- package/src/web/convert/object/boxShadow.ts +55 -0
- package/src/web/convert/object/filter.ts +39 -0
- package/src/web/convert/object/index.ts +3 -0
- package/src/web/convert/object/objectStyle.ts +69 -0
- package/src/web/convert/object/transform.ts +24 -0
- package/src/web/convert/pseudo.ts +137 -0
- package/src/web/convert/shadow/boxShadow.ts +50 -0
- package/src/web/convert/shadow/getShadowBreakpoints.ts +34 -0
- package/src/web/convert/shadow/index.ts +2 -0
- package/src/web/convert/shadow/textShadow.ts +48 -0
- package/{web → src/web}/convert/style.ts +61 -10
- package/{web → src/web}/convert/types.ts +9 -2
- package/{web → src/web}/convert/utils.ts +11 -5
- package/src/web/create.ts +48 -0
- package/{web → src/web}/index.ts +4 -3
- package/src/web/listener.ts +63 -0
- package/{web → src/web}/mock.ts +3 -14
- package/src/web/registry.ts +215 -0
- package/{web → src/web}/runtime.ts +32 -21
- package/src/web/shadowRegistry.ts +145 -0
- package/src/web/state.ts +94 -0
- package/src/web/utils/common.ts +45 -0
- package/src/web/utils/index.ts +2 -0
- package/src/web/utils/unistyle.ts +108 -0
- package/src/web/variants/getVariants.ts +42 -0
- package/src/web/variants/index.ts +2 -0
- package/src/web/variants/useVariants.ts +65 -0
- package/android/src/main/cxx/helpers.cpp +0 -105
- package/android/src/main/cxx/helpers.h +0 -16
- package/android/src/main/cxx/platform.cpp +0 -170
- package/android/src/main/cxx/platform.h +0 -20
- package/lib/typescript/example/App.d.ts +0 -4
- package/lib/typescript/example/App.d.ts.map +0 -1
- package/lib/typescript/example/unistyles.d.ts +0 -63
- package/lib/typescript/example/unistyles.d.ts.map +0 -1
- package/lib/typescript/expo-example/App.d.ts +0 -4
- package/lib/typescript/expo-example/App.d.ts.map +0 -1
- package/lib/typescript/expo-example/unistyles.d.ts +0 -63
- package/lib/typescript/expo-example/unistyles.d.ts.map +0 -1
- package/lib/typescript/web/convert/boxShadow.d.ts +0 -3
- package/lib/typescript/web/convert/boxShadow.d.ts.map +0 -1
- package/lib/typescript/web/convert/breakpoint.d.ts +0 -3
- package/lib/typescript/web/convert/breakpoint.d.ts.map +0 -1
- package/lib/typescript/web/convert/index.d.ts +0 -4
- package/lib/typescript/web/convert/index.d.ts.map +0 -1
- package/lib/typescript/web/convert/shadow.d.ts +0 -2
- package/lib/typescript/web/convert/shadow.d.ts.map +0 -1
- package/lib/typescript/web/convert/style.d.ts +0 -3
- package/lib/typescript/web/convert/style.d.ts.map +0 -1
- package/lib/typescript/web/convert/textShadow.d.ts +0 -3
- package/lib/typescript/web/convert/textShadow.d.ts.map +0 -1
- package/lib/typescript/web/convert/transform.d.ts +0 -5
- package/lib/typescript/web/convert/transform.d.ts.map +0 -1
- package/lib/typescript/web/convert/types.d.ts.map +0 -1
- package/lib/typescript/web/convert/utils.d.ts +0 -8
- package/lib/typescript/web/convert/utils.d.ts.map +0 -1
- package/lib/typescript/web/create.d.ts +0 -2449
- package/lib/typescript/web/index.d.ts +0 -2464
- package/lib/typescript/web/listener/index.d.ts +0 -2
- package/lib/typescript/web/listener/index.d.ts.map +0 -1
- package/lib/typescript/web/listener/listener.d.ts.map +0 -1
- package/lib/typescript/web/mock.d.ts +0 -14
- package/lib/typescript/web/mock.d.ts.map +0 -1
- package/lib/typescript/web/mq.d.ts +0 -4
- package/lib/typescript/web/mq.d.ts.map +0 -1
- package/lib/typescript/web/pseudo.d.ts +0 -4
- package/lib/typescript/web/pseudo.d.ts.map +0 -1
- package/lib/typescript/web/registry.d.ts +0 -12
- package/lib/typescript/web/registry.d.ts.map +0 -1
- package/lib/typescript/web/runtime.d.ts.map +0 -1
- package/lib/typescript/web/state.d.ts +0 -24
- package/lib/typescript/web/state.d.ts.map +0 -1
- package/lib/typescript/web/useVariants.d.ts +0 -3
- package/lib/typescript/web/useVariants.d.ts.map +0 -1
- package/lib/typescript/web/utils.d.ts +0 -18
- package/lib/typescript/web/utils.d.ts.map +0 -1
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency_.hpp +0 -60
- package/plugin/__tests__/dependencies.spec.js +0 -360
- package/plugin/__tests__/ref.spec.js +0 -991
- package/plugin/__tests__/stylesheet.spec.js +0 -396
- package/web/convert/boxShadow.ts +0 -72
- package/web/convert/breakpoint.ts +0 -21
- package/web/convert/shadow.ts +0 -68
- package/web/convert/textShadow.ts +0 -69
- package/web/convert/transform.ts +0 -89
- package/web/create.ts +0 -102
- package/web/listener/index.ts +0 -1
- package/web/listener/listener.ts +0 -33
- package/web/mq.ts +0 -19
- package/web/pseudo.ts +0 -11
- package/web/registry.ts +0 -41
- package/web/state.ts +0 -148
- package/web/useVariants.ts +0 -99
- package/web/utils.ts +0 -95
- /package/nitrogen/generated/android/{UnistylesOnLoad.kt → unistylesOnLoad.kt} +0 -0
- /package/{web → src/web}/convert/module.d.ts +0 -0
@@ -1,6 +1,6 @@
|
|
1
|
-
import {
|
1
|
+
import { StatusBar as NativeStatusBar } from 'react-native'
|
2
2
|
import type { UnistylesStatusBar as UnistylesStatusBarSpec } from './UnistylesStatusBar.nitro'
|
3
|
-
import {
|
3
|
+
import { StatusBarStyle } from '../types'
|
4
4
|
|
5
5
|
export type StatusBarHiddenAnimation = 'none' | 'fade' | 'slide'
|
6
6
|
|
@@ -8,8 +8,6 @@ interface PrivateUnistylesStatusBar extends Omit<UnistylesStatusBarSpec, 'setBac
|
|
8
8
|
setStyle(style: StatusBarStyle, animated?: boolean): void,
|
9
9
|
setHidden(isHidden: boolean, animation?: StatusBarHiddenAnimation): void,
|
10
10
|
_setHidden(isHidden: boolean, animation?: StatusBarHiddenAnimation): void,
|
11
|
-
setBackgroundColor(color?: string): void,
|
12
|
-
_setBackgroundColor(color?: Color): void
|
13
11
|
}
|
14
12
|
|
15
13
|
export const attachStatusBarJSMethods = (hybridObject: UnistylesStatusBar) => {
|
@@ -31,17 +29,9 @@ export const attachStatusBarJSMethods = (hybridObject: UnistylesStatusBar) => {
|
|
31
29
|
NativeStatusBar.setHidden(isHidden, animation)
|
32
30
|
privateHybrid._setHidden(isHidden)
|
33
31
|
}
|
34
|
-
|
35
|
-
privateHybrid._setBackgroundColor = hybridObject.setBackgroundColor
|
36
|
-
hybridObject.setBackgroundColor = (color?: string) => {
|
37
|
-
const parsedColor = processColor(color)
|
38
|
-
|
39
|
-
privateHybrid._setBackgroundColor(parsedColor as number)
|
40
|
-
}
|
41
32
|
}
|
42
33
|
|
43
34
|
type PrivateMethods =
|
44
|
-
| '_setBackgroundColor'
|
45
35
|
| '_setHidden'
|
46
36
|
| 'dispose'
|
47
37
|
|
@@ -1,6 +1,9 @@
|
|
1
1
|
import type { HybridObject } from 'react-native-nitro-modules'
|
2
|
+
import { UnistyleDependency } from '../NativePlatform'
|
2
3
|
|
3
4
|
export interface UnistylesStyleSheet extends HybridObject<{ ios: 'c++', android: 'c++' }> {
|
4
5
|
readonly hairlineWidth: number
|
5
|
-
readonly
|
6
|
+
readonly unid: number
|
7
|
+
|
8
|
+
addChangeListener(onChanged: (dependencies: Array<UnistyleDependency>) => void): () => void
|
6
9
|
}
|
@@ -23,6 +23,7 @@ export interface UnistylesStyleSheet extends UnistylesStyleSheetSpec {
|
|
23
23
|
flatten: typeof NativeStyleSheetType.flatten,
|
24
24
|
|
25
25
|
// overridden methods
|
26
|
+
init(): void,
|
26
27
|
create: CreateUnistylesStyleSheet,
|
27
28
|
configure(config: UnistylesConfig): void,
|
28
29
|
jsMethods: {
|
@@ -41,4 +42,8 @@ HybridUnistylesStyleSheet.jsMethods = {
|
|
41
42
|
processColor
|
42
43
|
}
|
43
44
|
|
44
|
-
|
45
|
+
HybridUnistylesStyleSheet.init()
|
46
|
+
|
47
|
+
type PrivateMethods = 'jsMethods' | 'addChangeListener' | 'init'
|
48
|
+
|
49
|
+
export const StyleSheet = HybridUnistylesStyleSheet as Omit<UnistylesStyleSheet, PrivateMethods>
|
@@ -10,7 +10,6 @@ type Orientation = 'portrait' | 'landscape'
|
|
10
10
|
export interface UnistylesCxxMiniRuntime extends UnistylesNativeMiniRuntime {
|
11
11
|
readonly themeName?: string,
|
12
12
|
readonly breakpoint?: string,
|
13
|
-
readonly orientation: Orientation,
|
14
13
|
readonly hasAdaptiveThemes: boolean,
|
15
14
|
}
|
16
15
|
|
@@ -31,6 +30,7 @@ export interface UnistylesRuntime extends HybridObject<{ ios: 'c++', android: 'c
|
|
31
30
|
readonly themeName?: string,
|
32
31
|
readonly contentSizeCategory: string,
|
33
32
|
readonly breakpoint?: string,
|
33
|
+
readonly breakpoints: Record<string, number>,
|
34
34
|
readonly insets: Insets,
|
35
35
|
readonly orientation: Orientation,
|
36
36
|
readonly pixelRatio: number,
|
@@ -3,9 +3,10 @@ import { NitroModules } from 'react-native-nitro-modules'
|
|
3
3
|
import type { UnistylesRuntime as UnistylesRuntimeSpec, UnistylesMiniRuntime } from './UnistylesRuntime.nitro'
|
4
4
|
import type { AppBreakpoint, AppTheme, AppThemeName, Color, ColorScheme, Orientation } from '../types'
|
5
5
|
import { attachStatusBarJSMethods, type UnistylesStatusBar } from '../StatusBar'
|
6
|
-
import {
|
7
|
-
import type { AndroidContentSizeCategory, IOSContentSizeCategory } from '../../types'
|
6
|
+
import { type UnistylesNavigationBar } from '../NavigtionBar'
|
7
|
+
import type { AndroidContentSizeCategory, IOSContentSizeCategory, UnistylesTheme } from '../../types'
|
8
8
|
import { isIOS } from '../../common'
|
9
|
+
import type { UnistylesThemes } from '../../global'
|
9
10
|
|
10
11
|
export interface UnistylesRuntimePrivate extends Omit<UnistylesRuntimeSpec, 'setRootViewBackgroundColor'> {
|
11
12
|
readonly colorScheme: ColorScheme,
|
@@ -18,6 +19,7 @@ export interface UnistylesRuntimePrivate extends Omit<UnistylesRuntimeSpec, 'set
|
|
18
19
|
statusBar: UnistylesStatusBar,
|
19
20
|
navigationBar: UnistylesNavigationBar,
|
20
21
|
|
22
|
+
getTheme(themeName?: keyof UnistylesThemes): UnistylesTheme,
|
21
23
|
setTheme(themeName: AppThemeName): void
|
22
24
|
updateTheme(themeName: AppThemeName, updater: (currentTheme: AppTheme) => AppTheme): void,
|
23
25
|
setRootViewBackgroundColor(color?: string): void,
|
@@ -45,7 +47,7 @@ HybridUnistylesRuntime.navigationBar = HybridUnistylesRuntime.createHybridNaviga
|
|
45
47
|
HybridUnistylesRuntime._setRootViewBackgroundColor = HybridUnistylesRuntime.setRootViewBackgroundColor
|
46
48
|
|
47
49
|
HybridUnistylesRuntime.setRootViewBackgroundColor = (color?: string) => {
|
48
|
-
const parsedColor = processColor(color)
|
50
|
+
const parsedColor = processColor(color) ?? 0
|
49
51
|
|
50
52
|
HybridUnistylesRuntime._setRootViewBackgroundColor(parsedColor as number)
|
51
53
|
}
|
@@ -55,7 +57,6 @@ if (isIOS) {
|
|
55
57
|
}
|
56
58
|
|
57
59
|
attachStatusBarJSMethods(HybridUnistylesRuntime.statusBar)
|
58
|
-
attachNavigationBarJSMethods(HybridUnistylesRuntime.navigationBar)
|
59
60
|
|
60
61
|
export const Runtime = HybridUnistylesRuntime as UnistylesRuntime
|
61
62
|
|
package/src/specs/index.ts
CHANGED
@@ -2,14 +2,17 @@ import './TurboUnistyles'
|
|
2
2
|
|
3
3
|
import { Runtime } from './UnistylesRuntime'
|
4
4
|
import { StyleSheet } from './StyleSheet'
|
5
|
+
import type { UnistylesStyleSheet } from './StyleSheet'
|
5
6
|
import { UnistylesShadowRegistry } from './ShadowRegistry'
|
6
7
|
import type { UnistylesMiniRuntime } from './UnistylesRuntime'
|
7
8
|
import { StatusBarStyle, ColorScheme, Orientation } from './types'
|
9
|
+
import { UnistyleDependency } from './NativePlatform'
|
8
10
|
|
9
11
|
export {
|
10
12
|
StatusBarStyle,
|
11
13
|
ColorScheme,
|
12
|
-
Orientation
|
14
|
+
Orientation,
|
15
|
+
UnistyleDependency
|
13
16
|
}
|
14
17
|
|
15
18
|
export {
|
@@ -19,5 +22,6 @@ export {
|
|
19
22
|
}
|
20
23
|
|
21
24
|
export type {
|
22
|
-
UnistylesMiniRuntime
|
25
|
+
UnistylesMiniRuntime,
|
26
|
+
UnistylesStyleSheet
|
23
27
|
}
|
package/src/specs/index.web.ts
CHANGED
package/src/types/breakpoints.ts
CHANGED
@@ -17,45 +17,57 @@ type ExtractBreakpoints<T> = T extends object
|
|
17
17
|
}
|
18
18
|
: T
|
19
19
|
|
20
|
-
type ParseNestedObject<T> = T extends (...args: infer A) => infer R
|
21
|
-
? (...args: A) => ParseNestedObject<R>
|
20
|
+
type ParseNestedObject<T, ShouldFlatten> = T extends (...args: infer A) => infer R
|
21
|
+
? (...args: A) => ParseNestedObject<R, false>
|
22
22
|
: T extends object
|
23
23
|
? T extends { variants: infer R, compoundVariants: infer C }
|
24
|
-
|
24
|
+
// // if intersection of Base, Variants and Compound Variants is never, then flatten variants and compound variants to generic "string"
|
25
|
+
? (ParseVariants<FlattenVariants<R, false>> & FlattenCompoundVariants<C, false> & ParseNestedObject<Omit<T, 'variants' | 'compoundVariants'>, false>) extends never
|
26
|
+
? ParseVariants<FlattenVariants<R, true>> & FlattenCompoundVariants<C, true> & ParseNestedObject<Omit<T, 'variants' | 'compoundVariants'>, false>
|
27
|
+
: ParseVariants<FlattenVariants<R, false>> & FlattenCompoundVariants<C, false> & ParseNestedObject<Omit<T, 'variants' | 'compoundVariants'>, false>
|
25
28
|
: T extends { variants: infer R }
|
26
|
-
|
29
|
+
// if intersection of Base and Variants is never, then flatten variants to generic "string"
|
30
|
+
? (ParseVariants<FlattenVariants<R, false>> & ParseNestedObject<Omit<T, 'variants'>, false>) extends never
|
31
|
+
? ParseVariants<FlattenVariants<R, true>> & ParseNestedObject<Omit<T, 'variants'>, false>
|
32
|
+
: ParseVariants<FlattenVariants<R, false>> & ParseNestedObject<Omit<T, 'variants'>, false>
|
27
33
|
: T extends { compoundVariants: object }
|
28
|
-
? ParseNestedObject<Omit<T, 'compoundVariants'
|
34
|
+
? ParseNestedObject<Omit<T, 'compoundVariants'>, false>
|
29
35
|
: {
|
30
36
|
[K in keyof T as K extends '_web' ? never : K]: T[K] extends object
|
31
37
|
? T[K] extends OpaqueColorValue
|
32
38
|
? ColorValue
|
33
39
|
: ExtractBreakpoints<T[K]>
|
34
|
-
: T[K]
|
40
|
+
: T[K] extends string
|
41
|
+
? ShouldFlatten extends true
|
42
|
+
? string
|
43
|
+
: T[K]
|
44
|
+
: T[K]
|
35
45
|
}
|
36
46
|
: T
|
37
47
|
|
38
|
-
type FlattenVariants<T> = T extends object
|
48
|
+
type FlattenVariants<T, ShouldFlatten> = T extends object
|
39
49
|
? {
|
40
50
|
[K in keyof T]: T[K] extends object
|
41
51
|
? {
|
42
52
|
[key in keyof T[K]]: T[K][key] extends object
|
43
|
-
? ParseNestedObject<T[K][key]>
|
53
|
+
? ParseNestedObject<T[K][key], ShouldFlatten>
|
44
54
|
: never
|
45
55
|
}
|
46
56
|
: never
|
47
57
|
}
|
48
58
|
: never
|
49
59
|
|
50
|
-
type FlattenCompoundVariants<T> = T extends Array<infer _>
|
51
|
-
? FlattenCompoundVariants<T[number]>
|
60
|
+
type FlattenCompoundVariants<T, ShouldFlatten> = T extends Array<infer _>
|
61
|
+
? FlattenCompoundVariants<T[number], ShouldFlatten>
|
52
62
|
: T extends { styles: infer S }
|
53
|
-
? ParseNestedObject<S>
|
63
|
+
? ParseNestedObject<S, ShouldFlatten>
|
54
64
|
: never
|
55
65
|
|
56
66
|
type ParseVariants<T> = T extends object
|
57
67
|
? T[keyof T] extends object
|
58
|
-
? UnionToIntersection<ParseVariants<T[keyof T]>>
|
68
|
+
? UnionToIntersection<ParseVariants<T[keyof T]>> extends never
|
69
|
+
? ParseVariants<T[keyof T]>
|
70
|
+
: UnionToIntersection<ParseVariants<T[keyof T]>>
|
59
71
|
: T
|
60
72
|
: T
|
61
73
|
|
@@ -63,7 +75,7 @@ type UnionToIntersection<U> =
|
|
63
75
|
(U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never
|
64
76
|
|
65
77
|
type ParseStyleKeys<T> = T extends object
|
66
|
-
? { [K in keyof T]: ParseNestedObject<T[K]> }
|
78
|
+
? { [K in keyof T]: ParseNestedObject<T[K], false> }
|
67
79
|
: never
|
68
80
|
|
69
81
|
export type ReactNativeStyleSheet<T> = ParseStyleKeys<SafeReturnType<T>>
|
package/src/types/common.ts
CHANGED
package/src/types/index.ts
CHANGED
@@ -17,5 +17,5 @@ export type {
|
|
17
17
|
UnistyleImage
|
18
18
|
} from './stylesheet'
|
19
19
|
export type { ReactNativeStyleSheet } from './breakpoints'
|
20
|
-
export type { ExtractVariantNames } from './variants'
|
20
|
+
export type { ExtractVariantNames, UnistylesVariants } from './variants'
|
21
21
|
export { AndroidContentSizeCategory, IOSContentSizeCategory, WebContentSizeCategory } from './accessibility'
|
package/src/types/stylesheet.ts
CHANGED
@@ -1,14 +1,14 @@
|
|
1
|
-
import type { ImageStyle, TextStyle, ViewStyle } from 'react-native'
|
1
|
+
import type { BoxShadowValue, ImageStyle, TextStyle, ViewStyle, FilterFunction } from 'react-native'
|
2
2
|
import type { ShadowOffset, TransformStyles, UnistylesTheme } from './core'
|
3
3
|
import type { UnistylesBreakpoints } from '../global'
|
4
4
|
import type { UnistylesMiniRuntime } from '../specs'
|
5
5
|
import type { ReactNativeStyleSheet } from './breakpoints'
|
6
6
|
import type { ExtractVariantNames } from './variants'
|
7
7
|
import type { CSSProperties } from 'react'
|
8
|
-
import type { Pseudo } from '
|
8
|
+
import type { Pseudo } from '../web/convert/pseudo'
|
9
9
|
|
10
10
|
// these props are treated differently to nest breakpoints and media queries
|
11
|
-
type NestedKeys = 'shadowOffset' | 'transform' | 'textShadowOffset'
|
11
|
+
type NestedKeys = 'shadowOffset' | 'transform' | 'textShadowOffset' | 'boxShadow' | 'filter'
|
12
12
|
|
13
13
|
export type UnistyleView = Omit<ViewStyle, NestedKeys>
|
14
14
|
export type UnistyleText = Omit<TextStyle, NestedKeys>
|
@@ -17,7 +17,9 @@ export type UnistyleImage = Omit<ImageStyle, NestedKeys>
|
|
17
17
|
type UnistyleNestedStyles = {
|
18
18
|
shadowOffset?: ToDeepUnistyles<ShadowOffset>,
|
19
19
|
textShadowOffset?: ToDeepUnistyles<ShadowOffset>,
|
20
|
-
transform?: Array<ToDeepUnistyles<TransformStyles
|
20
|
+
transform?: Array<ToDeepUnistyles<TransformStyles>>,
|
21
|
+
boxShadow?: Array<ToDeepUnistyles<BoxShadowValue>> | string,
|
22
|
+
filter?: Array<ToDeepUnistyles<FilterFunction>> | string
|
21
23
|
}
|
22
24
|
|
23
25
|
type VariantsObject = {
|
@@ -27,7 +29,7 @@ type VariantsObject = {
|
|
27
29
|
}
|
28
30
|
|
29
31
|
type CustomClassName = {
|
30
|
-
|
32
|
+
_classNames?: string | Array<string>
|
31
33
|
}
|
32
34
|
|
33
35
|
type CompoundVariant = {
|
package/src/types/variants.ts
CHANGED
@@ -20,4 +20,10 @@ type ExtractSubVariantKeys<T> = T extends object
|
|
20
20
|
|
21
21
|
type ExtractVariant<T> = T extends { variants: infer V }
|
22
22
|
? { [key in keyof V]?: ExtractSubVariantKeys<V[key]> }
|
23
|
-
:
|
23
|
+
: never
|
24
|
+
|
25
|
+
export type UnistylesVariants<ST> = ST extends { useVariants: infer V }
|
26
|
+
? V extends (variants: infer T) => void
|
27
|
+
? T
|
28
|
+
: never
|
29
|
+
: never
|
package/src/utils.ts
ADDED
@@ -0,0 +1,22 @@
|
|
1
|
+
export const deepMergeObjects = <T extends Record<PropertyKey, any>>(...sources: Array<T>) => {
|
2
|
+
const target = {} as T
|
3
|
+
|
4
|
+
sources.forEach(source => {
|
5
|
+
Object.keys(source).forEach(key => {
|
6
|
+
const sourceValue = source[key]
|
7
|
+
const targetValue = target[key]
|
8
|
+
|
9
|
+
if (Object(sourceValue) == sourceValue && Object(targetValue) === targetValue) {
|
10
|
+
// @ts-expect-error - can't assign to generic
|
11
|
+
target[key] = deepMergeObjects(targetValue, sourceValue)
|
12
|
+
|
13
|
+
return
|
14
|
+
}
|
15
|
+
|
16
|
+
// @ts-expect-error - can't assign to generic
|
17
|
+
target[key] = sourceValue
|
18
|
+
})
|
19
|
+
})
|
20
|
+
|
21
|
+
return target
|
22
|
+
}
|
@@ -1,39 +1,31 @@
|
|
1
|
-
import type {
|
2
|
-
import
|
3
|
-
import { media } from 'typestyle'
|
4
|
-
import { isPseudo } from '../pseudo'
|
5
|
-
import { convertBreakpoint } from './breakpoint'
|
1
|
+
import type { UnistylesValues } from '../../types'
|
2
|
+
import { isPseudo } from './pseudo'
|
6
3
|
import { getStyle } from './style'
|
7
|
-
import { deepMergeObjects } from '
|
8
|
-
import { getTransformStyle } from './
|
9
|
-
import {
|
10
|
-
import { getTextShadowStyle } from './
|
11
|
-
import { getBoxShadowStyle } from './boxShadow'
|
4
|
+
import { deepMergeObjects } from '../../utils'
|
5
|
+
import { getTransformStyle, getBoxShadow, getFilterStyle } from './object'
|
6
|
+
import { isShadow, isFilter, isTextShadow, isTransform, isBoxShadow } from './utils'
|
7
|
+
import { getTextShadowStyle, getBoxShadowStyle } from './shadow'
|
12
8
|
|
13
|
-
export const
|
9
|
+
export const convertUnistyles = (value: UnistylesValues) => {
|
14
10
|
// Flag to mark if textShadow is already created
|
15
11
|
let hasTextShadow = false
|
16
12
|
// Flag to mark if boxShadow is already created
|
17
|
-
let
|
13
|
+
let hasShadow = false
|
18
14
|
|
19
15
|
const stylesArray = Object.entries({
|
20
16
|
...value,
|
21
17
|
...value._web
|
22
18
|
}).flatMap(([unistylesKey, unistylesValue]) => {
|
23
19
|
// Keys to omit
|
24
|
-
if (['
|
20
|
+
if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies', '__unistyles-secrets__'].includes(unistylesKey) || unistylesKey.startsWith('variant-')) {
|
25
21
|
return []
|
26
22
|
}
|
27
23
|
|
28
24
|
// Pseudo classes :hover, :before etc.
|
29
25
|
if (isPseudo(unistylesKey)) {
|
30
|
-
const
|
26
|
+
const flattenValues = convertUnistyles(unistylesValue as UnistylesValues)
|
31
27
|
|
32
|
-
return {
|
33
|
-
$nest: {
|
34
|
-
[unistylesKey.replace('_', '&:')]: typestyleValues
|
35
|
-
}
|
36
|
-
}
|
28
|
+
return { [unistylesKey]: flattenValues }
|
37
29
|
}
|
38
30
|
|
39
31
|
// Text shadow
|
@@ -47,17 +39,25 @@ export const convertToTypeStyle = (value: UnistylesValues) => {
|
|
47
39
|
return getTextShadowStyle(value)
|
48
40
|
}
|
49
41
|
|
50
|
-
//
|
51
|
-
if (
|
52
|
-
if (
|
42
|
+
// RN shadows
|
43
|
+
if (isShadow(unistylesKey)) {
|
44
|
+
if (hasShadow) {
|
53
45
|
return []
|
54
46
|
}
|
55
47
|
|
56
|
-
|
48
|
+
hasShadow = true
|
57
49
|
|
58
50
|
return getBoxShadowStyle(value)
|
59
51
|
}
|
60
52
|
|
53
|
+
if (isFilter(unistylesKey, unistylesValue)) {
|
54
|
+
return getFilterStyle(unistylesValue)
|
55
|
+
}
|
56
|
+
|
57
|
+
if (isBoxShadow(unistylesKey, unistylesValue)) {
|
58
|
+
return getBoxShadow(unistylesValue)
|
59
|
+
}
|
60
|
+
|
61
61
|
// Transforms
|
62
62
|
if (isTransform(unistylesKey, unistylesValue)) {
|
63
63
|
return getTransformStyle(unistylesValue)
|
@@ -66,13 +66,13 @@ export const convertToTypeStyle = (value: UnistylesValues) => {
|
|
66
66
|
// Breakpoints
|
67
67
|
if (typeof unistylesValue === 'object' && unistylesValue !== null) {
|
68
68
|
return Object.entries(unistylesValue).map(([breakpointKey, breakpointValue]) => {
|
69
|
-
return
|
69
|
+
return { [breakpointKey]: getStyle(unistylesKey, breakpointValue) }
|
70
70
|
})
|
71
71
|
}
|
72
72
|
|
73
73
|
// Regular styles
|
74
74
|
return getStyle(unistylesKey, unistylesValue)
|
75
|
-
}) as Array<
|
75
|
+
}) as Array<Record<string, any>>
|
76
76
|
|
77
77
|
return deepMergeObjects(...stylesArray)
|
78
78
|
}
|
@@ -0,0 +1,55 @@
|
|
1
|
+
import type { BoxShadowValue } from 'react-native'
|
2
|
+
import { normalizeNumericValue } from '../utils'
|
3
|
+
import { keyInObject } from '../../utils'
|
4
|
+
import { deepMergeObjects } from '../../../utils'
|
5
|
+
|
6
|
+
const createBoxShadowValue = (style: BoxShadowValue) => {
|
7
|
+
const { offsetX, offsetY, blurRadius = 0, spreadDistance = 0, color = '#000', inset } = style
|
8
|
+
|
9
|
+
return `${inset ? 'inset ' : ''}${normalizeNumericValue(offsetX)} ${normalizeNumericValue(offsetY)} ${normalizeNumericValue(blurRadius as number)} ${normalizeNumericValue(spreadDistance as number)} ${color}`
|
10
|
+
}
|
11
|
+
|
12
|
+
export const getBoxShadow = (boxShadow: Array<BoxShadowValue>) => {
|
13
|
+
const breakpoints = new Set<string>()
|
14
|
+
boxShadow.forEach(shadow => {
|
15
|
+
const [key] = Object.keys(shadow)
|
16
|
+
const value = shadow[key as keyof BoxShadowValue]
|
17
|
+
|
18
|
+
// Breakpoints
|
19
|
+
if (typeof value === 'object') {
|
20
|
+
Object.keys(value).forEach(breakpoint => breakpoints.add(breakpoint))
|
21
|
+
}
|
22
|
+
})
|
23
|
+
|
24
|
+
if (breakpoints.size === 0) {
|
25
|
+
const boxShadowStyle = Object.fromEntries(boxShadow.map(shadow => {
|
26
|
+
const [key] = Object.keys(shadow)
|
27
|
+
return [key, shadow[key as keyof BoxShadowValue]]
|
28
|
+
}))
|
29
|
+
|
30
|
+
return {
|
31
|
+
boxShadow: createBoxShadowValue(boxShadowStyle)
|
32
|
+
}
|
33
|
+
}
|
34
|
+
|
35
|
+
const breakpointStyles = Array.from(breakpoints).map(breakpoint => {
|
36
|
+
const styles = Object.fromEntries(boxShadow.map(shadow => {
|
37
|
+
const [key] = Object.keys(shadow)
|
38
|
+
const value = shadow[key as keyof BoxShadowValue]
|
39
|
+
|
40
|
+
if (typeof value === 'object' && keyInObject(value, breakpoint)) {
|
41
|
+
return [key, value[breakpoint]]
|
42
|
+
}
|
43
|
+
|
44
|
+
return [key, value]
|
45
|
+
}))
|
46
|
+
|
47
|
+
return {
|
48
|
+
[breakpoint]: {
|
49
|
+
boxShadow: createBoxShadowValue(styles)
|
50
|
+
}
|
51
|
+
}
|
52
|
+
})
|
53
|
+
|
54
|
+
return deepMergeObjects(...breakpointStyles)
|
55
|
+
}
|
@@ -0,0 +1,39 @@
|
|
1
|
+
import type { DropShadowValue } from 'react-native'
|
2
|
+
import { hyphenate } from '../../utils'
|
3
|
+
import type { Filters } from '../types'
|
4
|
+
import { getObjectStyle } from './objectStyle'
|
5
|
+
import { normalizeColor, normalizeNumericValue } from '../utils'
|
6
|
+
import { UnistylesRuntime } from '../../runtime'
|
7
|
+
import { isUnistylesMq } from '../../../mq'
|
8
|
+
|
9
|
+
const getDropShadowStyle = (dropShadow: DropShadowValue) => {
|
10
|
+
const { offsetX = 0, offsetY = 0, standardDeviation = 0, color = '#000' } = dropShadow
|
11
|
+
|
12
|
+
return `${normalizeColor(String(color))} ${normalizeNumericValue(offsetX)} ${normalizeNumericValue(offsetY)} ${normalizeNumericValue(standardDeviation)}`
|
13
|
+
}
|
14
|
+
|
15
|
+
export const getFilterStyle = (filters: Array<Filters>) => {
|
16
|
+
const restFilters = filters.filter(filter => Object.keys(filter)[0] !== 'dropShadow')
|
17
|
+
const dropShadow = (() => {
|
18
|
+
const dropShadowValue = filters.find(filter => Object.keys(filter)[0] === 'dropShadow')?.dropShadow as Record<string, any>
|
19
|
+
|
20
|
+
if (typeof dropShadowValue !== 'object') {
|
21
|
+
return []
|
22
|
+
}
|
23
|
+
|
24
|
+
const breakpoints = Object.keys(dropShadowValue).filter(key => Object.keys(UnistylesRuntime.breakpoints).includes(key) || isUnistylesMq(key))
|
25
|
+
const breakpointsDropShadow = Object.fromEntries(breakpoints.map(breakpoint => [breakpoint, getDropShadowStyle(dropShadowValue[breakpoint])]))
|
26
|
+
|
27
|
+
if (breakpoints.length === 0) {
|
28
|
+
return [{
|
29
|
+
dropShadow: getDropShadowStyle(dropShadowValue as DropShadowValue)
|
30
|
+
}]
|
31
|
+
}
|
32
|
+
|
33
|
+
return [{
|
34
|
+
dropShadow: breakpointsDropShadow
|
35
|
+
}]
|
36
|
+
})()
|
37
|
+
|
38
|
+
return getObjectStyle([...restFilters, ...dropShadow], 'filter', (key, value) => `${hyphenate(key)}(${normalizeNumericValue(value as number | string)})`)
|
39
|
+
}
|
@@ -0,0 +1,69 @@
|
|
1
|
+
import { deepMergeObjects } from '../../../utils'
|
2
|
+
import { keyInObject } from '../../utils'
|
3
|
+
|
4
|
+
type Styles = Record<string, any>
|
5
|
+
type Normalize<TStyles extends Styles> = (key: keyof TStyles, value: TStyles[keyof TStyles]) => any
|
6
|
+
|
7
|
+
const createStylesValue = <TStyles extends Styles>(styles: Array<TStyles>, normalize: Normalize<TStyles>) => styles
|
8
|
+
.map(style => {
|
9
|
+
const [key] = Object.keys(style)
|
10
|
+
|
11
|
+
if (!key) {
|
12
|
+
return undefined
|
13
|
+
}
|
14
|
+
|
15
|
+
return normalize(key, style[key])
|
16
|
+
})
|
17
|
+
.filter(Boolean)
|
18
|
+
.join(' ')
|
19
|
+
|
20
|
+
export const getObjectStyle = <TStyles extends Styles>(styles: Array<TStyles>, styleKey: string, normalize: Normalize<TStyles>) => {
|
21
|
+
const breakpoints = new Set<string>()
|
22
|
+
const normalStyles: Array<TStyles> = []
|
23
|
+
|
24
|
+
styles.forEach(style => {
|
25
|
+
const [property] = Object.keys(style)
|
26
|
+
|
27
|
+
if (!property) {
|
28
|
+
return
|
29
|
+
}
|
30
|
+
|
31
|
+
const value = style[property]
|
32
|
+
|
33
|
+
if (typeof value === 'object' && !Array.isArray(value)) {
|
34
|
+
Object.keys(value ?? {}).forEach(breakpoint => breakpoints.add(breakpoint))
|
35
|
+
|
36
|
+
return
|
37
|
+
}
|
38
|
+
|
39
|
+
normalStyles.push(style)
|
40
|
+
})
|
41
|
+
|
42
|
+
const breakpointStyles = Array.from(breakpoints).flatMap(breakpoint => {
|
43
|
+
const stylesPerBreakpoint = styles.flatMap(style => {
|
44
|
+
const [property] = Object.keys(style)
|
45
|
+
|
46
|
+
if (!property) {
|
47
|
+
return []
|
48
|
+
}
|
49
|
+
|
50
|
+
const value = style[property]
|
51
|
+
|
52
|
+
if (typeof value === 'object' && !Array.isArray(value)) {
|
53
|
+
return keyInObject(value, breakpoint) ? [{ [property]: value[breakpoint] }] : []
|
54
|
+
}
|
55
|
+
|
56
|
+
return []
|
57
|
+
}) as Array<TStyles>
|
58
|
+
|
59
|
+
return [{
|
60
|
+
[breakpoint]: {
|
61
|
+
[styleKey]: createStylesValue(stylesPerBreakpoint, normalize)
|
62
|
+
}
|
63
|
+
}]
|
64
|
+
})
|
65
|
+
|
66
|
+
return deepMergeObjects<Record<string, any>>({
|
67
|
+
[styleKey]: createStylesValue(normalStyles, normalize)
|
68
|
+
}, ...breakpointStyles)
|
69
|
+
}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
import { getObjectStyle } from './objectStyle'
|
2
|
+
import { normalizeNumericValue } from '../utils'
|
3
|
+
import type { TransformStyles } from '../../../types/core'
|
4
|
+
|
5
|
+
const normalizeTransform = (key: string, value: any) => {
|
6
|
+
if (key.includes('scale')) {
|
7
|
+
return value
|
8
|
+
}
|
9
|
+
|
10
|
+
if (typeof value === 'number') {
|
11
|
+
return normalizeNumericValue(value)
|
12
|
+
}
|
13
|
+
|
14
|
+
return value
|
15
|
+
}
|
16
|
+
|
17
|
+
export const getTransformStyle = (transforms: Array<TransformStyles>) => getObjectStyle(transforms, 'transform', (key, value) => {
|
18
|
+
switch(key) {
|
19
|
+
case 'matrix':
|
20
|
+
return `${key}(${(value as Array<number>).join(',')})`
|
21
|
+
default:
|
22
|
+
return `${key}(${normalizeTransform(key, value)})`
|
23
|
+
}
|
24
|
+
})
|