feat: show user gesture type in click event (electron#16954)

codebytere · web-flow · commit 3edc497d3dd4 · 2019-02-20T12:20:24.000Z
diff --git a/atom/browser/api/event_emitter.cc b/atom/browser/api/event_emitter.cc
@@ -79,6 +79,7 @@ v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {
   obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));
   obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));
   obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));
+  obj.Set("triggeredByAccelerator", static_cast<bool>(flags));
   return obj.GetHandle();
 }
 
diff --git a/docs/api/structures/keyboard-event.md b/docs/api/structures/keyboard-event.md
@@ -4,3 +4,4 @@
 * `metaKey` Boolean (optional) - whether a meta key was used in an accelerator to trigger the Event
 * `shiftKey` Boolean (optional) - whether a Shift key was used in an accelerator to trigger the Event
 * `altKey` Boolean (optional) - whether an Alt key was used in an accelerator to trigger the Event
+* `triggeredByAccelerator` Boolean (optional) - whether an accelerator was used to trigger the event as opposed to another user gesture like mouse click
diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
@@ -31,7 +31,7 @@ const delegate = {
     command.click(event, TopLevelWindow.getFocusedWindow(), webContents.getFocusedWebContents())
   },
   menuWillShow: (menu) => {
-    // Ensure radio groups have at least one menu item seleted
+    // Ensure radio groups have at least one menu item selected
     for (const id in menu.groupsMap) {
       const found = menu.groupsMap[id].find(item => item.checked) || null
       if (!found) v8Util.setHiddenValue(menu.groupsMap[id][0], 'checked', true)

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ v8::Local<v8::Object> CreateEventFromFlags(v8::Isolate* isolate, int flags) {`
`79`	`79`	`obj.Set("ctrlKey", static_cast<bool>(flags & ui::EF_CONTROL_DOWN));`
`80`	`80`	`obj.Set("altKey", static_cast<bool>(flags & ui::EF_ALT_DOWN));`
`81`	`81`	`obj.Set("metaKey", static_cast<bool>(flags & ui::EF_COMMAND_DOWN));`
	`82`	`+ obj.Set("triggeredByAccelerator", static_cast<bool>(flags));`
`82`	`83`	`return obj.GetHandle();`
`83`	`84`	`}`
`84`	`85`