[Emotion] Convert EuiSearchBar

changelogs/upcoming/7490.md

@@ -0,0 +1,3 @@
+**CSS-in-JS conversions**
+
+- Converted `EuiSearchBar` to Emotion

src/components/index.scss

@@ -9,6 +9,5 @@
 @import 'markdown_editor/index';
 @import 'tree_view/index';
 @import 'side_nav/index';
-@import 'search_bar/index';
 @import 'selectable/index';
 @import 'table/index';

src/components/search_bar/__snapshots__/search_bar.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`SearchBar render - box 1`] = `
   class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-m-flexStart-center-row"
 >
   <div
-    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1"
+    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1-euiSearchBar__searchHolder"
   >
     <div
       class="euiFormControlLayout euiFormControlLayout--fullWidth"
@@ -45,7 +45,7 @@ exports[`SearchBar render - no config, no query 1`] = `
   class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-m-flexStart-center-row"
 >
   <div
-    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1"
+    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1-euiSearchBar__searchHolder"
   >
     <div
       class="euiFormControlLayout euiFormControlLayout--fullWidth"
@@ -84,7 +84,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
   class="euiFlexGroup emotion-euiFlexGroup-responsive-wrap-m-flexStart-center-row"
 >
   <div
-    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1"
+    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1-euiSearchBar__searchHolder"
   >
     <div
       class="euiFormControlLayout euiFormControlLayout--fullWidth"
@@ -131,7 +131,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
     </div>
   </div>
   <div
-    class="euiFlexItem euiSearchBar__filtersHolder emotion-euiFlexItem-growZero"
+    class="euiFlexItem euiSearchBar__filtersHolder emotion-euiFlexItem-growZero-euiSearchBar__filtersHolder"
   >
     <div
       class="euiFilterGroup emotion-euiFilterGroup-uncompressed"
