react-native-unistyles 2.8.0-rc.5 → 2.8.0-rc.6

package/ios/UnistylesModule.h

@@ -1,6 +1,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
-#import <ReactCommon/RCTRuntimeExecutor.h>
+
 #import <string>
 
 #if TARGET_OS_OSX

package/ios/platform/Platform_Shared.mm

@@ -1,3 +1,5 @@
+#if TARGET_OS_TV || TARGET_OS_VISION || TARGET_OS_IOS
+
 #include "Platform_Shared.h"
 
 std::string getContentSizeCategory() {
@@ -154,3 +156,5 @@ UIColor* colorFromHexString(NSString* hexString, float alpha) {
                     blue:(rgbValue & 0x0000FF) / 255.0
                     alpha:alpha];
 }
+
+#endif

package/ios/platform/Platform_macOS.mm

@@ -45,8 +45,12 @@
     });
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        unistylesRuntime->screen = [self getScreenDimensions];
+        Screen screen = [self getScreenDimensions];
+        
+        unistylesRuntime->screen = Dimensions({screen.width, screen.height});
         unistylesRuntime->colorScheme = [self getColorScheme];
+        unistylesRuntime->fontScale = screen.fontScale;
+        unistylesRuntime->pixelRatio = screen.pixelRatio;
     });
 }
 
@@ -69,7 +73,7 @@
 }
 
 - (void)onWindowChange {
-    Dimensions screen = [self getScreenDimensions];
+    Screen screen = [self getScreenDimensions];
     
     if (self.unistylesRuntime != nullptr) {
         ((UnistylesRuntime*)self.unistylesRuntime)->handleScreenSizeChange(
@@ -91,11 +95,21 @@
     return UnistylesLightScheme;
 }
 
-- (Dimensions)getScreenDimensions {
+- (Screen)getScreenDimensions {
     NSWindow *window = RCTSharedApplication().mainWindow;
-    Dimensions screenDimension = {(int)window.frame.size.width, (int)window.frame.size.height};
+    int width = (int)window.frame.size.width;
+    int height = (int)window.frame.size.height;
+    float pixelRatio = window.backingScaleFactor;
+    float fontScale = [self getFontScale];
     
-    return screenDimension;
+    return Screen({width, height, pixelRatio, fontScale});
+}
+
+- (float)getFontScale {
+    NSFont *systemFont = [NSFont systemFontOfSize:[NSFont systemFontSize]];
+    CGFloat systemFontScale = systemFont.pointSize / 13.0;
+    
+    return systemFontScale;
 }
 
 @end

package/package.json

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