Merge branch 'main' into ppl-autocomplete

opensearch-project · Aug 30, 2024 · 087a7f0 · 087a7f0
2 parents 6754d6c + e5c125d
commit 087a7f0
Showing 1 changed file with 10 additions and 21 deletions.
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -202,31 +202,20 @@ export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
 
           // Show the SearchBar in-place
           default:
-            if (showDatePicker === TopNavMenuItemRenderType.IN_PORTAL) {
-              return (
-                <>
-                  <MountPointPortal setMountPoint={setMenuMountPoint}>
-                    <EuiFlexGroup alignItems="stretch" gutterSize="none">
-                      <EuiFlexItem grow={false} className="osdTopNavMenuScreenTitle">
-                        <EuiText size="s">{screenTitle}</EuiText>
-                      </EuiFlexItem>
-                      <EuiFlexItem grow={false}>{renderMenu(menuClassName)}</EuiFlexItem>
-                      <EuiFlexItem className="globalDatePicker">
-                        <div ref={datePickerRef} />
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  </MountPointPortal>
-                  {renderSearchBar({ datePickerRef })}
-                </>
-              );
-            }
-
             return (
               <>
                 <MountPointPortal setMountPoint={setMenuMountPoint}>
-                  {renderMenu(menuClassName)}
+                  <EuiFlexGroup alignItems="stretch" gutterSize="none">
+                    <EuiFlexItem grow={false} className="osdTopNavMenuScreenTitle">
+                      <EuiText size="s">{screenTitle}</EuiText>
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>{renderMenu(menuClassName)}</EuiFlexItem>
+                    <EuiFlexItem className="globalDatePicker">
+                      <div ref={datePickerRef} />
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
                 </MountPointPortal>
-                {renderSearchBar()}
+                {renderSearchBar({ datePickerRef })}
               </>
             );
         }