@cloud-ru/ds-table 1.0.13-preview-06dc4823.0 → 1.0.13

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-table",
3
- "version": "1.0.13-preview-06dc4823.0",
3
+ "version": "1.0.13",
4
4
  "description": "Таблица данных: клиентская Table, серверная ServerTable и preset-обёртки с упрощённым API.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -48,26 +48,26 @@
48
48
  "@tanstack/react-table": "^8.21.3",
49
49
  "@tanstack/react-virtual": "^3.14.8",
50
50
  "classnames": "^2.5.1",
51
- "@cloud-ru/ds-adaptive": "1.0.1",
52
- "@cloud-ru/ds-card": "1.0.10-preview-06dc4823.0",
53
- "@cloud-ru/ds-chips": "1.0.12-preview-06dc4823.0",
54
- "@cloud-ru/ds-drag-and-drop": "1.1.1",
55
- "@cloud-ru/ds-icons": "1.1.0",
56
- "@cloud-ru/ds-locale": "1.0.0",
57
- "@cloud-ru/ds-list": "2.1.1-preview-06dc4823.0",
58
- "@cloud-ru/ds-scroll": "1.0.2",
59
- "@cloud-ru/ds-button": "1.0.2-preview-06dc4823.0",
60
- "@cloud-ru/ds-skeleton": "1.0.1",
61
- "@cloud-ru/ds-materials": "1.0.1",
62
- "@cloud-ru/ds-pagination": "1.0.4-preview-06dc4823.0",
63
- "@cloud-ru/ds-info-block": "1.0.1",
64
- "@cloud-ru/ds-toggles": "1.1.3",
65
- "@cloud-ru/ds-toolbar": "1.0.13-preview-06dc4823.0",
66
- "@cloud-ru/ds-status": "1.0.2-preview-06dc4823.0",
67
- "@cloud-ru/ds-theme": "1.1.0",
68
- "@cloud-ru/ds-tooltip": "1.0.4",
69
- "@cloud-ru/ds-truncate-string": "1.0.4",
70
- "@cloud-ru/ds-utils": "1.1.0"
51
+ "@cloud-ru/ds-adaptive": "^1.0.1",
52
+ "@cloud-ru/ds-button": "^1.0.2",
53
+ "@cloud-ru/ds-card": "^1.0.10",
54
+ "@cloud-ru/ds-chips": "^1.0.12",
55
+ "@cloud-ru/ds-drag-and-drop": "^1.1.1",
56
+ "@cloud-ru/ds-icons": "^1.1.0",
57
+ "@cloud-ru/ds-list": "^2.1.1",
58
+ "@cloud-ru/ds-locale": "^1.0.0",
59
+ "@cloud-ru/ds-materials": "^1.0.1",
60
+ "@cloud-ru/ds-info-block": "^1.0.1",
61
+ "@cloud-ru/ds-scroll": "^1.0.2",
62
+ "@cloud-ru/ds-pagination": "^1.0.4",
63
+ "@cloud-ru/ds-skeleton": "^1.0.1",
64
+ "@cloud-ru/ds-status": "^1.0.2",
65
+ "@cloud-ru/ds-theme": "^1.1.0",
66
+ "@cloud-ru/ds-toggles": "^1.1.3",
67
+ "@cloud-ru/ds-tooltip": "^1.0.4",
68
+ "@cloud-ru/ds-toolbar": "^1.0.13",
69
+ "@cloud-ru/ds-truncate-string": "^1.0.4",
70
+ "@cloud-ru/ds-utils": "^1.1.0"
71
71
  },
72
72
  "publishConfig": {
73
73
  "access": "public"
@@ -11,6 +11,10 @@ import { getInitColumnSizeFromLocalStorage, saveStateToLocalStorage } from '../u
11
11
  import { getColumnIdentifier } from '../utils/getColumnIdentifier';
12
12
  import { getColumnStyleVars } from '../utils/getColumnStyleVars';
13
13
  import { getCurrentlyConfiguredHeaderWidth } from '../utils/getCurrentlyConfiguredHeaderWidth';
14
+ import { getTableViewportWidth } from '../utils/getTableViewportWidth';
15
+
16
+ /** Закреплённая колонка не прокручивается: без запаса её ручка ресайза уезжает за край видимой области. */
17
+ const PINNED_COLUMN_VIEWPORT_RESERVE = 160;
14
18
 
15
19
  type UseColumnSizesParams<TData extends object> = {
16
20
  table: Table<TData>;
@@ -73,7 +77,19 @@ export function useColumnSizes<TData extends object>({
73
77
  const hasAssignedSize = table.getState().columnSizing[header.id] !== undefined;
74
78
 
75
79
  if (hasAssignedSize) {
76
- const currentSize = header.getSize();
80
+ let currentSize = header.getSize();
81
+ // `pinned` живёт в ColumnDefinition кита, а `_getColumnDefs` отдаёт тип tanstack.
82
+ const isPinned = Boolean((originalColDef as unknown as ColumnDefinition<TData> | undefined)?.pinned);
83
+
84
+ if (isPinned) {
85
+ const viewportWidth = getTableViewportWidth(header.id);
86
+
87
+ if (viewportWidth) {
88
+ const minSize = header.column.columnDef.minSize ?? 0;
89
+
90
+ currentSize = Math.min(currentSize, Math.max(minSize, viewportWidth - PINNED_COLUMN_VIEWPORT_RESERVE));
91
+ }
92
+ }
77
93
 
78
94
  realSizes[header.id] = currentSize;
79
95
  size = `${currentSize}px`;
@@ -0,0 +1,16 @@
1
+ import { isBrowser } from '@cloud-ru/ds-utils';
2
+
3
+ import { TABLE_CSS_VARS } from '../../../constants';
4
+
5
+ /** Ширина видимой области таблицы из CSS-переменной обёртки (её пишет `useTableScroll`); 0 — замерить не удалось. */
6
+ export function getTableViewportWidth(headerId: string): number {
7
+ if (isBrowser()) {
8
+ const cell = document.querySelector(`[data-header-id="${headerId}"]`);
9
+
10
+ if (cell) {
11
+ return Number.parseFloat(getComputedStyle(cell).getPropertyValue(TABLE_CSS_VARS.viewportWidth)) || 0;
12
+ }
13
+ }
14
+
15
+ return 0;
16
+ }
@@ -3,6 +3,7 @@ export * from './columnSize';
3
3
  export * from './getColumnIdentifier';
4
4
  export * from './getColumnStyleVars';
5
5
  export * from './getCurrentlyConfiguredHeaderWidth';
6
+ export * from './getTableViewportWidth';
6
7
  export * from './getTableColumnsDefinitions';
7
8
  export * from './sortColumnDefinitions';
8
9
  export * from './isEveryArrayItemString';