From aa341104e523afc75d77493002efef0fbea21a0d Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Fri, 22 Apr 2022 16:19:14 +0200
Subject: [PATCH] keyboard: Fill suggestion on button-press-event

Like OSK key buttons, we must avoid the default grabbing behavior
of StButton here. Hook to button-press-event to commit the selected
words, so we get a chance to prevent focus changes on the current
key focus.

Likewise, connect to ::touch-event to handle touch input.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2278>
---
 js/ui/keyboard.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 39066057a..e7b1eae4f 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -175,7 +175,17 @@ class Suggestions extends St.BoxLayout {
 
     add(word, callback) {
         let button = new St.Button({ label: word });
-        button.connect('clicked', callback);
+        button.connect('button-press-event', () => {
+            callback();
+            return Clutter.EVENT_STOP;
+        });
+        button.connect('touch-event', (actor, event) => {
+            if (event.type() !== Clutter.EventType.TOUCH_BEGIN)
+                return Clutter.EVENT_PROPAGATE;
+
+            callback();
+            return Clutter.EVENT_STOP;
+        });
         this.add_child(button);
     }