MacOS keyboard: RawKeyboard uses filtered modifier (#28666)

Removes the uninterested bits from the modifiers sent to the framework to keep consistency.
flutter · Oct 4, 2021 · 2d0c025 · 2d0c025
1 parent b874967
commit 2d0c025
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
@@ -68,7 +68,7 @@ - (void)handleEvent:(NSEvent*)event callback:(FlutterAsyncKeyCallback)callback {
     @"keymap" : @"macos",
     @"type" : type,
     @"keyCode" : @(event.keyCode),
-    @"modifiers" : @(event.modifierFlags),
+    @"modifiers" : @(modifierFlags),
   } mutableCopy];
   // Calling these methods on any other type of event
   // (e.g NSEventTypeFlagsChanged) will raise an exception.

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
@@ -75,7 +75,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x100);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x0);
   EXPECT_EQ([[messages lastObject][@"characters"] UTF8String], "a");
   EXPECT_EQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
 
@@ -96,7 +96,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x100);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
   EXPECT_EQ([[messages lastObject][@"characters"] UTF8String], "a");
   EXPECT_EQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");
 
@@ -117,7 +117,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 56);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20102);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20002);
 
   EXPECT_EQ([responses count], 1u);
   EXPECT_EQ([[responses lastObject] boolValue], TRUE);
@@ -127,7 +127,7 @@
 
   // RShift down
   next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x20106, @"", @"", FALSE, 60)
+  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x20006, @"", @"", FALSE, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
@@ -136,7 +136,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 60);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20106);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20006);
 
   EXPECT_EQ([responses count], 1u);
   EXPECT_EQ([[responses lastObject] boolValue], FALSE);
@@ -155,7 +155,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 56);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20104);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x20004);
 
   EXPECT_EQ([responses count], 1u);
   EXPECT_EQ([[responses lastObject] boolValue], FALSE);
@@ -165,7 +165,7 @@
 
   // RShift up
   next_response = false;
-  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0x100, @"", @"", FALSE, 60)
+  [responder handleEvent:keyEvent(NSEventTypeFlagsChanged, 0, @"", @"", FALSE, 60)
                 callback:^(BOOL handled) {
                   [responses addObject:@(handled)];
                 }];
@@ -174,7 +174,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keyup");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 60);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x100);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
 
   EXPECT_EQ([responses count], 1u);
   EXPECT_EQ([[responses lastObject] boolValue], FALSE);
@@ -221,7 +221,7 @@
   EXPECT_STREQ([[messages lastObject][@"keymap"] UTF8String], "macos");
   EXPECT_STREQ([[messages lastObject][@"type"] UTF8String], "keydown");
   EXPECT_EQ([[messages lastObject][@"keyCode"] intValue], 0);
-  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0x100);
+  EXPECT_EQ([[messages lastObject][@"modifiers"] intValue], 0);
   EXPECT_EQ([[messages lastObject][@"characters"] UTF8String], "a");
   EXPECT_EQ([[messages lastObject][@"charactersIgnoringModifiers"] UTF8String], "a");