react-native-unistyles 3.5.1 → 3.5.3

package/Unistyles.podspec

@@ -42,6 +42,7 @@ Pod::Spec.new do |s|
     end
 
     add_dependency(s, "React-rendererconsistency", :framework_name => "React_rendererconsistency")
+    add_dependency(s, "React-FabricComponents")
   end
 
   load "nitrogen/generated/ios/Unistyles+autolinking.rb"

package/android/src/main/java/com/unistyles/NativePlatform+android.kt

@@ -3,11 +3,16 @@ package com.unistyles
 import android.os.Build
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Handler
+import android.os.Looper
 import android.util.DisplayMetrics
 import android.view.View
 import android.view.WindowManager
 import androidx.annotation.Keep
+import androidx.core.content.OnConfigurationChangedProvider
 import androidx.core.text.TextUtilsCompat
+import androidx.core.util.Consumer
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -22,6 +27,7 @@ import com.margelo.nitro.unistyles.Insets
 import com.margelo.nitro.unistyles.Orientation
 import com.margelo.nitro.unistyles.UnistyleDependency
 import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
+import java.lang.ref.WeakReference
 import java.util.Locale
 
 @Keep
@@ -30,6 +36,14 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     private val _insets = NativePlatformInsets(reactContext, this::getMiniRuntime) { this.onConfigChange() }
     private var _miniRuntime: UnistylesNativeMiniRuntime = buildMiniRuntime()
     private val _listener = NativePlatformListener(reactContext, this::getMiniRuntime) { this.diffMiniRuntime() }
+    private var _configurationProvider: WeakReference<OnConfigurationChangedProvider>? = null
+    private val _activityConfigurationListener = Consumer<Configuration> {
+        Handler(Looper.getMainLooper()).post { this.onConfigChange() }
+    }
+
+    // Application resources can lag behind configuration changes
+    private val configurationResources: Resources
+        get() = reactContext.currentActivity?.resources ?: reactContext.resources
 
     init {
         checkEdgeToEdge()
@@ -37,12 +51,16 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     }
 
     fun onDestroy() {
+        stopObservingActivityConfiguration()
         _listener.onDestroy()
         _insets.onDestroy()
         reactContext.removeLifecycleEventListener(this)
     }
 
     override fun onHostResume() {
+        observeActivityConfiguration()
+        // catch configuration changes missed while no Activity was attached
+        onConfigChange()
         _insets.getInitialInsets(false)
         _insets.startInsetsListener()
     }
@@ -51,7 +69,26 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
         _insets.stopInsetsListener()
     }
 
-    override fun onHostDestroy() {}
+    override fun onHostDestroy() {
+        stopObservingActivityConfiguration()
+    }
+
+    private fun observeActivityConfiguration() {
+        val provider = reactContext.currentActivity as? OnConfigurationChangedProvider
+
+        if (_configurationProvider?.get() === provider) {
+            return
+        }
+
+        stopObservingActivityConfiguration()
+        provider?.addOnConfigurationChangedListener(_activityConfigurationListener)
+        _configurationProvider = provider?.let { WeakReference(it) }
+    }
+
+    private fun stopObservingActivityConfiguration() {
+        _configurationProvider?.get()?.removeOnConfigurationChangedListener(_activityConfigurationListener)
+        _configurationProvider = null
+    }
 
     override val memorySize: Long
         get() = 0
