Fixes #38916 - Update EditorHostSelect to pf5 #10777
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,6 +1,18 @@ | ||
| import React, { Component } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { | ||
|
Contributor
There was a problem hiding this comment. these changes are waiting to be integrated to this tests.
Contributor
Author
Contributor
There was a problem hiding this comment. It seems that #10728 should be merged first to leverage its passing tests. Subsequent changes can then be fully integrated with these tested, stable components. |
||
| Select, | ||
| SelectList, | ||
| SelectOption, | ||
| MenuToggle, | ||
| TextInputGroup, | ||
| TextInputGroupMain, | ||
| TextInputGroupUtilities, | ||
| Button, | ||
| Spinner, | ||
| Icon, | ||
| } from '@patternfly/react-core'; | ||
| import { TimesIcon } from '@patternfly/react-icons'; | ||
| import { translate as __ } from '../../../common/I18n'; | ||
| import './editorhostselect.scss'; | ||
|
|
||
|
|
@@ -20,7 +32,9 @@ class EditorHostSelect extends Component { | |
| handleClickOutside = event => { | ||
| if (this.selectRef && !this.selectRef.contains(event.target)) { | ||
| const { open, onToggle } = this.props; | ||
| if (open) { | ||
| onToggle(); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
|
|
@@ -31,38 +45,163 @@ class EditorHostSelect extends Component { | |
| } | ||
| }; | ||
|
|
||
| handleInputChange = (_event, value) => { | ||
| const { onSearchChange, selectedItem, onChange } = this.props; | ||
|
|
||
| onSearchChange({ target: { value } }); | ||
|
|
||
| if (selectedItem && selectedItem.name && value !== selectedItem.name) { | ||
| onChange({ id: '', name: '' }); | ||
| } | ||
| }; | ||
|
|
||
| onInputClick = () => { | ||
| const { open, onToggle } = this.props; | ||
|
|
||
| if (!open) { | ||
| onToggle(); | ||
| } | ||
| }; | ||
|
|
||
| toggle = toggleRef => { | ||
| const { | ||
| open, | ||
| searchQuery, | ||
| selectedItem, | ||
| onToggle, | ||
| onSearchClear, | ||
| } = this.props; | ||
|
|
||
| const inputValue = searchQuery || (selectedItem && selectedItem.name) || ''; | ||
|
|
||
| return ( | ||
| <MenuToggle | ||
| ref={toggleRef} | ||
| variant="typeahead" | ||
| onClick={onToggle} | ||
| isExpanded={open} | ||
| isFullWidth | ||
| > | ||
| <TextInputGroup isPlain> | ||
| <TextInputGroupMain | ||
| value={inputValue} | ||
| onClick={this.onInputClick} | ||
| onChange={this.handleInputChange} | ||
| onKeyDown={this.onKey} | ||
| placeholder={__('Select Host...')} | ||
| aria-label={__('Filter hosts')} | ||
| /> | ||
|
|
||
| <TextInputGroupUtilities | ||
| {...(!inputValue ? { style: { display: 'none' } } : {})} | ||
| > | ||
| <Button | ||
| variant="plain" | ||
| onClick={onSearchClear} | ||
| aria-label="Clear input value" | ||
| ouiaId="clear-input-value-button" | ||
| > | ||
| <Icon aria-hidden> | ||
| <TimesIcon /> | ||
| </Icon> | ||
| </Button> | ||
| </TextInputGroupUtilities> | ||
| </TextInputGroup> | ||
| </MenuToggle> | ||
| ); | ||
| }; | ||
|
|
||
| handleSelect = (_event, selection) => { | ||
| const { | ||
| options, | ||
| onChange, | ||
| onToggle, | ||
| onSearchChange, | ||
| onSearchClear, | ||
| } = this.props; | ||
| const normalizedSelection = | ||
| selection === undefined || selection === null | ||
| ? undefined | ||
| : String(selection); | ||
| const selectedHost = | ||
| options.find(option => String(option.id) === normalizedSelection) || | ||
| options.find(option => option.name === normalizedSelection); | ||
|
|
||
| if (selectedHost) { | ||
| onSearchChange({ target: { value: selectedHost.name } }); | ||
| onChange(selectedHost); | ||
|
|
||
| onToggle(); | ||
| onSearchClear(); | ||
| } | ||
| }; | ||
|
|
||
| render() { | ||
| const { | ||
| show, | ||
| isLoading, | ||
| open, | ||
| options, | ||
| onToggle, | ||
| selectedItem, | ||
| } = this.props; | ||
|
|
||
| const selectedValue = | ||
| selectedItem && | ||
| selectedItem.id !== undefined && | ||
| selectedItem.id !== null && | ||
| selectedItem.id !== '' | ||
| ? String(selectedItem.id) | ||
| : undefined; | ||
|
|
||
| let selectOptions; | ||
| if (isLoading) { | ||
| selectOptions = ( | ||
| <SelectOption isDisabled key="loading" value="loading"> | ||
| <Spinner | ||
| size="md" | ||
| style={{ marginRight: 'var(--pf-v5-global--spacer--sm)' }} | ||
| /> | ||
| {__('Loading...')} | ||
| </SelectOption> | ||
| ); | ||
| } else if (!options || options.length === 0) { | ||
| selectOptions = ( | ||
| <SelectOption isDisabled key="no-results" value="no-results"> | ||
| {__('No Results')} | ||
| </SelectOption> | ||
| ); | ||
| } else { | ||
| selectOptions = options.map(option => ( | ||
| <SelectOption key={option.id} value={String(option.id)}> | ||
| {option.name || option.id} | ||
| </SelectOption> | ||
| )); | ||
| } | ||
|
|
||
| return ( | ||
| <div | ||
| ref={this.setWrapperRef} | ||
| id="editor-select-container" | ||
| className={show ? '' : 'hidden'} | ||
| > | ||
| <Select | ||
| id="editor-host-select" | ||
| aria-label={__('Host selector')} | ||
| isOpen={open} | ||
| onSelect={this.handleSelect} | ||
| onOpenChange={isOpen => { | ||
| if (!isOpen && open) onToggle(); | ||
| }} | ||
| shouldFocusFirstItemOnOpen={false} | ||
| toggle={this.toggle} | ||
| selected={selectedValue} | ||
| variant="typeahead" | ||
| isScrollable | ||
| ouiaId="editor-host-select" | ||
| > | ||
| <SelectList>{selectOptions}</SelectList> | ||
| </Select> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
Deleting things from
package.jsonwill always get you a 📦 ACK from me ;-)