react-native-unistyles 2.6.0 → 2.7.0

package/README.md

@@ -10,10 +10,11 @@
 [![platform - ios](https://img.shields.io/badge/iOS-000?logo=apple&style=for-the-badge)](https://developer.apple.com/ios/)
 [![platform - macos](https://img.shields.io/badge/macOS-000?logo=apple&style=for-the-badge)](https://developer.apple.com/macos/)
 [![platform - appletv](https://img.shields.io/badge/Apple_TV-000?logo=apple&style=for-the-badge)](https://developer.apple.com/tvos/)
-[![platform - windows](https://img.shields.io/badge/windows-00a2ed?logo=windows&style=for-the-badge)](https://microsoft.github.io/react-native-windows/docs/getting-started)
-[![platform - ssr](https://img.shields.io/badge/SSR-black?style=for-the-badge&logo=next.js&logoColor=white)](https://nextjs.org/)
+[![platform - visionos](https://img.shields.io/badge/vision_os-000?logo=apple&style=for-the-badge)](https://developer.apple.com/visionos/)
 [![platform - android](https://img.shields.io/badge/Android-44CD11?style=for-the-badge&logo=android&logoColor=white)](https://developer.android.com/)
 [![platform - androidtv](https://img.shields.io/badge/Android_TV-44CD11?style=for-the-badge&logo=android&logoColor=white)](https://www.android.com/intl/pl_pl/tv/)
+[![platform - windows](https://img.shields.io/badge/windows-00a2ed?logo=windows&style=for-the-badge)](https://microsoft.github.io/react-native-windows/docs/getting-started)
+[![platform - ssr](https://img.shields.io/badge/SSR-black?style=for-the-badge&logo=next.js&logoColor=white)](https://nextjs.org/)
 
 <a href="https://github.com/jpudysz?tab=followers">
     <img src="https://img.shields.io/github/followers/jpudysz?label=Follow%20%40jpudysz&style=social" />

package/cxx/UnistylesRuntime.cpp

@@ -220,6 +220,10 @@ jsi::Value UnistylesRuntime::get(jsi::Runtime& runtime, const jsi::PropNameID& p
             1,
             [this](jsi::Runtime &runtime, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) -> jsi::Value {
                 bool enableAdaptiveThemes = arguments[0].asBool();
+            
+                if (enableAdaptiveThemes && this->colorScheme == UnistylesUnspecifiedScheme) {
+                    throw jsi::JSError(runtime, UnistylesErrorAdaptiveThemesNotSupported);
+                }
 
                 this->hasAdaptiveThemes = enableAdaptiveThemes;
 

package/cxx/UnistylesRuntime.h

@@ -17,6 +17,7 @@ const std::string UnistylesUnspecifiedScheme = "unspecified";
 const std::string UnistylesErrorBreakpointsCannotBeEmpty = "You are trying to register empty breakpoints object";
 const std::string UnistylesErrorBreakpointsMustStartFromZero = "You are trying to register breakpoints that don't start from 0";
 const std::string UnistylesErrorThemesCannotBeEmpty = "You are trying to register empty themes object";
+const std::string UnistylesErrorAdaptiveThemesNotSupported = "Your platform doesn't support adaptive themes";
 
 struct Dimensions {
     int width;

package/ios/UnistylesModule.h

@@ -8,6 +8,8 @@
     #import "Platform_iOS.h"
 #elif TARGET_OS_TV
     #import "Platform_tvOS.h"
+#elif TARGET_OS_VISION
+    #import "Platform_visionOS.h"
 #endif
 
 @interface UnistylesModule : RCTEventEmitter<RCTBridgeModule>

package/ios/platform/Platform_visionOS.h

@@ -0,0 +1,25 @@
+#include <string>
+#include <map>
+#include <UnistylesRuntime.h>
+#import <UIKit/UIKit.h>
+
+@interface Platform : NSObject
+
+@property (nonatomic, assign) Dimensions initialScreen;
+@property (nonatomic, assign) std::string initialColorScheme;
+@property (nonatomic, assign) std::string initialContentSizeCategory;
+@property (nonatomic, assign) Insets initialInsets;
+@property (nonatomic, assign) Dimensions initialStatusBar;
+@property (nonatomic, assign) Dimensions initialNavigationBar;
+@property (nonatomic, assign) void* unistylesRuntime;
+
+- (instancetype)init;
+
+- (void)setupListeners;
+- (UIWindow *)getMainWindow;
+- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory;
+- (void)onContentSizeCategoryChange:(NSNotification *)notification;
+- (void)onWindowResize:(NSNotification *)notification;
+
+@end
+

package/ios/platform/Platform_visionOS.mm

@@ -0,0 +1,164 @@
+#if TARGET_OS_VISION
+
+#import "Platform_visionOS.h"
+#import "UnistylesRuntime.h"
+#import <React/RCTAppearance.h>
+
+@implementation Platform
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        UIWindow* mainWindow = [self getMainWindow];
+        UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
+
+        self.initialScreen = {(int)mainWindow.bounds.size.width, (int)mainWindow.bounds.size.height};
+        self.initialColorScheme = UnistylesUnspecifiedScheme;
+        self.initialContentSizeCategory = [self getContentSizeCategory:contentSizeCategory];
+        self.initialStatusBar = [self getStatusBarDimensions];
+        self.initialInsets = [self getInsets];
+        
+        [self setupListeners];
+    }
+    return self;
+}
+
+- (UIWindow *)getMainWindow {
+    if (RCTRunningInAppExtension()) {
+      return nil;
+    }
+   
+    for (UIScene* scene in RCTSharedApplication().connectedScenes) {
+      if (scene.activationState != UISceneActivationStateForegroundActive || ![scene isKindOfClass:[UIWindowScene class]]) {
+        continue;
+      }
+      UIWindowScene *windowScene = (UIWindowScene *)scene;
+   
+      for (UIWindow *window in windowScene.windows) {
+        if (window.isKeyWindow) {
+          return window;
+        }
+      }
+    }
+   
+    return nil;
+}
+
+- (void)dealloc {
+    if (self.unistylesRuntime != nullptr) {
+        self.unistylesRuntime = nullptr;
+    }
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                          name: UIContentSizeCategoryDidChangeNotification
+                                          object: nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                          name: RCTWindowFrameDidChangeNotification
+                                          object: nil];
+}
+
+- (void)setupListeners {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onContentSizeCategoryChange:)
+                                                 name:UIContentSizeCategoryDidChangeNotification
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onWindowResize:)
+                                                 name:RCTWindowFrameDidChangeNotification
+                                               object:nil];
+}
+
+- (void)onWindowResize:(NSNotification *)notification {
+    UIWindow* mainWindow = [self getMainWindow];
+
+    Dimensions screen = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
+    Insets insets = [self getInsets];
+    Dimensions statusBar = [self getStatusBarDimensions];
+    Dimensions navigationBar = [self getNavigationBarDimensions];
+
+    if (self.unistylesRuntime != nullptr) {
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
+           screen,
+           insets,
+           statusBar,
+           navigationBar
+        );
+    }
+}
+
+- (void)onContentSizeCategoryChange:(NSNotification *)notification {
+    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
+
+    if (self.unistylesRuntime != nullptr) {
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+    }
+}
+
+- (Insets)getInsets {
+    return {0, 0, 0, 0};
+}
+
+- (Dimensions)getStatusBarDimensions {
+    return {0, 0};
+}
+
+- (Dimensions)getNavigationBarDimensions {
+    return {0, 0};
+}
+
+- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory {
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraExtraLarge]) {
+        return std::string([@"xxxLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraExtraLarge]) {
+        return std::string([@"xxLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraLarge]) {
+        return std::string([@"xLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryLarge]) {
+        return std::string([@"Large" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryMedium]) {
+        return std::string([@"Medium" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategorySmall]) {
+        return std::string([@"Small" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryExtraSmall]) {
+        return std::string([@"xSmall" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityMedium]) {
+        return std::string([@"accessibilityMedium" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityLarge]) {
+        return std::string([@"accessibilityLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraLarge]) {
+        return std::string([@"accessibilityExtraLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraLarge]) {
+        return std::string([@"accessibilityExtraExtraLarge" UTF8String]);
+    }
+    
+    if ([contentSizeCategory isEqualToString:UIContentSizeCategoryAccessibilityExtraExtraExtraLarge]) {
+        return std::string([@"accessibilityExtraExtraExtraLarge" UTF8String]);
+    }
+    
+    return std::string([@"unspecified" UTF8String]);
+}
+
+@end
+
+
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -44,6 +44,7 @@
     "react-native-windows",
     "react-native-web",
     "react-native-tvos",
+    "react-native-visionos",
     "expo"
   ],
   "repository": "https://github.com/jpudysz/react-native-unistyles",
@@ -119,6 +120,7 @@
     "examples/win",
     "examples/bare",
     "examples/tv",
+    "examples/vision",
     "docs"
   ],
   "packageManager": "yarn@3.6.4",
@@ -133,6 +135,7 @@
       "<rootDir>/examples/win/node_modules",
       "<rootDir>/examples/bare/node_modules",
       "<rootDir>/examples/tv/node_modules",
+      "<rootDir>/examples/vision/node_modules",
       "<rootDir>/docs/node_modules",
       "<rootDir>/lib/"
     ],

package/react-native-unistyles.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported, :osx => "10.14", :tvos => "9.0" }
+  s.platforms    = { :ios => min_ios_version_supported, :osx => "10.14", :tvos => "9.0", :visionos => "1.0" }
   s.source       = { :git => package["repository"], :tag => "#{s.version}" }
 
   s.source_files = [