[Controls] [PresentationUtil] QoL improvements to control creation form #162067
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
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
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 |
|---|---|---|
|
|
@@ -7,35 +7,33 @@ | |
| */ | ||
|
|
||
| import React, { useState } from 'react'; | ||
|
|
||
| import { | ||
| EuiFilterGroup, | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiInputPopover, | ||
| EuiContextMenuPanel, | ||
| EuiContextMenuItem, | ||
| EuiFilterButton, | ||
| EuiFilterButtonProps, | ||
| } from '@elastic/eui'; | ||
| import { FieldIcon } from '@kbn/react-field'; | ||
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
|
|
||
| export interface Props { | ||
| onFieldTypesChange: (value: string[]) => void; | ||
| buttonProps?: Partial<EuiFilterButtonProps>; | ||
| setFocusToSearch: () => void; | ||
| availableFieldTypes: string[]; | ||
| fieldTypesValue: string[]; | ||
| } | ||
|
|
||
| export function FieldTypeFilter({ | ||
| availableFieldTypes, | ||
| onFieldTypesChange, | ||
| setFocusToSearch, | ||
| fieldTypesValue, | ||
| buttonProps, | ||
| }: Props) { | ||
| const [isPopoverOpen, setPopoverOpen] = useState(false); | ||
|
|
@@ -63,48 +61,45 @@ export function FieldTypeFilter({ | |
| ); | ||
|
|
||
| return ( | ||
| <EuiFilterGroup fullWidth> | ||
| <EuiInputPopover | ||
| panelPaddingSize="none" | ||
| display="block" | ||
| isOpen={isPopoverOpen} | ||
| closePopover={() => { | ||
| setPopoverOpen(false); | ||
| }} | ||
| fullWidth | ||
| input={buttonContent} | ||
| focusTrapProps={{ | ||
| returnFocus: false, // we will be manually returning the focus to the search | ||
| onDeactivation: setFocusToSearch, | ||
| }} | ||
|
Comment on lines
+74
to
+77
There was a problem hiding this comment. This is the important change in this file - it ensures that, as described in elastic/eui#6627 (comment), the focus returns to the search field when the field type filter is closed (either via |
||
| > | ||
| <EuiContextMenuPanel | ||
| items={(availableFieldTypes as string[]).map((type) => ( | ||
| <EuiContextMenuItem | ||
| key={type} | ||
| icon={fieldTypesValue.includes(type) ? 'check' : 'empty'} | ||
| data-test-subj={`typeFilter-${type}`} | ||
| onClick={() => { | ||
| if (fieldTypesValue.includes(type)) { | ||
| onFieldTypesChange(fieldTypesValue.filter((f) => f !== type)); | ||
| } else { | ||
| onFieldTypesChange([...fieldTypesValue, type]); | ||
| } | ||
| }} | ||
| > | ||
| <EuiFlexGroup gutterSize="xs" responsive={false}> | ||
| <EuiFlexItem grow={false}> | ||
| <FieldIcon type={type} label={type} /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem>{type}</EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| </EuiContextMenuItem> | ||
| ))} | ||
| /> | ||
| </EuiInputPopover> | ||
| </EuiFilterGroup> | ||
| ); | ||
| } | ||
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
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
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.
Switched this to a
divso that it can receive theidpassed down from theEuiFormRowcomponent - not sure why, but the React fragment ignored it 🤷