Merge branch 'main' into add-qa

gravity-ui · Nov 30, 2023 · af52e7b · af52e7b
2 parents cffa90f + d767727
commit af52e7b
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 14 deletions.
diff --git a/src/components/Select/Select.tsx b/src/components/Select/Select.tsx
@@ -156,6 +156,10 @@ export const Select = React.forwardRef<HTMLButtonElement, SelectProps>(function
                     handleOptionClick(getActiveItem(listRef));
                 }
             }
+            if ([KeyCode.ARROW_DOWN, KeyCode.ARROW_UP].includes(e.key) && !open) {
+                e.preventDefault();
+                toggleOpen();
+            }
 
             listRef?.current?.onKeyDown(e);
         },

diff --git a/src/components/Select/__tests__/Select.base-actions.test.tsx b/src/components/Select/__tests__/Select.base-actions.test.tsx
@@ -52,6 +52,22 @@ describe('Select base actions', () => {
             await user.keyboard('[Space]');
             getByTestId(SelectQa.POPUP);
         });
+
+        test('ArrowUp', async () => {
+            const {getByTestId} = setup();
+            const user = userEvent.setup();
+            await user.keyboard('[Tab]');
+            await user.keyboard('[ArrowUp]');
+            getByTestId(SelectQa.POPUP);
+        });
+
+        test('ArrowDown', async () => {
+            const {getByTestId} = setup();
+            const user = userEvent.setup();
+            await user.keyboard('[Tab]');
+            await user.keyboard('[ArrowDown]');
+            getByTestId(SelectQa.POPUP);
+        });
     });
 
     describe('initial state', () => {

diff --git a/src/components/controls/TextArea/__tests__/TextArea.test.tsx b/src/components/controls/TextArea/__tests__/TextArea.test.tsx
@@ -39,19 +39,17 @@ describe('TextArea', () => {
             render(<TextArea hasClear />);
             const user = userEvent.setup();
             const input = screen.getByRole('textbox');
-            let clearButton = screen.queryByRole('button', {name: 'Clear input value'});
+            let clearButton = screen.queryByRole('button', {name: 'Clear'});
             expect(clearButton).not.toBeInTheDocument();
             await user.type(input, 'abc');
-            clearButton = screen.queryByRole('button', {name: 'Clear input value'});
+            clearButton = screen.queryByRole('button', {name: 'Clear'});
             expect(clearButton).toBeInTheDocument();
         });
 
         test('do not render clear button without hasClear prop', () => {
             render(<TextArea />);
 
-            expect(
-                screen.queryByRole('button', {name: 'Clear input value'}),
-            ).not.toBeInTheDocument();
+            expect(screen.queryByRole('button', {name: 'Clear'})).not.toBeInTheDocument();
         });
 
         test('call onChange when input changes value', () => {
@@ -79,7 +77,7 @@ describe('TextArea', () => {
             render(<TextArea hasClear onChange={onChangeFn} />);
             const input = screen.getByRole('textbox');
             await user.type(input, 'abc');
-            const clear = screen.getByRole('button', {name: 'Clear input value'});
+            const clear = screen.getByRole('button', {name: 'Clear'});
 
             if (clear) {
                 await user.click(clear);

diff --git a/src/components/controls/TextInput/__tests__/TextInput.input.test.tsx b/src/components/controls/TextInput/__tests__/TextInput.input.test.tsx
@@ -40,19 +40,17 @@ describe('TextInput input', () => {
                 render(<TextInput hasClear />);
                 const user = userEvent.setup();
                 const input = screen.getByRole('textbox');
-                let clearButton = screen.queryByRole('button', {name: 'Clear input value'});
+                let clearButton = screen.queryByRole('button', {name: 'Clear'});
                 expect(clearButton).not.toBeInTheDocument();
                 await user.type(input, 'abc');
-                clearButton = screen.queryByRole('button', {name: 'Clear input value'});
+                clearButton = screen.queryByRole('button', {name: 'Clear'});
                 expect(clearButton).toBeInTheDocument();
             });
 
             test('do not render clear button without hasClear prop', () => {
                 render(<TextInput />);
 
-                expect(
-                    screen.queryByRole('button', {name: 'Clear input value'}),
-                ).not.toBeInTheDocument();
+                expect(screen.queryByRole('button', {name: 'Clear'})).not.toBeInTheDocument();
             });
 
             test('call onChange when input changes value', () => {
@@ -80,7 +78,7 @@ describe('TextInput input', () => {
                 render(<TextInput hasClear onChange={onChangeFn} />);
                 const input = screen.getByRole('textbox');
                 await user.type(input, 'abc');
-                const clear = screen.getByRole('button', {name: 'Clear input value'});
+                const clear = screen.getByRole('button', {name: 'Clear'});
 
                 if (clear) {
                     await user.click(clear);

diff --git a/src/components/controls/common/ClearButton/i18n/en.json b/src/components/controls/common/ClearButton/i18n/en.json
@@ -1,3 +1,3 @@
 {
-    "label_clear-button": "Clear input value"
+    "label_clear-button": "Clear"
 }
diff --git a/src/components/controls/common/ClearButton/i18n/ru.json b/src/components/controls/common/ClearButton/i18n/ru.json
@@ -1,3 +1,3 @@
 {
-    "label_clear-button": "Очистить введённое значение"
+    "label_clear-button": "Очистить"
 }
diff --git a/src/constants.ts b/src/constants.ts
@@ -6,4 +6,6 @@ export const KeyCode = {
     SPACEBAR: ' ',
     SPACEBAR_OLD: 'Spacebar',
     ESCAPE: 'Escape',
+    ARROW_UP: 'ArrowUp',
+    ARROW_DOWN: 'ArrowDown',
 };