@@ -194,7 +194,7 @@ exports[`SearchBar render - tools 1`] = `
     </div>
   </div>
   <div
-    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1"
+    class="euiFlexItem euiSearchBar__searchHolder emotion-euiFlexItem-grow-1-euiSearchBar__searchHolder"
   >
     <div
       class="euiFormControlLayout euiFormControlLayout--fullWidth"

src/components/search_bar/search_bar.styles.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { css } from '@emotion/react';
+
+import { UseEuiTheme } from '../../services';
+import { euiBreakpoint, logicalCSS, mathWithUnits } from '../../global_styling';
+import { euiFormVariables } from '../form/form.styles';
+
+export const euiSearchBar__searchHolder = (euiThemeContext: UseEuiTheme) => {
+  const { maxWidth } = euiFormVariables(euiThemeContext);
+  return css`
+    ${logicalCSS(
+      'min-width',
+      mathWithUnits(maxWidth, (x) => x / 2)
+    )}
+  `;
+};
+
+export const euiSearchBar__filtersHolder = (euiThemeContext: UseEuiTheme) => {
+  const { euiTheme } = euiThemeContext;
+  return css`
+    ${euiBreakpoint(euiThemeContext, ['m', 'l', 'xl'])} {
+      /* Helps with flex-wrapping */
+      ${logicalCSS('max-width', `calc(100% - ${euiTheme.size.base})`)}
+    }
+  `;
+};

src/components/search_bar/search_bar.test.tsx

@@ -7,8 +7,7 @@
  */
 
 import React, { useState } from 'react';
-import { act } from '@testing-library/react';
-import { mount } from 'enzyme';
+import { fireEvent, act } from '@testing-library/react';
 
 import { render } from '../../test/rtl';
 import { requiredProps } from '../../test';
@@ -92,15 +91,15 @@ describe('SearchBar', () => {
     test('calls onChange callback when the query is modified', () => {
       const onChange = jest.fn();
 
-      const component = mount(
+      const { getByTestSubject } = render(
         <EuiSearchBar
           query="status:active"
           onChange={onChange}
           box={{ 'data-test-subj': 'searchbar' }}
         />
       );
 
-      component.find('input[data-test-subj="searchbar"]').simulate('keyup', {
+      fireEvent.keyUp(getByTestSubject('searchbar'), {
         key: keys.ENTER,
         target: { value: 'status:inactive' },
       });
@@ -114,7 +113,7 @@ describe('SearchBar', () => {
 
   describe('hint', () => {
     test('renders a hint below the search bar on focus', () => {
-      const component = mount(
+      const { getByTestSubject, queryByTestSubject } = render(
         <EuiSearchBar
           query="status:active"
           box={{ 'data-test-subj': 'searchbar' }}
@@ -124,19 +123,14 @@ describe('SearchBar', () => {
         />
       );
 
-      const getHint = () => component.find('[data-test-subj="myHint"]');
-
-      let hint = getHint();
-      expect(hint.length).toBe(0);
+      expect(queryByTestSubject('myHint')).toBeNull();
 
       act(() => {
-        component.find('input[data-test-subj="searchbar"]').simulate('focus');
+        fireEvent.focus(getByTestSubject('searchbar'));
       });
-      component.update();
 
-      hint = getHint();
-      expect(hint.length).toBe(1);
-      expect(hint.text()).toBe('Hello from hint');
+      expect(queryByTestSubject('myHint')).toBeInTheDocument();
+      expect(queryByTestSubject('myHint')).toHaveTextContent('Hello from hint');
     });
 
     test('control the visibility of the hint', () => {
@@ -164,28 +158,22 @@ describe('SearchBar', () => {
         );
       };
 
-      const component = mount(<TestComp />);
-      const getHint = () => component.find('[data-test-subj="myHint"]');
+      const { getByTestSubject, queryByTestSubject } = render(<TestComp />);
 
-      let hint = getHint();
-      expect(hint.length).toBe(0);
+      expect(queryByTestSubject('myHint')).toBeNull(); // Not visible on focus as it is controlled
 
       act(() => {
-        component.find('input[data-test-subj="searchbar"]').simulate('focus');
+        fireEvent.focus(getByTestSubject('searchbar'));
       });
-      component.update();
 
-      hint = getHint();
-      expect(hint.length).toBe(0); // Not visible on focus as it is controlled
+      expect(queryByTestSubject('myHint')).toBeNull(); // Not visible on focus as it is controlled
 
       act(() => {
-        component.find('[data-test-subj="showHintBtn"]').simulate('click');
+        fireEvent.click(getByTestSubject('showHintBtn'));
       });
-      component.update();
 
-      hint = getHint();
-      expect(hint.length).toBe(1);
-      expect(hint.text()).toBe('Hello from hint');
+      expect(queryByTestSubject('myHint')).toBeInTheDocument();
+      expect(queryByTestSubject('myHint')).toHaveTextContent('Hello from hint');
     });
   });
 });

src/components/search_bar/search_bar.tsx

@@ -8,7 +8,7 @@
 
 import React, { Component, ReactElement } from 'react';
 
-import { htmlIdGenerator } from '../../services/accessibility';
+import { RenderWithEuiTheme, htmlIdGenerator } from '../../services';
 import { isString } from '../../services/predicate';
 import { EuiFlexGroup, EuiFlexItem } from '../flex';
 import { EuiSearchBox } from './search_box';
@@ -18,6 +18,10 @@ import { CommonProps } from '../common';
 import { EuiFieldSearchProps } from '../form/field_search';
 import { EuiInputPopoverProps } from '../popover';
 
+import {
+  euiSearchBar__searchHolder,
+  euiSearchBar__filtersHolder,
+} from './search_bar.styles';
 export { Query, AST as Ast } from './query';
 
 export type QueryType = Query | string;
@@ -259,24 +263,20 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {
 
     const toolsLeftEl = this.renderTools(toolsLeft);
 
-    const filtersBar = !filters ? undefined : (
-      <EuiFlexItem className="euiSearchBar__filtersHolder" grow={false}>
-        <EuiSearchBarFilters
-          filters={filters}
-          query={query}
-          onChange={this.onFiltersChange}
-        />
-      </EuiFlexItem>
-    );
-
     const toolsRightEl = this.renderTools(toolsRight);
 
     const isHintVisible = hint?.popoverProps?.isOpen ?? isHintVisibleState;
 
     return (
+      <RenderWithEuiTheme>
+        {(euiTheme) => (
           <EuiFlexGroup gutterSize="m" alignItems="center" wrap>
             {toolsLeftEl}
-        <EuiFlexItem className="euiSearchBar__searchHolder" grow={true}>
+            <EuiFlexItem
+              className="euiSearchBar__searchHolder"
+              css={euiSearchBar__searchHolder(euiTheme)}
+              grow={true}
+            >
               <EuiSearchBox
                 {...box}
                 query={queryText}
@@ -298,9 +298,23 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> {
                 }
               />
             </EuiFlexItem>
-        {filtersBar}
+            {filters && (
+              <EuiFlexItem
+                className="euiSearchBar__filtersHolder"
+                css={euiSearchBar__filtersHolder(euiTheme)}
+                grow={false}
+              >
+                <EuiSearchBarFilters
+                  filters={filters}
+                  query={query}
+                  onChange={this.onFiltersChange}
+                />
+              </EuiFlexItem>
+            )}
             {toolsRightEl}
           </EuiFlexGroup>
+        )}
+      </RenderWithEuiTheme>
     );
   }
 }