From 7dc6982472e11bb811ec4f95b532a00ec4edf6fb Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 20 Aug 2025 18:27:13 -0400
Subject: [PATCH] Update React Bootstrap fork to support React 18 (#33661)

* Update React Bootstrap fork to support React 18

* Fix mismatched versions

* Change react-bootstrap version back to 0.34 branch
---
 webapp/channels/package.json            |  2 +-
 webapp/package-lock.json                | 16 +++++++++-------
 webapp/package.json                     |  4 ----
 webapp/platform/components/package.json |  2 +-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/webapp/channels/package.json b/webapp/channels/package.json
index c07e8cb69c2..629904ee20c 100644
--- a/webapp/channels/package.json
+++ b/webapp/channels/package.json
@@ -61,7 +61,7 @@
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-beautiful-dnd": "13.1.1",
-    "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
+    "react-bootstrap": "github:mattermost/react-bootstrap#7d8660f06188a6433bb0f69b5816a97dc9ebe48c",
     "react-color": "2.19.3",
     "react-custom-scrollbars": "4.2.1",
     "react-day-picker": "8.3.6",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index d92c60e94d1..4fed9ad1716 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -115,7 +115,7 @@
         "prop-types": "15.8.1",
         "react": "17.0.2",
         "react-beautiful-dnd": "13.1.1",
-        "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
+        "react-bootstrap": "github:mattermost/react-bootstrap#7d8660f06188a6433bb0f69b5816a97dc9ebe48c",
         "react-color": "2.19.3",
         "react-custom-scrollbars": "4.2.1",
         "react-day-picker": "8.3.6",
@@ -2435,9 +2435,9 @@
       }
     },
     "node_modules/@babel/runtime-corejs2": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.27.6.tgz",
-      "integrity": "sha512-WgvlQpGnm1rmvgrm+H+cVcAckEPlwURUCvv1ZVSFr9J9yixgFbNlu7+CjVKKAd4xQtMijPwxwcSi5SFFHKlmDw==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.28.2.tgz",
+      "integrity": "sha512-dUImRLTCIBuPXKItbP0Bdl7NfLQgDOnNSzsW4Ah17hylLyJMpWujyJ6ppWUIcOErlUAUXUMAGMtj71OLl5OhIQ==",
       "dependencies": {
         "core-js": "^2.6.12"
       },
@@ -23108,8 +23108,10 @@
     },
     "node_modules/react-bootstrap": {
       "version": "0.32.4",
-      "resolved": "git+ssh://git@github.com/mattermost/react-bootstrap.git#d821e2b1db1059bd36112d7587fd1b0912b27626",
-      "integrity": "sha512-dMW2UPKpxMz+3jT03MjitHIb6JS7pKhYvOcgwA/l1es0j7V8fAioEKd5SQtS5UNhFFmc+MU6HzqJ2SpFi6KmZQ==",
+      "resolved": "git+ssh://git@github.com/mattermost/react-bootstrap.git#7d8660f06188a6433bb0f69b5816a97dc9ebe48c",
+      "integrity": "sha512-G1BxOkjZHfKdIqvncpYQT37MFNYd2aUgA5r3xJcQrptWu13rvpSu6flxOXoCRsZo2lpTqKYVd2V2WPo00+EWww==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime-corejs2": "^7.0.0",
         "classnames": "^2.2.5",
@@ -29535,7 +29537,7 @@
         "classnames": "^2.3.1",
         "lodash": "^4.17.21",
         "react": "^17.0.2",
-        "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
+        "react-bootstrap": "github:mattermost/react-bootstrap#7d8660f06188a6433bb0f69b5816a97dc9ebe48c",
         "react-dom": "^17.0.2",
         "react-intl": "*",
         "shallow-equals": "^1.0.0",
diff --git a/webapp/package.json b/webapp/package.json
index 74dedc00198..8985c1069ca 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -72,10 +72,6 @@
       "react": "17.0.2",
       "react-dom": "17.0.2"
     },
-    "react-bootstrap": {
-      "react": "17.0.2",
-      "react-dom": "17.0.2"
-    },
     "react-color": {
       "react": "17.0.2",
       "react-dom": "17.0.2"
diff --git a/webapp/platform/components/package.json b/webapp/platform/components/package.json
index 1d924251bdc..0f105933c32 100644
--- a/webapp/platform/components/package.json
+++ b/webapp/platform/components/package.json
@@ -43,7 +43,7 @@
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
-    "react-bootstrap": "github:mattermost/react-bootstrap#d821e2b1db1059bd36112d7587fd1b0912b27626",
+    "react-bootstrap": "github:mattermost/react-bootstrap#7d8660f06188a6433bb0f69b5816a97dc9ebe48c",
     "react-dom": "^17.0.2",
     "react-intl": "*",
     "shallow-equals": "^1.0.0",