@@ -61,7 +98,7 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     }
 
     override fun getColorScheme(): ColorScheme {
-        val uiMode = reactContext.resources.configuration.uiMode
+        val uiMode = configurationResources.configuration.uiMode
 
         val colorScheme = when (uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
             Configuration.UI_MODE_NIGHT_YES -> ColorScheme.DARK
@@ -73,15 +110,15 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
     }
 
     override fun getFontScale(): Double {
-        return reactContext.resources.configuration.fontScale.toDouble()
+        return configurationResources.configuration.fontScale.toDouble()
     }
 
     override fun getPixelRatio(): Double {
-        return reactContext.resources.displayMetrics.density.toDouble()
+        return configurationResources.displayMetrics.density.toDouble()
     }
 
     override fun getOrientation(): Orientation {
-        val orientation = when (reactContext.resources.configuration.orientation) {
+        val orientation = when (configurationResources.configuration.orientation) {
             Configuration.ORIENTATION_PORTRAIT -> Orientation.PORTRAIT
             Configuration.ORIENTATION_LANDSCAPE -> Orientation.LANDSCAPE
             else -> Orientation.PORTRAIT
@@ -122,7 +159,7 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
                 return Dimensions(screenWidth, screenHeight)
             }
             else -> {
-                val displayMetrics = reactContext.resources.displayMetrics
+                val displayMetrics = configurationResources.displayMetrics
 
                 reactContext.currentActivity?.windowManager?.currentWindowMetrics?.bounds?.let {
                     val boundsWidth = (it.width() / displayMetrics.density).toDouble()
@@ -157,7 +194,7 @@ class NativePlatformAndroid(private val reactContext: ReactApplicationContext):
             "com.facebook.react.modules.i18nmanager.I18nUtil",
             Context.MODE_PRIVATE
         )
-        val resourcesLocale = reactContext.resources.configuration.locales[0]
+        val resourcesLocale = configurationResources.configuration.locales[0]
         val hasForcedRtl = sharedPrefs.getBoolean("RCTI18nUtil_forceRTL", false)
         // user preferences
         val isRtl = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL

package/android/src/main/java/com/unistyles/NativePlatform+insets.kt

@@ -38,7 +38,7 @@ class NativePlatformInsets(
     }
 
     fun getInsets(): Insets {
-        val density = reactContext.resources.displayMetrics.density
+        val density = (reactContext.currentActivity?.resources ?: reactContext.resources).displayMetrics.density
 
         return Insets(
             this._insets.top / density,

package/cxx/core/UnistylesRegistry.cpp

@@ -407,7 +407,7 @@ core::UnistylesRegistry::OwnedState core::UnistylesRegistry::takeOwnedState() {
     ownedState.styleSheets = std::exchange(this->_styleSheetRegistry, {});
     ownedState.state = std::move(this->_state);
     this->_scopedTheme = std::nullopt;
-    this->_committedTags.clear();
+    this->_committedInstanceHandles.clear();
     _nextStyleSheetTag.store(0);
 
     return ownedState;
@@ -435,10 +435,10 @@ size_t core::UnistylesRegistry::getPendingUpdatesCount() {
     });
 }
 
-void core::UnistylesRegistry::setCommittedTags(std::vector<Tag>&& tags) {
-    this->_committedTags = std::move(tags);
+void core::UnistylesRegistry::setCommittedInstanceHandles(std::vector<InstanceHandle::Shared>&& instanceHandles) {
+    this->_committedInstanceHandles = std::move(instanceHandles);
 }
 
-std::vector<Tag> core::UnistylesRegistry::takeCommittedTags() {
-    return std::exchange(this->_committedTags, {});
+std::vector<InstanceHandle::Shared> core::UnistylesRegistry::takeCommittedInstanceHandles() {
+    return std::exchange(this->_committedInstanceHandles, {});
 }

package/cxx/core/UnistylesRegistry.h

@@ -70,8 +70,8 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     core::Unistyle::Shared getUnistyleById(std::string unistyleID);
     std::vector<LinkedFamilySnapshot> getLinkedFamiliesSnapshot();
     size_t getPendingUpdatesCount();
-    void setCommittedTags(std::vector<Tag>&& tags);
-    std::vector<Tag> takeCommittedTags();
+    void setCommittedInstanceHandles(std::vector<InstanceHandle::Shared>&& instanceHandles);
+    std::vector<InstanceHandle::Shared> takeCommittedInstanceHandles();
 
     // newest installed runtime owns the registry, generation 0 means no owner
     // previous runtime's state is kept aside until it releases ownership, as it may still run JS
@@ -119,7 +119,7 @@ private:
     std::unordered_map<int, std::shared_ptr<core::StyleSheet>> _styleSheetRegistry{};
     std::unordered_map<const ShadowNodeFamily*, LinkedFamily> _shadowRegistry{};
     size_t _sweepThreshold = MIN_SWEEP_THRESHOLD;
-    std::vector<Tag> _committedTags{};
+    std::vector<InstanceHandle::Shared> _committedInstanceHandles{};
 };
 
 inline UnistylesRegistry& UnistylesRegistry::get() {

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -33,8 +33,7 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
             try {
                 auto rawStyle = args[1].asObject(rt).asArray(rt).getValueAtIndex(rt, i);
                 auto rawStyleObj = rawStyle.getObject(rt);
-                auto unistyleHashKeys = core::getUnistylesHashKeys(rt, rawStyleObj);
-                auto secrets = rawStyleObj.getProperty(rt, unistyleHashKeys.at(0).c_str()).asObject(rt);
+                auto secrets = getUnistyleSecrets(rt, rawStyleObj, unistyleWrappers[i]).value();
                 auto secretArguments = secrets.getProperty(rt, helpers::ARGUMENTS.c_str()).asObject(rt).asArray(rt);
 
                 arguments.push_back(helpers::parseDynamicFunctionArguments(rt, secretArguments));
@@ -65,15 +64,14 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
         core::Unistyle::Shared& unistyle = unistyleWrappers[i];
         auto rawStyle = args[1].asObject(rt).asArray(rt).getValueAtIndex(rt, i);
         auto rawStyleObj = rawStyle.getObject(rt);
-        auto unistyleHashKeys = core::getUnistylesHashKeys(rt, rawStyleObj);
+        auto secrets = getUnistyleSecrets(rt, rawStyleObj, unistyle);
         core::Variants variants{};
 
-        if (unistyleHashKeys.size() == 1) {
-            auto secrets = rawStyleObj.getProperty(rt, unistyleHashKeys.at(0).c_str()).asObject(rt);
-            auto hasVariants = secrets.hasProperty(rt, helpers::STYLESHEET_VARIANTS.c_str());
+        if (secrets.has_value()) {
+            auto rawVariants = secrets->getProperty(rt, helpers::STYLESHEET_VARIANTS.c_str());
 
-            if (hasVariants) {
-                variants = helpers::variantsToPairs(rt, secrets.getProperty(rt, helpers::STYLESHEET_VARIANTS.c_str()).asObject(rt));
+            if (rawVariants.isObject()) {
+                variants = helpers::variantsToPairs(rt, rawVariants.asObject(rt));
             }
         }
 
@@ -94,8 +92,18 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
 
         // The shared cache can belong to another view by the time React attaches refs.
         // Restore this view's arguments and variants before saving its native styles.
+        // An object style without variants is the same for every view, so it's reused unless it's stale (dirty).
         if (!unistyleData->parsedStyle.has_value() && unistyle->parsedStyle.has_value()) {
-            parser.rebuildUnistyleWithVariants(rt, unistyleData);
+            auto isSharedStyle = unistyle->type == core::UnistyleType::Object &&
+                unistyle->styleKey != helpers::EXOTIC_STYLE_KEY &&
+                !unistyle->isDirty &&
+                !unistyle->rawValue.hasProperty(rt, "variants");
+
+            if (isSharedStyle) {
+                unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+            } else {
+                parser.rebuildUnistyleWithVariants(rt, unistyleData);
+            }
         }
 
         unistylesData.emplace_back(unistyleData);
@@ -131,6 +139,29 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     return jsi::Value::undefined();
 }
 
+// a style made by Unistyles keeps its secrets (variants, arguments) under the unistyle's id,
+// reading it directly spares enumerating (and converting to strings) every prop of every linked style
+std::optional<jsi::Object> HybridShadowRegistry::getUnistyleSecrets(jsi::Runtime& rt, jsi::Object& style, const core::Unistyle::Shared& unistyle) {
+    // inline and React Native styles have no secrets
+    if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY) {
+        return std::nullopt;
+    }
+
+    auto secrets = style.getProperty(rt, unistyle->unid.c_str());
+
+    if (secrets.isObject()) {
+        return secrets.asObject(rt);
+    }
+
+    auto unistyleHashKeys = core::getUnistylesHashKeys(rt, style);
+
+    if (unistyleHashKeys.size() != 1) {
+        return std::nullopt;
+    }
+
+    return style.getProperty(rt, unistyleHashKeys.at(0).c_str()).asObject(rt);
+}
+
 void HybridShadowRegistry::scheduleShadowTreeUpdate(jsi::Runtime& rt) {
     if (this->_isShadowTreeUpdateScheduled->exchange(true)) {
         return;
@@ -232,12 +263,15 @@ jsi::Value HybridShadowRegistry::verify(jsi::Runtime &rt, const jsi::Value &this
     return shadow::ShadowTreeDiagnostics::verify(rt, this->_unistylesRuntime);
 }
 
-jsi::Value HybridShadowRegistry::takeCommittedTags(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    auto tags = core::UnistylesRegistry::get().takeCommittedTags();
-    auto result = jsi::Array(rt, tags.size());
+// the fibers React created the committed nodes with (weak, null once collected)
+jsi::Value HybridShadowRegistry::takeCommittedInstanceHandles(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
+    auto instanceHandles = core::UnistylesRegistry::get().takeCommittedInstanceHandles();
+    auto result = jsi::Array(rt, instanceHandles.size());
+
+    for (size_t i = 0; i < instanceHandles.size(); i++) {
+        auto& instanceHandle = instanceHandles[i];
 
-    for (size_t i = 0; i < tags.size(); i++) {
-        result.setValueAtIndex(rt, i, jsi::Value(static_cast<double>(tags[i])));
+        result.setValueAtIndex(rt, i, instanceHandle ? instanceHandle->getInstanceHandle(rt) : jsi::Value::null());
     }
 
     return result;

package/cxx/hybridObjects/HybridShadowRegistry.h

@@ -44,7 +44,7 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
                             const jsi::Value& thisValue,
                             const jsi::Value* args,
                             size_t count);
-    jsi::Value takeCommittedTags(jsi::Runtime& rt,
+    jsi::Value takeCommittedInstanceHandles(jsi::Runtime& rt,
                             const jsi::Value& thisValue,
                             const jsi::Value* args,
                             size_t count);
@@ -64,7 +64,7 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
             prototype.registerRawHybridMethod("setScopedTheme", 1, &HybridShadowRegistry::setScopedTheme);
             prototype.registerRawHybridMethod("getScopedTheme", 0, &HybridShadowRegistry::getScopedTheme);
             prototype.registerRawHybridMethod("verify", 0, &HybridShadowRegistry::verify);
-            prototype.registerRawHybridMethod("takeCommittedTags", 0, &HybridShadowRegistry::takeCommittedTags);
+            prototype.registerRawHybridMethod("takeCommittedInstanceHandles", 0, &HybridShadowRegistry::takeCommittedInstanceHandles);
             prototype.registerRawHybridMethod("refreshReactNodes", 1, &HybridShadowRegistry::refreshReactNodes);
         });
     };
@@ -73,6 +73,7 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
 
 private:
     void scheduleShadowTreeUpdate(jsi::Runtime& rt);
+    static std::optional<jsi::Object> getUnistyleSecrets(jsi::Runtime& rt, jsi::Object& style, const core::Unistyle::Shared& unistyle);
 
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
     std::shared_ptr<std::atomic<bool>> _isShadowTreeUpdateScheduled = std::make_shared<std::atomic<bool>>(false);

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -362,14 +362,14 @@ void HybridStyleSheet::applyDependencyChanges(jsi::Runtime& rt, std::vector<Unis
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
     }
 
-    std::vector<Tag> committedTags;
+    std::vector<InstanceHandle::Shared> committedInstanceHandles;
 
     if (!dependencyMap.empty()) {
-        committedTags = shadow::ShadowTreeManager::updateShadowTree(rt);
+        committedInstanceHandles = shadow::ShadowTreeManager::updateShadowTree(rt);
     }
 
     // after the commit, so listeners can point React at the committed nodes
-    registry.setCommittedTags(std::move(committedTags));
+    registry.setCommittedInstanceHandles(std::move(committedInstanceHandles));
     // also when no StyleSheet depends on the change, hooks (useUnistyles, withUnistyles, Display, Hide) may
     this->notifyJSListeners(dependencies);
 }

package/cxx/parser/Parser.cpp

@@ -281,6 +281,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(
     std::unordered_map<std::shared_ptr<StyleSheet>, jsi::Value> parsedStyleSheetsWithDefaultTheme;
     std::unordered_map<std::string, std::unordered_map<std::shared_ptr<StyleSheet>, jsi::Value>> parsedStyleSheetsWithScopedTheme;
     std::unordered_set<std::shared_ptr<core::Unistyle>> parsedUnistyles;
+    std::unordered_set<std::shared_ptr<core::Unistyle>> sharedUnistyles;
 
     // Parse all stylesheets that depend on changes
     for (const auto& styleSheet : styleSheets) {
@@ -355,6 +356,8 @@ void parser::Parser::rebuildUnistylesInDependencyMap(
                 }
 
                 this->rebuildUnistyleWithScopedTheme(rt, parsedStyleSheet, unistyleData);
+            } else if (sharedUnistyles.contains(unistyle)) {
+                unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
             } else {
                 unistyle->rawValue = parsedSheetObj
                     .getProperty(rt, unistyle->styleKey.c_str())
@@ -365,9 +368,14 @@ void parser::Parser::rebuildUnistylesInDependencyMap(
                 );
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
                 unistyle->isDirty = true;
-            }
 
-            parsedUnistyles.insert(unistyle);
+                if (unistyle->type == core::UnistyleType::Object && !unistyle->rawValue.hasProperty(rt, "variants")) {
+                    sharedUnistyles.insert(unistyle);
+                }
+
+                // unistyles rebuilt only for a scoped theme stay out of this set, so the loop below refreshes their global rawValue
+                parsedUnistyles.insert(unistyle);
+            }
         }
     }
 
@@ -1273,6 +1281,14 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
 // so a value captured at link time would undo what React rendered since
 folly::dynamic parser::Parser::parseStylesToShadowTreeUpdates(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles) {
     auto props = this->parseStylesToShadowTreeStyles(rt, unistyles);
+    auto hasInlineStyle = std::any_of(unistyles.begin(), unistyles.end(), [](const std::shared_ptr<UnistyleData>& unistyleData) {
+        return unistyleData->parsedStyle.has_value() && unistyleData->unistyle->styleKey == helpers::EXOTIC_STYLE_KEY;
+    });
+
+    if (!hasInlineStyle) {
+        return props;
+    }
+
     std::unordered_map<std::string, bool> isOwnedByInlineStyle;
 
     for (const auto& unistyleData : unistyles) {

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -4,13 +4,13 @@ using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
 using namespace facebook;
 
-std::vector<Tag> shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
+std::vector<InstanceHandle::Shared> shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
     auto& registry = core::UnistylesRegistry::get();
 
     // updates pin their families, so raw pointers stay valid during the commit
     // declared outside of the lock, so the last pin is released after unlocking
     PinnedShadowLeafUpdates updates;
-    std::vector<Tag> committedTags;
+    std::vector<InstanceHandle::Shared> committedInstanceHandles;
 
     registry.trafficController.withLock([&](){
         updates = registry.trafficController.takeUpdates();
@@ -21,18 +21,18 @@ std::vector<Tag> shadow::ShadowTreeManager::updateShadowTree(jsi::Runtime& rt) {
 
         std::unordered_map<Tag, folly::dynamic> tagToProps;
 
-        committedTags.reserve(updates.size());
+        committedInstanceHandles.reserve(updates.size());
 
         for (const auto& [family, update] : updates) {
             auto safeProps = update.props.isObject() ? update.props : folly::dynamic::object();
 
             tagToProps.insert({family->getTag(), safeProps});
-            committedTags.push_back(family->getTag());
+            committedInstanceHandles.push_back(family->getInstanceHandle());
             shadow::mergeNativeProps(family, safeProps);
         }
 
         UIManagerBinding::getBinding(rt)->getUIManager().updateShadowTree(std::move(tagToProps));
     });
 
-    return committedTags;
+    return committedInstanceHandles;
 }

package/cxx/shadowTree/ShadowTreeManager.h

@@ -15,7 +15,7 @@ using namespace facebook::react;
 using namespace facebook;
 
 struct ShadowTreeManager {
-    static std::vector<Tag> updateShadowTree(jsi::Runtime& rt);
+    static std::vector<InstanceHandle::Shared> updateShadowTree(jsi::Runtime& rt);
 };
 
 }

package/ios/NativePlatform+ios.swift

@@ -120,8 +120,10 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
                     return cachedRuntime.screen;
                 }
                 
-                // this should never happen, but it's better to return zeros
-                return Dimensions(width: 0, height: 0)
+                // when the app is launched in the background there is no foreground window yet, fall back to the screen
+                let screenSize = UIScreen.main.bounds.size
+
+                return Dimensions(width: screenSize.width, height: screenSize.height)
             }
 
             let width = windowFrame.size.width
@@ -280,8 +282,8 @@ class NativeIOSPlatform: HybridNativePlatformSpec {
                     return cachedRuntime.pixelRatio;
                 }
                 
-                // this should never happen, but it's better to return default
-                return 1
+                // when the app is launched in the background there is no foreground window yet, fall back to the screen
+                return UIScreen.main.scale
             }
 
             return window.screen.scale

package/lib/commonjs/components/AdaptiveTheme.js

@@ -8,6 +8,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _core = require("../core");
 var _specs = require("../specs");
 var _ApplyScopedTheme = require("./ApplyScopedTheme");
+var _scopeChildren = require("./scopeChildren");
+var _ScopedThemeContext = require("./ScopedThemeContext");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const AdaptiveTheme = ({
@@ -18,9 +20,15 @@ const AdaptiveTheme = ({
     rt
   } = (0, _core.useUnistyles)();
   const name = rt.colorScheme === 'dark' ? 'light' : 'dark';
+  const scope = (0, _react.useMemo)(() => ({
+    name
+  }), [name]);
   const mappedChildren = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: name
-  }, name), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
+  }, name), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScopedThemeContext.ScopedThemeContext.Provider, {
+    value: scope,
+    children: (0, _scopeChildren.scopeChildren)(name, children)
+  }, "scope"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: previousScopedTheme
   }, "dispose")];
   (0, _react.useLayoutEffect)(() => {

package/lib/commonjs/components/AdaptiveTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_core","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AdaptiveTheme","children","previousScopedTheme","rt","useUnistyles","name","colorScheme","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AAAqD,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,wBAAAM,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAR,uBAAA,YAAAA,CAAAM,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAM9C,MAAMkB,aAA0D,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,kBAAY,EAAC,CAAC;EAC7B,MAAMC,IAAI,GAAIF,EAAE,CAACG,WAAW,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EACpF,MAAMC,cAAc,GAAG,cACnB,IAAA3B,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAYJ,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,EAC3CJ,QAAQ,eACR,IAAArB,WAAA,CAAA4B,GAAA,EAAC7B,iBAAA,CAAA8B,gBAAgB;IAAeJ,IAAI,EAAEH;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAQ,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAO,IAAAhC,WAAA,CAAA4B,GAAA,EAAClC,MAAA,CAAAiB,OAAK,CAACsB,QAAQ;IAAAZ,QAAA,EAAaM;EAAc,GAArBF,IAAsC,CAAC;AACvE,CAAC;AAAAS,OAAA,CAAAd,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_core","_specs","_ApplyScopedTheme","_scopeChildren","_ScopedThemeContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","AdaptiveTheme","children","previousScopedTheme","rt","useUnistyles","name","colorScheme","scope","useMemo","mappedChildren","jsx","ApplyScopedTheme","ScopedThemeContext","Provider","value","scopeChildren","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/AdaptiveTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,cAAA,GAAAJ,OAAA;AACA,IAAAK,mBAAA,GAAAL,OAAA;AAAyD,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAD,wBAAAQ,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAV,uBAAA,YAAAA,CAAAQ,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAMlD,MAAMkB,aAA0D,GAAGA,CAAC;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAM;IAAEC;EAAG,CAAC,GAAG,IAAAC,kBAAY,EAAC,CAAC;EAC7B,MAAMC,IAAI,GAAIF,EAAE,CAACG,WAAW,KAAK,MAAM,GAAG,OAAO,GAAG,MAAgC;EACpF,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,OAAO;IAAEH;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,MAAMI,cAAc,GAAG,cACnB,IAAA7B,WAAA,CAAA8B,GAAA,EAACjC,iBAAA,CAAAkC,gBAAgB;IAAYN,IAAI,EAAEA;EAAK,GAAjBA,IAAmB,CAAC,eAC3C,IAAAzB,WAAA,CAAA8B,GAAA,EAAC/B,mBAAA,CAAAiC,kBAAkB,CAACC,QAAQ;IAAaC,KAAK,EAAEP,KAAM;IAAAN,QAAA,EACjD,IAAAc,4BAAa,EAACV,IAAI,EAAEJ,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9B,IAAArB,WAAA,CAAA8B,GAAA,EAACjC,iBAAA,CAAAkC,gBAAgB;IAAeN,IAAI,EAAEH;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAc,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAO,IAAAtC,WAAA,CAAA8B,GAAA,EAACtC,MAAA,CAAAmB,OAAK,CAAC4B,QAAQ;IAAAlB,QAAA,EAAaQ;EAAc,GAArBJ,IAAsC,CAAC;AACvE,CAAC;AAAAe,OAAA,CAAApB,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/components/NamedTheme.js

@@ -7,6 +7,8 @@ exports.NamedTheme = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _specs = require("../specs");
 var _ApplyScopedTheme = require("./ApplyScopedTheme");
+var _scopeChildren = require("./scopeChildren");
+var _ScopedThemeContext = require("./ScopedThemeContext");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const NamedTheme = ({
@@ -14,9 +16,15 @@ const NamedTheme = ({
   children,
   previousScopedTheme
 }) => {
+  const scope = (0, _react.useMemo)(() => ({
+    name
+  }), [name]);
   const mappedChildren = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: name
-  }, "apply"), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
+  }, "apply"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScopedThemeContext.ScopedThemeContext.Provider, {
+    value: scope,
+    children: (0, _scopeChildren.scopeChildren)(name, children)
+  }, "scope"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: previousScopedTheme
   }, "dispose")];
   (0, _react.useLayoutEffect)(() => {

package/lib/commonjs/components/NamedTheme.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","mappedChildren","jsx","ApplyScopedTheme","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAAqD,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,wBAAAK,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAP,uBAAA,YAAAA,CAAAK,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAO9C,MAAMkB,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,cAAc,GAAG,cACnB,IAAAxB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAaL,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,EAC5CC,QAAQ,eACR,IAAAtB,WAAA,CAAAyB,GAAA,EAAC1B,iBAAA,CAAA2B,gBAAgB;IAAeL,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAI,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAO,IAAA7B,WAAA,CAAAyB,GAAA,EAAC9B,MAAA,CAAAgB,OAAK,CAACmB,QAAQ;IAAAR,QAAA,EAAEE;EAAc,CAAiB,CAAC;AAC5D,CAAC;AAAAO,OAAA,CAAAX,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_scopeChildren","_ScopedThemeContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","scope","useMemo","mappedChildren","jsx","ApplyScopedTheme","ScopedThemeContext","Provider","value","scopeChildren","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,wBAAAO,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAT,uBAAA,YAAAA,CAAAO,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAOlD,MAAMkB,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,OAAO;IAAEJ;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,MAAMK,cAAc,GAAG,cACnB,IAAA1B,WAAA,CAAA2B,GAAA,EAAC9B,iBAAA,CAAA+B,gBAAgB;IAAaP,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,eAC5C,IAAArB,WAAA,CAAA2B,GAAA,EAAC5B,mBAAA,CAAA8B,kBAAkB,CAACC,QAAQ;IAAaC,KAAK,EAAEP,KAAM;IAAAF,QAAA,EACjD,IAAAU,4BAAa,EAACX,IAAI,EAAEC,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9B,IAAAtB,WAAA,CAAA2B,GAAA,EAAC9B,iBAAA,CAAA+B,gBAAgB;IAAeP,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAU,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAO,IAAAnC,WAAA,CAAA2B,GAAA,EAAClC,MAAA,CAAAkB,OAAK,CAACyB,QAAQ;IAAAd,QAAA,EAAEI;EAAc,CAAiB,CAAC;AAC5D,CAAC;AAAAW,OAAA,CAAAjB,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/commonjs/components/ScopedThemeContext.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ScopedThemeContext = void 0;
+var _react = require("react");
+const ScopedThemeContext = exports.ScopedThemeContext = /*#__PURE__*/(0, _react.createContext)(null);
+//# sourceMappingURL=ScopedThemeContext.js.map

package/lib/commonjs/components/ScopedThemeContext.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","ScopedThemeContext","exports","createContext"],"sourceRoot":"../../../src","sources":["components/ScopedThemeContext.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAQO,MAAMC,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,gBAAG,IAAAE,oBAAa,EAAe,IAAI,CAAC","ignoreList":[]}

package/lib/commonjs/components/native/Pressable.native.js

@@ -8,6 +8,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _core = require("../../core");
 var _specs = require("../../specs");
+var _ScopedThemeContext = require("../ScopedThemeContext");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // instance type of View for both legacy and Strict TypeScript API (RN 0.87+)
@@ -29,7 +30,7 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
   ...props
 }, forwardedRef) => {
   const storedRef = (0, _react.useRef)(null);
-  const scopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
+  const scope = (0, _react.useContext)(_ScopedThemeContext.ScopedThemeContext);
   (0, _react.useLayoutEffect)(() => {
     return () => {
       if (storedRef.current) {
@@ -50,7 +51,7 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
       }
       return (0, _core.passForwardedRef)(ref, forwardedRef, () => {
         // @ts-expect-error - this is hidden from TS
-        _specs.UnistylesShadowRegistry.add(ref, unistyles);
+        _specs.UnistylesShadowRegistry.add(ref, unistyles, scope);
       }, () => {
         // @ts-expect-error - this is hidden from TS
         _specs.UnistylesShadowRegistry.remove(ref);
@@ -59,8 +60,9 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
     style: state => {
       const isPropStyleAFunction = typeof style === 'function';
       const previousScopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
-      _specs.UnistylesShadowRegistry.setScopedTheme(scopedTheme);
+      _specs.UnistylesShadowRegistry.setScopedTheme(scope?.name);
       const unistyles = isPropStyleAFunction ? style.call(style, state) : getStyles(style);
+      _specs.UnistylesShadowRegistry.setScopedTheme(previousScopedTheme);
       if (!storedRef.current) {
         return unistyles;
       }
@@ -69,8 +71,7 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
       _specs.UnistylesShadowRegistry.remove(storedRef.current);
 
       // @ts-expect-error - this is hidden from TS
-      _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles);
-      _specs.UnistylesShadowRegistry.setScopedTheme(previousScopedTheme);
+      _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles, scope);
       return unistyles;
     }
   });