@cloud-ru/ds-list 2.3.7-preview-f66dfce6.0 → 2.3.7-preview-85aaafa9.0
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/dist/cjs/components/Items/BaseItem/BaseItem.js +1 -2
- package/dist/cjs/components/Items/types.d.ts +1 -1
- package/dist/cjs/components/Lists/contexts/NewListProvider.d.ts +10 -31
- package/dist/esm/components/Items/BaseItem/BaseItem.js +1 -2
- package/dist/esm/components/Items/types.d.ts +1 -1
- package/dist/esm/components/Lists/contexts/NewListProvider.d.ts +10 -31
- package/dist/esm/components/Lists/contexts/NewListProvider.js +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/src/components/Items/BaseItem/BaseItem.tsx +1 -3
- package/src/components/Items/types.ts +1 -1
- package/src/components/Lists/contexts/NewListProvider.tsx +29 -42
|
@@ -123,7 +123,7 @@ function BaseItem({ beforeContent, afterContent, content, onClick, onMouseDown,
|
|
|
123
123
|
const stateLayerState = isSelectionSingle && isChecked && !switchProp && !isParentNode
|
|
124
124
|
? 'activatedOnBackground'
|
|
125
125
|
: 'emptyNeutralOnBackground';
|
|
126
|
-
const dataTestId =
|
|
126
|
+
const dataTestId = typeof props['data-test-id'] === 'string' ? props['data-test-id'] : `${constants_1.TEST_IDS.baseItem}_${id}`;
|
|
127
127
|
const tabIndex = firstItemId && id === focusFlattenItems[firstItemId]?.originalId ? 0 : -1;
|
|
128
128
|
const dragHandleNode = dragHandle ? (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_2.default.dragHandle, children: dragHandle }) : undefined;
|
|
129
129
|
// Маркер/чекбокс/шеврон-обёртка нужны только дефолтной разметке; при `itemRender`
|
|
@@ -173,7 +173,6 @@ function BaseItem({ beforeContent, afterContent, content, onClick, onMouseDown,
|
|
|
173
173
|
onKeyDown: handleItemKeyDown,
|
|
174
174
|
onFocus: handleItemFocus,
|
|
175
175
|
onExpandIconClick: onExpandIconClick ? handleExpandIconClick : undefined,
|
|
176
|
-
expandIconInteractive: Boolean(onExpandIconClick),
|
|
177
176
|
})) : ((0, jsx_runtime_1.jsxs)("div", { className: (0, classnames_1.default)(styles_module_scss_1.default.itemWrapper, styles_module_scss_2.default.innerWrapper, className), "data-size": size, "data-inactive": inactive || undefined, "data-disabled": disabled || undefined, "data-variant": mode || undefined, "data-checked": (isParentNode && isChecked) || (!isParentNode && isChecked && !switchProp) || undefined, children: [(0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.stateLayer, "aria-hidden": true, "data-state": stateLayerState }), (0, jsx_runtime_1.jsxs)("li", { "data-type": 'outside', role: 'menuitem', "data-test-id": dataTestId, ref: itemRef, className: (0, classnames_1.default)(styles_module_scss_1.default.listItem, styles_module_scss_2.default.droplistItem), "data-size": size, onClick: handleItemClick, onMouseDown: handleItemMouseDown, tabIndex: tabIndex, "data-non-pointer": (inactive && !onClick) || undefined, "data-variant": mode || undefined, "data-open": open || undefined, "aria-expanded": isParentNode ? Boolean(open) : undefined, onKeyDown: handleItemKeyDown, onFocus: handleItemFocus, style: { '--level': level }, "data-level-one": level === 1 || undefined, "data-level-more-one": level > 1 || undefined, "data-checked": (isParentNode && (indeterminate || isChecked)) || (isChecked && !switchProp) || undefined, children: [dragHandleNode, markerNode, checkboxNode, (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_2.default.contentWrapper, children: [beforeContent && (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_2.default.beforeContent, children: beforeContent }), contentNode, afterContent && (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_2.default.afterContent, children: afterContent })] }), switchControlNode, expandIconNode] })] }));
|
|
178
177
|
if (!itemWrapRender) {
|
|
179
178
|
return itemJSX;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { CSSProperties, FocusEvent, ForwardedRef, KeyboardEvent, MouseEvent, ReactNode, RefObject } from 'react';
|
|
1
|
+
import { CSSProperties, ForwardedRef, MouseEvent, ReactNode } from 'react';
|
|
3
2
|
import { ItemContentProps } from '../../../helperComponents';
|
|
4
3
|
import { Mode, Size } from '../../../types';
|
|
5
|
-
import { FlattenItem, FocusFlattenItem, ItemId } from '../../Items';
|
|
4
|
+
import { BaseItem, CommonGroupItem, FlattenItem, FocusFlattenItem, ItemId } from '../../Items';
|
|
6
5
|
export type ContentRenderProps = {
|
|
7
6
|
id?: ItemId;
|
|
8
7
|
content?: ItemContentProps | ReactNode;
|
|
@@ -10,13 +9,11 @@ export type ContentRenderProps = {
|
|
|
10
9
|
};
|
|
11
10
|
/**
|
|
12
11
|
* Данные строки для кастомной оболочки (`itemRender`).
|
|
13
|
-
*
|
|
14
|
-
*
|
|
12
|
+
* Поля айтема — `Pick` из `BaseItem`; остальное — runtime-контекст оболочки
|
|
13
|
+
* (слоты, режим выбора, уровень вложенности). Логика клика/выбора остаётся в `BaseItem`.
|
|
14
|
+
* Индикаторы выбора оболочка рисует сама по `selectionMode` / `checked` / `disabled`.
|
|
15
15
|
*/
|
|
16
|
-
export type ItemRenderProps = {
|
|
17
|
-
id?: ItemId;
|
|
18
|
-
/** Исходный `content` айтема (пропсы `ItemContent` или произвольный узел) */
|
|
19
|
-
content?: ItemContentProps | ReactNode;
|
|
16
|
+
export type ItemRenderProps = Pick<BaseItem, 'id' | 'content' | 'beforeContent' | 'afterContent' | 'disabled' | 'inactive' | 'checked' | 'className' | 'itemRef' | 'onClick' | 'onMouseDown' | 'onKeyDown' | 'onFocus' | 'data-test-id'> & {
|
|
20
17
|
/**
|
|
21
18
|
* Уже собранный контент: результат `contentRender`, либо дефолтный `ItemContent`,
|
|
22
19
|
* либо обёртка над произвольным `content`. Кастомная оболочка может использовать его
|
|
@@ -29,46 +26,28 @@ export type ItemRenderProps = {
|
|
|
29
26
|
* пересобирать текст из полей `content`.
|
|
30
27
|
*/
|
|
31
28
|
contentFromRender?: boolean;
|
|
32
|
-
beforeContent?: ReactNode;
|
|
33
|
-
afterContent?: ReactNode;
|
|
34
29
|
dragHandle?: ReactNode;
|
|
35
30
|
switchControl?: ReactNode;
|
|
36
31
|
/** Сырая иконка шеврона — обёртку рисует оболочка */
|
|
37
32
|
expandIcon?: ReactNode;
|
|
38
33
|
/** Режим выбора списка (`none` / `single` / `multiple`) */
|
|
39
34
|
selectionMode: Mode;
|
|
40
|
-
disabled?: boolean;
|
|
41
|
-
inactive?: boolean;
|
|
42
|
-
checked?: boolean;
|
|
43
35
|
open?: boolean;
|
|
44
36
|
isParentNode?: boolean;
|
|
45
37
|
size: Size;
|
|
46
38
|
level: number;
|
|
47
|
-
className?: string;
|
|
48
|
-
itemRef?: RefObject<HTMLElement>;
|
|
49
39
|
tabIndex: number;
|
|
50
|
-
'data-test-id'?: string;
|
|
51
40
|
/** CSS-переменная `--level` и прочие инлайн-стили корня строки */
|
|
52
41
|
style?: CSSProperties;
|
|
53
|
-
onClick?(e: MouseEvent<HTMLElement>): void;
|
|
54
|
-
onMouseDown?(e: MouseEvent<HTMLElement>): void;
|
|
55
|
-
onKeyDown?(e: KeyboardEvent<HTMLElement>): void;
|
|
56
|
-
onFocus?(e: FocusEvent<HTMLElement>): void;
|
|
57
42
|
onExpandIconClick?(e: MouseEvent<HTMLElement>): void;
|
|
58
|
-
expandIconInteractive?: boolean;
|
|
59
43
|
};
|
|
60
44
|
/**
|
|
61
45
|
* Данные заголовка группы для кастомной оболочки (`groupItemRender`).
|
|
62
|
-
*
|
|
46
|
+
* Поля заголовка — `Pick` из `CommonGroupItem`; `selectButton` / `selectButtonNode` /
|
|
47
|
+
* `size` / `level` — runtime-контекст (кнопка массового выбора и вложенность).
|
|
63
48
|
*/
|
|
64
|
-
export type GroupItemRenderProps = {
|
|
65
|
-
|
|
66
|
-
beforeContent?: ReactNode;
|
|
67
|
-
truncate?: {
|
|
68
|
-
variant?: TruncateStringProps['variant'];
|
|
69
|
-
};
|
|
70
|
-
groupVariant?: 'subtitle' | 'subtitleTertiary';
|
|
71
|
-
divider?: boolean;
|
|
49
|
+
export type GroupItemRenderProps = Pick<CommonGroupItem, 'label' | 'beforeContent' | 'truncate' | 'groupVariant' | 'divider'> & {
|
|
50
|
+
/** Уже собранная кнопка массового выбора (если есть). */
|
|
72
51
|
selectButtonNode?: ReactNode;
|
|
73
52
|
selectButton?: {
|
|
74
53
|
onClick?(e: MouseEvent<HTMLElement>): void;
|
|
@@ -117,7 +117,7 @@ export function BaseItem({ beforeContent, afterContent, content, onClick, onMous
|
|
|
117
117
|
const stateLayerState = isSelectionSingle && isChecked && !switchProp && !isParentNode
|
|
118
118
|
? 'activatedOnBackground'
|
|
119
119
|
: 'emptyNeutralOnBackground';
|
|
120
|
-
const dataTestId =
|
|
120
|
+
const dataTestId = typeof props['data-test-id'] === 'string' ? props['data-test-id'] : `${TEST_IDS.baseItem}_${id}`;
|
|
121
121
|
const tabIndex = firstItemId && id === focusFlattenItems[firstItemId]?.originalId ? 0 : -1;
|
|
122
122
|
const dragHandleNode = dragHandle ? _jsx("div", { className: styles.dragHandle, children: dragHandle }) : undefined;
|
|
123
123
|
// Маркер/чекбокс/шеврон-обёртка нужны только дефолтной разметке; при `itemRender`
|
|
@@ -167,7 +167,6 @@ export function BaseItem({ beforeContent, afterContent, content, onClick, onMous
|
|
|
167
167
|
onKeyDown: handleItemKeyDown,
|
|
168
168
|
onFocus: handleItemFocus,
|
|
169
169
|
onExpandIconClick: onExpandIconClick ? handleExpandIconClick : undefined,
|
|
170
|
-
expandIconInteractive: Boolean(onExpandIconClick),
|
|
171
170
|
})) : (_jsxs("div", { className: cn(commonStyles.itemWrapper, styles.innerWrapper, className), "data-size": size, "data-inactive": inactive || undefined, "data-disabled": disabled || undefined, "data-variant": mode || undefined, "data-checked": (isParentNode && isChecked) || (!isParentNode && isChecked && !switchProp) || undefined, children: [_jsx("span", { className: commonStyles.stateLayer, "aria-hidden": true, "data-state": stateLayerState }), _jsxs("li", { "data-type": 'outside', role: 'menuitem', "data-test-id": dataTestId, ref: itemRef, className: cn(commonStyles.listItem, styles.droplistItem), "data-size": size, onClick: handleItemClick, onMouseDown: handleItemMouseDown, tabIndex: tabIndex, "data-non-pointer": (inactive && !onClick) || undefined, "data-variant": mode || undefined, "data-open": open || undefined, "aria-expanded": isParentNode ? Boolean(open) : undefined, onKeyDown: handleItemKeyDown, onFocus: handleItemFocus, style: { '--level': level }, "data-level-one": level === 1 || undefined, "data-level-more-one": level > 1 || undefined, "data-checked": (isParentNode && (indeterminate || isChecked)) || (isChecked && !switchProp) || undefined, children: [dragHandleNode, markerNode, checkboxNode, _jsxs("div", { className: styles.contentWrapper, children: [beforeContent && _jsx("div", { className: styles.beforeContent, children: beforeContent }), contentNode, afterContent && _jsx("div", { className: styles.afterContent, children: afterContent })] }), switchControlNode, expandIconNode] })] }));
|
|
172
171
|
if (!itemWrapRender) {
|
|
173
172
|
return itemJSX;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { CSSProperties, FocusEvent, ForwardedRef, KeyboardEvent, MouseEvent, ReactNode, RefObject } from 'react';
|
|
1
|
+
import { CSSProperties, ForwardedRef, MouseEvent, ReactNode } from 'react';
|
|
3
2
|
import { ItemContentProps } from '../../../helperComponents/index.js';
|
|
4
3
|
import { Mode, Size } from '../../../types.js';
|
|
5
|
-
import { FlattenItem, FocusFlattenItem, ItemId } from '../../Items/index.js';
|
|
4
|
+
import { BaseItem, CommonGroupItem, FlattenItem, FocusFlattenItem, ItemId } from '../../Items/index.js';
|
|
6
5
|
export type ContentRenderProps = {
|
|
7
6
|
id?: ItemId;
|
|
8
7
|
content?: ItemContentProps | ReactNode;
|
|
@@ -10,13 +9,11 @@ export type ContentRenderProps = {
|
|
|
10
9
|
};
|
|
11
10
|
/**
|
|
12
11
|
* Данные строки для кастомной оболочки (`itemRender`).
|
|
13
|
-
*
|
|
14
|
-
*
|
|
12
|
+
* Поля айтема — `Pick` из `BaseItem`; остальное — runtime-контекст оболочки
|
|
13
|
+
* (слоты, режим выбора, уровень вложенности). Логика клика/выбора остаётся в `BaseItem`.
|
|
14
|
+
* Индикаторы выбора оболочка рисует сама по `selectionMode` / `checked` / `disabled`.
|
|
15
15
|
*/
|
|
16
|
-
export type ItemRenderProps = {
|
|
17
|
-
id?: ItemId;
|
|
18
|
-
/** Исходный `content` айтема (пропсы `ItemContent` или произвольный узел) */
|
|
19
|
-
content?: ItemContentProps | ReactNode;
|
|
16
|
+
export type ItemRenderProps = Pick<BaseItem, 'id' | 'content' | 'beforeContent' | 'afterContent' | 'disabled' | 'inactive' | 'checked' | 'className' | 'itemRef' | 'onClick' | 'onMouseDown' | 'onKeyDown' | 'onFocus' | 'data-test-id'> & {
|
|
20
17
|
/**
|
|
21
18
|
* Уже собранный контент: результат `contentRender`, либо дефолтный `ItemContent`,
|
|
22
19
|
* либо обёртка над произвольным `content`. Кастомная оболочка может использовать его
|
|
@@ -29,46 +26,28 @@ export type ItemRenderProps = {
|
|
|
29
26
|
* пересобирать текст из полей `content`.
|
|
30
27
|
*/
|
|
31
28
|
contentFromRender?: boolean;
|
|
32
|
-
beforeContent?: ReactNode;
|
|
33
|
-
afterContent?: ReactNode;
|
|
34
29
|
dragHandle?: ReactNode;
|
|
35
30
|
switchControl?: ReactNode;
|
|
36
31
|
/** Сырая иконка шеврона — обёртку рисует оболочка */
|
|
37
32
|
expandIcon?: ReactNode;
|
|
38
33
|
/** Режим выбора списка (`none` / `single` / `multiple`) */
|
|
39
34
|
selectionMode: Mode;
|
|
40
|
-
disabled?: boolean;
|
|
41
|
-
inactive?: boolean;
|
|
42
|
-
checked?: boolean;
|
|
43
35
|
open?: boolean;
|
|
44
36
|
isParentNode?: boolean;
|
|
45
37
|
size: Size;
|
|
46
38
|
level: number;
|
|
47
|
-
className?: string;
|
|
48
|
-
itemRef?: RefObject<HTMLElement>;
|
|
49
39
|
tabIndex: number;
|
|
50
|
-
'data-test-id'?: string;
|
|
51
40
|
/** CSS-переменная `--level` и прочие инлайн-стили корня строки */
|
|
52
41
|
style?: CSSProperties;
|
|
53
|
-
onClick?(e: MouseEvent<HTMLElement>): void;
|
|
54
|
-
onMouseDown?(e: MouseEvent<HTMLElement>): void;
|
|
55
|
-
onKeyDown?(e: KeyboardEvent<HTMLElement>): void;
|
|
56
|
-
onFocus?(e: FocusEvent<HTMLElement>): void;
|
|
57
42
|
onExpandIconClick?(e: MouseEvent<HTMLElement>): void;
|
|
58
|
-
expandIconInteractive?: boolean;
|
|
59
43
|
};
|
|
60
44
|
/**
|
|
61
45
|
* Данные заголовка группы для кастомной оболочки (`groupItemRender`).
|
|
62
|
-
*
|
|
46
|
+
* Поля заголовка — `Pick` из `CommonGroupItem`; `selectButton` / `selectButtonNode` /
|
|
47
|
+
* `size` / `level` — runtime-контекст (кнопка массового выбора и вложенность).
|
|
63
48
|
*/
|
|
64
|
-
export type GroupItemRenderProps = {
|
|
65
|
-
|
|
66
|
-
beforeContent?: ReactNode;
|
|
67
|
-
truncate?: {
|
|
68
|
-
variant?: TruncateStringProps['variant'];
|
|
69
|
-
};
|
|
70
|
-
groupVariant?: 'subtitle' | 'subtitleTertiary';
|
|
71
|
-
divider?: boolean;
|
|
49
|
+
export type GroupItemRenderProps = Pick<CommonGroupItem, 'label' | 'beforeContent' | 'truncate' | 'groupVariant' | 'divider'> & {
|
|
50
|
+
/** Уже собранная кнопка массового выбора (если есть). */
|
|
72
51
|
selectButtonNode?: ReactNode;
|
|
73
52
|
selectButton?: {
|
|
74
53
|
onClick?(e: MouseEvent<HTMLElement>): void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { createContext, useContext, useMemo
|
|
2
|
+
import { createContext, useContext, useMemo } from 'react';
|
|
3
3
|
import { ITEM_PREFIXES } from '../../../constants.js';
|
|
4
4
|
export const ListContext = createContext({
|
|
5
5
|
flattenItems: {},
|