react-native-unistyles 3.0.0-beta.6 → 3.0.0-beta.8
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 +19 -0
- package/android/CMakeLists.txt +2 -1
- package/android/src/main/java/com/unistyles/NativePlatform+android.kt +4 -0
- package/android/src/main/java/com/unistyles/NativePlatform+insets.kt +29 -2
- package/android/src/main/java/com/unistyles/NativePlatform+listener.kt +4 -0
- package/android/src/main/java/com/unistyles/UnistylesModule.kt +5 -0
- package/cxx/common/Helpers.h +85 -0
- package/cxx/core/HashGenerator.cpp +1 -1
- package/cxx/core/HostUnistyle.cpp +28 -4
- package/cxx/core/HostUnistyle.h +1 -0
- package/cxx/core/UnistyleWrapper.h +6 -6
- package/cxx/core/UnistylesCommitHook.cpp +20 -17
- package/cxx/core/UnistylesMountHook.cpp +2 -2
- package/cxx/core/UnistylesMountHook.h +1 -4
- package/cxx/core/UnistylesRegistry.cpp +8 -6
- package/cxx/hybridObjects/HybridShadowRegistry.cpp +2 -5
- package/cxx/hybridObjects/HybridStyleSheet.cpp +1 -1
- package/cxx/hybridObjects/HybridUnistylesRuntime.cpp +5 -1
- package/cxx/parser/Parser.cpp +79 -14
- package/cxx/shadowTree/ShadowTrafficController.h +10 -4
- package/cxx/shadowTree/ShadowTreeManager.cpp +38 -35
- package/lib/commonjs/components/native/Animated.js +2 -2
- package/lib/commonjs/components/native/Animated.js.map +1 -1
- package/lib/commonjs/components/native/ImageBackground.js +29 -33
- package/lib/commonjs/components/native/ImageBackground.js.map +1 -1
- package/lib/commonjs/components/native/NativeText.native.js.map +1 -1
- package/lib/commonjs/components/native/NativeView.native.js.map +1 -1
- package/lib/commonjs/components/native/Pressable.js +1 -1
- package/lib/commonjs/components/native/Pressable.js.map +1 -1
- package/lib/commonjs/components/native/Pressable.native.js +17 -10
- package/lib/commonjs/components/native/Pressable.native.js.map +1 -1
- package/lib/commonjs/core/createUnistylesElement.js +5 -5
- package/lib/commonjs/core/createUnistylesElement.js.map +1 -1
- package/lib/commonjs/core/createUnistylesElement.native.js +5 -1
- package/lib/commonjs/core/createUnistylesElement.native.js.map +1 -1
- package/lib/commonjs/core/createUnistylesImageBackground.js +5 -1
- package/lib/commonjs/core/createUnistylesImageBackground.js.map +1 -1
- package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js +3 -3
- package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
- package/lib/commonjs/core/warn.js +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.js +2 -2
- package/lib/commonjs/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js +18 -9
- package/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/commonjs/hooks/useMedia.native.js +1 -1
- package/lib/commonjs/hooks/useMedia.native.js.map +1 -1
- package/lib/commonjs/mq.js.map +1 -1
- package/lib/commonjs/server/getServerUnistyles.js +1 -1
- package/lib/commonjs/server/getServerUnistyles.js.map +1 -1
- package/lib/commonjs/server/hydrateServerUnistyles.js +1 -1
- package/lib/commonjs/server/hydrateServerUnistyles.js.map +1 -1
- package/lib/commonjs/server/resetServerUnistyles.js +1 -1
- package/lib/commonjs/server/resetServerUnistyles.js.map +1 -1
- package/lib/commonjs/server/useServerUnistyles.js +2 -2
- package/lib/commonjs/server/useServerUnistyles.js.map +1 -1
- package/lib/commonjs/specs/ShadowRegistry/index.js +1 -1
- package/lib/commonjs/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/commonjs/specs/StatusBar/index.js.map +1 -1
- package/lib/commonjs/specs/StyleSheet/index.js +1 -1
- package/lib/commonjs/specs/StyleSheet/index.js.map +1 -1
- package/lib/commonjs/specs/UnistylesRuntime/index.js +1 -1
- package/lib/commonjs/specs/UnistylesRuntime/index.js.map +1 -1
- package/lib/commonjs/specs/index.native.js +3 -3
- package/lib/commonjs/specs/index.native.js.map +1 -1
- package/lib/commonjs/web/convert/index.js +4 -4
- package/lib/commonjs/web/convert/index.js.map +1 -1
- package/lib/commonjs/web/convert/object/boxShadow.js +4 -4
- package/lib/commonjs/web/convert/object/boxShadow.js.map +1 -1
- package/lib/commonjs/web/convert/object/filter.js +3 -3
- package/lib/commonjs/web/convert/object/filter.js.map +1 -1
- package/lib/commonjs/web/convert/object/transform.js +1 -1
- package/lib/commonjs/web/convert/object/transform.js.map +1 -1
- package/lib/commonjs/web/convert/utils.js.map +1 -1
- package/lib/commonjs/web/index.js +1 -1
- package/lib/commonjs/web/index.js.map +1 -1
- package/lib/commonjs/web/registry.js +1 -1
- package/lib/commonjs/web/registry.js.map +1 -1
- package/lib/commonjs/web/runtime.js.map +1 -1
- package/lib/commonjs/web/shadowRegistry.js +1 -1
- package/lib/commonjs/web/shadowRegistry.js.map +1 -1
- package/lib/commonjs/web/state.js +1 -1
- package/lib/commonjs/web/state.js.map +1 -1
- package/lib/commonjs/web/utils/common.js +1 -1
- package/lib/commonjs/web/utils/unistyle.js +5 -5
- package/lib/commonjs/web/utils/unistyle.js.map +1 -1
- package/lib/module/components/native/Animated.js +2 -2
- package/lib/module/components/native/Animated.js.map +1 -1
- package/lib/module/components/native/ImageBackground.js +29 -33
- package/lib/module/components/native/ImageBackground.js.map +1 -1
- package/lib/module/components/native/NativeText.native.js.map +1 -1
- package/lib/module/components/native/NativeView.native.js.map +1 -1
- package/lib/module/components/native/Pressable.js +1 -1
- package/lib/module/components/native/Pressable.js.map +1 -1
- package/lib/module/components/native/Pressable.native.js +17 -10
- package/lib/module/components/native/Pressable.native.js.map +1 -1
- package/lib/module/core/createUnistylesElement.js +3 -3
- package/lib/module/core/createUnistylesElement.js.map +1 -1
- package/lib/module/core/createUnistylesElement.native.js +5 -1
- package/lib/module/core/createUnistylesElement.native.js.map +1 -1
- package/lib/module/core/createUnistylesImageBackground.js +5 -1
- package/lib/module/core/createUnistylesImageBackground.js.map +1 -1
- package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js +3 -3
- package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
- package/lib/module/core/warn.js +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.js +2 -2
- package/lib/module/core/withUnistyles/withUnistyles.js.map +1 -1
- package/lib/module/core/withUnistyles/withUnistyles.native.js +19 -10
- package/lib/module/core/withUnistyles/withUnistyles.native.js.map +1 -1
- package/lib/module/hooks/useMedia.native.js +1 -1
- package/lib/module/hooks/useMedia.native.js.map +1 -1
- package/lib/module/mq.js.map +1 -1
- package/lib/module/server/getServerUnistyles.js +1 -1
- package/lib/module/server/getServerUnistyles.js.map +1 -1
- package/lib/module/server/hydrateServerUnistyles.js +1 -1
- package/lib/module/server/hydrateServerUnistyles.js.map +1 -1
- package/lib/module/server/resetServerUnistyles.js +1 -1
- package/lib/module/server/resetServerUnistyles.js.map +1 -1
- package/lib/module/server/useServerUnistyles.js +2 -2
- package/lib/module/server/useServerUnistyles.js.map +1 -1
- package/lib/module/specs/ShadowRegistry/index.js +1 -1
- package/lib/module/specs/ShadowRegistry/index.js.map +1 -1
- package/lib/module/specs/StatusBar/index.js.map +1 -1
- package/lib/module/specs/StyleSheet/index.js +1 -1
- package/lib/module/specs/StyleSheet/index.js.map +1 -1
- package/lib/module/specs/UnistylesRuntime/index.js +1 -1
- package/lib/module/specs/UnistylesRuntime/index.js.map +1 -1
- package/lib/module/specs/index.native.js +4 -4
- package/lib/module/specs/index.native.js.map +1 -1
- package/lib/module/web/convert/index.js +5 -5
- package/lib/module/web/convert/index.js.map +1 -1
- package/lib/module/web/convert/object/boxShadow.js +2 -2
- package/lib/module/web/convert/object/boxShadow.js.map +1 -1
- package/lib/module/web/convert/object/filter.js +3 -3
- package/lib/module/web/convert/object/filter.js.map +1 -1
- package/lib/module/web/convert/object/transform.js +1 -1
- package/lib/module/web/convert/object/transform.js.map +1 -1
- package/lib/module/web/convert/utils.js.map +1 -1
- package/lib/module/web/index.js +1 -1
- package/lib/module/web/index.js.map +1 -1
- package/lib/module/web/registry.js +1 -1
- package/lib/module/web/registry.js.map +1 -1
- package/lib/module/web/runtime.js.map +1 -1
- package/lib/module/web/shadowRegistry.js +1 -1
- package/lib/module/web/shadowRegistry.js.map +1 -1
- package/lib/module/web/state.js +1 -1
- package/lib/module/web/state.js.map +1 -1
- package/lib/module/web/utils/common.js +1 -1
- package/lib/module/web/utils/unistyle.js +5 -5
- package/lib/module/web/utils/unistyle.js.map +1 -1
- package/lib/typescript/src/components/native/ImageBackground.d.ts.map +1 -1
- 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/core/createUnistylesElement.native.d.ts.map +1 -1
- package/lib/typescript/src/core/createUnistylesImageBackground.d.ts.map +1 -1
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts +2 -1
- package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts.map +1 -1
- 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/mq.d.ts +1 -1
- package/lib/typescript/src/mq.d.ts.map +1 -1
- package/lib/typescript/src/server/hydrateServerUnistyles.d.ts.map +1 -1
- package/lib/typescript/src/server/useServerUnistyles.d.ts.map +1 -1
- package/lib/typescript/src/specs/ShadowRegistry/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/StatusBar/index.d.ts +1 -1
- package/lib/typescript/src/specs/StatusBar/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/StyleSheet/index.d.ts +1 -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 +5 -5
- package/lib/typescript/src/specs/UnistylesRuntime/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/index.native.d.ts +4 -4
- package/lib/typescript/src/specs/index.native.d.ts.map +1 -1
- package/lib/typescript/src/types/breakpoints.d.ts +2 -2
- package/lib/typescript/src/types/breakpoints.d.ts.map +1 -1
- package/lib/typescript/src/types/core.d.ts +1 -1
- package/lib/typescript/src/types/core.d.ts.map +1 -1
- package/lib/typescript/src/types/stylesheet.d.ts +5 -5
- package/lib/typescript/src/types/stylesheet.d.ts.map +1 -1
- package/lib/typescript/src/web/convert/object/filter.d.ts.map +1 -1
- package/lib/typescript/src/web/convert/object/transform.d.ts.map +1 -1
- package/lib/typescript/src/web/convert/types.d.ts +1 -1
- package/lib/typescript/src/web/convert/types.d.ts.map +1 -1
- package/lib/typescript/src/web/convert/utils.d.ts +2 -2
- package/lib/typescript/src/web/convert/utils.d.ts.map +1 -1
- package/lib/typescript/src/web/create.d.ts +1 -1
- package/lib/typescript/src/web/create.d.ts.map +1 -1
- package/lib/typescript/src/web/index.d.ts +1 -1
- package/lib/typescript/src/web/index.d.ts.map +1 -1
- package/lib/typescript/src/web/registry.d.ts +1 -1
- package/lib/typescript/src/web/registry.d.ts.map +1 -1
- package/lib/typescript/src/web/runtime.d.ts +1 -1
- package/lib/typescript/src/web/runtime.d.ts.map +1 -1
- package/lib/typescript/src/web/shadowRegistry.d.ts.map +1 -1
- package/lib/typescript/src/web/state.d.ts +1 -1
- package/lib/typescript/src/web/state.d.ts.map +1 -1
- package/lib/typescript/src/web/utils/unistyle.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JFunc_void_UnistylesNativeMiniRuntime.hpp +2 -2
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.hpp +2 -2
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp +19 -19
- package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_UnistylesNativeMiniRuntime.kt +7 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.kt +7 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt +1 -17
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/unistylesOnLoad.kt +35 -0
- package/nitrogen/generated/android/unistyles+autolinking.cmake +16 -0
- package/nitrogen/generated/ios/Unistyles+autolinking.rb +2 -0
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp +1 -1
- package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp +0 -1
- package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp +3 -1
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift +2 -3
- package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift +18 -18
- package/nitrogen/generated/shared/c++/ColorScheme.hpp +1 -1
- package/nitrogen/generated/shared/c++/Dimensions.hpp +2 -1
- package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/Insets.hpp +2 -1
- package/nitrogen/generated/shared/c++/Orientation.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistyleDependency.hpp +1 -1
- package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp +2 -1
- package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp +2 -1
- package/package.json +31 -19
- package/plugin/index.d.ts +51 -18
- package/plugin/index.js +791 -189
- package/src/components/native/Animated.tsx +2 -2
- package/src/components/native/ImageBackground.tsx +6 -7
- package/src/components/native/NativeText.native.tsx +1 -1
- package/src/components/native/NativeView.native.tsx +1 -1
- package/src/components/native/Pressable.native.tsx +22 -12
- package/src/components/native/Pressable.tsx +1 -1
- package/src/core/createUnistylesElement.native.tsx +6 -1
- package/src/core/createUnistylesElement.tsx +3 -3
- package/src/core/createUnistylesImageBackground.tsx +6 -1
- package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts +4 -4
- package/src/core/warn.ts +1 -1
- package/src/core/withUnistyles/withUnistyles.native.tsx +47 -19
- package/src/core/withUnistyles/withUnistyles.tsx +4 -4
- package/src/hooks/useMedia.native.ts +1 -1
- package/src/mq.ts +1 -1
- package/src/server/getServerUnistyles.tsx +1 -1
- package/src/server/hydrateServerUnistyles.ts +1 -1
- package/src/server/resetServerUnistyles.ts +1 -1
- package/src/server/useServerUnistyles.tsx +2 -2
- package/src/specs/ShadowRegistry/index.ts +1 -0
- package/src/specs/StatusBar/index.ts +1 -1
- package/src/specs/StyleSheet/index.ts +3 -3
- package/src/specs/UnistylesRuntime/UnistylesRuntime.nitro.ts +1 -1
- package/src/specs/UnistylesRuntime/index.ts +5 -5
- package/src/specs/index.native.ts +4 -4
- package/src/types/breakpoints.ts +2 -2
- package/src/types/core.ts +1 -1
- package/src/types/stylesheet.ts +5 -5
- package/src/web/convert/index.ts +5 -5
- package/src/web/convert/object/boxShadow.ts +2 -2
- package/src/web/convert/object/filter.ts +3 -3
- package/src/web/convert/object/transform.ts +2 -2
- package/src/web/convert/types.ts +1 -1
- package/src/web/convert/utils.ts +2 -2
- package/src/web/create.ts +1 -1
- package/src/web/index.ts +3 -3
- package/src/web/registry.ts +2 -2
- package/src/web/runtime.ts +2 -2
- package/src/web/shadowRegistry.ts +2 -2
- package/src/web/state.ts +4 -4
- package/src/web/utils/common.ts +1 -1
- package/src/web/utils/unistyle.ts +6 -6
- package/plugin/common.js +0 -142
- package/plugin/consts.js +0 -63
- package/plugin/exotic.js +0 -54
- package/plugin/import.js +0 -51
- package/plugin/ref.js +0 -11
- package/plugin/stylesheet.js +0 -239
- package/plugin/variants.js +0 -66
package/cxx/parser/Parser.cpp
CHANGED
@@ -18,7 +18,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
|
|
18
18
|
|
19
19
|
if (styleValue.isFunction(rt)) {
|
20
20
|
styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
|
21
|
-
helpers::HashGenerator::generateHash(styleKey),
|
21
|
+
helpers::HashGenerator::generateHash(styleKey + std::to_string(styleSheet->tag)),
|
22
22
|
UnistyleType::DynamicFunction,
|
23
23
|
styleKey,
|
24
24
|
styleValue,
|
@@ -29,7 +29,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
|
|
29
29
|
}
|
30
30
|
|
31
31
|
styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
|
32
|
-
helpers::HashGenerator::generateHash(styleKey),
|
32
|
+
helpers::HashGenerator::generateHash(styleKey + std::to_string(styleSheet->tag)),
|
33
33
|
UnistyleType::Object,
|
34
34
|
styleKey,
|
35
35
|
styleValue,
|
@@ -62,10 +62,10 @@ jsi::Value parser::Parser::getParsedStyleSheetForScopedTheme(jsi::Runtime& rt, c
|
|
62
62
|
.asObject(rt);
|
63
63
|
}
|
64
64
|
|
65
|
-
void parser::Parser::rebuildUnistyleWithScopedTheme(jsi::Runtime& rt, jsi::Value&
|
66
|
-
auto parsedStyleSheet =
|
65
|
+
void parser::Parser::rebuildUnistyleWithScopedTheme(jsi::Runtime& rt, jsi::Value& scopedStyleSheet, std::shared_ptr<core::UnistyleData> unistyleData) {
|
66
|
+
auto parsedStyleSheet = scopedStyleSheet.isUndefined()
|
67
67
|
? this->getParsedStyleSheetForScopedTheme(rt, unistyleData->unistyle, unistyleData->scopedTheme.value())
|
68
|
-
:
|
68
|
+
: scopedStyleSheet.asObject(rt);
|
69
69
|
|
70
70
|
if (parsedStyleSheet.isUndefined()) {
|
71
71
|
return;
|
@@ -305,6 +305,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
|
|
305
305
|
unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[unistyleStyleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
|
306
306
|
this->rebuildUnistyle(rt, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
|
307
307
|
unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
|
308
|
+
unistyle->isDirty = true;
|
308
309
|
}
|
309
310
|
|
310
311
|
if (!parsedUnistyles.contains(unistyle)) {
|
@@ -361,7 +362,7 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle
|
|
361
362
|
unistyleFn->unprocessedValue = std::move(functionResult);
|
362
363
|
unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
|
363
364
|
}
|
364
|
-
|
365
|
+
|
365
366
|
if (unistyle->isDirty) {
|
366
367
|
unistyle->isDirty = false;
|
367
368
|
}
|
@@ -401,7 +402,7 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
|
|
401
402
|
// parse dependencies only once
|
402
403
|
if (propertyName == helpers::STYLE_DEPENDENCIES && !unistyle->isSealed()) {
|
403
404
|
auto newDeps = this->parseDependencies(rt, propertyValue.asObject(rt));
|
404
|
-
|
405
|
+
|
405
406
|
unistyle->dependencies.insert(unistyle->dependencies.end(), newDeps.begin(), newDeps.end());
|
406
407
|
|
407
408
|
return;
|
@@ -526,7 +527,7 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
|
|
526
527
|
|
527
528
|
Variants variants = helpers::variantsToPairs(rt, rawVariants.asObject(rt));
|
528
529
|
|
529
|
-
unistyleFn->parsedStyle =
|
530
|
+
unistyleFn->parsedStyle = parser.parseFirstLevel(rt, unistyleFn, variants);
|
530
531
|
unistyleFn->seal();
|
531
532
|
|
532
533
|
// for compatibility purpose save last arguments to style instance. It will work ok, if user sees warning about multiple unistyles
|
@@ -880,21 +881,43 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
|
|
880
881
|
|
881
882
|
return;
|
882
883
|
}
|
883
|
-
|
884
|
+
|
885
|
+
auto isArray = nestedObjectStyle.isArray(rt);
|
886
|
+
|
887
|
+
if (!isArray) {
|
888
|
+
parsedStyle.setProperty(rt, propertyName.c_str(), this->getValueFromBreakpoints(rt, unistyle, nestedObjectStyle));
|
889
|
+
}
|
890
|
+
|
884
891
|
// possible with variants and compoundVariants
|
885
|
-
if (
|
892
|
+
if (propertyName == "transform") {
|
886
893
|
parsedStyle.setProperty(rt, propertyName.c_str(), parseTransforms(rt, unistyle, nestedObjectStyle));
|
887
894
|
|
888
895
|
return;
|
889
896
|
}
|
890
897
|
|
891
|
-
if (
|
898
|
+
if (propertyName == "boxShadow") {
|
899
|
+
parsedStyle.setProperty(rt, propertyName.c_str(), parseBoxShadow(rt, unistyle, nestedObjectStyle));
|
900
|
+
|
901
|
+
return;
|
902
|
+
}
|
903
|
+
|
904
|
+
if (propertyName == "filter") {
|
905
|
+
parsedStyle.setProperty(rt, propertyName.c_str(), parseFilters(rt, unistyle, nestedObjectStyle));
|
906
|
+
|
907
|
+
return;
|
908
|
+
}
|
909
|
+
|
910
|
+
if (propertyName == "fontVariant") {
|
892
911
|
parsedStyle.setProperty(rt, propertyName.c_str(), propertyValue);
|
893
912
|
|
894
913
|
return;
|
895
914
|
}
|
896
915
|
|
897
|
-
|
916
|
+
if (propertyName == "shadowOffset" || propertyName == "textShadowOffset") {
|
917
|
+
parsedStyle.setProperty(rt, propertyName.c_str(), this->parseSecondLevel(rt, unistyle, propertyValue));
|
918
|
+
|
919
|
+
return;
|
920
|
+
}
|
898
921
|
});
|
899
922
|
|
900
923
|
return parsedStyle;
|
@@ -908,7 +931,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
|
|
908
931
|
for (const auto& unistyleData : unistyles) {
|
909
932
|
// this can happen for exotic stylesheets
|
910
933
|
if (!unistyleData->parsedStyle.has_value()) {
|
911
|
-
|
934
|
+
continue;
|
912
935
|
}
|
913
936
|
|
914
937
|
helpers::enumerateJSIObject(rt, unistyleData->parsedStyle.value(), [&](const std::string& propertyName, jsi::Value& propertyValue){
|
@@ -916,7 +939,49 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
|
|
916
939
|
return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));
|
917
940
|
}
|
918
941
|
|
919
|
-
|
942
|
+
if (!propertyValue.isObject()) {
|
943
|
+
return convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
|
944
|
+
}
|
945
|
+
|
946
|
+
auto objValue = propertyValue.asObject(rt);
|
947
|
+
|
948
|
+
if (!objValue.isArray(rt)) {
|
949
|
+
return convertedStyles.setProperty(rt, propertyName.c_str(), propertyValue);
|
950
|
+
}
|
951
|
+
|
952
|
+
// parse nested arrays like boxShadow
|
953
|
+
auto arrValue = objValue.asArray(rt);
|
954
|
+
auto parsedArray = jsi::Array(rt, arrValue.length(rt));
|
955
|
+
|
956
|
+
helpers::iterateJSIArray(rt, arrValue, [&](size_t i, jsi::Value& nestedValue){
|
957
|
+
if (nestedValue.isObject()) {
|
958
|
+
jsi::Object obj = jsi::Object(rt);
|
959
|
+
|
960
|
+
helpers::enumerateJSIObject(rt, nestedValue.asObject(rt), [&](const std::string& propertyName, jsi::Value& propertyValue){
|
961
|
+
if (this->isColor(propertyName)) {
|
962
|
+
obj.setProperty(rt, propertyName.c_str(), state.parseColor(propertyValue));
|
963
|
+
|
964
|
+
return;
|
965
|
+
}
|
966
|
+
|
967
|
+
obj.setProperty(rt, propertyName.c_str(), propertyValue);
|
968
|
+
});
|
969
|
+
|
970
|
+
parsedArray.setValueAtIndex(rt, i, std::move(obj));
|
971
|
+
|
972
|
+
return;
|
973
|
+
}
|
974
|
+
|
975
|
+
if (this->isColor(propertyName)) {
|
976
|
+
parsedArray.setValueAtIndex(rt, i, jsi::Value(state.parseColor(nestedValue)));
|
977
|
+
|
978
|
+
return;
|
979
|
+
}
|
980
|
+
|
981
|
+
parsedArray.setValueAtIndex(rt, i, nestedValue);
|
982
|
+
});
|
983
|
+
|
984
|
+
return convertedStyles.setProperty(rt, propertyName.c_str(), parsedArray);
|
920
985
|
});
|
921
986
|
}
|
922
987
|
|
@@ -21,7 +21,7 @@ struct ShadowTrafficController {
|
|
21
21
|
}
|
22
22
|
|
23
23
|
inline shadow::ShadowLeafUpdates& getUpdates() {
|
24
|
-
|
24
|
+
// call it only within withLock!
|
25
25
|
|
26
26
|
return _unistylesUpdates;
|
27
27
|
}
|
@@ -45,8 +45,7 @@ struct ShadowTrafficController {
|
|
45
45
|
}
|
46
46
|
|
47
47
|
inline void removeShadowNode(const ShadowNodeFamily* shadowNodeFamily) {
|
48
|
-
|
49
|
-
|
48
|
+
// call it only within withLock!
|
50
49
|
if (_unistylesUpdates.contains(shadowNodeFamily)) {
|
51
50
|
_unistylesUpdates.erase(shadowNodeFamily);
|
52
51
|
}
|
@@ -58,7 +57,14 @@ struct ShadowTrafficController {
|
|
58
57
|
_unistylesUpdates = {};
|
59
58
|
_canCommit = false;
|
60
59
|
}
|
61
|
-
|
60
|
+
|
61
|
+
template <typename F>
|
62
|
+
inline auto withLock(F&& func) {
|
63
|
+
std::lock_guard<std::mutex> lock(_mutex);
|
64
|
+
|
65
|
+
return std::forward<F>(func)();
|
66
|
+
}
|
67
|
+
|
62
68
|
private:
|
63
69
|
std::atomic<bool> _canCommit = false;
|
64
70
|
shadow::ShadowLeafUpdates _unistylesUpdates{};
|
@@ -8,43 +8,46 @@ using AffectedNodes = std::unordered_map<const ShadowNodeFamily*, std::unordered
|
|
8
8
|
|
9
9
|
void shadow::ShadowTreeManager::updateShadowTree(const ShadowTreeRegistry& shadowTreeRegistry) {
|
10
10
|
auto& registry = core::UnistylesRegistry::get();
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
return;
|
15
|
-
}
|
16
|
-
|
17
|
-
shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
|
18
|
-
// we could iterate via updates and create multiple commits
|
19
|
-
// but it can cause performance issues for hundreds of nodes
|
20
|
-
// so let's mutate Shadow Tree in single transaction
|
21
|
-
auto transaction = [&](const RootShadowNode& oldRootShadowNode) {
|
22
|
-
auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
|
23
|
-
auto newRootNode = std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
|
24
|
-
oldRootShadowNode,
|
25
|
-
updates,
|
26
|
-
affectedNodes
|
27
|
-
));
|
28
|
-
|
29
|
-
// set unistyles trait
|
30
|
-
auto unistylesRootNode = std::reinterpret_pointer_cast<core::UnistylesCommitShadowNode>(newRootNode);
|
31
|
-
|
32
|
-
unistylesRootNode->addUnistylesCommitTrait();
|
33
|
-
|
34
|
-
return newRootNode;
|
35
|
-
};
|
36
|
-
|
37
|
-
// commit once!
|
38
|
-
// CommitOptions:
|
39
|
-
// enableStateReconciliation: https://reactnative.dev/architecture/render-pipeline#react-native-renderer-state-updates
|
40
|
-
// mountSynchronously: must be true as this is update from C++ not React
|
41
|
-
shadowTree.commit(transaction, {false, true});
|
11
|
+
|
12
|
+
registry.trafficController.withLock([&](){
|
13
|
+
auto updates = registry.trafficController.getUpdates();
|
42
14
|
|
15
|
+
if (updates.empty()) {
|
16
|
+
return;
|
17
|
+
}
|
43
18
|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
19
|
+
shadowTreeRegistry.enumerate([&updates](const ShadowTree& shadowTree, bool& stop){
|
20
|
+
// we could iterate via updates and create multiple commits
|
21
|
+
// but it can cause performance issues for hundreds of nodes
|
22
|
+
// so let's mutate Shadow Tree in single transaction
|
23
|
+
auto transaction = [&](const RootShadowNode& oldRootShadowNode) {
|
24
|
+
auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(oldRootShadowNode, updates);
|
25
|
+
auto newRootNode = std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
|
26
|
+
oldRootShadowNode,
|
27
|
+
updates,
|
28
|
+
affectedNodes
|
29
|
+
));
|
30
|
+
|
31
|
+
// set unistyles trait
|
32
|
+
auto unistylesRootNode = std::reinterpret_pointer_cast<core::UnistylesCommitShadowNode>(newRootNode);
|
33
|
+
|
34
|
+
unistylesRootNode->addUnistylesCommitTrait();
|
35
|
+
|
36
|
+
return newRootNode;
|
37
|
+
};
|
38
|
+
|
39
|
+
// commit once!
|
40
|
+
// CommitOptions:
|
41
|
+
// enableStateReconciliation: https://reactnative.dev/architecture/render-pipeline#react-native-renderer-state-updates
|
42
|
+
// mountSynchronously: must be true as this is update from C++ not React
|
43
|
+
shadowTree.commit(transaction, {false, true});
|
44
|
+
|
45
|
+
|
46
|
+
// for now we're assuming single surface, can be improved in the future
|
47
|
+
// stop = true means stop enumerating next shadow tree
|
48
|
+
// so in other words first shadow tree is our desired tree
|
49
|
+
stop = true;
|
50
|
+
});
|
48
51
|
});
|
49
52
|
}
|
50
53
|
|
@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.Animated = void 0;
|
7
7
|
var _reactNative = require("react-native");
|
8
|
-
var _View = require("./View");
|
9
|
-
var _Text = require("./Text");
|
10
8
|
var _FlatList = require("./FlatList");
|
11
9
|
var _Image = require("./Image");
|
12
10
|
var _ScrollView = require("./ScrollView");
|
13
11
|
var _SectionList = require("./SectionList");
|
12
|
+
var _Text = require("./Text");
|
13
|
+
var _View = require("./View");
|
14
14
|
const Animated = exports.Animated = {
|
15
15
|
..._reactNative.Animated,
|
16
16
|
View: _reactNative.Animated.createAnimatedComponent(_View.View),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_reactNative","require","
|
1
|
+
{"version":3,"names":["_reactNative","require","_FlatList","_Image","_ScrollView","_SectionList","_Text","_View","Animated","exports","RNAnimated","View","createAnimatedComponent","Text","FlatList","Image","ScrollView","SectionList"],"sourceRoot":"../../../../src","sources":["components/native/Animated.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,YAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,KAAA,GAAAN,OAAA;AAEO,MAAMO,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACpB,GAAGE,qBAAU;EACbC,IAAI,EAAED,qBAAU,CAACE,uBAAuB,CAACD,UAAI,CAAC;EAC9CE,IAAI,EAAEH,qBAAU,CAACE,uBAAuB,CAACC,UAAI,CAAC;EAC9CC,QAAQ,EAAEJ,qBAAU,CAACE,uBAAuB,CAACE,kBAAQ,CAAC;EACtDC,KAAK,EAAEL,qBAAU,CAACE,uBAAuB,CAACG,YAAK,CAAC;EAChDC,UAAU,EAAEN,qBAAU,CAACE,uBAAuB,CAACI,sBAAU,CAAC;EAC1DC,WAAW,EAAEP,qBAAU,CAACE,uBAAuB,CAACK,wBAAW;AAC/D,CAAC","ignoreList":[]}
|
@@ -7,9 +7,9 @@ exports.ImageBackground = void 0;
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
8
8
|
var _reactNative = require("react-native");
|
9
9
|
var _core = require("../../core");
|
10
|
-
var _utils = require("../../
|
10
|
+
var _utils = require("../../utils");
|
11
11
|
var _web = require("../../web");
|
12
|
-
var _utils2 = require("../../utils");
|
12
|
+
var _utils2 = require("../../web/utils");
|
13
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
15
15
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
@@ -18,39 +18,35 @@ const UnistylesImageBackground = /*#__PURE__*/(0, _react.forwardRef)((props, for
|
|
18
18
|
let storedImageRef = null;
|
19
19
|
const styleClassNames = (0, _core.getClassName)(props.style);
|
20
20
|
const imageClassNames = (0, _core.getClassName)(props.imageStyle);
|
21
|
-
return (
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
imageStyle: imageClassNames,
|
28
|
-
ref: (0, _utils.isServer)() ? undefined : ref => {
|
29
|
-
if (!ref) {
|
30
|
-
// @ts-expect-error hidden from TS
|
31
|
-
_web.UnistylesShadowRegistry.remove(storedRef, styleClassNames?.hash);
|
32
|
-
}
|
33
|
-
storedRef = ref;
|
21
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ImageBackground, {
|
22
|
+
...props,
|
23
|
+
style: styleClassNames,
|
24
|
+
imageStyle: imageClassNames,
|
25
|
+
ref: (0, _utils2.isServer)() ? undefined : ref => {
|
26
|
+
if (!ref) {
|
34
27
|
// @ts-expect-error hidden from TS
|
35
|
-
_web.UnistylesShadowRegistry.
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
}
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
28
|
+
_web.UnistylesShadowRegistry.remove(storedRef, styleClassNames?.hash);
|
29
|
+
}
|
30
|
+
storedRef = ref;
|
31
|
+
// @ts-expect-error hidden from TS
|
32
|
+
_web.UnistylesShadowRegistry.add(ref, styleClassNames?.hash);
|
33
|
+
if (typeof forwardedRef === 'function') {
|
34
|
+
return forwardedRef(ref);
|
35
|
+
}
|
36
|
+
if (forwardedRef) {
|
37
|
+
forwardedRef.current = ref;
|
38
|
+
}
|
39
|
+
},
|
40
|
+
imageRef: (0, _utils2.isServer)() ? undefined : ref => {
|
41
|
+
if (!ref) {
|
49
42
|
// @ts-expect-error hidden from TS
|
50
|
-
_web.UnistylesShadowRegistry.
|
43
|
+
_web.UnistylesShadowRegistry.remove(storedImageRef, imageClassNames?.hash);
|
51
44
|
}
|
52
|
-
|
53
|
-
|
45
|
+
storedImageRef = ref;
|
46
|
+
// @ts-expect-error hidden from TS
|
47
|
+
_web.UnistylesShadowRegistry.add(ref, imageClassNames?.hash);
|
48
|
+
}
|
49
|
+
});
|
54
50
|
});
|
55
|
-
const ImageBackground = exports.ImageBackground = (0,
|
51
|
+
const ImageBackground = exports.ImageBackground = (0, _utils.copyComponentProperties)(_reactNative.ImageBackground, UnistylesImageBackground);
|
56
52
|
//# sourceMappingURL=ImageBackground.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_utils","_web","_utils2","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","UnistylesImageBackground","forwardRef","props","forwardedRef","storedRef","storedImageRef","styleClassNames","getClassName","style","imageClassNames","imageStyle","jsx","ImageBackground","ref","isServer","undefined","UnistylesShadowRegistry","remove","hash","add","current","imageRef","exports","copyComponentProperties","NativeImageBackground"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_utils","_web","_utils2","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","UnistylesImageBackground","forwardRef","props","forwardedRef","storedRef","storedImageRef","styleClassNames","getClassName","style","imageClassNames","imageStyle","jsx","ImageBackground","ref","isServer","undefined","UnistylesShadowRegistry","remove","hash","add","current","imageRef","exports","copyComponentProperties","NativeImageBackground"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,IAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAA0C,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAO,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAT,wBAAAS,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAO1C,MAAMW,wBAAwB,gBAAG,IAAAC,iBAAU,EAAiB,CAACC,KAAK,EAAEC,YAAY,KAAK;EACjF,IAAIC,SAAuC,GAAG,IAAI;EAClD,IAAIC,cAA4C,GAAG,IAAI;EACvD,MAAMC,eAAe,GAAG,IAAAC,kBAAY,EAACL,KAAK,CAACM,KAAK,CAAC;EACjD,MAAMC,eAAe,GAAG,IAAAF,kBAAY,EAACL,KAAK,CAACQ,UAAU,CAAC;EAEtD,oBACI,IAAA/B,WAAA,CAAAgC,GAAA,EAACrC,YAAA,CAAAsC,eAAqB;IAAA,GACdV,KAAK;IACTM,KAAK,EAAEF,eAAwC;IAC/CI,UAAU,EAAED,eAAyC;IACrDI,GAAG,EAAE,IAAAC,gBAAQ,EAAC,CAAC,GAAGC,SAAS,GAAGF,GAAG,IAAI;MACjC,IAAI,CAACA,GAAG,EAAE;QACN;QACAG,4BAAuB,CAACC,MAAM,CAACb,SAAS,EAAEE,eAAe,EAAEY,IAAI,CAAC;MACpE;MAEAd,SAAS,GAAGS,GAAG;MACf;MACAG,4BAAuB,CAACG,GAAG,CAACN,GAAG,EAAEP,eAAe,EAAEY,IAAI,CAAC;MAEvD,IAAI,OAAOf,YAAY,KAAK,UAAU,EAAE;QACpC,OAAOA,YAAY,CAACU,GAAG,CAAC;MAC5B;MAEA,IAAIV,YAAY,EAAE;QACdA,YAAY,CAACiB,OAAO,GAAGP,GAAG;MAC9B;IACJ,CAAE;IACFQ,QAAQ,EAAE,IAAAP,gBAAQ,EAAC,CAAC,GAAGC,SAAS,GAAGF,GAAG,IAAI;MACtC,IAAI,CAACA,GAAG,EAAE;QACN;QACAG,4BAAuB,CAACC,MAAM,CAACZ,cAAc,EAAEI,eAAe,EAAES,IAAI,CAAC;MACzE;MAEAb,cAAc,GAAGQ,GAAG;MACpB;MACAG,4BAAuB,CAACG,GAAG,CAACN,GAAG,EAAEJ,eAAe,EAAES,IAAI,CAAC;IAC3D;EAAE,CACL,CAAC;AAEV,CAAC,CAAC;AAEK,MAAMN,eAAe,GAAAU,OAAA,CAAAV,eAAA,GAAG,IAAAW,8BAAuB,EAACC,4BAAqB,EAAExB,wBAAwB,CAAC","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","require","_core","LeanText","forwardRef","props","ref","createElement","displayName","NativeText","exports","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeText.native.tsx"],"mappings":";;;;;;
|
1
|
+
{"version":3,"names":["_react","require","_core","LeanText","forwardRef","props","ref","createElement","displayName","NativeText","exports","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeText.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA;AACA,MAAME,QAAQ,gBAAG,IAAAC,iBAAU,EAAC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACxC,oBAAO,IAAAC,oBAAa,EAAC,SAAS,EAAE;IAAE,GAAGF,KAAK;IAAEC;EAAI,CAAC,CAAC;AACtD,CAAC,CAA6B;AAE9BH,QAAQ,CAACK,WAAW,GAAG,SAAS;AAEzB,MAAMC,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG,IAAAE,4BAAsB,EAACR,QAAQ,CAAC","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","require","_core","LeanView","forwardRef","props","ref","createElement","displayName","_default","exports","default","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeView.native.tsx"],"mappings":";;;;;;
|
1
|
+
{"version":3,"names":["_react","require","_core","LeanView","forwardRef","props","ref","createElement","displayName","_default","exports","default","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/NativeView.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,KAAA,GAAAD,OAAA;AAEA;AACA,MAAME,QAAQ,gBAAG,IAAAC,iBAAU,EAAC,CAACC,KAAK,EAAEC,GAAG,KAAK;EACxC,oBAAO,IAAAC,oBAAa,EAAC,SAAS,EAAE;IAAE,GAAGF,KAAK;IAAEC;EAAI,CAAC,CAAC;AACtD,CAAC,CAA6B;AAE9BH,QAAQ,CAACK,WAAW,GAAG,SAAS;;AAEhC;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACe,IAAAC,4BAAsB,EAACT,QAAQ,CAAC","ignoreList":[]}
|
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.Pressable = void 0;
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
8
8
|
var _reactNative = require("react-native");
|
9
|
-
var _specs = require("../../specs");
|
10
9
|
var _core = require("../../core");
|
10
|
+
var _specs = require("../../specs");
|
11
11
|
var _utils = require("../../web/utils");
|
12
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
13
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_specs","_utils","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Pressable","exports","forwardRef","style","props","forwardedRef","scopedTheme","UnistylesShadowRegistry","getScopedTheme","storedRef","classNames","undefined","jsx","ref","isServer","add","hash","current","state","styleResult","previousScopedTheme","setScopedTheme","remove","getClassName"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.tsx"],"mappings":"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","ignoreList":[]}
|
@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.Pressable = void 0;
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
8
8
|
var _reactNative = require("react-native");
|
9
|
-
var _specs = require("../../specs");
|
10
9
|
var _core = require("../../core");
|
10
|
+
var _specs = require("../../specs");
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
12
12
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
13
13
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
14
14
|
const getStyles = (styleProps = {}) => {
|
15
|
-
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('
|
15
|
+
const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
|
16
16
|
if (!unistyleKey) {
|
17
17
|
return styleProps;
|
18
18
|
}
|
19
19
|
return {
|
20
20
|
// styles without C++ state
|
21
21
|
...styleProps[unistyleKey].uni__getStyles(),
|
22
|
-
[unistyleKey]: styleProps[unistyleKey]
|
22
|
+
[unistyleKey]: styleProps[unistyleKey]
|
23
23
|
};
|
24
24
|
};
|
25
25
|
const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
|
@@ -27,7 +27,8 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
|
|
27
27
|
style,
|
28
28
|
...props
|
29
29
|
}, forwardedRef) => {
|
30
|
-
const storedRef = (0, _react.useRef)();
|
30
|
+
const storedRef = (0, _react.useRef)(null);
|
31
|
+
const scopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
|
31
32
|
(0, _react.useLayoutEffect)(() => {
|
32
33
|
return () => {
|
33
34
|
if (storedRef.current) {
|
@@ -39,27 +40,33 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
|
|
39
40
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
|
40
41
|
...props,
|
41
42
|
ref: ref => {
|
42
|
-
const
|
43
|
+
const isPropStyleAFunction = typeof style === 'function';
|
44
|
+
const unistyles = isPropStyleAFunction ? style.call(style, {
|
43
45
|
pressed: false
|
44
|
-
}) : style;
|
45
|
-
|
46
|
-
// @ts-expect-error - this is hidden from TS
|
47
|
-
_specs.UnistylesShadowRegistry.add(ref, unistyles);
|
46
|
+
}) : getStyles(style);
|
48
47
|
if (ref) {
|
49
48
|
storedRef.current = ref;
|
50
49
|
}
|
50
|
+
|
51
|
+
// @ts-expect-error - this is hidden from TS
|
52
|
+
_specs.UnistylesShadowRegistry.add(storedRef.current, unistyles);
|
51
53
|
return (0, _core.passForwardedRef)(props, ref, forwardedRef);
|
52
54
|
},
|
53
55
|
style: state => {
|
54
|
-
const
|
56
|
+
const isPropStyleAFunction = typeof style === 'function';
|
57
|
+
const previousScopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
|
58
|
+
_specs.UnistylesShadowRegistry.setScopedTheme(scopedTheme);
|
59
|
+
const unistyles = isPropStyleAFunction ? style.call(style, state) : getStyles(style);
|
55
60
|
if (!storedRef.current) {
|
56
61
|
return unistyles;
|
57
62
|
}
|
58
63
|
|
59
64
|
// @ts-expect-error - this is hidden from TS
|
60
65
|
_specs.UnistylesShadowRegistry.remove(storedRef.current);
|
66
|
+
|
61
67
|
// @ts-expect-error - this is hidden from TS
|
62
68
|
_specs.UnistylesShadowRegistry.add(storedRef.current, unistyles);
|
69
|
+
_specs.UnistylesShadowRegistry.setScopedTheme(previousScopedTheme);
|
63
70
|
return unistyles;
|
64
71
|
}
|
65
72
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_core","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getStyles","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","Pressable","exports","forwardRef","variants","style","props","forwardedRef","storedRef","useRef","scopedTheme","UnistylesShadowRegistry","getScopedTheme","useLayoutEffect","current","remove","jsx","ref","isPropStyleAFunction","unistyles","pressed","add","passForwardedRef","state","previousScopedTheme","setScopedTheme"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":"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","ignoreList":[]}
|
@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.createUnistylesElement = void 0;
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
8
|
-
var
|
9
|
-
var _utils = require("../web/utils");
|
8
|
+
var _utils = require("../utils");
|
10
9
|
var _web = require("../web");
|
10
|
+
var _utils2 = require("../web/utils");
|
11
|
+
var _getClassname = require("./getClassname");
|
11
12
|
var _warn = require("./warn");
|
12
|
-
var _utils2 = require("../utils");
|
13
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
14
14
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
15
15
|
const createUnistylesElement = Component => {
|
@@ -19,7 +19,7 @@ const createUnistylesElement = Component => {
|
|
19
19
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
|
20
20
|
...props,
|
21
21
|
style: classNames,
|
22
|
-
ref: (0,
|
22
|
+
ref: (0, _utils2.isServer)() ? undefined : ref => {
|
23
23
|
// @ts-ignore we don't know the type of the component
|
24
24
|
(0, _warn.maybeWarnAboutMultipleUnistyles)(props.style, Component.displayName);
|
25
25
|
if (!ref) {
|
@@ -38,7 +38,7 @@ const createUnistylesElement = Component => {
|
|
38
38
|
}
|
39
39
|
});
|
40
40
|
});
|
41
|
-
return (0,
|
41
|
+
return (0, _utils.copyComponentProperties)(Component, UnistylesComponent);
|
42
42
|
};
|
43
43
|
exports.createUnistylesElement = createUnistylesElement;
|
44
44
|
//# sourceMappingURL=createUnistylesElement.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_utils","_web","_utils2","_getClassname","_warn","_jsxRuntime","e","__esModule","default","createUnistylesElement","Component","UnistylesComponent","React","forwardRef","props","forwardedRef","storedRef","classNames","getClassName","style","jsx","ref","isServer","undefined","maybeWarnAboutMultipleUnistyles","displayName","UnistylesShadowRegistry","remove","hash","add","current","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AAAwD,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,uBAAAQ,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAMjD,MAAMG,sBAAsB,GAAIC,SAAc,IAAK;EACtD,MAAMC,kBAAkB,gBAAGC,cAAK,CAACC,UAAU,CAA0B,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC1F,IAAIC,SAA6B,GAAG,IAAI;IACxC,MAAMC,UAAU,GAAG,IAAAC,0BAAY,EAACJ,KAAK,CAACK,KAAK,CAAC;IAE5C,oBACI,IAAAd,WAAA,CAAAe,GAAA,EAACV,SAAS;MAAA,GACFI,KAAK;MACTK,KAAK,EAAEF,UAAW;MAClBI,GAAG,EAAE,IAAAC,gBAAQ,EAAC,CAAC,GAAGC,SAAS,GAAIF,GAAuB,IAAK;QACvD;QACA,IAAAG,qCAA+B,EAACV,KAAK,CAACK,KAAK,EAAET,SAAS,CAACe,WAAW,CAAC;QAEnE,IAAI,CAACJ,GAAG,EAAE;UACN;UACAK,4BAAuB,CAACC,MAAM,CAACX,SAAS,EAAEC,UAAU,EAAEW,IAAI,CAAC;QAC/D;QAEAZ,SAAS,GAAGK,GAAG;QACf;QACAK,4BAAuB,CAACG,GAAG,CAACR,GAAG,EAAEJ,UAAU,EAAEW,IAAI,CAAC;QAElD,IAAI,OAAOb,YAAY,KAAK,UAAU,EAAE;UACpC,OAAOA,YAAY,CAACM,GAAG,CAAC;QAC5B;QAEA,IAAIN,YAAY,EAAE;UACdA,YAAY,CAACe,OAAO,GAAGT,GAAG;QAC9B;MACJ;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAO,IAAAU,8BAAuB,EAACrB,SAAS,EAAEC,kBAAkB,CAAC;AACjE,CAAC;AAAAqB,OAAA,CAAAvB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
|
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.createUnistylesElement = void 0;
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
8
8
|
var _specs = require("../specs");
|
9
|
+
var _utils = require("../utils");
|
9
10
|
var _passForwardRef = require("./passForwardRef");
|
10
11
|
var _warn = require("./warn");
|
11
|
-
var _utils = require("../utils");
|
12
12
|
var _jsxRuntime = require("react/jsx-runtime");
|
13
13
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
14
14
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
@@ -45,6 +45,10 @@ const createUnistylesElement = Component => {
|
|
45
45
|
|
46
46
|
// @ts-ignore we don't know the type of the component
|
47
47
|
(0, _warn.maybeWarnAboutMultipleUnistyles)(props.style, Component.displayName);
|
48
|
+
return () => {
|
49
|
+
// @ts-ignore
|
50
|
+
_specs.UnistylesShadowRegistry.remove(ref);
|
51
|
+
};
|
48
52
|
}
|
49
53
|
});
|
50
54
|
});
|