@cloud-ru/ds-toolbar 2.1.11-preview-2991dba0.0 → 2.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/README.md +4 -4
  3. package/dist/cjs/components/Toolbar/Toolbar.js +3 -3
  4. package/dist/cjs/components/Toolbar/{utils/bulkActions.d.ts → helpers.d.ts} +2 -2
  5. package/dist/cjs/components/Toolbar/styles.module.css +0 -1
  6. package/dist/cjs/helperComponents/BulkActions/components/BulkActionsControls/BulkActionsControls.js +3 -1
  7. package/dist/cjs/helperComponents/BulkActions/components/MobileBulkActionsSheet/MobileBulkActionsSheet.js +3 -1
  8. package/dist/cjs/helperComponents/BulkActions/components/SelectionLabel/SelectionLabel.js +1 -1
  9. package/dist/cjs/helperComponents/BulkActions/components/index.d.ts +1 -1
  10. package/dist/cjs/helperComponents/BulkActions/components/index.js +1 -1
  11. package/dist/cjs/helperComponents/BulkActions/styles.module.css +1 -0
  12. package/dist/cjs/helperComponents/FilterButton/FilterButton.js +1 -1
  13. package/dist/cjs/style.css +1 -1
  14. package/dist/cjs/testIds.d.ts +1 -1
  15. package/dist/cjs/testIds.js +1 -1
  16. package/dist/esm/components/Toolbar/Toolbar.js +1 -1
  17. package/dist/esm/components/Toolbar/{utils/bulkActions.d.ts → helpers.d.ts} +2 -2
  18. package/dist/esm/components/Toolbar/styles.module.css +0 -1
  19. package/dist/esm/helperComponents/BulkActions/components/BulkActionsControls/BulkActionsControls.js +3 -1
  20. package/dist/esm/helperComponents/BulkActions/components/MobileBulkActionsSheet/MobileBulkActionsSheet.js +3 -1
  21. package/dist/esm/helperComponents/BulkActions/components/SelectionLabel/SelectionLabel.js +1 -1
  22. package/dist/esm/helperComponents/BulkActions/components/index.d.ts +1 -1
  23. package/dist/esm/helperComponents/BulkActions/components/index.js +1 -1
  24. package/dist/esm/helperComponents/BulkActions/styles.module.css +1 -0
  25. package/dist/esm/helperComponents/FilterButton/FilterButton.js +1 -1
  26. package/dist/esm/style.css +1 -1
  27. package/dist/esm/testIds.d.ts +1 -1
  28. package/dist/esm/testIds.js +1 -1
  29. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  30. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  31. package/package.json +17 -17
  32. package/src/components/Toolbar/Toolbar.tsx +1 -1
  33. package/src/components/Toolbar/{utils/bulkActions.ts → helpers.ts} +1 -1
  34. package/src/components/Toolbar/styles.module.scss +0 -2
  35. package/src/helperComponents/BulkActions/components/BulkActionsControls/BulkActionsControls.tsx +1 -1
  36. package/src/helperComponents/BulkActions/components/MobileBulkActionsSheet/MobileBulkActionsSheet.tsx +1 -0
  37. package/src/helperComponents/BulkActions/components/SelectionLabel/SelectionLabel.tsx +1 -1
  38. package/src/helperComponents/BulkActions/components/index.ts +1 -1
  39. package/src/helperComponents/BulkActions/styles.module.scss +2 -9
  40. package/src/helperComponents/FilterButton/FilterButton.tsx +2 -2
  41. package/src/testIds.ts +1 -1
  42. /package/dist/cjs/components/Toolbar/{utils/bulkActions.js → helpers.js} +0 -0
  43. /package/dist/esm/components/Toolbar/{utils/bulkActions.js → helpers.js} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-toolbar",
3
- "version": "2.1.11-preview-2991dba0.0",
3
+ "version": "2.1.11",
4
4
  "description": "Панель инструментов списков и таблиц — поиск, фильтры, массовые действия, меню «Ещё».",
