From b398e8640dffecadc9ee9744b44d45c6e7c98da8 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 17 Nov 2022 09:03:12 +0000
Subject: [PATCH] Navigation: Change quick add styling (#58854)

Change quick add styling + allow for returning isOpen state to dropdown children
---
 .../src/components/Dropdown/Dropdown.tsx      |  4 ++--
 .../AppChrome/QuickAdd/QuickAdd.test.tsx      | 20 -----------------
 .../AppChrome/QuickAdd/QuickAdd.tsx           | 22 ++++++++-----------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
index 07d05fcc0dc..93f91724e2a 100644
--- a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
@@ -11,7 +11,7 @@ import { TooltipPlacement } from '../Tooltip/types';
 export interface Props {
   overlay: React.ReactElement | (() => React.ReactElement);
   placement?: TooltipPlacement;
-  children: React.ReactElement;
+  children: React.ReactElement | ((isOpen: boolean) => React.ReactElement);
 }
 
 export const Dropdown = React.memo(({ children, overlay, placement }: Props) => {
@@ -38,7 +38,7 @@ export const Dropdown = React.memo(({ children, overlay, placement }: Props) =>
 
   return (
     <>
-      {React.cloneElement(children, {
+      {React.cloneElement(typeof children === 'function' ? children(visible) : children, {
         ref: setTriggerRef,
       })}
       {visible && (
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
index dbf20988fde..3aba09ac311 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.test.tsx
@@ -44,26 +44,6 @@ describe('QuickAdd', () => {
     expect(screen.getByRole('button', { name: 'New' })).toBeInTheDocument();
   });
 
-  it('renders the `New` text on a larger viewport', () => {
-    (window.matchMedia as jest.Mock).mockImplementation(() => ({
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-      matches: () => false,
-    }));
-    setup();
-    expect(screen.getByText('New')).toBeInTheDocument();
-  });
-
-  it('does not render the text on a smaller viewport', () => {
-    (window.matchMedia as jest.Mock).mockImplementation(() => ({
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-      matches: () => true,
-    }));
-    setup();
-    expect(screen.queryByText('New')).not.toBeInTheDocument();
-  });
-
   it('shows isCreateAction options when clicked', async () => {
     setup();
     await userEvent.click(screen.getByRole('button', { name: 'New' }));
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
index 13dbdcc9b65..0ed2337c7ff 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { useMemo, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Menu, Dropdown, Button, Icon, useStyles2, useTheme2, ToolbarButton } from '@grafana/ui';
+import { Menu, Dropdown, useStyles2, useTheme2, ToolbarButton } from '@grafana/ui';
 import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange';
 import { useSelector } from 'app/types';
 
@@ -41,16 +41,13 @@ export const QuickAdd = ({}: Props) => {
   return createActions.length > 0 ? (
     <>
       <Dropdown overlay={MenuActions} placement="bottom-end">
-        {isSmallScreen ? (
-          <ToolbarButton iconOnly icon="plus-circle" aria-label="New" />
-        ) : (
-          <Button variant="primary" size="sm" icon="plus">
-            <div className={styles.buttonContent}>
-              <span className={styles.buttonText}>New</span>
-              <Icon name="angle-down" />
-            </div>
-          </Button>
-        )}
+        {(isOpen) =>
+          isSmallScreen ? (
+            <ToolbarButton iconOnly icon="plus-circle" aria-label="New" />
+          ) : (
+            <ToolbarButton iconOnly icon="plus" isOpen={isOpen} aria-label="New" />
+          )
+        }
       </Dropdown>
       <NavToolbarSeparator className={styles.separator} />
     </>
@@ -68,8 +65,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     },
   }),
   separator: css({
-    marginLeft: theme.spacing(1),
-    [theme.breakpoints.down('md')]: {
+    [theme.breakpoints.down('sm')]: {
       display: 'none',
     },
   }),