react-native-nswindow 0.0.1 → 0.0.2

package/macos/RNNSWindow.h

@@ -11,23 +11,23 @@ using WindowProps = NativeNSWindowWindowProps<
     std::optional<double>, std::optional<double>, std::optional<double>,
     std::optional<double>, std::optional<double>, std::optional<bool>,
     std::optional<std::string>, std::optional<std::string>,
-    std::optional<std::string>, std::optional<std::string>, std::optional<bool>,
+    std::optional<std::string>, std::optional<bool>, std::optional<bool>,
     std::optional<bool>, std::optional<bool>, std::optional<bool>,
     std::optional<bool>, std::optional<bool>, std::optional<bool>,
-    std::optional<bool>, std::optional<std::string>, std::optional<bool>,
-    std::optional<bool>, std::optional<std::string>, std::optional<bool>,
-    std::string, std::string, jsi::Object>;
+    std::optional<std::string>, std::optional<bool>, std::optional<bool>,
+    std::optional<std::string>, std::optional<bool>, std::string, std::string,
+    jsi::Object>;
 
 using ModifyProps = NativeNSWindowModifyableWindowProps<
     std::optional<double>, std::optional<double>, std::optional<double>,
     std::optional<double>, std::optional<double>, std::optional<double>,
     std::optional<double>, std::optional<double>, std::optional<bool>,
     std::optional<std::string>, std::optional<std::string>,
-    std::optional<std::string>, std::optional<std::string>, std::optional<bool>,
+    std::optional<std::string>, std::optional<bool>, std::optional<bool>,
     std::optional<bool>, std::optional<bool>, std::optional<bool>,
     std::optional<bool>, std::optional<bool>, std::optional<bool>,
-    std::optional<bool>, std::optional<std::string>, std::optional<bool>,
-    std::optional<bool>, std::optional<std::string>, std::optional<bool>>;
+    std::optional<std::string>, std::optional<bool>, std::optional<bool>,
+    std::optional<std::string>, std::optional<bool>>;
 
 // Concrete types for events
 using WindowMovePayload =

package/macos/RNNSWindow.mm

@@ -1,6 +1,7 @@
 #import "RNNSWindow.h"
 #import "RNNSWindowHelper.h"
 #import <React/RCTConvert.h>
+#import <ReactCommon/RCTTurboModule.h>
 
 // ─── C++ Implementation ───
 
