From e725bb812fab5eab4c15758df11314fac8ca98fc Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <me@vinzscam.dev>
Date: Wed, 9 Feb 2022 17:55:06 +0100
Subject: [PATCH] Remove SearchContextProvider from Root component

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
---
 .changeset/bright-games-eat.md                | 24 +++++++++++++++++++
 .../packages/app/src/components/Root/Root.tsx |  9 ++-----
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/bright-games-eat.md

diff --git a/.changeset/bright-games-eat.md b/.changeset/bright-games-eat.md
new file mode 100644
index 0000000000000..3bae70283f84d
--- /dev/null
+++ b/.changeset/bright-games-eat.md
@@ -0,0 +1,24 @@
+---
+'@backstage/create-app': patch
+---
+
+Remove SearchContextProvider from `<Root />`
+
+The `SidebarSearchModal` exported from `plugin-search` internally renders `SearchContextProvider`, so it can be removed from `Root.tsx`:
+
+```diff
+-import {
+-  SidebarSearchModal,
+-  SearchContextProvider,
+-} from '@backstage/plugin-search';
++import { SidebarSearchModal } from '@backstage/plugin-search';
+
+... omitted ...
+
+       <SidebarGroup label="Search" icon={<SearchIcon />} to="/search">
+-        <SearchContextProvider>
+-          <SidebarSearchModal />
+-        </SearchContextProvider>
++        <SidebarSearchModal />
+       </SidebarGroup>
+```
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
index 7e98c7d3e6e08..90738c44d4779 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
@@ -28,10 +28,7 @@ import {
   Settings as SidebarSettings,
   UserSettingsSignInAvatar,
 } from '@backstage/plugin-user-settings';
-import {
-  SidebarSearchModal,
-  SearchContextProvider,
-} from '@backstage/plugin-search';
+import { SidebarSearchModal } from '@backstage/plugin-search';
 import {
   Sidebar,
   sidebarConfig,
@@ -84,9 +81,7 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
     <Sidebar>
       <SidebarLogo />
       <SidebarGroup label="Search" icon={<SearchIcon />} to="/search">
-        <SearchContextProvider>
-          <SidebarSearchModal />
-        </SearchContextProvider>{' '}
+        <SidebarSearchModal />
       </SidebarGroup>
       <SidebarDivider />
       <SidebarGroup label="Menu" icon={<MenuIcon />}>