node-mac-recorder 2.10.18 → 2.10.20

package/package.json

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

package/quick-test.js

@@ -1,33 +1,30 @@
 #!/usr/bin/env node
 
-const WindowSelector = require("./window-selector");
+const WindowSelector = require('./window-selector');
 
 async function quickTest() {
-    console.log("🧪 Quick Window Selector Test");
-    console.log("============================
-");
+    console.log('🧪 Quick Window Selector Test');
+    console.log('============================\n');
 
     const selector = new WindowSelector();
 
     try {
-        console.log("✅ Starting window selection...");
-        console.log("🎯 Hover over windows to see highlighting (no border)");
-        console.log("🔒 Window dragging should be blocked");
-        console.log("⌛ Test will auto-stop in 15 seconds
-");
+        console.log('✅ Starting window selection...');
+        console.log('🎯 Hover over windows to see highlighting (no border)');
+        console.log('🔒 Window dragging should be blocked');
+        console.log('⌛ Test will auto-stop in 15 seconds\n');
 
         await selector.startSelection();
 
         // Auto stop after 15 seconds
         setTimeout(async () => {
-            console.log("
-⏹️  Auto-stopping test...");
+            console.log('\n⏹️  Auto-stopping test...');
             await selector.cleanup();
             process.exit(0);
         }, 15000);
 
     } catch (error) {
-        console.error("❌ Test failed:", error.message);
+        console.error('❌ Test failed:', error.message);
         await selector.cleanup();
         process.exit(1);
     }

package/src/window_selector.mm

@@ -60,6 +60,12 @@ void updateScreenOverlays();
 - (void)setHighlightFrame:(NSRect)frame;
 @end
 
+// Custom button with hover effects
+@interface HoverButton : NSButton
+@property (nonatomic) BOOL isHovered;
+- (void)setupHoverTracking;
+@end
+
 @implementation WindowSelectorOverlayView
 
 - (instancetype)initWithFrame:(NSRect)frameRect {
@@ -95,17 +101,29 @@ void updateScreenOverlays();
                                                                   xRadius:8.0
                                                                   yRadius:8.0];
     
-    // Fill color based on toggle state - no border
+    // Fill color and border based on toggle state
     NSColor *fillColor;
+    NSColor *strokeColor;
+    CGFloat lineWidth;
     
     if (self.isToggled) {
+        // Locked state: thicker border
         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;
     } else {
+        // Normal state: thin border
         fillColor = [NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4];
+        strokeColor = [NSColor whiteColor];
+        lineWidth = 1.0;
     }
     
     [fillColor setFill];
     [highlightPath fill];
+    
+    [strokeColor setStroke];
+    [highlightPath setLineWidth:lineWidth];
+    [highlightPath stroke];
 }
 
 - (void)updateAppearance {
@@ -162,6 +180,65 @@ void updateScreenOverlays();
 
 @end
 
+@implementation HoverButton
+
+- (instancetype)initWithFrame:(NSRect)frameRect {
+    self = [super initWithFrame:frameRect];
+    if (self) {
+        self.isHovered = NO;
+        [self setupHoverTracking];
+    }
+    return self;
+}
+
+- (void)setupHoverTracking {
+    NSTrackingArea *trackingArea = [[NSTrackingArea alloc] 
+        initWithRect:self.bounds
+             options:(NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways)
+               owner:self
+            userInfo:nil];
+    [self addTrackingArea:trackingArea];
+}
+
+- (void)mouseEntered:(NSEvent *)event {
+    self.isHovered = YES;
+    [self animateScale:1.2 duration:0.15];
+}
+
+- (void)mouseExited:(NSEvent *)event {
+    self.isHovered = NO;
+    [self animateScale:1.0 duration:0.15];
+}
+
+- (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 = 
+        [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    
+    CATransform3D transform = CATransform3DMakeScale(scale, scale, 1.0);
+    self.layer.transform = transform;
+    
+    [NSAnimationContext endGrouping];
+}
+
+- (void)updateTrackingAreas {
+    [super updateTrackingAreas];
+    
+    // Remove old tracking areas
+    for (NSTrackingArea *area in self.trackingAreas) {
+        [self removeTrackingArea:area];
+    }
+    
+    // Add new tracking area
+    [self setupHoverTracking];
+}
+
+@end
+
 // Recording preview overlay view - full screen with cutout
 @interface RecordingPreviewView : NSView
 @property (nonatomic, strong) NSDictionary *recordingWindowInfo;
@@ -950,7 +1027,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];
@@ -1127,6 +1204,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;
@@ -1219,7 +1301,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];
@@ -1239,8 +1321,8 @@ bool startScreenSelection() {
             
             // Note: NSWindow doesn't have setWantsLayer method, only NSView does
             
-            // Create select button with more padding
-            NSButton *selectButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
+            // Create select button with more padding and hover effects
+            NSButton *selectButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
             [selectButton setTitle:@"Start Record"];
             [selectButton setButtonType:NSButtonTypeMomentaryPushIn];
             [selectButton setBordered:NO];
@@ -1282,8 +1364,8 @@ bool startScreenSelection() {
             [selectButton setFocusRingType:NSFocusRingTypeNone];
             [selectButton setShowsBorderOnlyWhileMouseInside:NO];
             
-            // Create cancel button for screen selection
-            NSButton *screenCancelButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 120, 40)];
+            // Create cancel button for screen selection with hover effects
+            NSButton *screenCancelButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 120, 40)];
             [screenCancelButton setTitle:@"Cancel"];
             [screenCancelButton setButtonType:NSButtonTypeMomentaryPushIn];
             [screenCancelButton setBordered:NO];
@@ -1519,7 +1601,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
@@ -1576,7 +1658,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;
@@ -1584,6 +1666,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];
         
@@ -1610,7 +1697,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];
@@ -1640,8 +1727,8 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_overlayWindow setMovable:NO];
         [g_overlayWindow setMovableByWindowBackground:NO];
         
-        // Create select button with purple theme
-        g_selectButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
+        // Create select button with purple theme and hover effects
+        g_selectButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
         [g_selectButton setTitle:@"Start Record"];
         [g_selectButton setButtonType:NSButtonTypeMomentaryPushIn];
         [g_selectButton setBordered:NO];
@@ -1681,8 +1768,8 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         // Add select button directly to window (not view) for proper layering
         [g_overlayWindow.contentView addSubview:g_selectButton];
         
-        // Create cancel button
-        NSButton *cancelButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 120, 40)];
+        // Create cancel button with hover effects
+        NSButton *cancelButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 120, 40)];
         [cancelButton setTitle:@"Cancel"];
         [cancelButton setButtonType:NSButtonTypeMomentaryPushIn];
         [cancelButton setBordered:NO];