node-mac-recorder 2.10.20 → 2.10.22

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.10.20",
+	"version": "2.10.22",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/window_selector.mm

@@ -66,6 +66,10 @@ void updateScreenOverlays();
 - (void)setupHoverTracking;
 @end
 
+// Window delegate to prevent focus
+@interface OverlayWindowDelegate : NSObject <NSWindowDelegate>
+@end
+
 @implementation WindowSelectorOverlayView
 
 - (instancetype)initWithFrame:(NSRect)frameRect {
@@ -79,6 +83,9 @@ void updateScreenOverlays();
         // Transparent background for full-screen overlay
         self.layer.backgroundColor = [[NSColor clearColor] CGColor];
         
+        // Disable focus ring completely
+        [self setFocusRingType:NSFocusRingTypeNone];
+        
         // Window selector overlay view created
     }
     return self;
@@ -107,12 +114,12 @@ void updateScreenOverlays();
     CGFloat lineWidth;
     
     if (self.isToggled) {
-        // Locked state: thicker border
+        // Locked state: same 1px border but different color
         fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4];
         strokeColor = [NSColor colorWithRed:0.45 green:0.25 blue:0.75 alpha:0.9];
-        lineWidth = 3.0;
+        lineWidth = 1.0;
     } else {
-        // Normal state: thin border
+        // Normal state: 1px border
         fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4];
         strokeColor = [NSColor whiteColor];
         lineWidth = 1.0;
@@ -131,6 +138,14 @@ void updateScreenOverlays();
     [self setNeedsDisplay:YES];
 }
 
