Fix non-key event modifier flag calculations

ChimeHQ · Jul 12, 2024 · 132b130 · 132b130
1 parent 4c4d7d8
commit 132b130
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Sources/KeyCodes/NSEvent+Key.swift b/Sources/KeyCodes/NSEvent+Key.swift
@@ -7,10 +7,6 @@ extension NSEvent {
 	///
 	/// This value can be a subset of the results of `deviceIndependentOnly`. There are flag values that `NSEvent` can include which are not representable by the `KeyModifierFlags` set.
     public var keyModifierFlags: KeyModifierFlags? {
-        guard type == .keyDown || type == .keyUp else {
-            return nil
-        }
-
         var flags = KeyModifierFlags(rawValue: 0)
 
         let deviceIndependentFlags = modifierFlags.deviceIndependentOnly

diff --git a/Tests/KeyCodesTests/NSEventTests.swift b/Tests/KeyCodesTests/NSEventTests.swift
@@ -16,5 +16,17 @@ final class NSEventTests: XCTestCase {
 
 		XCTAssertEqual(event.keyModifierFlags, [.command, .numericPad])
 	}
+
+	func testDeviceIndependentOnlyFromMouseDown() throws {
+		let eventRef = try XCTUnwrap(CGEvent(mouseEventSource: nil, mouseType: .leftMouseDown, mouseCursorPosition: CGPoint(), mouseButton: .left))
+		eventRef.flags = [.maskCommand]
+
+		let event = try XCTUnwrap(NSEvent(cgEvent: eventRef))
+
+		XCTAssertEqual(event.modifierFlags, [.command])
+		XCTAssertEqual(event.modifierFlags.deviceIndependentOnly, [.command])
+
+		XCTAssertEqual(event.keyModifierFlags, [.command])
+	}
 }
 #endif