Merge branch 'main' into Breadcrumbs-renderItem

.github/workflows/release.yml

@@ -2,14 +2,19 @@ name: Release
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - release/v*
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - uses: gravity-ui/release-action@v1
-      with:
-        github-token: ${{ secrets.GRAVITY_UI_BOT_GITHUB_TOKEN }}
-        npm-token: ${{ secrets.GRAVITY_UI_BOT_NPM_TOKEN }}
-        node-version: 18
+      - name: Release from ${{ github.ref_name }}
+        uses: gravity-ui/release-action@v1
+        with:
+          github-token: ${{ secrets.GRAVITY_UI_BOT_GITHUB_TOKEN }}
+          npm-token: ${{ secrets.GRAVITY_UI_BOT_NPM_TOKEN }}
+          node-version: 18
+          default-branch: ${{ github.ref_name != 'main' && github.ref_name || null }}
+          npm-dist-tag: ${{ github.ref_name != 'main' && 'untagged' || 'latest' }}

CODEOWNERS

@@ -46,7 +46,6 @@
 /src/components/controls/TextInput @korvin89
 /src/components/Toaster @ogonkov
 /src/components/Tooltip @amje
-/src/components/theme @resure
 
 /src/hooks/useActionHandlers @ogonkov
 /src/hooks/useFileInput @korvin89

gulpfile.js

@@ -11,7 +11,7 @@ const BUILD_DIR = path.resolve('build');
 
 task('clean', (done) => {
     rimrafSync(BUILD_DIR);
-    rimrafSync('styles/**/*.css');
+    rimrafSync('styles/**/*.css', {glob: true});
     done();
 });
 

playwright/playwright/index.tsx

@@ -1 +1,18 @@
+import React from 'react';
+
+import {beforeMount} from '@playwright/experimental-ct-react/hooks';
+
+import {MobileProvider} from '../../src/components/mobile/MobileProvider';
+import {ThemeProvider} from '../../src/components/theme/ThemeProvider';
+
 import './index.scss';
+
+beforeMount(async ({App}) => {
+    return (
+        <ThemeProvider theme="light">
+            <MobileProvider>
+                <App />
+            </MobileProvider>
+        </ThemeProvider>
+    );
+});

src/components/Table/__stories__/Table.stories.tsx

@@ -150,6 +150,9 @@ const WithTableActionsTemplate: StoryFn<TableProps<DataItem>> = (args) => {
     );
 };
 export const HOCWithTableActions = WithTableActionsTemplate.bind({});
+HOCWithTableActions.args = {
+    onRowClick: () => action('default')('click'),
+};
 
 // ---------------------------------
 const columnsWithCopy = _cloneDeep(columns);

src/components/Table/__tests__/Table.hocs.test.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 
-import {render} from '../../../../test-utils/utils';
+import userEvent from '@testing-library/user-event';
+
+import {render, screen, within} from '../../../../test-utils/utils';
 import type {TableProps} from '../Table';
 import {Table} from '../Table';
 import type {
@@ -47,6 +49,38 @@ describe('Table HOCs tests', () => {
         expect(getTextContent(container1.outerHTML)).toEqual(getTextContent(container2.outerHTML));
     });
 
+    it('using withTableActions with onRowClick should not click on row when clicking on menu item', async () => {
+        const TableWithActions = withTableActions<Model>(Table);
+
+        type Props = TableProps<Model> & WithTableActionsProps<Model>;
+        const user = userEvent.setup();
+        const onRowClick = jest.fn();
+        const onMenuItemClick = jest.fn();
+        const props: Props = {
+            data: [{disabled: false}],
+            columns: [{id: 'name'}],
+            onRowClick,
+            getRowActions: () => [
+                {
+                    text: 'event',
+                    handler: onMenuItemClick,
+                },
+            ],
+        };
+
+        render(React.createElement<Props>(TableWithActions, props));
+
+        const table = screen.getByRole('table');
+        const menuButton = within(table).getAllByRole('button');
+        await user.click(menuButton[0]);
+        const menuItem = screen.getByRole('menuitem');
+        expect(menuItem).toBeInTheDocument();
+        await user.click(menuItem);
+
+        expect(onMenuItemClick).toHaveBeenCalledTimes(props.data.length);
+        expect(onRowClick).toHaveBeenCalledTimes(0);
+    });
+
     it('using withTableActions and withTableSorting should not depend of order', () => {
         const Table1 = withTableActions(withTableSorting<Model>(Table));
         const Table2 = withTableSorting(withTableActions<Model>(Table));

src/components/Table/hoc/withTableActions/withTableActions.tsx

@@ -131,7 +131,10 @@ const DefaultRowActions = <I extends TableDataItem>({
         return (
             <Menu.Item
                 key={index}
-                onClick={(event) => handler(item, index, event)}
+                onClick={(event) => {
+                    event.stopPropagation();
+                    handler(item, index, event);
+                }}
                 iconStart={icon}
                 className={menuItemCn}
                 {...restProps}

src/components/Toc/__stories__/Toc.stories.tsx

@@ -11,7 +11,7 @@ import './Toc.stories.scss';
 const b = block('toc-stories');
 
 export default {
-    title: 'Components/Data Display/Toc',
+    title: 'Components/Navigation/Toc',
     component: Toc,
     argTypes: {},
 } as Meta;

src/components/index.ts

@@ -54,6 +54,6 @@ export * from './utils/event-broker';
 export {getComponentName} from './utils/getComponentName';
 export * from './utils/withEventBrokerDomHandlers';
 export * from './utils/layer-manager';
-export {Lang, configure} from './utils/configure';
+export {Lang, configure, getConfig} from './utils/configure';
 export * from './utils/xpath';
 export {getUniqId} from './utils/common';

src/components/theme/dom-helpers.ts

@@ -23,15 +23,6 @@ export function updateBodyClassName({
         bodyEl.classList.add(rootClassName);
     }
 
-    if (className) {
-        const parsedCustomRootClassNames = className.split(' ');
-        parsedCustomRootClassNames.forEach((cls) => {
-            if (cls && !bodyEl.classList.contains(cls)) {
-                bodyEl.classList.add(cls);
-            }
-        });
-    }
-
     if (prevClassName) {
         const parsedPrevCustomRootClassNames = prevClassName.split(' ');
         parsedPrevCustomRootClassNames.forEach((cls) => {
@@ -41,6 +32,15 @@ export function updateBodyClassName({
         });
     }
 
+    if (className) {
+        const parsedCustomRootClassNames = className.split(' ');
+        parsedCustomRootClassNames.forEach((cls) => {
+            if (cls && !bodyEl.classList.contains(cls)) {
+                bodyEl.classList.add(cls);
+            }
+        });
+    }
+
     [...bodyEl.classList].forEach((cls) => {
         if (cls.startsWith(modsClassName(b({theme: true})))) {
             bodyEl.classList.remove(cls);