node-mac-recorder 2.10.19 → 2.10.21

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.10.19",
+	"version": "2.10.21",
 	"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;
@@ -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;
@@ -211,6 +226,9 @@ void updateScreenOverlays();
 }
 
 - (void)animateScale:(CGFloat)scale duration:(NSTimeInterval)duration {
+    // Set anchor point to center for center-based scaling
+    self.layer.anchorPoint = CGPointMake(0.5, 0.5);
+    
     [NSAnimationContext beginGrouping];
     [NSAnimationContext currentContext].duration = duration;
     [NSAnimationContext currentContext].timingFunction = 
@@ -236,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;
@@ -1024,7 +1054,7 @@ bool showRecordingPreview(NSDictionary *windowInfo) {
         [g_recordingPreviewWindow setAcceptsMouseMovedEvents:NO];
         [g_recordingPreviewWindow setHasShadow:NO];
         [g_recordingPreviewWindow setAlphaValue:1.0];
-        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces];
+        [g_recordingPreviewWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_recordingPreviewWindow setTitlebarAppearsTransparent:YES];
@@ -1201,6 +1231,11 @@ bool startScreenSelection() {
     @try {
         if (g_isScreenSelecting) return false;
         
+        // Clean up any existing window selector first
+        if (g_isWindowSelecting) {
+            cleanupWindowSelector();
+        }
+        
         // Get all available screens
         NSArray *screens = [NSScreen screens];
         if (!screens || [screens count] == 0) return false;
@@ -1293,7 +1328,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];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
             
             // Remove any default window decorations and borders
             [overlayWindow setTitlebarAppearsTransparent:YES];
@@ -1593,7 +1628,7 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo) {
             // no border
             [overlayWindow setStyleMask:NSWindowStyleMaskBorderless];
             [overlayWindow setAlphaValue:1.0];
-            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces];
+            [overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle];
             
 
             // Force content view to have no borders
@@ -1650,7 +1685,7 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
     }
     
     @try {
-        // Clean up any existing overlay first
+        // Clean up any existing overlays first
         if (g_overlayWindow) {
             [g_overlayWindow close];
             g_overlayWindow = nil;
@@ -1658,6 +1693,11 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
             g_selectButton = nil;
         }
         
+        // Also cleanup screen selector if running
+        if (g_isScreenSelecting) {
+            cleanupScreenSelector();
+        }
+        
         // Get all windows
         g_allWindows = [getAllSelectableWindows() retain];
         
@@ -1684,7 +1724,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];
+        [g_overlayWindow setCollectionBehavior:NSWindowCollectionBehaviorStationary | NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary | NSWindowCollectionBehaviorIgnoresCycle];
         
         // Remove any default window decorations and borders
         [g_overlayWindow setTitlebarAppearsTransparent:YES];
@@ -1703,17 +1743,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"];