5
5
  "repository": {
6
6
  "type": "git",
@@ -41,22 +41,22 @@
41
41
  "dependencies": {
42
42
  "@cloud-ru/ft-request-payload-transform": "^0.5.0",
43
43
  "classnames": "^2.5.1",
44
- "@cloud-ru/ds-adaptive": "1.0.6",
45
- "@cloud-ru/ds-chips": "1.2.14-preview-2991dba0.0",
46
- "@cloud-ru/ds-icons": "1.7.5",
47
- "@cloud-ru/ds-button": "1.0.8",
48
- "@cloud-ru/ds-bottom-sheet": "2.3.0",
49
- "@cloud-ru/ds-list": "3.1.5-preview-2991dba0.0",
50
- "@cloud-ru/ds-locale": "1.0.0",
51
- "@cloud-ru/ds-materials": "2.0.5",
52
- "@cloud-ru/ds-search": "1.0.22",
53
- "@cloud-ru/ds-portal-context": "1.0.6",
54
- "@cloud-ru/ds-scroll": "1.0.9",
55
- "@cloud-ru/ds-segment-control": "1.0.23",
56
- "@cloud-ru/ds-tag": "1.2.4",
57
- "@cloud-ru/ds-tooltip": "1.0.21",
58
- "@cloud-ru/ds-utils": "1.4.2",
59
- "@cloud-ru/ds-toggles": "1.1.18"
44
+ "@cloud-ru/ds-bottom-sheet": "^2.3.1",
45
+ "@cloud-ru/ds-adaptive": "^1.0.6",
46
+ "@cloud-ru/ds-button": "^1.0.8",
47
+ "@cloud-ru/ds-locale": "^1.0.0",
48
+ "@cloud-ru/ds-icons": "^1.8.0",
49
+ "@cloud-ru/ds-list": "^3.1.5",
50
+ "@cloud-ru/ds-materials": "^2.0.5",
51
+ "@cloud-ru/ds-portal-context": "^1.0.6",
52
+ "@cloud-ru/ds-scroll": "^1.0.9",
53
+ "@cloud-ru/ds-segment-control": "^1.0.24",
54
+ "@cloud-ru/ds-tag": "^1.2.5",
55
+ "@cloud-ru/ds-tooltip": "^1.0.22",
56
+ "@cloud-ru/ds-search": "^1.0.23",
57
+ "@cloud-ru/ds-toggles": "^1.1.19",
58
+ "@cloud-ru/ds-utils": "^1.4.2",
59
+ "@cloud-ru/ds-chips": "^1.2.14"
60
60
  },
61
61
  "publishConfig": {
62
62
  "access": "public"
@@ -9,11 +9,11 @@ import { useMemo, useRef } from 'react';
9
9
  import { BulkActions, DataView, FilterButton, MoreActions, Search, Separator } from '../../helperComponents';
10
10
  import { toolbarLocale } from '../../locale';
11
11
  import { TEST_IDS } from '../../testIds';
12
+ import { extractBulkActionsProps, isBulkActionsProps } from './helpers';
12
13
  import { useFilters, usePersistState } from './hooks';
13
14
  import styles from './styles.module.scss';
14
15
  import { ToolbarProps } from './types';
15
16
  import { buildMobileOverflowActions } from './utils/buildMobileOverflowActions';
16
- import { extractBulkActionsProps, isBulkActionsProps } from './utils/bulkActions';
17
17
 
18
18
  export function Toolbar<TState extends FiltersState = Record<string, unknown>>({
19
19
  className,
@@ -1,6 +1,6 @@
1
1
  import { FiltersState } from '@cloud-ru/ds-chips';
2
2
 
3
- import { ToolbarBulkActionProps, ToolbarProps } from '../types';
3
+ import { ToolbarBulkActionProps, ToolbarProps } from './types';
4
4
 
5
5
  export function extractBulkActionsProps({
6
6
  onCheck,
@@ -6,8 +6,6 @@
6
6
  display: flex;
7
7
  flex-direction: column;
8
8
  gap: toolbar.$sn-toolbar-anatomy-container-gap;
9
-
10
- box-sizing: border-box;
11
9
  width: 100%;
12
10
  }
13
11
 
@@ -92,6 +92,7 @@ export function BulkActionsControls({
92
92
  {hiddenItems.length > 0 && (
93
93
  <Droplist
94
94
  label={isSheet ? t('multipleActions') : undefined}
95
+ // TODO: slotAfterTitle должен расширяться на всю ширину, а section-label уходить вправо
95
96
  slotAfterTitle={
96
97
  isSheet ? (
97
98
  <SelectionLabel
@@ -104,7 +105,6 @@ export function BulkActionsControls({
104
105
  }
105
106
  open={isMoreOpen}
106
107
  onOpenChange={setIsMoreOpen}
107
- onBackButtonClick={isSheet ? () => setIsMoreOpen(false) : undefined}
108
108
  trigger='clickAndFocusVisible'
109
109
  triggerElemRef={triggerRef}
110
110
  triggerClassName={styles.triggerClassName}
@@ -50,6 +50,7 @@ export function MobileBulkActionsSheet({
50
50
  open={open}
51
51
  onClose={CLOSE_STUB_CALLBACK}
52
52
  title={t('multipleActions')}
53
+ // TODO: slotAfterTitle должен расширяться на всю ширину, а section-label уходить вправо
53
54
  slotAfterTitle={
54
55
  <SelectionLabel
55
56
  placement='headline'
@@ -21,7 +21,7 @@ export function SelectionLabel({
21
21
  const { t } = toolbarLocale.useTranslations();
22
22
 
23
23
  const valueLabel =
24
- totalCount != null
24
+ hasSelection && totalCount != null
25
25
  ? t('selectedCountOf', { count: selectedCount, total: totalCount })
26
26
  : t('selectedCount', { count: selectedCount });
27
27
 
@@ -1,4 +1,4 @@
1
1
  export * from './BulkActionsCheckbox';
2
2
  export * from './BulkActionsControls';
3
- export * from './SelectionLabel';
4
3
  export * from './MobileBulkActionsSheet';
4
+ export * from './SelectionLabel';
@@ -9,6 +9,7 @@
9
9
  box-sizing: border-box;
10
10
  width: 100%;
11
11
  min-height: toolbar.$sn-toolbar-anatomy-container-tool-bulkTool-minHeight;
12
+ padding-left: toolbar.$sn-toolbar-anatomy-container-tool-bulkAction-paddingLeft;
12
13
  }
13
14
 
14
15
  .volumeWrapper {
@@ -24,13 +25,5 @@
24
25
  align-items: center;
25
26
  justify-content: center;
26
27
 
27
- @include base.composite-var(
28
- toolbar.$toolbar,
29
- 'anatomy',
30
- 'container',
31
- 'tool',
32
- 'bulkTool',
33
- 'volumeWrapper',
34
- 'checkboxWrapper'
35
- );
28
+ @include base.composite-var(toolbar.$toolbar, 'anatomy', 'container', 'tool', 'bulkTool', 'volumeWrapper', 'checkboxWrapper');
36
29
  }
@@ -24,8 +24,8 @@ export function FilterButton({ open, onOpenChange, numberOfFilters }: FilterButt
24
24
  return (
25
25
  <Tooltip tip={open ? t('hideFilters') : t('showFilters')} triggerClassName={styles.trigger}>
26
26
  <Button
27
- view='function'
28
- appearance='neutral'
27
+ view={open ? 'tonal' : 'function'}
28
+ appearance={open ? 'primary' : 'neutral'}
29
29
  size='m'
30
30
  icon={<FilterSVG />}
31
31
  iconPosition='after'
package/src/testIds.ts CHANGED
@@ -7,8 +7,8 @@ export const TEST_IDS = {
7
7
  deactivateAction: 'toolbar__deactivate-action',
8
8
  disabledAction: 'toolbar__disabled-action',
9
9
  bulkTool: 'toolbar__bulk-tool',
10
- mobileBulkActionsSheet: 'toolbar__mobile-bulk-actions-sheet',
11
10
  bulkActions: 'toolbar__bulk-actions',
11
+ mobileBulkActionsSheet: 'toolbar__mobile-bulk-actions-sheet',
12
12
  moreBulkActionsButton: 'toolbar__more-bulk-actions-button',
13
13
  refreshButton: 'toolbar__refresh-button',
14
14
  refreshOption: 'toolbar__refresh-option',