Skip to content

Commit e00b995

Browse files
authored
feat(MenuInput): use SearchInput instead of TextInput (#8329)
* feat(MenuInput): use SearchInput instead of TextInput * fix cypress test
1 parent 5d1af98 commit e00b995

File tree

6 files changed

+14
-21
lines changed

6 files changed

+14
-21
lines changed

packages/react-core/src/components/Menu/examples/Menu.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-ico
3838
```ts file="./MenuWithCheckbox.tsx"
3939
```
4040

41-
### Filtering with text input
41+
### Filtering with search input
4242

43-
```ts file="MenuFilteringWithTextInput.tsx"
43+
```ts file="MenuFilteringWithSearchInput.tsx"
4444
```
4545

4646
### With links

packages/react-core/src/components/Menu/examples/MenuFilteringWithTextInput.tsx renamed to packages/react-core/src/components/Menu/examples/MenuFilteringWithSearchInput.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import { Menu, MenuList, MenuItem, MenuContent, MenuInput, TextInput, Divider } from '@patternfly/react-core';
2+
import { Menu, MenuList, MenuItem, MenuContent, MenuInput, Divider, SearchInput } from '@patternfly/react-core';
33

4-
export const MenuFilteringWithTextInput: React.FunctionComponent = () => {
4+
export const MenuFilteringWithSearchInput: React.FunctionComponent = () => {
55
const [activeItem, setActiveItem] = React.useState(0);
66
const [input, setInput] = React.useState('');
77

@@ -35,10 +35,9 @@ export const MenuFilteringWithTextInput: React.FunctionComponent = () => {
3535
return (
3636
<Menu onSelect={onSelect} activeItemId={activeItem}>
3737
<MenuInput>
38-
<TextInput
38+
<SearchInput
3939
value={input}
4040
aria-label="Filter menu items"
41-
iconVariant="search"
4241
type="search"
4342
onChange={value => handleTextInputChange(value)}
4443
/>

packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
Popper,
1111
Tooltip,
1212
Divider,
13-
TextInput
13+
SearchInput
1414
} from '@patternfly/react-core';
1515
import { Link } from '@reach/router';
1616
import ThIcon from '@patternfly/react-icons/dist/js/icons/th-icon';
@@ -250,12 +250,7 @@ export const ComposableApplicationLauncher: React.FunctionComponent = () => {
250250
// eslint-disable-next-line no-console
251251
<Menu ref={menuRef} onActionClick={onFavorite} onSelect={(_ev, itemId) => console.log('selected', itemId)}>
252252
<MenuInput>
253-
<TextInput
254-
aria-label="Filter menu items"
255-
iconVariant="search"
256-
type="search"
257-
onChange={value => onTextChange(value)}
258-
/>
253+
<SearchInput aria-label="Filter menu items" type="search" onChange={value => onTextChange(value)} />
259254
</MenuInput>
260255
<Divider />
261256
<MenuContent>

packages/react-core/src/demos/ComposableMenu/examples/ComposableContextSelector.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
MenuInput,
1010
Popper,
1111
Divider,
12-
TextInput,
1312
InputGroup,
1413
Button,
15-
ButtonVariant
14+
ButtonVariant,
15+
SearchInput
1616
} from '@patternfly/react-core';
1717
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
1818

@@ -160,7 +160,7 @@ export const ComposableContextSelector: React.FunctionComponent = () => {
160160
>
161161
<MenuInput>
162162
<InputGroup>
163-
<TextInput
163+
<SearchInput
164164
value={searchInputValue}
165165
type="search"
166166
placeholder="Search"

packages/react-integration/cypress/integration/menu.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Menu Test', () => {
3737
.first()
3838
.should('have.class', 'pf-c-menu__search');
3939

40-
cy.get('.pf-c-form-control.pf-m-search').type('Action 1');
40+
cy.get('.pf-c-text-input-group__text-input').type('Action 1');
4141

4242
cy.get('#filtered-items.pf-c-menu__list-item')
4343
.last()

packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDemo.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
MenuItemAction,
1313
MenuContent,
1414
MenuInput,
15-
TextInput,
1615
MenuFooter,
1716
Button,
18-
Spinner
17+
Spinner,
18+
SearchInput
1919
} from '@patternfly/react-core';
2020
import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
2121
import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
@@ -258,10 +258,9 @@ export class MenuDemo extends Component {
258258
</Title>
259259
<Menu onSelect={this.onSimpleSelect} activeItemId={activeItem} id="filterable-menu">
260260
<MenuInput>
261-
<TextInput
261+
<SearchInput
262262
value={input}
263263
aria-label="filterable-example-with-text-input"
264-
iconVariant="search"
265264
type="search"
266265
onChange={value => this.handleTextInputChange(value, 'input')}
267266
/>

0 commit comments

Comments
 (0)