react-native-unistyles 3.0.0-nightly-20250208 → 3.0.0-nightly-20250213

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.
Files changed (77) hide show
  1. package/README.md +3 -0
  2. package/android/CMakeLists.txt +1 -1
  3. package/android/src/main/java/com/unistyles/NativePlatform+android.kt +4 -0
  4. package/android/src/main/java/com/unistyles/NativePlatform+insets.kt +20 -1
  5. package/android/src/main/java/com/unistyles/NativePlatform+listener.kt +4 -0
  6. package/android/src/main/java/com/unistyles/UnistylesModule.kt +5 -0
  7. package/cxx/core/HashGenerator.cpp +1 -1
  8. package/cxx/core/HostUnistyle.cpp +15 -5
  9. package/cxx/core/HostUnistyle.h +1 -0
  10. package/cxx/core/UnistyleWrapper.h +6 -6
  11. package/cxx/core/UnistylesCommitHook.cpp +20 -17
  12. package/cxx/core/UnistylesRegistry.cpp +8 -6
  13. package/cxx/shadowTree/ShadowTrafficController.h +10 -4
  14. package/cxx/shadowTree/ShadowTreeManager.cpp +38 -35
  15. package/lib/commonjs/components/native/Pressable.native.js +8 -1
  16. package/lib/commonjs/components/native/Pressable.native.js.map +1 -1
  17. package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js +2 -2
  18. package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
  19. package/lib/commonjs/core/warn.js +1 -1
  20. package/lib/commonjs/core/withUnistyles/withUnistyles.js +1 -1
  21. package/lib/commonjs/core/withUnistyles/withUnistyles.js.map +1 -1
  22. package/lib/commonjs/core/withUnistyles/withUnistyles.native.js +4 -2
  23. package/lib/commonjs/core/withUnistyles/withUnistyles.native.js.map +1 -1
  24. package/lib/commonjs/web/convert/index.js +1 -1
  25. package/lib/commonjs/web/convert/index.js.map +1 -1
  26. package/lib/commonjs/web/utils/common.js +1 -1
  27. package/lib/commonjs/web/utils/unistyle.js +3 -3
  28. package/lib/module/components/native/Pressable.native.js +8 -1
  29. package/lib/module/components/native/Pressable.native.js.map +1 -1
  30. package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js +2 -2
  31. package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map +1 -1
  32. package/lib/module/core/warn.js +1 -1
  33. package/lib/module/core/withUnistyles/withUnistyles.js +1 -1
  34. package/lib/module/core/withUnistyles/withUnistyles.js.map +1 -1
  35. package/lib/module/core/withUnistyles/withUnistyles.native.js +5 -3
  36. package/lib/module/core/withUnistyles/withUnistyles.native.js.map +1 -1
  37. package/lib/module/web/convert/index.js +1 -1
  38. package/lib/module/web/convert/index.js.map +1 -1
  39. package/lib/module/web/utils/common.js +1 -1
  40. package/lib/module/web/utils/unistyle.js +3 -3
  41. package/lib/typescript/src/components/native/Pressable.native.d.ts.map +1 -1
  42. package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts +2 -1
  43. package/lib/typescript/src/core/useProxifiedUnistyles/useProxifiedUnistyles.d.ts.map +1 -1
  44. package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map +1 -1
  45. package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.hpp +1 -1
  46. package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt +23 -39
  47. package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/unistylesOnLoad.kt +35 -0
  48. package/nitrogen/generated/ios/Unistyles+autolinking.rb +2 -0
  49. package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp +1 -1
  50. package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp +3 -1
  51. package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift +2 -3
  52. package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift +18 -18
  53. package/nitrogen/generated/shared/c++/ColorScheme.hpp +1 -1
  54. package/nitrogen/generated/shared/c++/Dimensions.hpp +1 -1
  55. package/nitrogen/generated/shared/c++/HybridNativePlatformSpec.hpp +1 -1
  56. package/nitrogen/generated/shared/c++/HybridUnistylesNavigationBarSpec.hpp +1 -1
  57. package/nitrogen/generated/shared/c++/HybridUnistylesRuntimeSpec.hpp +1 -1
  58. package/nitrogen/generated/shared/c++/HybridUnistylesShadowRegistrySpec.hpp +1 -1
  59. package/nitrogen/generated/shared/c++/HybridUnistylesStatusBarSpec.hpp +1 -1
  60. package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp +1 -1
  61. package/nitrogen/generated/shared/c++/Insets.hpp +1 -1
  62. package/nitrogen/generated/shared/c++/Orientation.hpp +1 -1
  63. package/nitrogen/generated/shared/c++/UnistyleDependency.hpp +1 -1
  64. package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp +1 -1
  65. package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp +1 -1
  66. package/package.json +3 -3
  67. package/plugin/import.js +1 -1
  68. package/plugin/index.js +2 -2
  69. package/plugin/stylesheet.js +2 -2
  70. package/src/components/native/Pressable.native.tsx +9 -1
  71. package/src/core/useProxifiedUnistyles/useProxifiedUnistyles.ts +2 -2
  72. package/src/core/warn.ts +1 -1
  73. package/src/core/withUnistyles/withUnistyles.native.tsx +6 -4
  74. package/src/core/withUnistyles/withUnistyles.tsx +1 -1
  75. package/src/web/convert/index.ts +1 -1
  76. package/src/web/utils/common.ts +1 -1
  77. package/src/web/utils/unistyle.ts +3 -3
