From 441e9b4e3c8866e1f1fcf00e93ce98931dfb9ce6 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:03:33 -0600
Subject: [PATCH] Fix composer focus when using emoji picker and pressing Enter
 and upgrade focus-trap-react to 10.3.1

Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
---
 package-lock.json                   | 26 +++++++++++++-------------
 package.json                        |  2 +-
 ts/components/emoji/EmojiPicker.tsx |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3071c851006e..6c3e95318b4d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,7 @@
         "fast-glob": "3.3.2",
         "filesize": "9.0.11",
         "firstline": "2.0.2",
-        "focus-trap-react": "9.0.2",
+        "focus-trap-react": "10.3.1",
         "form-data": "4.0.1",
         "fs-extra": "11.2.0",
         "fuse.js": "6.5.3",
@@ -16650,22 +16650,22 @@
       "license": "ISC"
     },
     "node_modules/focus-trap": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.4.tgz",
-      "integrity": "sha512-v2NTsZe2FF59Y+sDykKY+XjqZ0cPfhq/hikWVL88BqLivnNiEffAsac6rP6H45ff9wG9LL5ToiDqrLEP9GX9mw==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
+      "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
       "license": "MIT",
       "dependencies": {
-        "tabbable": "^5.3.3"
+        "tabbable": "^6.2.0"
       }
     },
     "node_modules/focus-trap-react": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-9.0.2.tgz",
-      "integrity": "sha512-ZwhO5by6KG5r3dy48Lk00A1/0zNYw1Z3RZTN6O6kgAPsWFcwTFszOcQ1dLSfM8pIxpS/ttc7wTttJowjVT3jpg==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-10.3.1.tgz",
+      "integrity": "sha512-PN4Ya9xf9nyj/Nd9VxBNMuD7IrlRbmaG6POAQ8VLqgtc6IY/Ln1tYakow+UIq4fihYYYFM70/2oyidE6bbiPgw==",
       "license": "MIT",
       "dependencies": {
-        "focus-trap": "^6.9.4",
-        "tabbable": "^5.3.3"
+        "focus-trap": "^7.6.1",
+        "tabbable": "^6.2.0"
       },
       "peerDependencies": {
         "prop-types": "^15.8.1",
@@ -28408,9 +28408,9 @@
       "dev": true
     },
     "node_modules/tabbable": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
-      "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
       "license": "MIT"
     },
     "node_modules/table": {
diff --git a/package.json b/package.json
index 9e1ad432f382..a1f0fc35c823 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "fast-glob": "3.3.2",
     "filesize": "9.0.11",
     "firstline": "2.0.2",
-    "focus-trap-react": "9.0.2",
+    "focus-trap-react": "10.3.1",
     "form-data": "4.0.1",
     "fs-extra": "11.2.0",
     "fuse.js": "6.5.3",
diff --git a/ts/components/emoji/EmojiPicker.tsx b/ts/components/emoji/EmojiPicker.tsx
index 18acdb465af5..1d0452619087 100644
--- a/ts/components/emoji/EmojiPicker.tsx
+++ b/ts/components/emoji/EmojiPicker.tsx
@@ -405,6 +405,7 @@ export const EmojiPicker = React.memo(
         <FocusTrap
           focusTrapOptions={{
             allowOutsideClick: true,
+            returnFocusOnDeactivate: false,
           }}
         >
           <div className="module-emoji-picker" ref={ref} style={style}>