fix(TableColumnSetup): uniq i18n keysets, styles (#1498)

gravity-ui · Apr 10, 2024 · 271ae3f · 271ae3f
1 parent 79c1452
commit 271ae3f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/components/Table/__tests__/Table.withTableSettings.test.tsx b/src/components/Table/__tests__/Table.withTableSettings.test.tsx
@@ -288,7 +288,7 @@ describe('withTableSettings', () => {
 
             await userEvent.click(screen.getByRole('button', {name: 'Table settings'}));
             await userEvent.click(await screen.findByRole('button', {name: 'description'}));
-            await userEvent.click(screen.getByRole('button', {name: 'button_apply'}));
+            await userEvent.click(screen.getByRole('button', {name: 'Apply'}));
 
             expect(updateSettings).toHaveBeenCalledWith([
                 {

diff --git a/src/components/Table/hoc/withTableSettings/TableColumnSetup/i18n/index.ts b/src/components/Table/hoc/withTableSettings/TableColumnSetup/i18n/index.ts
@@ -3,6 +3,6 @@ import {addComponentKeysets} from '../../../../../utils/addComponentKeysets';
 import en from './en.json';
 import ru from './ru.json';
 
-const COMPONENT = 'TableColumnSetup';
+const COMPONENT = 'TableColumnSetupInner';
 
 export default addComponentKeysets({en, ru}, COMPONENT);
diff --git a/src/components/TableColumnSetup/TableColumnSetup.scss b/src/components/TableColumnSetup/TableColumnSetup.scss
@@ -3,6 +3,8 @@
 $block: '.#{variables.$ns}table-column-setup';
 
 #{$block} {
+    display: inline-block;
+
     &__status {
         margin-inline-start: 5px;
         color: var(--g-color-text-secondary);