+- (BOOL)acceptsFirstResponder {
+    return NO; // Never accept focus to prevent blue ring
+}
+
+- (BOOL)canBecomeKeyView {
+    return NO; // Never become key view
+}
+
 - (void)setIsActiveWindow:(BOOL)isActiveWindow {
     if (_isActiveWindow != isActiveWindow) {
         _isActiveWindow = isActiveWindow;
@@ -239,6 +254,18 @@ void updateScreenOverlays();
 
 @end
 
+@implementation OverlayWindowDelegate
+
+- (BOOL)windowShouldBecomeKey:(NSWindow *)window {
+    return NO; // Prevent window from becoming key to avoid focus ring
+}
+
+- (BOOL)windowShouldBecomeMain:(NSWindow *)window {
+    return NO; // Prevent window from becoming main
+}
+
+@end
+
 // Recording preview overlay view - full screen with cutout
 @interface RecordingPreviewView : NSView
 @property (nonatomic, strong) NSDictionary *recordingWindowInfo;
@@ -906,7 +933,8 @@ void updateOverlay() {
             }
             
             [g_overlayWindow orderFront:nil];
-            [g_overlayWindow makeKeyAndOrderFront:nil];
+            // DON'T make key - prevents focus ring
+            // [g_overlayWindow makeKeyAndOrderFront:nil];
             
             // Ensure subviews (except overlay view itself) have no borders after positioning
             for (NSView *subview in [g_overlayWindow.contentView subviews]) {
@@ -1027,7 +1055,7 @@ bool showRecordingPreview(NSDictionary *windowInfo) {
         [g_recordingPreviewWindow setAcceptsMouseMovedEvents:NO];
         [g_recordingPreviewWindow setHasShadow:NO];
         [g_recordingPreviewWindow setAlphaValue:1.0];
-        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_recordingPreviewWindow setTitlebarAppearsTransparent:YES];
@@ -1156,7 +1184,7 @@ void updateScreenOverlays() {
                 // Ensure ALL overlays are visible, but active one is on top
                 [overlayWindow orderFront:nil];
                 if (isActiveScreen) {
-                    [overlayWindow makeKeyAndOrderFront:nil];
+                    [overlayWindow orderFront:nil]; // Don't make key
                 } else {
                     [overlayWindow orderFront:nil]; // Keep inactive screens visible too
                 }
@@ -1301,7 +1329,7 @@ bool startScreenSelection() {
             [overlayWindow setHasShadow:NO];
             [overlayWindow setAlphaValue:1.0];
             // Ensure window appears on all spaces and stays put - match g_overlayWindow
-            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
             
             // Remove any default window decorations and borders
             [overlayWindow setTitlebarAppearsTransparent:YES];
@@ -1474,12 +1502,12 @@ bool startScreenSelection() {
             // Show overlay - different strategy for secondary screens
             if (i == 0) {
                 // Primary screen
-                [overlayWindow makeKeyAndOrderFront:nil];
+                [overlayWindow orderFront:nil]; // Don't make key
                 // Primary screen overlay shown
             } else {
                 // Secondary screens - more aggressive approach
                 [overlayWindow orderFront:nil];
-                [overlayWindow makeKeyAndOrderFront:nil]; // Try makeKey too
+                [overlayWindow orderFront:nil]; // Don't make key // Try makeKey too
                 [overlayWindow setLevel:CGWindowLevelForKey(kCGMaximumWindowLevelKey)]; // Match g_overlayWindow level
                 
                 // Secondary screen overlay shown
@@ -1487,7 +1515,7 @@ bool startScreenSelection() {
                 // Double-check with delayed re-show
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [overlayWindow orderFront:nil];
-                    [overlayWindow makeKeyAndOrderFront:nil];
+                    [overlayWindow orderFront:nil]; // Don't make key
                 });
             }
             
@@ -1601,7 +1629,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
             // no border
             [overlayWindow setStyleMask:NSWindowStyleMaskBorderless];
             [overlayWindow setAlphaValue:1.0];
-            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
             
 
             // Force content view to have no borders
@@ -1624,7 +1652,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
 
 
             [overlayWindow orderFront:nil];
-            [overlayWindow makeKeyAndOrderFront:nil];
+            // [overlayWindow makeKeyAndOrderFront:nil];
             
             // Note: NSWindow doesn't have setWantsLayer method, only NSView does
             
@@ -1697,7 +1725,7 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_overlayWindow setAcceptsMouseMovedEvents:YES];
         [g_overlayWindow setHasShadow:NO];
         [g_overlayWindow setAlphaValue:1.0];
-        [g_overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary | NSWindowCollectionBehaviorIgnoresCycle];
+        [g_overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorTransient | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_overlayWindow setTitlebarAppearsTransparent:YES];
@@ -1716,17 +1744,29 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         
         // Note: NSWindow doesn't have setWantsLayer method, only NSView does
         
-        // Force content view to have no borders
+        // Force content view to have no borders and no focus ring
         g_overlayWindow.contentView.wantsLayer = YES;
         g_overlayWindow.contentView.layer.borderWidth = 0.0;
         g_overlayWindow.contentView.layer.borderColor = [[NSColor clearColor] CGColor];
         g_overlayWindow.contentView.layer.cornerRadius = 0.0;
         g_overlayWindow.contentView.layer.masksToBounds = YES;
         
+        // Disable focus ring on overlay view
+        if ([g_overlayView respondsToSelector:@selector(setFocusRingType:)]) {
+            [(NSView*)g_overlayView setFocusRingType:NSFocusRingTypeNone];
+        }
+        
         // Additional window styling to ensure no borders or decorations
         [g_overlayWindow setMovable:NO];
         [g_overlayWindow setMovableByWindowBackground:NO];
         
+        // Set delegate to prevent focus
+        static OverlayWindowDelegate *windowDelegate = nil;
+        if (!windowDelegate) {
+            windowDelegate = [[OverlayWindowDelegate alloc] init];
+        }
+        [g_overlayWindow setDelegate:windowDelegate];
+        
         // Create select button with purple theme and hover effects
         g_selectButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
         [g_selectButton setTitle:@"Start Record"];