@@ -71,7 +72,16 @@ jsi::Value RNNSWindow::addWindow(jsi::Runtime &rt, jsi::Object props) {
   NSString *title = toNSString(p.title);
   NSString *titleBarStyle = toNSString(p.titleBarStyle);
   NSString *vibrancy = toNSString(p.vibrancy);
-  NSString *backgroundColor = toNSString(p.backgroundColor);
+  // Read backgroundColor directly from JSI props (it's a processed color:
+  // number or object)
+  id backgroundColor = nil;
+  {
+    jsi::Value bgVal = props.getProperty(rt, "backgroundColor");
+    if (!bgVal.isNull() && !bgVal.isUndefined()) {
+      backgroundColor = TurboModuleConvertUtils::convertJSIValueToObjCObject(
+          rt, bgVal, jsInvoker_);
+    }
+  }
   BOOL transparent = p.transparent.value_or(false);
   BOOL hasShadow = p.hasShadow.value_or(true);
   BOOL resizable = p.resizable.value_or(true);
@@ -177,7 +187,16 @@ jsi::Value RNNSWindow::modifyWindow(jsi::Runtime &rt, jsi::String windowId,
   NSString *title = toNSString(p.title);
   NSString *titleBarStyle = toNSString(p.titleBarStyle);
   NSString *vibrancy = toNSString(p.vibrancy);
-  NSString *backgroundColor = toNSString(p.backgroundColor);
+  // Read backgroundColor directly from JSI props (it's a processed color:
+  // number or object)
+  id backgroundColor = nil;
+  {
+    jsi::Value bgVal = props.getProperty(rt, "backgroundColor");
+    if (!bgVal.isNull() && !bgVal.isUndefined()) {
+      backgroundColor = TurboModuleConvertUtils::convertJSIValueToObjCObject(
+          rt, bgVal, jsInvoker_);
+    }
+  }
   NSNumber *nTransparent = toNSBool(p.transparent);
   NSNumber *nHasShadow = toNSBool(p.hasShadow);
   NSNumber *nResizable = toNSBool(p.resizable);

package/macos/RNNSWindowHelper.h

@@ -28,7 +28,7 @@ class RNNSWindow;
                                   title:(NSString *_Nullable)title
                           titleBarStyle:(NSString *_Nullable)titleBarStyle
                                vibrancy:(NSString *_Nullable)vibrancy
-                        backgroundColor:(NSString *_Nullable)backgroundColor
+                        backgroundColor:(id _Nullable)backgroundColor
                             transparent:(BOOL)transparent
                               hasShadow:(BOOL)hasShadow
                               resizable:(BOOL)resizable
@@ -55,7 +55,7 @@ class RNNSWindow;
                title:(NSString *_Nullable)title
        titleBarStyle:(NSString *_Nullable)titleBarStyle
             vibrancy:(NSString *_Nullable)vibrancy
-     backgroundColor:(NSString *_Nullable)backgroundColor
+     backgroundColor:(id _Nullable)backgroundColor
          transparent:(NSNumber *_Nullable)transparent
            hasShadow:(NSNumber *_Nullable)hasShadow
            resizable:(NSNumber *_Nullable)resizable

package/macos/RNNSWindowHelper.mm

@@ -269,7 +269,7 @@
                                   title:(NSString *_Nullable)title
                           titleBarStyle:(NSString *_Nullable)titleBarStyle
                                vibrancy:(NSString *_Nullable)vibrancy
-                        backgroundColor:(NSString *_Nullable)backgroundColor
+                        backgroundColor:(id _Nullable)backgroundColor
                             transparent:(BOOL)transparent
                               hasShadow:(BOOL)hasShadow
                               resizable:(BOOL)resizable
@@ -408,6 +408,18 @@
   NSView *rootView = [factory viewWithModuleName:componentName
                                initialProperties:initialProps];
 
+  // Make the root view transparent so the native window backgroundColor shows
+  // through
+  if (transparent) {
+    rootView.wantsLayer = YES;
+    rootView.layer.backgroundColor = [NSColor clearColor].CGColor;
+    rootView.layer.opaque = NO;
+    // RCTSurfaceHostingView sets backgroundColor to white by default
+    if ([rootView respondsToSelector:@selector(setBackgroundColor:)]) {
+      [(id)rootView setBackgroundColor:[NSColor clearColor]];
+    }
+  }
+
   if (vibrancy && ![vibrancy isEqualToString:@"none"]) {
     rootView.frame = window.contentView.bounds;
     rootView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
@@ -452,7 +464,7 @@
                title:(NSString *_Nullable)title
        titleBarStyle:(NSString *_Nullable)titleBarStyle
             vibrancy:(NSString *_Nullable)vibrancy
-     backgroundColor:(NSString *_Nullable)backgroundColor
+     backgroundColor:(id _Nullable)backgroundColor
          transparent:(NSNumber *_Nullable)transparent
            hasShadow:(NSNumber *_Nullable)hasShadow
            resizable:(NSNumber *_Nullable)resizable
@@ -536,6 +548,15 @@
   // Background color
   if (transparent) {
     window.opaque = !transparent.boolValue;
+    if (transparent.boolValue) {
+      NSView *rootView = window.contentView;
+      rootView.wantsLayer = YES;
+      rootView.layer.backgroundColor = [NSColor clearColor].CGColor;
+      rootView.layer.opaque = NO;
+      if ([rootView respondsToSelector:@selector(setBackgroundColor:)]) {
+        [(id)rootView setBackgroundColor:[NSColor clearColor]];
+      }
+    }
   }
   if (backgroundColor) {
     window.backgroundColor = [RCTConvert NSColor:backgroundColor];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nswindow",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Multi-window support for react-native-macos using NSWindow",
   "author": "Jim Lake <jim@blueskylabs.com>",
   "homepage": "https://github.com/jim-lake/react-native-nswindow#readme",

package/spec/NativeNSWindow.ts

@@ -34,7 +34,6 @@ export interface ModifyableWindowProps {
     | 'fullScreenUI'
     | 'underWindowBackground'
     | 'hudWindow';
-  backgroundColor?: string;
   transparent?: boolean;
   hasShadow?: boolean;
 

package/src/index.ts

@@ -1,9 +1,14 @@
-export { default } from '../spec/NativeNSWindow';
+import { processColor } from 'react-native';
+import type { ColorValue } from 'react-native';
+import NativeModule from '../spec/NativeNSWindow';
+import type {
+  WindowProps as NativeWindowProps,
+  ModifyableWindowProps as NativeModifyableWindowProps,
+} from '../spec/NativeNSWindow';
+
 export type {
   TitleBarStyle,
   WindowLevel,
-  WindowProps,
-  ModifyableWindowProps,
   WindowState,
   Rect,
   Screen,
@@ -12,5 +17,36 @@ export type {
   WindowMovePayload,
   WindowResizePayload,
   WindowOcclusionStatePayload,
-  Spec,
 } from '../spec/NativeNSWindow';
+
+/**
+ * Public-facing props that accept ColorValue (string colors like '#ff0000', 'red', etc.)
+ * The module converts these via processColor before passing to native.
+ */
+export interface ModifyableWindowProps extends NativeModifyableWindowProps {
+  backgroundColor?: ColorValue;
+}
+
+export interface WindowProps extends NativeWindowProps {
+  backgroundColor?: ColorValue;
+}
+
+function processProps(props: Record<string, any>): Record<string, any> {
+  const { backgroundColor, ...rest } = props;
+  if (backgroundColor) {
+    rest.backgroundColor = processColor(backgroundColor);
+  }
+  return rest;
+}
+
+export default {
+  ...NativeModule,
+
+  addWindow(props: WindowProps): Promise<string> {
+    return NativeModule.addWindow(processProps(props) as NativeWindowProps);
+  },
+
+  modifyWindow(windowId: string, props: ModifyableWindowProps): Promise<void> {
+    return NativeModule.modifyWindow(windowId, processProps(props));
+  },
+};