[Emotion] Convert EuiSearchBar #7490
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| **CSS-in-JS conversions** | ||
|
|
||
| - Converted `EuiSearchBar` to Emotion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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( | ||
JasonStoltz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| '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})`)} | ||
| } | ||
| `; | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ | |
|
|
||
| import React, { Component, ReactElement } from 'react'; | ||
|
|
||
| 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,48 +263,58 @@ export class EuiSearchBar extends Component<EuiSearchBarProps, State> { | |
|
|
||
| const toolsLeftEl = this.renderTools(toolsLeft); | ||
|
|
||
| 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" | ||
| css={euiSearchBar__searchHolder(euiTheme)} | ||
| grow={true} | ||
| > | ||
| <EuiSearchBox | ||
| {...box} | ||
| query={queryText} | ||
| onSearch={this.onSearch} | ||
| isInvalid={error != null} | ||
| title={error ? error.message : undefined} | ||
| aria-describedby={isHintVisible ? `${this.hintId}` : undefined} | ||
| hint={ | ||
| hint | ||
| ? { | ||
| isVisible: isHintVisible, | ||
| setIsVisible: (isVisible: boolean) => { | ||
| this.setState({ isHintVisible: isVisible }); | ||
| }, | ||
| id: this.hintId, | ||
| ...hint, | ||
| } | ||
| : undefined | ||
| } | ||
| /> | ||
| </EuiFlexItem> | ||
| {filters && ( | ||
|
There was a problem hiding this comment.
That's wild that this has a performance implication, I had no idea. I assume this is what you're referring to. I'm going to link to this change specifically as a reference on #7499 There was a problem hiding this comment. Kevin chatted about me with this in relation to #7374, but iirc the issue is that React creates the conditional node |
||
| <EuiFlexItem | ||
| className="euiSearchBar__filtersHolder" | ||
| css={euiSearchBar__filtersHolder(euiTheme)} | ||
| grow={false} | ||
| > | ||
| <EuiSearchBarFilters | ||
| filters={filters} | ||
| query={query} | ||
| onChange={this.onFiltersChange} | ||
| /> | ||
| </EuiFlexItem> | ||
| )} | ||
| {toolsRightEl} | ||
| </EuiFlexGroup> | ||
| )} | ||
| </RenderWithEuiTheme> | ||
| ); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This very likely has performance implications as well (see #7486) and we likely need to memoize
euiFormVariables(and other CSS-in-JS component style vars) going forward. I'll address that in a separate PR from this one