react-native-unistyles 2.8.0-beta.1 → 2.8.0-beta.2

package/ios/platform/Platform_tvOS.mm

@@ -1,7 +1,6 @@
 #if TARGET_OS_TV
 
 #import "Platform_tvOS.h"
-#import "UnistylesRuntime.h"
 #import <React/RCTAppearance.h>
 
 @implementation Platform
@@ -9,15 +8,6 @@
 - (instancetype)init {
     self = [super init];
     if (self) {
-        UIScreen *screen = [UIScreen mainScreen];
-        UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
-        self.initialScreen = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
-        self.initialColorScheme = [self getColorScheme];
-        self.initialContentSizeCategory = [self getContentSizeCategory:contentSizeCategory];
-        self.initialStatusBar = [self getStatusBarDimensions];
-        self.initialInsets = [self getInsets];
-        
         [self setupListeners];
     }
     return self;
@@ -47,101 +37,49 @@
                                                object:nil];
 }
 
-- (void)onAppearanceChange:(NSNotification *)notification {
-    std::string colorScheme = [self getColorScheme];
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
 
-    if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(colorScheme);
-    }
+    unistylesRuntime->setColorSchemeCallback([](){
+        return getColorScheme();
+    });
+    
+    unistylesRuntime->setContentSizeCategoryCallback([](){
+        return getContentSizeCategory();
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+        unistylesRuntime->colorScheme = getColorScheme();
+    });
 }
 
-- (void)onContentSizeCategoryChange:(NSNotification *)notification {
-    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
+- (void)onAppearanceChange:(NSNotification *)notification {
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleAppearanceChange(getColorScheme());
     }
 }
 
-- (std::string)getColorScheme {
-    UIUserInterfaceStyle colorScheme = [UIScreen mainScreen].traitCollection.userInterfaceStyle;
-
-    switch (colorScheme) {
-        case UIUserInterfaceStyleLight:
-            return UnistylesLightScheme;
-        case UIUserInterfaceStyleDark:
-            return UnistylesDarkScheme;
-        case UIUserInterfaceStyleUnspecified:
-        default:
-            return UnistylesUnspecifiedScheme;
+- (void)onContentSizeCategoryChange:(NSNotification *)notification {
+    if (self.unistylesRuntime != nullptr) {
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange(getContentSizeCategory());
     }
 }
 
-- (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]);
-    }
+- (Dimensions)getScreenDimensions {
+    UIScreen *screen = [UIScreen mainScreen];
+    Dimensions screenDimension = {(int)screen.bounds.size.width, (int)screen.bounds.size.height};
     
-    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]);
+    return screenDimension;
 }
 
 @end
 
-
 #endif

package/ios/platform/Platform_visionOS.h

@@ -1,23 +1,17 @@
 #include <string>
 #include <map>
-#include <UnistylesRuntime.h>
 #import <UIKit/UIKit.h>
+#import "Platform_Shared.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;
+- (void)makeShared:(void*)runtime;
 - (UIWindow *)getMainWindow;
-- (std::string)getContentSizeCategory:(UIContentSizeCategory)contentSizeCategory;
 - (void)onContentSizeCategoryChange:(NSNotification *)notification;
 - (void)onWindowChange:(NSNotification *)notification;
 

package/ios/platform/Platform_visionOS.mm

@@ -9,15 +9,6 @@
 - (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;
@@ -68,97 +59,51 @@
                                                object:nil];
 }
 
-- (void)onWindowChange:(NSNotification *)notification {
-    UIWindow* mainWindow = [self getMainWindow];
+- (void)makeShared:(void*)runtime {
+    self.unistylesRuntime = runtime;
+    
+    auto unistylesRuntime = ((UnistylesRuntime*)self.unistylesRuntime);
+    
+    unistylesRuntime->setScreenDimensionsCallback([self](){
+        return [self getScreenDimensions];
+    });
+    
+    unistylesRuntime->setContentSizeCategoryCallback([](){
+        return getContentSizeCategory();
+    });
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        unistylesRuntime->screen = [self getScreenDimensions];
+        unistylesRuntime->contentSizeCategory = getContentSizeCategory();
+    });
+}
 
-    Dimensions screen = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
-    Insets insets = [self getInsets];
-    Dimensions statusBar = [self getStatusBarDimensions];
-    Dimensions navigationBar = [self getNavigationBarDimensions];
+- (void)onWindowChange:(NSNotification *)notification {
+    Dimensions screen = [self getScreenDimensions];
 
     if (self.unistylesRuntime != nullptr) {
         ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
            screen,
-           insets,
-           statusBar,
-           navigationBar
+           std::nullopt,
+           std::nullopt,
+           std::nullopt
         );
     }
 }
 
 - (void)onContentSizeCategoryChange:(NSNotification *)notification {
-    UIContentSizeCategory contentSizeCategory = [[UIApplication sharedApplication] preferredContentSizeCategory];
-
     if (self.unistylesRuntime != nullptr) {
-        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange([self getContentSizeCategory:contentSizeCategory]);
+        ((UnistylesRuntime*)self.unistylesRuntime)->handleContentSizeCategoryChange(getContentSizeCategory());
     }
 }
 
-- (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]);
-    }
+- (Dimensions)getScreenDimensions {
+    UIWindow* mainWindow = [self getMainWindow];
+    Dimensions screenDimension = {(int)mainWindow.frame.size.width, (int)mainWindow.frame.size.height};
     
-    return std::string([@"unspecified" UTF8String]);
+    return screenDimension;
 }
 
 @end
 
-
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.2",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",

package/react-native-unistyles.podspec

@@ -17,6 +17,9 @@ Pod::Spec.new do |s|
     "ios/**/*.{h,mm}",
     "cxx/*.{h,cpp}"
   ]
+  s.pod_target_xcconfig = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20"
+  }
 
   install_modules_dependencies(s)
 end

package/ios/UnistylesHelpers.h

@@ -1,3 +0,0 @@
-#include <string>
-
-NSString* cxxStringToNSString(std::string);

package/ios/UnistylesHelpers.mm

@@ -1,5 +0,0 @@
-#import "UnistylesHelpers.h"
-
-NSString* cxxStringToNSString(std::string cxxString) {
-    return [NSString stringWithUTF8String:cxxString.c_str()];
-}