package/README.md CHANGED
@@ -74,6 +74,9 @@ Then follow [installation guides](https://unistyl.es/v3/start/getting-started) f
74
74
  <a href="https://github.com/4cc3ssX">
75
75
  <img src="https://avatars.githubusercontent.com/u/57473799?v=4" height="70px" width="70px" alt="4cc3ssX" />
76
76
  </a>
77
+ <a href="https://github.com/dacoto97">
78
+ <img src="https://avatars.githubusercontent.com/u/16915053?v=4" height="70px" width="70px" alt="dacoto97" />
79
+ </a>
77
80
 
78
81
  ## Past sponsors
79
82
 
@@ -23,7 +23,7 @@ include_directories(
23
23
  ../cxx/shadowTree
24
24
  )
25
25
 
26
- string(APPEND CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
26
+ string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
27
27
 
28
28
  set_target_properties(unistyles PROPERTIES
29
29
  CXX_STANDARD 20
@@ -6,11 +6,13 @@ import android.os.Build
6
6
  import android.util.DisplayMetrics
7
7
  import android.view.View
8
8
  import android.view.WindowManager
9
+ import androidx.annotation.Keep
9
10
  import androidx.core.text.TextUtilsCompat
10
11
  import androidx.core.view.ViewCompat
11
12
  import androidx.core.view.WindowCompat
12
13
  import androidx.core.view.WindowInsetsCompat
13
14
  import androidx.core.view.WindowInsetsControllerCompat
15
+ import com.facebook.proguard.annotations.DoNotStrip
14
16
  import com.facebook.react.bridge.LifecycleEventListener
15
17
  import com.facebook.react.bridge.ReactApplicationContext
16
18
  import com.margelo.nitro.unistyles.ColorScheme
@@ -22,6 +24,8 @@ import com.margelo.nitro.unistyles.UnistyleDependency
22
24
  import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
23
25
  import java.util.Locale
24
26
 
27
+ @Keep
28
+ @DoNotStrip
25
29
  class NativePlatformAndroid(private val reactContext: ReactApplicationContext): HybridNativePlatformSpec(), LifecycleEventListener {
26
30
  private val _insets = NativePlatformInsets(reactContext, this::getMiniRuntime) { this.diffMiniRuntime() }
27
31
  private var _miniRuntime: UnistylesNativeMiniRuntime = buildMiniRuntime()
@@ -5,9 +5,11 @@ import android.os.Build
5
5
  import android.view.View
6
6
  import android.view.Window
7
7
  import android.view.WindowManager
8
+ import androidx.annotation.Keep
8
9
  import androidx.core.view.ViewCompat
9
10
  import androidx.core.view.WindowInsetsAnimationCompat
10
11
  import androidx.core.view.WindowInsetsCompat
12
+ import com.facebook.proguard.annotations.DoNotStrip
11
13
  import com.facebook.react.bridge.ReactApplicationContext
12
14
  import com.margelo.nitro.unistyles.Insets
13
15
  import com.margelo.nitro.unistyles.UnistyleDependency
@@ -15,6 +17,8 @@ import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
15
17
 
16
18
  typealias CxxImeListener = (miniRuntime: UnistylesNativeMiniRuntime) -> Unit
17
19
 
20
+ @Keep
21
+ @DoNotStrip
18
22
  class NativePlatformInsets(
19
23
  private val reactContext: ReactApplicationContext,
20
24
  private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
@@ -23,6 +27,17 @@ class NativePlatformInsets(
23
27
  private val _imeListeners: MutableList<CxxImeListener> = mutableListOf()
24
28
  private var _insets: Insets = Insets(0.0, 0.0, 0.0, 0.0, 0.0)
25
29
 
30
+ init {
31
+ // get initial insets
32
+ reactContext.currentActivity?.let { activity ->
33
+ val insets = ViewCompat.getRootWindowInsets(activity.window.decorView)
34
+
35
+ insets?.let { windowInsets ->
36
+ setInsets(windowInsets, activity.window, null, true)
37
+ }
38
+ }
39
+ }
40
+
26
41
  fun onDestroy() {
27
42
  this.removeImeListeners()
28
43
  }
@@ -39,7 +54,7 @@ class NativePlatformInsets(
39
54
  )
40
55
  }
41
56
 
42
- fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?) {
57
+ fun setInsets(insetsCompat: WindowInsetsCompat, window: Window, animatedBottomInsets: Double?, skipUpdate: Boolean = false) {
43
58
  // below Android 11, we need to use window flags to detect status bar visibility
44
59
  val isStatusBarVisible = when(Build.VERSION.SDK_INT) {
45
60
  in 30..Int.MAX_VALUE -> {
@@ -86,6 +101,10 @@ class NativePlatformInsets(
86
101
  imeInsets
87
102
  )
88
103
 
104
+ if (skipUpdate) {
105
+ return
106
+ }
107
+
89
108
  diffMiniRuntime()
90
109
 
91
110
  if (shouldEmitImeEvent) {
@@ -6,12 +6,16 @@ import android.content.Intent
6
6
  import android.content.IntentFilter
7
7
  import android.os.Handler
8
8
  import android.os.Looper
9
+ import androidx.annotation.Keep
10
+ import com.facebook.proguard.annotations.DoNotStrip
9
11
  import com.facebook.react.bridge.ReactApplicationContext
10
12
  import com.margelo.nitro.unistyles.UnistyleDependency
11
13
  import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
12
14
 
13
15
  typealias CxxDependencyListener = (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit
14
16
 
17
+ @Keep
18
+ @DoNotStrip
15
19
  class NativePlatformListener(
16
20
  private val reactContext: ReactApplicationContext,
17
21
  private val getMiniRuntime: () -> UnistylesNativeMiniRuntime,
@@ -11,6 +11,7 @@ import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
11
11
  import com.facebook.react.uimanager.UIManagerHelper
12
12
  import com.facebook.react.uimanager.common.UIManagerType
13
13
  import com.margelo.nitro.unistyles.HybridNativePlatformSpec
14
+ import com.margelo.nitro.unistyles.unistylesOnLoad.Companion.initializeNative
14
15
 
15
16
  @Suppress("KotlinJniMissingFunction")
16
17
  class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistylesSpec(reactContext), TurboModuleWithJSIBindings {
@@ -20,6 +21,10 @@ class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistyl
20
21
 
21
22
  companion object {
22
23
  const val NAME = NativeTurboUnistylesSpec.NAME
24
+
25
+ init {
26
+ initializeNative()
27
+ }
23
28
  }
24
29
 
25
30
  init {
@@ -17,7 +17,7 @@ std::string HashGenerator::generateHash(const std::string& input) {
17
17
  std::stringstream ss;
18
18
  ss << std::hex << std::setfill('0') << std::setw(8) << (combinedHash & 0xFFFFFFFF);
19
19
 
20
- return "unistyles-" + ss.str();
20
+ return "unistyles_" + ss.str();
21
21
  }
22
22
 
23
23
  }
@@ -41,28 +41,38 @@ jsi::Value HostUnistyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId
41
41
  // check if Unistyles recomputed new style in the background
42
42
  // (when no node was mounted), if so we need to simply rebuild unistyle to get fresh data
43
43
  if (unistyle->isDirty) {
44
+ this->_cache.erase(propertyName);
45
+
44
46
  auto parser = parser::Parser(this->_unistylesRuntime);
45
47
 
46
48
  parser.rebuildUnistyle(rt, unistyle, this->_variants, std::nullopt);
47
49
  }
48
-
50
+
49
51
  if (unistyle->type == UnistyleType::DynamicFunction) {
50
52
  // for dynamic functions we will also bind "this"
51
53
  auto styleFn = valueFromUnistyle(rt, this->_unistylesRuntime, unistyle, this->_variants);
52
-
54
+
53
55
  // construct newThis
54
56
  jsi::Object newThis = jsi::Object(rt);
55
57
  newThis.setProperty(rt, helpers::STYLESHEET_VARIANTS.c_str(), helpers::variantsToValue(rt, this->_variants));
56
-
58
+
57
59
  auto functionPrototype = rt.global()
58
60
  .getPropertyAsObject(rt, "Function")
59
61
  .getPropertyAsObject(rt, "prototype")
60
62
  .getPropertyAsFunction(rt, "bind");
61
-
63
+
62
64
  return functionPrototype.callWithThis(rt, styleFn.asObject(rt), newThis);
63
65
  }
64
66
 
65
- return valueFromUnistyle(rt, this->_unistylesRuntime, unistyle, this->_variants);
67
+ if (this->_cache.contains(propertyName)) {
68
+ return jsi::Value(rt, this->_cache[propertyName]);
69
+ }
70
+
71
+ auto style = valueFromUnistyle(rt, this->_unistylesRuntime, unistyle, this->_variants);
72
+
73
+ this->_cache.emplace(propertyName, jsi::Value(rt, style));
74
+
75
+ return style;
66
76
  }
67
77
 
68
78
  void HostUnistyle::set(jsi::Runtime& rt, const jsi::PropNameID& propNameId, const jsi::Value& value) {}
@@ -22,6 +22,7 @@ private:
22
22
  Variants _variants;
23
23
  std::shared_ptr<StyleSheet> _stylesheet;
24
24
  std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
25
+ std::unordered_map<std::string, jsi::Value> _cache;
25
26
  };
26
27
 
27
28
  }
@@ -35,7 +35,7 @@ inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, js
35
35
 
36
36
  inline static std::vector<std::string> getUnistylesHashKeys(jsi::Runtime& rt, jsi::Object& object) {
37
37
  std::vector<std::string> matchingKeys{};
38
- const std::string prefix = "unistyles-";
38
+ const std::string prefix = "unistyles_";
39
39
 
40
40
  auto propertyNames = object.getPropertyNames(rt);
41
41
  size_t length = propertyNames.length(rt);
@@ -82,13 +82,13 @@ inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(
82
82
 
83
83
  You likely altered unistyle hash key and we're not able to recover C++ state attached to this node.)");
84
84
  }
85
-
85
+
86
86
  // someone merged unistyles, and will be warned in JS
87
87
  // the best we can do is to return first unistyle
88
88
  if (unistyles.size() > 1) {
89
89
  return {unistyles.at(0)};
90
90
  }
91
-
91
+
92
92
  return unistyles;
93
93
  }
94
94
 
@@ -137,7 +137,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
137
137
  auto parsedArguments = arguments.has_value()
138
138
  ? helpers::parseDynamicFunctionArguments(rt, arguments.value())
139
139
  : std::optional<std::vector<folly::dynamic>>{};
140
-
140
+
141
141
  if (arguments.has_value()) {
142
142
  // this is required for HybridShadowRegistry::link
143
143
  helpers::defineHiddenProperty(rt, secrets, helpers::ARGUMENTS.c_str(), arguments.value());
@@ -148,7 +148,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
148
148
 
149
149
  // this is required for withUnistyles
150
150
  helpers::defineHiddenProperty(rt, secrets, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
151
-
151
+
152
152
  // this is required for withUnistyles
153
153
  auto hostFn = jsi::Function::createFromHostFunction(
154
154
  rt,
@@ -160,7 +160,7 @@ inline static jsi::Value objectFromUnistyle(jsi::Runtime& rt, std::shared_ptr<Hy
160
160
 
161
161
  return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
162
162
  });
163
-
163
+
164
164
  helpers::defineHiddenProperty(rt, secrets, helpers::GET_STYLES.c_str(), std::move(hostFn));
165
165
 
166
166
  obj.setProperty(rt, unistyleID, secrets);
@@ -29,21 +29,24 @@ RootShadowNode::Unshared core::UnistylesCommitHook::shadowTreeWillCommit(
29
29
  // this is React Native / Reanimated commit
30
30
  // merge Unistyles updates before it completes
31
31
  auto& registry = core::UnistylesRegistry::get();
32
- auto& shadowLeafUpdates = registry.trafficController.getUpdates();
33
-
34
- // oops, no updates from Unistyles yet, skip it!
35
- if (shadowLeafUpdates.size() == 0) {
36
- return newRootShadowNode;
37
- }
38
-
39
- auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates);
40
-
41
- registry.trafficController.stopUnistylesTraffic();
42
-
43
- // we have few updates, so merge it
44
- return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
45
- *rootNode,
46
- shadowLeafUpdates,
47
- affectedNodes
48
- ));
32
+
33
+ return registry.trafficController.withLock([&](){
34
+ auto& shadowLeafUpdates = registry.trafficController.getUpdates();
35
+
36
+ // oops, no updates from Unistyles yet, skip it!
37
+ if (shadowLeafUpdates.size() == 0) {
38
+ return newRootShadowNode;
39
+ }
40
+
41
+ auto affectedNodes = shadow::ShadowTreeManager::findAffectedNodes(*rootNode, shadowLeafUpdates);
42
+
43
+ registry.trafficController.stopUnistylesTraffic();
44
+
45
+ // we have few updates, so merge it
46
+ return std::static_pointer_cast<RootShadowNode>(shadow::ShadowTreeManager::cloneShadowTree(
47
+ *rootNode,
48
+ shadowLeafUpdates,
49
+ affectedNodes
50
+ ));
51
+ });
49
52
  }
@@ -108,12 +108,14 @@ void core::UnistylesRegistry::removeDuplicatedUnistyles(jsi::Runtime& rt, const
108
108
  }
109
109
 
110
110
  void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
111
- this->_shadowRegistry[&rt].erase(shadowNodeFamily);
112
- this->trafficController.removeShadowNode(shadowNodeFamily);
113
-
114
- if (this->_shadowRegistry[&rt].empty()) {
115
- this->_shadowRegistry.erase(&rt);
116
- }
111
+ this->trafficController.withLock([this, &rt, shadowNodeFamily](){
112
+ this->_shadowRegistry[&rt].erase(shadowNodeFamily);
113
+ this->trafficController.removeShadowNode(shadowNodeFamily);
114
+
115
+ if (this->_shadowRegistry[&rt].empty()) {
116
+ this->_shadowRegistry.erase(&rt);
117
+ }
118
+ });
117
119
  }
118
120
 
119
121
  std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Runtime& rt, int unid, core::StyleSheetType type, jsi::Object&& rawValue) {
@@ -21,7 +21,7 @@ struct ShadowTrafficController {
21
21
  }
22
22
 
23
23
  inline shadow::ShadowLeafUpdates& getUpdates() {
24
- std::lock_guard<std::mutex> lock(_mutex);
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
- std::lock_guard<std::mutex> lock(_mutex);
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
- auto updates = registry.trafficController.getUpdates();
12
-
13
- if (updates.empty()) {
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
- // for now we're assuming single surface, can be improved in the future
45
- // stop = true means stop enumerating next shadow tree
46
- // so in other words first shadow tree is our desired tree
47
- stop = true;
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
 
@@ -12,7 +12,7 @@ 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('unistyles-'));
15
+ const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
16
16
  if (!unistyleKey) {
17
17
  return styleProps;
18
18
  }
@@ -39,9 +39,16 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
39
39
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
40
40
  ...props,
41
41
  ref: ref => {
42
+ const isPropStyleAFunction = typeof style === 'function';
43
+ const unistyles = isPropStyleAFunction ? style.call(style, {
44
+ pressed: false
45
+ }) : getStyles(style);
42
46
  if (ref) {
43
47
  storedRef.current = ref;
44
48
  }
49
+
50
+ // @ts-expect-error - this is hidden from TS
51
+ _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles);
45
52
  return (0, _core.passForwardedRef)(props, ref, forwardedRef);
46
53
  },
47
54
  style: state => {
@@ -1 +1 @@
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","useLayoutEffect","current","UnistylesShadowRegistry","remove","jsx","ref","passForwardedRef","state","isPropStyleAFunction","unistyles","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":"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","ignoreList":[]}
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","useLayoutEffect","current","UnistylesShadowRegistry","remove","jsx","ref","isPropStyleAFunction","unistyles","pressed","add","passForwardedRef","state"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":"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","ignoreList":[]}
@@ -29,8 +29,8 @@ const RTDependencyMap = {
29
29
  pixelRatio: _NativePlatform.UnistyleDependency.PixelRatio,
30
30
  themeName: _NativePlatform.UnistyleDependency.ThemeName
31
31
  };
32
- const useProxifiedUnistyles = () => {
33
- const scopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
32
+ const useProxifiedUnistyles = forcedTheme => {
33
+ const scopedTheme = forcedTheme ?? _specs.UnistylesShadowRegistry.getScopedTheme();
34
34
  const [dependencies] = (0, _react.useState)(() => new Set());
35
35
  const [theme, setTheme] = (0, _react.useState)(_specs.UnistylesRuntime.getTheme(scopedTheme));
36
36
  const [_, runtimeChanged] = (0, _react.useReducer)(() => ({}), {});
@@ -1 +1 @@
1
- {"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","useProxifiedUnistyles","scopedTheme","UnistylesShadowRegistry","getScopedTheme","dependencies","useState","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","useEffect","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","useProxifiedUnistyles","forcedTheme","scopedTheme","UnistylesShadowRegistry","getScopedTheme","dependencies","useState","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","useEffect","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.maybeWarnAboutMultipleUnistyles = void 0;
7
7
  const maybeWarnAboutMultipleUnistyles = (style, displayName = 'Unknown') => {
8
8
  if (__DEV__ && style && !Array.isArray(style)) {
9
- const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles-'));
9
+ const unistylesKeys = Object.keys(style).filter(key => key.startsWith('unistyles_'));
10
10
  if (unistylesKeys.length > 1) {
11
11
  console.warn(`Unistyles: we detected style object with ${unistylesKeys.length} unistyles styles. This might cause no updates or unpredictable behavior. Please check style prop for "${displayName}" and use array syntax instead of object syntax.`);
12
12
  }
@@ -33,7 +33,7 @@ const withUnistyles = (Component, mappings) => {
33
33
  style: styleClassNames
34
34
  } : {}),
35
35
  ...(narrowedProps.contentContainerStyle ? {
36
- style: contentContainerStyleClassNames
36
+ contentContainerStyle: contentContainerStyleClassNames
37
37
  } : {})
38
38
  };
39
39
 
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","mappingsProps","unistyleProps","uniProps","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.withUnistyles = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
+ var _specs = require("../../specs");
8
9
  var _utils = require("../../utils");
9
10
  var _useProxifiedUnistyles = require("../useProxifiedUnistyles");
10
11
  var _warn = require("../warn");
@@ -17,7 +18,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
17
18
 
18
19
  const withUnistyles = (Component, mappings) => {
19
20
  const getSecrets = (styleProps = {}) => {
20
- const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles-'));
21
+ const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
21
22
  return unistyleKey ? styleProps[unistyleKey] : {
22
23
  uni__getStyles: () => styleProps,
23
24
  uni__dependencies: []
@@ -31,11 +32,12 @@ const withUnistyles = (Component, mappings) => {
31
32
  (0, _warn.maybeWarnAboutMultipleUnistyles)(narrowedProps.style, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
32
33
  // @ts-ignore we don't know the type of the component
33
34
  (0, _warn.maybeWarnAboutMultipleUnistyles)(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
35
+ const scopedTheme = (0, _react.useRef)(_specs.UnistylesShadowRegistry.getScopedTheme());
34
36
  const {
35
37
  proxifiedRuntime,
36
38
  proxifiedTheme,
37
39
  addDependencies
38
- } = (0, _useProxifiedUnistyles.useProxifiedUnistyles)();
40
+ } = (0, _useProxifiedUnistyles.useProxifiedUnistyles)(scopedTheme.current);
39
41
  (0, _react.useEffect)(() => {
40
42
  const styleSecrets = getSecrets(narrowedProps.style);
41
43
  const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
@@ -1 +1 @@
1
- {"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","uni__dependencies","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","style","displayName","name","contentContainerStyle","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","useEffect","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","uni__dependencies","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","style","displayName","name","contentContainerStyle","scopedTheme","useRef","UnistylesShadowRegistry","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","current","useEffect","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
@@ -20,7 +20,7 @@ const convertUnistyles = value => {
20
20
  ...value._web
21
21
  }).flatMap(([unistylesKey, unistylesValue]) => {
22
22
  // Keys to omit
23
- if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies', '__unistyles-secrets__'].includes(unistylesKey) || unistylesKey.startsWith('variant-')) {
23
+ if (['_classNames', '_web', 'variants', 'compoundVariants', 'uni__dependencies'].includes(unistylesKey) || unistylesKey.startsWith('unistyles_')) {
24
24
  return [];
25
25
  }
26
26