Skip to content

Commit 839830c

Browse files
authored
RI-7052: replace EuiFieldSearch with SearchInput (#4586)
* RI-7054: replace EuiFormRow with FormField * RI-7052 remove leftover * RI-7052: expose and use KeyboardKeys enum
1 parent ffda0f7 commit 839830c

File tree

40 files changed

+87
-459
lines changed

40 files changed

+87
-459
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { SearchInput } from '@redis-ui/components'
2+
3+
export default SearchInput
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export { default as PasswordInput } from './PasswordInput'
2+
export { default as SearchInput } from './SearchInput'

redisinsight/ui/src/components/cli/Cli/Cli.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react'
2-
import { keys } from '@elastic/eui'
2+
import { KeyboardKeys as keys } from 'uiSrc/constants/keys'
33
import { fireEvent, render } from 'uiSrc/utils/test-utils'
44
import CLI from './Cli'
55

redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { cloneDeep, last } from 'lodash'
22
import React from 'react'
3-
import { keys } from '@elastic/eui'
3+
import { KeyboardKeys as keys } from 'uiSrc/constants/keys'
44
import { instance, mock } from 'ts-mockito'
55
import {
66
cleanup,

redisinsight/ui/src/components/cli/components/cli-body/CliBody/CliBody.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Ref, useEffect, useRef, useState } from 'react'
2-
import { keys } from '@elastic/eui'
2+
import { KeyboardKeys as keys } from 'uiSrc/constants/keys'
33
import { useDispatch, useSelector } from 'react-redux'
44

55
import { Nullable, scrollIntoView } from 'uiSrc/utils'

redisinsight/ui/src/components/command-helper/components/command-helper-search/CHSearchFilter/styles.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.container {
2-
position: absolute;
32
height: 36px;
43
width: 180px;
54

redisinsight/ui/src/components/command-helper/components/command-helper-search/CHSearchInput/CHSearchInput.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React, { ChangeEvent, useEffect, useState } from 'react'
1+
import React, { useEffect, useState } from 'react'
22
import { useSelector } from 'react-redux'
3-
import { EuiFieldSearch } from '@elastic/eui'
43

54
import { cliSettingsSelector } from 'uiSrc/slices/cli/cli-settings'
65

6+
import { SearchInput } from 'uiSrc/components/base/inputs'
77
import styles from './styles.module.scss'
88

99
export interface Props {
@@ -38,18 +38,14 @@ const CHSearchInput = ({ submitSearch, isLoading = false }: Props) => {
3838

3939
return (
4040
<div className={styles.container}>
41-
<EuiFieldSearch
42-
isLoading={isLoading}
41+
<SearchInput
42+
loading={isLoading}
4343
disabled={isLoading}
44-
fullWidth={false}
4544
name="search-command"
4645
placeholder="Search for a command"
4746
autoComplete="off"
4847
value={searchValue}
49-
onChange={(e: ChangeEvent<HTMLInputElement>) =>
50-
onChangeSearch(e.target.value)
51-
}
52-
className={styles.searchInput}
48+
onChange={onChangeSearch}
5349
data-testid="cli-helper-search"
5450
/>
5551
</div>
Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
11
.container {
2-
max-width: 100%;
3-
height: 38px;
4-
margin-left: 106px;
5-
6-
:global(.euiFormControlLayout) {
7-
max-width: calc(100%) !important;
8-
height: 36px !important;
9-
}
10-
}
11-
12-
.searchInput {
13-
&:global(.euiFieldSearch) {
14-
border: 1px solid var(--euiColorLightShade) !important;
15-
height: 36px !important;
16-
}
2+
flex: 1;
173
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.searchWrapper {
22
margin-bottom: 16px;
33
position: relative;
4+
display: flex;
5+
gap: 6px;
46
}

redisinsight/ui/src/components/form-dialog/styles.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252

5353
.euiFieldText,
5454
.euiFieldNumber,
55-
.euiFieldSearch,
5655
.euiSelect,
5756
.euiSuperSelectControl,
5857
.euiComboBox .euiComboBox__inputWrap,

0 commit comments

Comments
 (0)