more fixes

Author: Saadnajmi

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -1040,10 +1040,20 @@ - (RCTUIView *)currentContainerView // [macOS]
   if (_useCustomContainerView) {
     if (!_containerView) {
       _containerView = [[RCTPlatformView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; // [macOS]
+#if TARGET_OS_OSX // [macOS
+      _containerView.wantsLayer = YES;
+#endif // macOS]
       for (RCTPlatformView *subview in self.subviews) { // [macOS]
         [_containerView addSubview:subview];
       }
+#if !TARGET_OS_OSX // [macOS]
       _containerView.clipsToBounds = self.clipsToBounds;
+#else // [macOS
+      // On macOS, clipsToBounds doesn't automatically set layer.masksToBounds
+      // like it does on iOS, so we need to set it directly.
+      _containerView.clipsToBounds = _props->getClipsContentToBounds();
+      _containerView.layer.masksToBounds = _props->getClipsContentToBounds();
+#endif // macOS]
       self.clipsToBounds = NO;
       _containerView.layer.mask = self.layer.mask;
       self.layer.mask = nil;
@@ -1075,10 +1085,15 @@ - (void)invalidateLayer
   }
 
 #if TARGET_OS_OSX // [macOS
-  // clipsToBounds is stubbed out on macOS because it's not part of NSView.
-  // Only set masksToBounds if there's no boxShadow - otherwise the shadow
-  // sublayer (which extends beyond bounds) would be clipped.
-  layer.masksToBounds = _props->boxShadow.empty() && self.clipsToBounds;
+  // On macOS, clipsToBounds doesn't automatically set layer.masksToBounds like iOS does.
+  // When _useCustomContainerView is true (boxShadow + overflow:hidden), the container
+  // view handles clipping children while the main layer stays unclipped for the shadow.
+  // The container view's masksToBounds is set in currentContainerView getter.
+  if (_useCustomContainerView) {
+    layer.masksToBounds = NO;
+  } else {
+    layer.masksToBounds = _props->getClipsContentToBounds();
+  }
 #endif // macOS]
 
   const auto borderMetrics = _props->resolveBorderMetrics(_layoutMetrics);
@@ -1337,7 +1352,8 @@ - (void)invalidateLayer
   if (!_props->boxShadow.empty()) {
     _boxShadowLayer = [CALayer layer];
     [self.layer addSublayer:_boxShadowLayer];
-    _boxShadowLayer.zPosition = _borderLayer.zPosition;
+    // Box shadow should be behind all content but still visible
+    _boxShadowLayer.zPosition = BACKGROUND_COLOR_ZPOSITION - 1;
     _boxShadowLayer.frame = RCTGetBoundingRect(_props->boxShadow, self.layer.bounds.size);
 
     UIImage *boxShadowImage = RCTGetBoxShadowImage(
@@ -1351,8 +1367,11 @@ - (void)invalidateLayer
 #else // [macOS
     // Keep a strong reference to the NSImage so that the CGImage it provides
     // (via UIImageGetCGImageRef) remains valid while the layer uses it.
+    // The image is lazy - force it to render before extracting CGImage.
     _boxShadowImage = boxShadowImage;
-    _boxShadowLayer.contents = (__bridge id)UIImageGetCGImageRef(boxShadowImage);
+    [_boxShadowImage lockFocus];
+    [_boxShadowImage unlockFocus];
+    _boxShadowLayer.contents = (__bridge id)UIImageGetCGImageRef(_boxShadowImage);
 #endif // macOS]
   }