react-native-unistyles 3.0.0-beta.3 → 3.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -3
- package/android/src/main/cxx/NativeUnistylesModule.cpp +1 -1
- package/android/src/main/cxx/NativeUnistylesModule.h +1 -1
- package/components/native/ActivityIndicator/package.json +2 -1
- package/components/native/FlatList/package.json +2 -1
- package/components/native/Image/package.json +2 -1
- package/components/native/ImageBackground/package.json +2 -1
- package/components/native/KeyboardAvoidingView/package.json +2 -1
- package/components/native/Pressable/package.json +1 -1
- package/components/native/RefreshControl/package.json +2 -1
- package/components/native/ScrollView/package.json +2 -1
- package/components/native/SectionList/package.json +2 -1
- package/components/native/Switch/package.json +2 -1
- package/components/native/Text/package.json +2 -1
- package/components/native/TextInput/package.json +2 -1
- package/components/native/TouchableHighlight/package.json +2 -1
- package/components/native/TouchableOpacity/package.json +2 -1
- package/components/native/View/package.json +2 -1
- package/components/native/VirtualizedList/package.json +2 -1
- package/cxx/common/Constants.h +4 -4
- package/cxx/common/Helpers.h +1 -1
- package/cxx/core/HashGenerator.cpp +23 -0
- package/cxx/core/HashGenerator.h +13 -0
- package/cxx/core/HostUnistyle.cpp +83 -0
- package/cxx/core/HostUnistyle.h +27 -0
- package/cxx/core/RNStyle.h +18 -0
- package/cxx/core/Unistyle.h +9 -4
- package/cxx/core/UnistyleWrapper.h +92 -47
- package/cxx/core/UnistylesRegistry.cpp +19 -11
- package/cxx/core/UnistylesRegistry.h +2 -4
- package/cxx/hybridObjects/HybridNavigationBar.cpp +3 -3
- package/cxx/hybridObjects/HybridNavigationBar.h +2 -2
- package/cxx/hybridObjects/HybridShadowRegistry.cpp +32 -45
- package/cxx/hybridObjects/HybridShadowRegistry.h +0 -10
- package/cxx/hybridObjects/HybridStatusBar.cpp +3 -3
- package/cxx/hybridObjects/HybridStatusBar.h +2 -2
- package/cxx/hybridObjects/HybridStyleSheet.cpp +25 -8
- package/cxx/hybridObjects/HybridStyleSheet.h +2 -1
- package/cxx/hybridObjects/HybridUnistylesRuntime.cpp +15 -15
- package/cxx/hybridObjects/HybridUnistylesRuntime.h +2 -2
- package/cxx/parser/Parser.cpp +17 -24
- package/cxx/parser/Parser.h +2 -1
- package/ios/NativePlatform+ios.swift +5 -7
- package/ios/NativePlatform.swift +2 -2
- package/ios/UnistylesModuleOnLoad.mm +2 -1
- package/lib/commonjs/components/ScopedTheme.js.map +1 -1
- package/lib/commonjs/components/index.js +0 -7
- package/lib/commonjs/components/index.js.map +1 -1
- package/lib/commonjs/components/native/ImageBackground.js +45 -1
- package/lib/commonjs/components/native/ImageBackground.js.map +1 -1
- package/lib/commonjs/components/native/ImageBackground.native.js +10 -0
- package/lib/commonjs/components/native/ImageBackground.native.js.map +1 -0
- package/lib/commonjs/components/native/Pressable.js +26 -51
- package/lib/commonjs/components/native/Pressable.js.map +1 -1
- package/lib/commonjs/components/native/Pressable.native.js +14 -11
- package/lib/commonjs/components/native/Pressable.native.js.map +1 -1
- package/lib/commonjs/core/createUnistylesElement.js +29 -5
- package/lib/commonjs/core/createUnistylesElement.js.map +1 -1
- package/lib/commonjs/core/createUnistylesElement.native.js +40 -0
- package/lib/commonjs/core/createUnistylesElement.native.js.map +1 -0
- package/lib/commonjs/core/createUnistylesImageBackground.js +36 -14
- package/lib/commonjs/core/createUnistylesImageBackground.js.map +1 -1
- package/lib/commonjs/core/getClassname.js +25 -0
- package/lib/commonjs/core/getClassname.js.map +1 -0
- package/lib/commonjs/core/getClassname.native.js +9 -0
- package/lib/commonjs/core/getClassname.native.js.map +1 -0
- package/lib/commonjs/core/index.js +14 -7
- package/lib/commonjs/core/index.js.map +1 -1
- package/lib/commonjs/core/passForwardRef.js +2 -2
- package/lib/commonjs/core/passForwardRef.js.map +1 -1
- package/lib/commonjs/core/useProxifiedUnistyles/index.js +13 -0
- package/lib/commonjs/core/useProxifiedUnistyles/index.js.map +1 -0
- package/lib/commonjs/core/useProxifiedUnistyles/listener.js +22 -0
- package/lib/commonjs/core/useProxifiedUnistyles/listener.js.map +1 -0
- package/lib/commonjs/core/useProxifiedUnistyles/listener.native.js +26 -0
- package/lib/commonjs/core/useProxifiedUnistyles/listener.native.js.map +1 -0
- package/lib/commonjs/core/useProxifiedUnistyles/types.js +6 -0
- package/lib/commonjs/core/useProxifiedUnistyles/types.js.map +1 -0
- package/lib/commonjs/core/{withUnistyles/useDependencies.js → useProxifiedUnistyles/useProxifiedUnistyles.js} +22 -22
- package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -0
- package/lib/commonjs/core/useUnistyles.js +19 -0
- package/lib/commonjs/core/useUnistyles.js.map +1 -0
- package/lib/commonjs/core/warn.js +16 -0
- package/lib/commonjs/core/warn.js.map +1 -0
- package/lib/commonjs/core/withUnistyles/withUnistyles.js +19 -55
- package/lib/commonjs/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js +32 -65
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/commonjs/index.js +23 -4
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/server/getServerUnistyles.js +38 -0
- package/lib/commonjs/server/getServerUnistyles.js.map +1 -0
- package/lib/commonjs/server/hydrateServerUnistyles.js +17 -0
- package/lib/commonjs/server/hydrateServerUnistyles.js.map +1 -0
- package/lib/commonjs/server/index.js +34 -0
- package/lib/commonjs/server/index.js.map +1 -0
- package/lib/commonjs/server/resetServerUnistyles.js +16 -0
- package/lib/commonjs/server/resetServerUnistyles.js.map +1 -0
- package/lib/commonjs/server/types.js +8 -0
- package/lib/commonjs/server/types.js.map +1 -0
- package/lib/commonjs/server/useServerUnistyles.js +27 -0
- package/lib/commonjs/server/useServerUnistyles.js.map +1 -0
- package/lib/commonjs/specs/ShadowRegistry/index.js +6 -3
- package/lib/commonjs/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/commonjs/specs/StyleSheet/index.js.map +1 -1
- package/lib/commonjs/utils.js +4 -2
- package/lib/commonjs/utils.js.map +1 -1
- package/lib/commonjs/web/convert/object/filter.js +2 -2
- package/lib/commonjs/web/convert/object/filter.js.map +1 -1
- package/lib/commonjs/web/convert/style.js +4 -4
- package/lib/commonjs/web/convert/style.js.map +1 -1
- package/lib/commonjs/web/create.js +20 -15
- package/lib/commonjs/web/create.js.map +1 -1
- package/lib/commonjs/web/css/core.js +55 -0
- package/lib/commonjs/web/css/core.js.map +1 -0
- package/lib/commonjs/web/css/index.js +17 -0
- package/lib/commonjs/web/css/index.js.map +1 -0
- package/lib/commonjs/web/css/state.js +155 -0
- package/lib/commonjs/web/css/state.js.map +1 -0
- package/lib/commonjs/web/css/utils.js +47 -0
- package/lib/commonjs/web/css/utils.js.map +1 -0
- package/lib/commonjs/web/index.js +14 -18
- package/lib/commonjs/web/index.js.map +1 -1
- package/lib/commonjs/web/listener.js +9 -7
- package/lib/commonjs/web/listener.js.map +1 -1
- package/lib/commonjs/web/registry.js +44 -123
- package/lib/commonjs/web/registry.js.map +1 -1
- package/lib/commonjs/web/runtime.js +28 -21
- package/lib/commonjs/web/runtime.js.map +1 -1
- package/lib/commonjs/web/services.js +28 -0
- package/lib/commonjs/web/services.js.map +1 -0
- package/lib/commonjs/web/shadowRegistry.js +46 -93
- package/lib/commonjs/web/shadowRegistry.js.map +1 -1
- package/lib/commonjs/web/state.js +39 -9
- package/lib/commonjs/web/state.js.map +1 -1
- package/lib/commonjs/web/types.js +6 -0
- package/lib/commonjs/web/types.js.map +1 -0
- package/lib/commonjs/web/utils/common.js +29 -9
- package/lib/commonjs/web/utils/common.js.map +1 -1
- package/lib/commonjs/web/utils/unistyle.js +28 -19
- package/lib/commonjs/web/utils/unistyle.js.map +1 -1
- package/lib/commonjs/web/variants.js +25 -27
- package/lib/commonjs/web/variants.js.map +1 -1
- package/lib/module/components/ScopedTheme.js.map +1 -1
- package/lib/module/components/index.js +0 -1
- package/lib/module/components/index.js.map +1 -1
- package/lib/module/components/native/ImageBackground.js +45 -2
- package/lib/module/components/native/ImageBackground.js.map +1 -1
- package/lib/module/components/native/ImageBackground.native.js +6 -0
- package/lib/module/components/native/ImageBackground.native.js.map +1 -0
- package/lib/module/components/native/Pressable.js +27 -52
- package/lib/module/components/native/Pressable.js.map +1 -1
- package/lib/module/components/native/Pressable.native.js +15 -12
- package/lib/module/components/native/Pressable.native.js.map +1 -1
- package/lib/module/core/createUnistylesElement.js +29 -5
- package/lib/module/core/createUnistylesElement.js.map +1 -1
- package/lib/module/core/createUnistylesElement.native.js +33 -0
- package/lib/module/core/createUnistylesElement.native.js.map +1 -0
- package/lib/module/core/createUnistylesImageBackground.js +34 -13
- package/lib/module/core/createUnistylesImageBackground.js.map +1 -1
- package/lib/module/core/getClassname.js +20 -0
- package/lib/module/core/getClassname.js.map +1 -0
- package/lib/module/core/getClassname.native.js +4 -0
- package/lib/module/core/getClassname.native.js.map +1 -0
- package/lib/module/core/index.js +2 -1
- package/lib/module/core/index.js.map +1 -1
- package/lib/module/core/passForwardRef.js +2 -2
- package/lib/module/core/passForwardRef.js.map +1 -1
- package/lib/module/core/useProxifiedUnistyles/index.js +4 -0
- package/lib/module/core/useProxifiedUnistyles/index.js.map +1 -0
- package/lib/module/core/useProxifiedUnistyles/listener.js +17 -0
- package/lib/module/core/useProxifiedUnistyles/listener.js.map +1 -0
- package/lib/module/core/useProxifiedUnistyles/listener.native.js +21 -0
- package/lib/module/core/useProxifiedUnistyles/listener.native.js.map +1 -0
- package/lib/module/core/useProxifiedUnistyles/types.js +4 -0
- package/lib/module/core/useProxifiedUnistyles/types.js.map +1 -0
- package/lib/module/core/{withUnistyles/useDependencies.js → useProxifiedUnistyles/useProxifiedUnistyles.js} +19 -19
- package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -0
- package/lib/module/core/useUnistyles.js +14 -0
- package/lib/module/core/useUnistyles.js.map +1 -0
- package/lib/module/core/warn.js +11 -0
- package/lib/module/core/warn.js.map +1 -0
- package/lib/module/core/withUnistyles/withUnistyles.js +19 -55
- package/lib/module/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.native.js +33 -66
- package/lib/module/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/module/index.js +3 -2
- package/lib/module/index.js.map +1 -1
- package/lib/module/server/getServerUnistyles.js +32 -0
- package/lib/module/server/getServerUnistyles.js.map +1 -0
- package/lib/module/server/hydrateServerUnistyles.js +12 -0
- package/lib/module/server/hydrateServerUnistyles.js.map +1 -0
- package/lib/module/server/index.js +7 -0
- package/lib/module/server/index.js.map +1 -0
- package/lib/module/server/resetServerUnistyles.js +11 -0
- package/lib/module/server/resetServerUnistyles.js.map +1 -0
- package/lib/module/server/types.js +4 -0
- package/lib/module/server/types.js.map +1 -0
- package/lib/module/server/useServerUnistyles.js +22 -0
- package/lib/module/server/useServerUnistyles.js.map +1 -0
- package/lib/module/specs/ShadowRegistry/index.js +6 -3
- package/lib/module/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/module/specs/StyleSheet/index.js.map +1 -1
- package/lib/module/utils.js +2 -1
- package/lib/module/utils.js.map +1 -1
- package/lib/module/web/convert/object/filter.js +2 -2
- package/lib/module/web/convert/object/filter.js.map +1 -1
- package/lib/module/web/convert/style.js +4 -4
- package/lib/module/web/convert/style.js.map +1 -1
- package/lib/module/web/create.js +20 -15
- package/lib/module/web/create.js.map +1 -1
- package/lib/module/web/css/core.js +50 -0
- package/lib/module/web/css/core.js.map +1 -0
- package/lib/module/web/css/index.js +4 -0
- package/lib/module/web/css/index.js.map +1 -0
- package/lib/module/web/css/state.js +150 -0
- package/lib/module/web/css/state.js.map +1 -0
- package/lib/module/web/css/utils.js +41 -0
- package/lib/module/web/css/utils.js.map +1 -0
- package/lib/module/web/index.js +10 -5
- package/lib/module/web/index.js.map +1 -1
- package/lib/module/web/listener.js +8 -7
- package/lib/module/web/listener.js.map +1 -1
- package/lib/module/web/registry.js +44 -124
- package/lib/module/web/registry.js.map +1 -1
- package/lib/module/web/runtime.js +27 -21
- package/lib/module/web/runtime.js.map +1 -1
- package/lib/module/web/services.js +23 -0
- package/lib/module/web/services.js.map +1 -0
- package/lib/module/web/shadowRegistry.js +46 -94
- package/lib/module/web/shadowRegistry.js.map +1 -1
- package/lib/module/web/state.js +39 -10
- package/lib/module/web/state.js.map +1 -1
- package/lib/module/web/types.js +4 -0
- package/lib/module/web/types.js.map +1 -0
- package/lib/module/web/utils/common.js +26 -7
- package/lib/module/web/utils/common.js.map +1 -1
- package/lib/module/web/utils/unistyle.js +27 -17
- package/lib/module/web/utils/unistyle.js.map +1 -1
- package/lib/module/web/variants.js +25 -27
- package/lib/module/web/variants.js.map +1 -1
- package/lib/typescript/src/components/index.d.ts +0 -1
- package/lib/typescript/src/components/index.d.ts.map +1 -1
- package/lib/typescript/src/components/native/ActivityIndicator.d.ts +3 -1
- package/lib/typescript/src/components/native/ActivityIndicator.d.ts.map +1 -1
- package/lib/typescript/src/components/native/FlatList.d.ts +3 -1
- package/lib/typescript/src/components/native/FlatList.d.ts.map +1 -1
- package/lib/typescript/src/components/native/Image.d.ts +3 -1
- package/lib/typescript/src/components/native/Image.d.ts.map +1 -1
- package/lib/typescript/src/components/native/ImageBackground.d.ts +8 -2
- package/lib/typescript/src/components/native/ImageBackground.d.ts.map +1 -1
- package/lib/typescript/src/components/native/ImageBackground.native.d.ts +3 -0
- package/lib/typescript/src/components/native/ImageBackground.native.d.ts.map +1 -0
- package/lib/typescript/src/components/native/KeyboardAvoidingView.d.ts +3 -1
- package/lib/typescript/src/components/native/KeyboardAvoidingView.d.ts.map +1 -1
- package/lib/typescript/src/components/native/Pressable.d.ts +3 -2
- package/lib/typescript/src/components/native/Pressable.d.ts.map +1 -1
- package/lib/typescript/src/components/native/Pressable.native.d.ts.map +1 -1
- package/lib/typescript/src/components/native/RefreshControl.d.ts +3 -1
- package/lib/typescript/src/components/native/RefreshControl.d.ts.map +1 -1
- package/lib/typescript/src/components/native/ScrollView.d.ts +3 -1
- package/lib/typescript/src/components/native/ScrollView.d.ts.map +1 -1
- package/lib/typescript/src/components/native/SectionList.d.ts +3 -1
- package/lib/typescript/src/components/native/SectionList.d.ts.map +1 -1
- package/lib/typescript/src/components/native/Switch.d.ts +3 -1
- package/lib/typescript/src/components/native/Switch.d.ts.map +1 -1
- package/lib/typescript/src/components/native/Text.d.ts +3 -1
- package/lib/typescript/src/components/native/Text.d.ts.map +1 -1
- package/lib/typescript/src/components/native/TextInput.d.ts +3 -1
- package/lib/typescript/src/components/native/TextInput.d.ts.map +1 -1
- package/lib/typescript/src/components/native/TouchableHighlight.d.ts +3 -1
- package/lib/typescript/src/components/native/TouchableHighlight.d.ts.map +1 -1
- package/lib/typescript/src/components/native/TouchableOpacity.d.ts +3 -1
- package/lib/typescript/src/components/native/TouchableOpacity.d.ts.map +1 -1
- package/lib/typescript/src/components/native/View.d.ts +3 -1
- package/lib/typescript/src/components/native/View.d.ts.map +1 -1
- package/lib/typescript/src/components/native/VirtualizedList.d.ts +3 -1
- package/lib/typescript/src/components/native/VirtualizedList.d.ts.map +1 -1
- package/lib/typescript/src/core/createUnistylesElement.d.ts +6 -1
- package/lib/typescript/src/core/createUnistylesElement.d.ts.map +1 -1
- package/lib/typescript/src/core/createUnistylesElement.native.d.ts +3 -0
- package/lib/typescript/src/core/createUnistylesElement.native.d.ts.map +1 -0
- package/lib/typescript/src/core/createUnistylesImageBackground.d.ts.map +1 -1
- package/lib/typescript/src/core/getClassname.d.ts +7 -0
- package/lib/typescript/src/core/getClassname.d.ts.map +1 -0
- package/lib/typescript/src/core/getClassname.native.d.ts +2 -0
- package/lib/typescript/src/core/getClassname.native.d.ts.map +1 -0
- package/lib/typescript/src/core/index.d.ts +2 -1
- package/lib/typescript/src/core/index.d.ts.map +1 -1
- package/lib/typescript/src/core/passForwardRef.d.ts.map +1 -1
- package/lib/typescript/src/core/useProxifiedUnistyles/index.d.ts +2 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/index.d.ts.map +1 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/listener.d.ts +3 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/listener.d.ts.map +1 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/listener.native.d.ts +3 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/listener.native.d.ts.map +1 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/types.d.ts +7 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/types.d.ts.map +1 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts +8 -0
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/core/useUnistyles.d.ts +6 -0
- package/lib/typescript/src/core/useUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/core/warn.d.ts +3 -0
- package/lib/typescript/src/core/warn.d.ts.map +1 -0
- package/lib/typescript/src/core/withUnistyles/withUnistyles.d.ts +0 -3
- package/lib/typescript/src/core/withUnistyles/withUnistyles.d.ts.map +1 -1
- package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +3 -2
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/server/getServerUnistyles.d.ts +4 -0
- package/lib/typescript/src/server/getServerUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/server/hydrateServerUnistyles.d.ts +8 -0
- package/lib/typescript/src/server/hydrateServerUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/server/index.d.ts +5 -0
- package/lib/typescript/src/server/index.d.ts.map +1 -0
- package/lib/typescript/src/server/resetServerUnistyles.d.ts +2 -0
- package/lib/typescript/src/server/resetServerUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/server/types.d.ts +5 -0
- package/lib/typescript/src/server/types.d.ts.map +1 -0
- package/lib/typescript/src/server/useServerUnistyles.d.ts +4 -0
- package/lib/typescript/src/server/useServerUnistyles.d.ts.map +1 -0
- package/lib/typescript/src/specs/ShadowRegistry/index.d.ts +0 -3
- package/lib/typescript/src/specs/ShadowRegistry/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/StyleSheet/index.d.ts +4 -1
- package/lib/typescript/src/specs/StyleSheet/index.d.ts.map +1 -1
- package/lib/typescript/src/utils.d.ts +1 -0
- package/lib/typescript/src/utils.d.ts.map +1 -1
- package/lib/typescript/src/web/convert/style.d.ts.map +1 -1
- package/lib/typescript/src/web/create.d.ts.map +1 -1
- package/lib/typescript/src/web/css/core.d.ts +3 -0
- package/lib/typescript/src/web/css/core.d.ts.map +1 -0
- package/lib/typescript/src/web/css/index.d.ts +2 -0
- package/lib/typescript/src/web/css/index.d.ts.map +1 -0
- package/lib/typescript/src/web/css/state.d.ts +30 -0
- package/lib/typescript/src/web/css/state.d.ts.map +1 -0
- package/lib/typescript/src/web/css/utils.d.ts +4 -0
- package/lib/typescript/src/web/css/utils.d.ts.map +1 -0
- package/lib/typescript/src/web/index.d.ts +7 -1
- package/lib/typescript/src/web/index.d.ts.map +1 -1
- package/lib/typescript/src/web/listener.d.ts +4 -3
- package/lib/typescript/src/web/listener.d.ts.map +1 -1
- package/lib/typescript/src/web/registry.d.ts +11 -8
- package/lib/typescript/src/web/registry.d.ts.map +1 -1
- package/lib/typescript/src/web/runtime.d.ts +6 -4
- package/lib/typescript/src/web/runtime.d.ts.map +1 -1
- package/lib/typescript/src/web/services.d.ts +15 -0
- package/lib/typescript/src/web/services.d.ts.map +1 -0
- package/lib/typescript/src/web/shadowRegistry.d.ts +10 -13
- package/lib/typescript/src/web/shadowRegistry.d.ts.map +1 -1
- package/lib/typescript/src/web/state.d.ts +7 -3
- package/lib/typescript/src/web/state.d.ts.map +1 -1
- package/lib/typescript/src/web/types.d.ts +13 -0
- package/lib/typescript/src/web/types.d.ts.map +1 -0
- package/lib/typescript/src/web/utils/common.d.ts +2 -1
- package/lib/typescript/src/web/utils/common.d.ts.map +1 -1
- package/lib/typescript/src/web/utils/unistyle.d.ts +5 -4
- package/lib/typescript/src/web/utils/unistyle.d.ts.map +1 -1
- package/lib/typescript/src/web/variants.d.ts +2 -2
- package/lib/typescript/src/web/variants.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JColorScheme.hpp +2 -1
- package/nitrogen/generated/android/c++/JDimensions.hpp +2 -1
- package/nitrogen/generated/android/c++/JFunc_void_UnistylesNativeMiniRuntime.hpp +36 -10
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.hpp +53 -19
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp +5 -5
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JInsets.hpp +2 -1
- package/nitrogen/generated/android/c++/JOrientation.hpp +2 -1
- package/nitrogen/generated/android/c++/JUnistyleDependency.hpp +2 -1
- package/nitrogen/generated/android/c++/JUnistylesNativeMiniRuntime.hpp +2 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/ColorScheme.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Dimensions.kt +10 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_UnistylesNativeMiniRuntime.kt +43 -14
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.kt +43 -14
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt +10 -10
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Insets.kt +13 -8
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Orientation.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistyleDependency.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/UnistylesNativeMiniRuntime.kt +19 -14
- package/nitrogen/generated/android/unistyles+autolinking.cmake +4 -1
- package/nitrogen/generated/android/unistyles+autolinking.gradle +1 -1
- package/nitrogen/generated/android/unistylesOnLoad.cpp +7 -3
- package/nitrogen/generated/android/unistylesOnLoad.hpp +1 -1
- package/nitrogen/generated/ios/Unistyles+autolinking.rb +1 -1
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp +21 -6
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp +105 -27
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp +5 -3
- package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.cpp +1 -1
- package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp +92 -33
- package/nitrogen/generated/ios/swift/ColorScheme.swift +1 -1
- package/nitrogen/generated/ios/swift/Dimensions.swift +1 -1
- package/nitrogen/generated/ios/swift/Func_void_UnistylesNativeMiniRuntime.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.swift +46 -0
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift +36 -23
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift +327 -0
- package/nitrogen/generated/ios/swift/Insets.swift +1 -1
- package/nitrogen/generated/ios/swift/Orientation.swift +1 -1
- package/nitrogen/generated/ios/swift/UnistyleDependency.swift +1 -1
- package/nitrogen/generated/ios/swift/UnistylesNativeMiniRuntime.swift +1 -1
- package/nitrogen/generated/shared/c++/ColorScheme.hpp +1 -1
- package/nitrogen/generated/shared/c++/Dimensions.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/Insets.hpp +1 -1
- package/nitrogen/generated/shared/c++/Orientation.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistyleDependency.hpp +2 -2
- package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp +1 -1
- package/package.json +21 -12
- package/plugin/import.js +1 -21
- package/plugin/index.d.ts +41 -0
- package/plugin/index.js +44 -76
- package/plugin/stylesheet.js +17 -1
- package/plugin/variants.js +49 -75
- package/src/components/ScopedTheme.tsx +1 -1
- package/src/components/index.ts +0 -1
- package/src/components/native/ImageBackground.native.tsx +4 -0
- package/src/components/native/ImageBackground.tsx +54 -2
- package/src/components/native/Pressable.native.tsx +16 -17
- package/src/components/native/Pressable.tsx +35 -69
- package/src/core/createUnistylesElement.native.tsx +36 -0
- package/src/core/createUnistylesElement.tsx +42 -8
- package/src/core/createUnistylesImageBackground.tsx +40 -19
- package/src/core/getClassname.native.ts +1 -0
- package/src/core/getClassname.ts +13 -0
- package/src/core/index.ts +2 -1
- package/src/core/passForwardRef.ts +1 -2
- package/src/core/useProxifiedUnistyles/index.ts +1 -0
- package/src/core/useProxifiedUnistyles/listener.native.ts +18 -0
- package/src/core/useProxifiedUnistyles/listener.ts +13 -0
- package/src/core/useProxifiedUnistyles/types.ts +7 -0
- package/src/core/{withUnistyles/useDependencies.ts → useProxifiedUnistyles/useProxifiedUnistyles.ts} +19 -26
- package/src/core/useUnistyles.ts +11 -0
- package/src/core/warn.ts +13 -0
- package/src/core/withUnistyles/withUnistyles.native.tsx +39 -68
- package/src/core/withUnistyles/withUnistyles.tsx +19 -56
- package/src/index.ts +3 -2
- package/src/server/getServerUnistyles.tsx +20 -0
- package/src/server/hydrateServerUnistyles.ts +17 -0
- package/src/server/index.ts +5 -0
- package/src/server/resetServerUnistyles.ts +9 -0
- package/src/server/types.ts +4 -0
- package/src/server/useServerUnistyles.tsx +22 -0
- package/src/specs/ShadowRegistry/index.ts +12 -9
- package/src/specs/StyleSheet/index.ts +5 -1
- package/src/utils.ts +15 -11
- package/src/web/convert/object/filter.ts +2 -2
- package/src/web/convert/style.ts +8 -7
- package/src/web/create.ts +23 -18
- package/src/web/css/core.ts +58 -0
- package/src/web/css/index.ts +1 -0
- package/src/web/css/state.ts +191 -0
- package/src/web/css/utils.ts +54 -0
- package/src/web/index.ts +18 -5
- package/src/web/listener.ts +8 -8
- package/src/web/registry.ts +47 -152
- package/src/web/runtime.ts +32 -22
- package/src/web/services.ts +28 -0
- package/src/web/shadowRegistry.ts +46 -104
- package/src/web/state.ts +46 -11
- package/src/web/types.ts +13 -0
- package/src/web/utils/common.ts +32 -8
- package/src/web/utils/unistyle.ts +40 -25
- package/src/web/variants.ts +27 -27
- package/cxx/core/HostStyle.cpp +0 -73
- package/cxx/core/HostStyle.h +0 -34
- package/lib/commonjs/components/Variants.js +0 -36
- package/lib/commonjs/components/Variants.js.map +0 -1
- package/lib/commonjs/core/createUnistylesComponent.js +0 -16
- package/lib/commonjs/core/createUnistylesComponent.js.map +0 -1
- package/lib/commonjs/core/withUnistyles/useDependencies.js.map +0 -1
- package/lib/module/components/Variants.js +0 -29
- package/lib/module/components/Variants.js.map +0 -1
- package/lib/module/core/createUnistylesComponent.js +0 -11
- package/lib/module/core/createUnistylesComponent.js.map +0 -1
- package/lib/module/core/withUnistyles/useDependencies.js.map +0 -1
- package/lib/typescript/src/components/Variants.d.ts +0 -7
- package/lib/typescript/src/components/Variants.d.ts.map +0 -1
- package/lib/typescript/src/core/createUnistylesComponent.d.ts +0 -14
- package/lib/typescript/src/core/createUnistylesComponent.d.ts.map +0 -1
- package/lib/typescript/src/core/withUnistyles/useDependencies.d.ts +0 -13
- package/lib/typescript/src/core/withUnistyles/useDependencies.d.ts.map +0 -1
- package/nitrogen/generated/android/unistylesOnLoad.kt +0 -1
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpecCxx.swift +0 -314
- package/plugin/style.js +0 -168
- package/src/components/Variants.tsx +0 -30
- package/src/core/createUnistylesComponent.tsx +0 -14
package/src/web/runtime.ts
CHANGED
@@ -2,16 +2,16 @@ import { UnistyleDependency } from '../specs/NativePlatform'
|
|
2
2
|
import { ColorScheme, Orientation, type AppTheme, type AppThemeName } from '../specs/types'
|
3
3
|
import type { UnistylesMiniRuntime } from '../specs/UnistylesRuntime'
|
4
4
|
import { WebContentSizeCategory } from '../types'
|
5
|
-
import { UnistylesListener } from './listener'
|
6
5
|
import { NavigationBar, StatusBar } from './mock'
|
7
6
|
import { error, isServer, schemeToTheme } from './utils'
|
7
|
+
import type { UnistylesServices } from './types'
|
8
8
|
|
9
|
-
|
10
|
-
import { UnistylesState } from './state'
|
11
|
-
|
12
|
-
class UnistylesRuntimeBuilder {
|
9
|
+
export class UnistylesRuntime {
|
13
10
|
lightMedia = this.getLightMedia()
|
14
11
|
darkMedia = this.getDarkMedia()
|
12
|
+
rootElement = isServer() ? null : document.querySelector(':root')
|
13
|
+
|
14
|
+
constructor(private services: UnistylesServices) {}
|
15
15
|
|
16
16
|
private getLightMedia(): MediaQueryList | null {
|
17
17
|
if (isServer()) {
|
@@ -49,11 +49,11 @@ class UnistylesRuntimeBuilder {
|
|
49
49
|
}
|
50
50
|
|
51
51
|
get themeName() {
|
52
|
-
if (
|
52
|
+
if (this.services.state.hasAdaptiveThemes) {
|
53
53
|
return schemeToTheme(this.colorScheme) as AppThemeName
|
54
54
|
}
|
55
55
|
|
56
|
-
return
|
56
|
+
return this.services.state.themeName
|
57
57
|
}
|
58
58
|
|
59
59
|
get contentSizeCategory() {
|
@@ -61,11 +61,11 @@ class UnistylesRuntimeBuilder {
|
|
61
61
|
}
|
62
62
|
|
63
63
|
get breakpoints() {
|
64
|
-
return
|
64
|
+
return this.services.state.breakpoints ?? {}
|
65
65
|
}
|
66
66
|
|
67
67
|
get breakpoint() {
|
68
|
-
return
|
68
|
+
return this.services.state.breakpoint
|
69
69
|
}
|
70
70
|
|
71
71
|
get orientation() {
|
@@ -121,7 +121,7 @@ class UnistylesRuntimeBuilder {
|
|
121
121
|
}
|
122
122
|
|
123
123
|
get hasAdaptiveThemes() {
|
124
|
-
return
|
124
|
+
return this.services.state.hasAdaptiveThemes
|
125
125
|
}
|
126
126
|
|
127
127
|
get navigationBar() {
|
@@ -158,23 +158,33 @@ class UnistylesRuntimeBuilder {
|
|
158
158
|
throw error(`You're trying to set theme to: '${themeName}', but adaptiveThemes are enabled.`)
|
159
159
|
}
|
160
160
|
|
161
|
-
if (themeName ===
|
161
|
+
if (themeName === this.themeName) {
|
162
162
|
return
|
163
163
|
}
|
164
164
|
|
165
|
-
|
166
|
-
|
167
|
-
|
165
|
+
const oldTheme = this.services.state.themeName
|
166
|
+
|
167
|
+
this.services.state.themeName = themeName
|
168
|
+
this.services.listener.emitChange(UnistyleDependency.Theme)
|
169
|
+
this.services.listener.emitChange(UnistyleDependency.ThemeName)
|
170
|
+
|
171
|
+
if (!isServer() && !this.services.state.hasAdaptiveThemes && this.services.state.CSSVars) {
|
172
|
+
this.rootElement?.classList.remove(oldTheme ?? '')
|
173
|
+
this.rootElement?.classList.add(themeName ?? '')
|
174
|
+
}
|
168
175
|
}
|
169
176
|
|
170
177
|
setAdaptiveThemes = (isEnabled: boolean) => {
|
171
|
-
|
178
|
+
this.services.state.hasAdaptiveThemes = isEnabled
|
172
179
|
|
173
180
|
if (!isEnabled) {
|
181
|
+
this.rootElement?.classList.add(this.themeName ?? '')
|
182
|
+
|
174
183
|
return
|
175
184
|
}
|
176
185
|
|
177
|
-
this.
|
186
|
+
this.rootElement?.classList.remove(this.themeName ?? '')
|
187
|
+
this.setTheme(schemeToTheme(this.colorScheme) as AppThemeName)
|
178
188
|
}
|
179
189
|
|
180
190
|
setRootViewBackgroundColor = (color: string) => {
|
@@ -188,17 +198,19 @@ class UnistylesRuntimeBuilder {
|
|
188
198
|
setImmersiveMode = () => {}
|
189
199
|
|
190
200
|
updateTheme = (themeName: AppThemeName, updater: (currentTheme: AppTheme) => AppTheme) => {
|
191
|
-
const oldTheme =
|
201
|
+
const oldTheme = this.services.state.themes.get(themeName)
|
192
202
|
|
193
203
|
if (!oldTheme) {
|
194
204
|
throw error(`Unistyles: You're trying to update theme "${themeName}" but it wasn't registered.`)
|
195
205
|
}
|
196
206
|
|
197
|
-
|
207
|
+
this.services.state.themes.set(themeName, updater(oldTheme))
|
198
208
|
}
|
199
209
|
|
200
|
-
getTheme = (themeName = this.themeName) => {
|
201
|
-
const theme =
|
210
|
+
getTheme = (themeName = this.themeName, CSSVars = false) => {
|
211
|
+
const theme = CSSVars
|
212
|
+
? this.services.state.cssThemes.get(themeName ?? '')
|
213
|
+
: this.services.state.themes.get(themeName ?? '')
|
202
214
|
|
203
215
|
if (!themeName || !theme) {
|
204
216
|
throw error(`You're trying to get theme "${themeName}" but it wasn't registered.`)
|
@@ -207,5 +219,3 @@ class UnistylesRuntimeBuilder {
|
|
207
219
|
return theme
|
208
220
|
}
|
209
221
|
}
|
210
|
-
|
211
|
-
export const UnistylesRuntime = new UnistylesRuntimeBuilder()
|
@@ -0,0 +1,28 @@
|
|
1
|
+
import { UnistylesListener } from './listener'
|
2
|
+
import { UnistylesRegistry } from './registry'
|
3
|
+
import { UnistylesRuntime } from './runtime'
|
4
|
+
import { UnistylesShadowRegistry } from './shadowRegistry'
|
5
|
+
import { UnistylesState } from './state'
|
6
|
+
|
7
|
+
export class UnistylesServices {
|
8
|
+
runtime: UnistylesRuntime
|
9
|
+
registry: UnistylesRegistry
|
10
|
+
shadowRegistry: UnistylesShadowRegistry
|
11
|
+
state: UnistylesState
|
12
|
+
listener: UnistylesListener
|
13
|
+
|
14
|
+
private services = {} as UnistylesServices
|
15
|
+
|
16
|
+
constructor() {
|
17
|
+
this.runtime = new UnistylesRuntime(this.services)
|
18
|
+
this.registry = new UnistylesRegistry(this.services)
|
19
|
+
this.shadowRegistry = new UnistylesShadowRegistry(this.services)
|
20
|
+
this.state = new UnistylesState(this.services)
|
21
|
+
this.listener = new UnistylesListener(this.services)
|
22
|
+
this.services.runtime = this.runtime
|
23
|
+
this.services.registry = this.registry
|
24
|
+
this.services.shadowRegistry = this.shadowRegistry
|
25
|
+
this.services.state = this.state
|
26
|
+
this.services.listener = this.listener
|
27
|
+
}
|
28
|
+
}
|
@@ -1,13 +1,11 @@
|
|
1
1
|
import type { UnistylesTheme, UnistylesValues } from '../types'
|
2
|
-
import { UnistylesListener } from './listener'
|
3
|
-
import { UnistylesRegistry } from './registry'
|
4
2
|
import { deepMergeObjects } from '../utils'
|
5
|
-
import {
|
3
|
+
import { extractSecrets, extractUnistyleDependencies } from './utils'
|
6
4
|
import { getVariants } from './variants'
|
5
|
+
import type { UnistylesServices } from './types'
|
6
|
+
import { UnistyleDependency } from '../specs'
|
7
7
|
|
8
|
-
|
9
|
-
|
10
|
-
class UnistylesShadowRegistryBuilder {
|
8
|
+
export class UnistylesShadowRegistry {
|
11
9
|
// MOCKS
|
12
10
|
name = 'UnistylesShadowRegistry'
|
13
11
|
__type = 'web'
|
@@ -16,131 +14,68 @@ class UnistylesShadowRegistryBuilder {
|
|
16
14
|
dispose = () => {}
|
17
15
|
// END MOCKS
|
18
16
|
|
19
|
-
private resultsMap = new Map<HTMLElement, UnistylesValues>()
|
20
|
-
private classNamesMap = new Map<HTMLElement, Array<string>>()
|
21
|
-
private selectedVariants = new Map<string, string | boolean | undefined>()
|
22
17
|
private scopedTheme: UnistylesTheme | undefined = undefined
|
23
|
-
private disposeMap = new Map<
|
24
|
-
|
25
|
-
add = (ref: any, styles: Array<Style>) => {
|
26
|
-
// Styles are not provided
|
27
|
-
if (!styles || !Array.isArray(styles)) {
|
28
|
-
return
|
29
|
-
}
|
18
|
+
private disposeMap = new Map<string, VoidFunction>()
|
30
19
|
|
31
|
-
|
32
|
-
if (ref === null) {
|
33
|
-
styles.flat().forEach(style => {
|
34
|
-
extractSecrets(style)?.__uni__refs.forEach(ref => {
|
35
|
-
if (isInDocument(ref)) {
|
36
|
-
return
|
37
|
-
}
|
38
|
-
|
39
|
-
const oldResult = this.resultsMap.get(ref)
|
40
|
-
|
41
|
-
this.resultsMap.delete(ref)
|
42
|
-
this.classNamesMap.delete(ref)
|
43
|
-
this.disposeMap.get(ref)?.()
|
44
|
-
this.disposeMap.delete(ref)
|
45
|
-
|
46
|
-
if (oldResult) {
|
47
|
-
UnistylesRegistry.remove(oldResult)
|
48
|
-
}
|
49
|
-
})
|
50
|
-
})
|
20
|
+
constructor(private services: UnistylesServices) {}
|
51
21
|
|
22
|
+
add = (ref: any, hash?: string) => {
|
23
|
+
if (!(ref instanceof HTMLElement) || !hash) {
|
52
24
|
return
|
53
25
|
}
|
54
26
|
|
55
|
-
|
56
|
-
|
57
|
-
return
|
58
|
-
}
|
27
|
+
this.services.registry.connect(ref, hash)
|
28
|
+
}
|
59
29
|
|
30
|
+
addStyles = (unistyles: Array<UnistylesValues>) => {
|
60
31
|
const getParsedStyles = () => {
|
61
|
-
|
62
|
-
|
63
|
-
return []
|
64
|
-
}
|
65
|
-
|
66
|
-
const secrets = extractSecrets(unistyleStyle)
|
32
|
+
const allStyles = unistyles.map(unistyle => {
|
33
|
+
const secrets = extractSecrets(unistyle)
|
67
34
|
|
68
35
|
// Regular style
|
69
36
|
if (!secrets) {
|
70
|
-
return
|
37
|
+
return unistyle
|
71
38
|
}
|
72
39
|
|
73
|
-
const { __uni__key, __uni__stylesheet, __uni__args = [],
|
74
|
-
const newComputedStylesheet =
|
40
|
+
const { __uni__key, __uni__stylesheet, __uni__args = [], __uni_variants: variants } = secrets
|
41
|
+
const newComputedStylesheet = this.services.registry.getComputedStylesheet(__uni__stylesheet, scopedTheme)
|
75
42
|
const style = newComputedStylesheet[__uni__key] as (UnistylesValues | ((...args: any) => UnistylesValues))
|
76
|
-
const args = __uni__args
|
77
43
|
const result = typeof style === 'function'
|
78
|
-
? style(...
|
44
|
+
? style(...__uni__args)
|
79
45
|
: style
|
80
|
-
const
|
81
|
-
const resultWithVariants = deepMergeObjects(result, variantsResult
|
46
|
+
const variantsResult = getVariants(result, variants)
|
47
|
+
const resultWithVariants = deepMergeObjects(result, variantsResult)
|
82
48
|
const dependencies = extractUnistyleDependencies(resultWithVariants)
|
83
49
|
|
84
50
|
if (typeof __uni__stylesheet === 'function') {
|
85
51
|
// Add dependencies from dynamic styles to stylesheet
|
86
|
-
|
52
|
+
this.services.registry.addDependenciesToStylesheet(__uni__stylesheet, dependencies)
|
87
53
|
}
|
88
54
|
|
89
|
-
__uni__refs.add(ref)
|
90
|
-
|
91
55
|
return resultWithVariants as UnistylesValues
|
92
56
|
})
|
57
|
+
|
58
|
+
return deepMergeObjects(...allStyles)
|
93
59
|
}
|
94
60
|
|
95
61
|
// Copy scoped theme to not use referenced value
|
96
|
-
const variants = this.getVariants()
|
97
62
|
const scopedTheme = this.scopedTheme
|
98
63
|
const parsedStyles = getParsedStyles()
|
99
|
-
const
|
100
|
-
const
|
101
|
-
|
102
|
-
|
103
|
-
|
64
|
+
const { hash, existingHash } = this.services.registry.add(parsedStyles)
|
65
|
+
const injectedClassNames = parsedStyles?._web?._classNames ?? []
|
66
|
+
const injectedClassName = Array.isArray(injectedClassNames) ? injectedClassNames.join(' ') : injectedClassNames
|
67
|
+
const dependencies = extractUnistyleDependencies(parsedStyles)
|
68
|
+
const filteredDependencies = this.services.state.CSSVars
|
69
|
+
? dependencies.filter(dependency => dependency !== UnistyleDependency.Theme)
|
70
|
+
: dependencies
|
71
|
+
|
72
|
+
if (!existingHash) {
|
73
|
+
this.disposeMap.set(hash, this.services.listener.addListeners(filteredDependencies, () => {
|
74
|
+
this.services.registry.applyStyles(hash, getParsedStyles())
|
75
|
+
}))
|
104
76
|
}
|
105
77
|
|
106
|
-
|
107
|
-
|
108
|
-
// Remove old styles
|
109
|
-
if (oldStyles) {
|
110
|
-
UnistylesRegistry.remove(oldStyles)
|
111
|
-
}
|
112
|
-
|
113
|
-
// Remove old classnames from the ref
|
114
|
-
oldClassNames?.forEach(className => ref.classList.remove(className))
|
115
|
-
this.resultsMap.set(ref, combinedStyles)
|
116
|
-
|
117
|
-
const { hash } = UnistylesRegistry.add(combinedStyles)
|
118
|
-
const injectedClassNames = combinedStyles?._web?._classNames ?? []
|
119
|
-
const newClassNames = (Array.isArray(injectedClassNames) ? injectedClassNames : [injectedClassNames]).concat(hash)
|
120
|
-
const dependencies = Array.from(new Set(parsedStyles.flatMap(style => extractUnistyleDependencies(style))))
|
121
|
-
|
122
|
-
this.disposeMap.get(ref)?.()
|
123
|
-
this.disposeMap.set(ref, UnistylesListener.addListeners(dependencies, () => {
|
124
|
-
UnistylesRegistry.applyStyles(hash, deepMergeObjects(...getParsedStyles()))
|
125
|
-
}))
|
126
|
-
this.classNamesMap.set(ref, newClassNames)
|
127
|
-
// Add new classnames to the ref
|
128
|
-
ref.classList.add(...newClassNames)
|
129
|
-
ref.removeAttribute('styles')
|
130
|
-
|
131
|
-
return newClassNames
|
132
|
-
}
|
133
|
-
|
134
|
-
selectVariants = (variants?: Record<string, string | boolean | undefined>) => {
|
135
|
-
if (!variants) {
|
136
|
-
this.selectedVariants.clear()
|
137
|
-
|
138
|
-
return
|
139
|
-
}
|
140
|
-
|
141
|
-
Object.entries(variants).forEach(([key, value]) => {
|
142
|
-
this.selectedVariants.set(key, value)
|
143
|
-
})
|
78
|
+
return { injectedClassName, hash }
|
144
79
|
}
|
145
80
|
|
146
81
|
setScopedTheme = (theme?: UnistylesTheme) => {
|
@@ -149,9 +84,16 @@ class UnistylesShadowRegistryBuilder {
|
|
149
84
|
|
150
85
|
getScopedTheme = () => this.scopedTheme
|
151
86
|
|
152
|
-
|
87
|
+
remove = (ref: any, hash?: string) => {
|
88
|
+
if (!(ref instanceof HTMLElement) || !hash) {
|
89
|
+
return
|
90
|
+
}
|
153
91
|
|
154
|
-
|
155
|
-
}
|
92
|
+
const removed = this.services.registry.remove(ref, hash)
|
156
93
|
|
157
|
-
|
94
|
+
if (removed) {
|
95
|
+
this.disposeMap.get(hash)?.()
|
96
|
+
this.disposeMap.delete(hash)
|
97
|
+
}
|
98
|
+
}
|
99
|
+
}
|
package/src/web/state.ts
CHANGED
@@ -2,17 +2,19 @@ import type { UnistylesTheme } from '../types'
|
|
2
2
|
import type { UnistylesConfig } from '../specs/StyleSheet'
|
3
3
|
import type { AppBreakpoint, AppTheme, AppThemeName } from '../specs/types'
|
4
4
|
import type { UnistylesBreakpoints, UnistylesThemes } from '../global'
|
5
|
-
import {
|
6
|
-
import { error, isServer, schemeToTheme } from './utils'
|
7
|
-
import { UnistylesListener } from './listener'
|
5
|
+
import { error, hyphenate, isServer, schemeToTheme } from './utils'
|
8
6
|
import { UnistyleDependency } from '../specs/NativePlatform'
|
9
7
|
import type { UnionToIntersection } from '../types'
|
8
|
+
import type { UnistylesServices } from './types'
|
10
9
|
|
11
10
|
type UnistylesSettings = Partial<UnionToIntersection<Required<UnistylesConfig>['settings']>>
|
12
11
|
|
13
|
-
class
|
12
|
+
export class UnistylesState {
|
13
|
+
isInitialized = false
|
14
14
|
themes = new Map<string, UnistylesTheme>()
|
15
|
+
cssThemes = new Map<string, UnistylesTheme>()
|
15
16
|
themeName?: AppThemeName
|
17
|
+
CSSVars = true
|
16
18
|
|
17
19
|
private matchingBreakpoints = new Map<string, boolean>()
|
18
20
|
|
@@ -28,8 +30,15 @@ class UnistylesStateBuilder {
|
|
28
30
|
|
29
31
|
hasAdaptiveThemes = false
|
30
32
|
|
33
|
+
constructor(private services: UnistylesServices) {}
|
34
|
+
|
31
35
|
init = (config: UnistylesConfig) => {
|
32
|
-
this.
|
36
|
+
if (this.isInitialized) {
|
37
|
+
return
|
38
|
+
}
|
39
|
+
|
40
|
+
this.isInitialized = true
|
41
|
+
this.initThemes(config.themes, config.settings?.CSSVars)
|
33
42
|
this.initBreakpoints(config.breakpoints)
|
34
43
|
|
35
44
|
if (config.settings) {
|
@@ -40,12 +49,40 @@ class UnistylesStateBuilder {
|
|
40
49
|
return
|
41
50
|
}
|
42
51
|
|
43
|
-
|
52
|
+
// Ensure we have a themeName before calling this
|
53
|
+
// classList.add throws a "SyntaxError" DOMException if one of the arguments is an empty string.
|
54
|
+
if (!this.hasAdaptiveThemes && this.CSSVars && this.themeName) {
|
55
|
+
document.querySelector(':root')?.classList.add(this.themeName)
|
56
|
+
}
|
57
|
+
|
58
|
+
this.services.listener.initListeners()
|
44
59
|
}
|
45
60
|
|
46
|
-
private initThemes = (themes = {} as UnistylesThemes) => {
|
61
|
+
private initThemes = (themes = {} as UnistylesThemes, CSSVars = true) => {
|
62
|
+
this.CSSVars = CSSVars
|
63
|
+
|
47
64
|
Object.entries(themes).forEach(([themeName, theme]) => {
|
48
65
|
this.themes.set(themeName, theme as AppTheme)
|
66
|
+
|
67
|
+
if (CSSVars) {
|
68
|
+
this.services.registry.css.addTheme(themeName, theme)
|
69
|
+
|
70
|
+
const convertTheme = (key: string, value: any, prev = '-'): [string, any] => {
|
71
|
+
if (typeof value === 'object' && value !== null) {
|
72
|
+
return [key, Object.fromEntries(Object.entries(value).map(([nestedKey, nestedValue]) => convertTheme(nestedKey, nestedValue, `${prev}-${key}`)))]
|
73
|
+
}
|
74
|
+
|
75
|
+
if (typeof value === 'string') {
|
76
|
+
return [key, `var(${prev}-${hyphenate(key)})`]
|
77
|
+
}
|
78
|
+
|
79
|
+
return [key, value]
|
80
|
+
}
|
81
|
+
|
82
|
+
this.cssThemes.set(themeName, Object.fromEntries(Object.entries(theme).map(([key, value]) => {
|
83
|
+
return convertTheme(key, value)
|
84
|
+
})) as UnistylesTheme)
|
85
|
+
}
|
49
86
|
})
|
50
87
|
}
|
51
88
|
|
@@ -62,7 +99,7 @@ class UnistylesStateBuilder {
|
|
62
99
|
throw error(`You're trying to enable adaptiveThemes, but you didn't register both 'light' and 'dark' themes.`)
|
63
100
|
}
|
64
101
|
|
65
|
-
this.themeName = schemeToTheme(
|
102
|
+
this.themeName = schemeToTheme(this.services.runtime.colorScheme) as AppThemeName
|
66
103
|
|
67
104
|
return
|
68
105
|
}
|
@@ -104,10 +141,8 @@ class UnistylesStateBuilder {
|
|
104
141
|
|
105
142
|
mediaQuery.addEventListener('change', event => {
|
106
143
|
this.matchingBreakpoints.set(breakpoint, event.matches)
|
107
|
-
|
144
|
+
this.services.listener.emitChange(UnistyleDependency.Breakpoints)
|
108
145
|
})
|
109
146
|
})
|
110
147
|
}
|
111
148
|
}
|
112
|
-
|
113
|
-
export const UnistylesState = new UnistylesStateBuilder()
|
package/src/web/types.ts
ADDED
@@ -0,0 +1,13 @@
|
|
1
|
+
import type { UnistylesListener } from './listener'
|
2
|
+
import type{ UnistylesRegistry } from './registry'
|
3
|
+
import type{ UnistylesRuntime } from './runtime'
|
4
|
+
import type{ UnistylesShadowRegistry } from './shadowRegistry'
|
5
|
+
import type{ UnistylesState } from './state'
|
6
|
+
|
7
|
+
export type UnistylesServices = {
|
8
|
+
runtime: UnistylesRuntime,
|
9
|
+
registry: UnistylesRegistry,
|
10
|
+
shadowRegistry: UnistylesShadowRegistry,
|
11
|
+
state: UnistylesState,
|
12
|
+
listener: UnistylesListener
|
13
|
+
}
|
package/src/web/utils/common.ts
CHANGED
@@ -5,7 +5,7 @@ export const reduceObject = <TObj extends Record<string, any>, TReducer>(
|
|
5
5
|
|
6
6
|
export const keyInObject = <T extends Record<string, any>>(obj: T, key: PropertyKey): key is keyof T => key in obj
|
7
7
|
|
8
|
-
export const isServer = () => typeof window === 'undefined'
|
8
|
+
export const isServer = () => typeof window === 'undefined' || typeof document === 'undefined'
|
9
9
|
|
10
10
|
export const error = (message: string) => new Error(`Unistyles: ${message}`)
|
11
11
|
|
@@ -32,14 +32,38 @@ export const equal = <T>(a: T, b: T) => {
|
|
32
32
|
return keysA.every(key => Object.is(a[key], b[key]) && Object.prototype.hasOwnProperty.call(b, key))
|
33
33
|
}
|
34
34
|
|
35
|
-
export const
|
36
|
-
|
37
|
-
|
38
|
-
|
35
|
+
export const hyphenate = (propertyName: string) => propertyName.replace(/[A-Z]/g, (m: string) => `-${m.toLowerCase()}`)
|
36
|
+
|
37
|
+
export const serialize = (obj: string | number | object): string => {
|
38
|
+
if (typeof obj !== 'object') {
|
39
|
+
return String(obj)
|
40
|
+
}
|
39
41
|
|
40
|
-
|
42
|
+
const sortedKeys = Object.keys(obj).sort()
|
43
|
+
const sortedKeyValuePairs = sortedKeys.map(key => `${key}:${serialize(obj[key as keyof typeof obj])}`)
|
41
44
|
|
42
|
-
return `
|
45
|
+
return `{${sortedKeyValuePairs.join(',')}}`
|
43
46
|
}
|
44
47
|
|
45
|
-
|
48
|
+
// Based on https://github.com/bryc/code/blob/master/jshash/experimental/cyrb53.js
|
49
|
+
const cyrb53 = (data: string, seed = 0) => {
|
50
|
+
let h1 = 0xdeadbeef ^ seed
|
51
|
+
let h2 = 0x41c6ce57 ^ seed
|
52
|
+
|
53
|
+
for (let i = 0, ch: number; i < data.length; i++) {
|
54
|
+
ch = data.charCodeAt(i)
|
55
|
+
h1 = Math.imul(h1 ^ ch, 2654435761)
|
56
|
+
h2 = Math.imul(h2 ^ ch, 1597334677)
|
57
|
+
}
|
58
|
+
|
59
|
+
h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909)
|
60
|
+
h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909)
|
61
|
+
|
62
|
+
return 4294967296 * (2097151 & h2) + (h1 >>> 0)
|
63
|
+
}
|
64
|
+
|
65
|
+
export const generateHash = (value: any) => {
|
66
|
+
const serialized = serialize(value)
|
67
|
+
|
68
|
+
return `unistyles-${cyrb53(serialized).toString(36)}`
|
69
|
+
}
|
@@ -2,8 +2,9 @@ import type { UnistyleDependency } from '../../specs/NativePlatform'
|
|
2
2
|
import { ColorScheme, Orientation } from '../../specs/types'
|
3
3
|
import type { StyleSheet, StyleSheetWithSuperPowers, UnistylesValues } from '../../types/stylesheet'
|
4
4
|
import { isUnistylesMq, parseMq } from '../../mq'
|
5
|
-
import { UnistylesState } from '../state'
|
6
5
|
import { keyInObject, reduceObject } from './common'
|
6
|
+
import type { UnistylesBreakpoints } from '../../global'
|
7
|
+
import { UnistylesWeb } from '../index'
|
7
8
|
|
8
9
|
export const schemeToTheme = (scheme: ColorScheme) => {
|
9
10
|
switch (scheme) {
|
@@ -18,19 +19,37 @@ export const schemeToTheme = (scheme: ColorScheme) => {
|
|
18
19
|
export type UnistyleSecrets = {
|
19
20
|
__uni__stylesheet: StyleSheetWithSuperPowers<StyleSheet>,
|
20
21
|
__uni__key: string,
|
21
|
-
|
22
|
-
|
22
|
+
__uni__args?: Array<any>,
|
23
|
+
__uni_variants: Record<string, string | boolean | undefined>
|
23
24
|
}
|
24
25
|
|
25
26
|
export const assignSecrets = <T>(object: T, secrets: UnistyleSecrets) => {
|
26
|
-
|
27
|
-
|
27
|
+
const secretsId = Math.random().toString(36).slice(8)
|
28
|
+
|
29
|
+
// @ts-expect-error assign hidden secrets
|
30
|
+
object[`unistyles-${secretsId}`] = {}
|
31
|
+
// @ts-expect-error assign hidden secrets
|
32
|
+
Object.defineProperties(object[`unistyles-${secretsId}`], reduceObject(secrets, secret => ({
|
33
|
+
value: secret,
|
34
|
+
enumerable: false,
|
35
|
+
configurable: true
|
36
|
+
})))
|
28
37
|
|
29
38
|
return object
|
30
39
|
}
|
31
40
|
|
32
41
|
export const extractSecrets = (object: any) => {
|
33
|
-
|
42
|
+
if (!object) {
|
43
|
+
return undefined
|
44
|
+
}
|
45
|
+
|
46
|
+
const [, secrets] = Object.entries(object).find(([key]) => key.startsWith('unistyles-')) ?? []
|
47
|
+
|
48
|
+
if (!secrets) {
|
49
|
+
return undefined
|
50
|
+
}
|
51
|
+
|
52
|
+
return reduceObject(Object.getOwnPropertyDescriptors(secrets), secret => secret.value)
|
34
53
|
}
|
35
54
|
|
36
55
|
export const removeInlineStyles = (values: UnistylesValues) => {
|
@@ -47,39 +66,35 @@ export const removeInlineStyles = (values: UnistylesValues) => {
|
|
47
66
|
|
48
67
|
export const isInDocument = (element: HTMLElement) => document.body.contains(element)
|
49
68
|
|
50
|
-
export const
|
51
|
-
const [_, px] = query.match(/(\d+)px/) ?? []
|
52
|
-
|
53
|
-
if (!px) {
|
54
|
-
return undefined
|
55
|
-
}
|
56
|
-
|
57
|
-
const value = Number(px)
|
58
|
-
|
59
|
-
return Number.isNaN(value)
|
60
|
-
? undefined
|
61
|
-
: value
|
62
|
-
}
|
63
|
-
|
64
|
-
export const getMediaQuery = (query: string) => {
|
69
|
+
export const getMediaQuery = (query: string, allBreakpoints: Array<string>) => {
|
65
70
|
if (Object.values(Orientation).includes(query as Orientation)) {
|
66
|
-
return
|
71
|
+
return `@media (orientation: ${query})`
|
67
72
|
}
|
68
73
|
|
69
74
|
if (isUnistylesMq(query)) {
|
70
75
|
const { minWidth, maxWidth, minHeight, maxHeight } = parseMq(query)
|
71
76
|
|
72
|
-
|
77
|
+
const queries = [
|
73
78
|
minWidth ? `(min-width: ${minWidth}px)` : undefined,
|
74
79
|
maxWidth ? `(max-width: ${maxWidth}px)` : undefined,
|
75
80
|
minHeight ? `(min-height: ${minHeight}px)` : undefined,
|
76
81
|
maxHeight ? `(max-height: ${maxHeight}px)` : undefined
|
77
82
|
].filter(Boolean).join(' and ')
|
83
|
+
return `@media ${queries}`
|
78
84
|
}
|
79
85
|
|
80
|
-
const
|
86
|
+
const breakpointValue = UnistylesWeb.runtime.breakpoints[query as keyof UnistylesBreakpoints] ?? 0
|
87
|
+
const nextBreakpoint = allBreakpoints
|
88
|
+
.filter((b): b is keyof UnistylesBreakpoints => b in UnistylesWeb.runtime.breakpoints)
|
89
|
+
.map(b => UnistylesWeb.runtime.breakpoints[b] as number)
|
90
|
+
.sort((a, b) => a - b)
|
91
|
+
.find(b => b > breakpointValue)
|
92
|
+
const queries = [
|
93
|
+
`(min-width: ${breakpointValue}px)`,
|
94
|
+
nextBreakpoint ? `(max-width: ${nextBreakpoint - 1}px)` : undefined,
|
95
|
+
].filter(Boolean).join(' and ')
|
81
96
|
|
82
|
-
|
97
|
+
return `@media ${queries}`
|
83
98
|
}
|
84
99
|
|
85
100
|
export const extractUnistyleDependencies = (value: any) => {
|