From 3409d6ec1f99ffe265b35c2925b0c8eae86d2247 Mon Sep 17 00:00:00 2001
From: Omri SirComp <omribz156@gmail.com>
Date: Thu, 21 May 2026 12:02:24 +0300
Subject: [PATCH] fix: initialize base color scheme per instance

---
 packages/react-native-ui-lib/src/commons/asBaseComponent.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/react-native-ui-lib/src/commons/asBaseComponent.tsx b/packages/react-native-ui-lib/src/commons/asBaseComponent.tsx
index bcdb696f42..513528e6b8 100644
--- a/packages/react-native-ui-lib/src/commons/asBaseComponent.tsx
+++ b/packages/react-native-ui-lib/src/commons/asBaseComponent.tsx
@@ -19,7 +19,6 @@ export interface AsBaseComponentOptions {
 }
 
 const EMPTY_MODIFIERS = {};
-const colorScheme = Scheme.getSchemeType();
 
 function asBaseComponent<PROPS, STATICS = {}, RefInterface = any>(WrappedComponent: React.ComponentType<any>,
   options: AsBaseComponentOptions = {}) {
@@ -30,7 +29,7 @@ function asBaseComponent<PROPS, STATICS = {}, RefInterface = any>(WrappedCompone
 
     state = {
       error: false,
-      colorScheme
+      colorScheme: Scheme.getSchemeType()
     };
 
     componentDidMount() {