@cloud-ru/ds-list 3.1.6-preview-5400aa58.0 → 3.2.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/CHANGELOG.md +7 -0
- package/README.md +35 -9
- package/dist/cjs/components/Lists/Droplist/DropList.d.ts +4 -2
- package/dist/cjs/components/Lists/Droplist/DropList.js +9 -4
- package/dist/cjs/components/Lists/Droplist/useDroplistSearch.d.ts +3 -0
- package/dist/cjs/components/Lists/Droplist/useDroplistSearch.js +27 -0
- package/dist/cjs/components/Lists/types.d.ts +12 -4
- package/dist/cjs/helperComponents/DesktopDroplist/DesktopDroplist.d.ts +1 -1
- package/dist/cjs/helperComponents/DesktopDroplist/DesktopDroplist.js +8 -6
- package/dist/cjs/helperComponents/MobileDroplist/MobileDroplist.d.ts +1 -1
- package/dist/cjs/helperComponents/MobileDroplist/MobileDroplist.js +5 -3
- package/dist/esm/components/Lists/Droplist/DropList.d.ts +4 -2
- package/dist/esm/components/Lists/Droplist/DropList.js +9 -5
- package/dist/esm/components/Lists/Droplist/useDroplistSearch.d.ts +3 -0
- package/dist/esm/components/Lists/Droplist/useDroplistSearch.js +24 -0
- package/dist/esm/components/Lists/types.d.ts +12 -4
- package/dist/esm/helperComponents/DesktopDroplist/DesktopDroplist.d.ts +1 -1
- package/dist/esm/helperComponents/DesktopDroplist/DesktopDroplist.js +8 -6
- package/dist/esm/helperComponents/MobileDroplist/MobileDroplist.d.ts +1 -1
- package/dist/esm/helperComponents/MobileDroplist/MobileDroplist.js +5 -3
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +18 -18
- package/src/components/Lists/Droplist/DropList.tsx +18 -6
- package/src/components/Lists/Droplist/useDroplistSearch.ts +39 -0
- package/src/components/Lists/types.ts +14 -3
- package/src/helperComponents/DesktopDroplist/DesktopDroplist.tsx +11 -7
- package/src/helperComponents/MobileDroplist/MobileDroplist.tsx +6 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-list",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "Списочный UI — компонент List для плоских/вложенных списков с выбором, группами и поиском и Droplist — тот же список в поповере.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -48,24 +48,24 @@
|
|
|
48
48
|
"@tanstack/react-virtual": "^3.14.8",
|
|
49
49
|
"classnames": "^2.5.1",
|
|
50
50
|
"merge-refs": "^2.0.0",
|
|
51
|
-
"@cloud-ru/ds-adaptive": "1.0.6",
|
|
52
|
-
"@cloud-ru/ds-
|
|
53
|
-
"@cloud-ru/ds-
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-drag-and-drop": "1.1.7",
|
|
57
|
-
"@cloud-ru/ds-
|
|
58
|
-
"@cloud-ru/ds-
|
|
59
|
-
"@cloud-ru/ds-
|
|
60
|
-
"@cloud-ru/ds-
|
|
61
|
-
"@cloud-ru/ds-
|
|
62
|
-
"@cloud-ru/ds-
|
|
63
|
-
"@cloud-ru/ds-
|
|
64
|
-
"@cloud-ru/ds-
|
|
65
|
-
"@cloud-ru/ds-truncate-string": "1.0.23",
|
|
66
|
-
"@cloud-ru/ds-utils": "1.4.2"
|
|
51
|
+
"@cloud-ru/ds-adaptive": "^1.0.6",
|
|
52
|
+
"@cloud-ru/ds-divider": "^1.0.6",
|
|
53
|
+
"@cloud-ru/ds-dropdown": "^1.2.6",
|
|
54
|
+
"@cloud-ru/ds-bottom-sheet": "^2.3.2",
|
|
55
|
+
"@cloud-ru/ds-info-block": "^1.0.7",
|
|
56
|
+
"@cloud-ru/ds-drag-and-drop": "^1.1.7",
|
|
57
|
+
"@cloud-ru/ds-button": "^1.0.9",
|
|
58
|
+
"@cloud-ru/ds-icons": "^1.8.0",
|
|
59
|
+
"@cloud-ru/ds-loader": "^1.0.7",
|
|
60
|
+
"@cloud-ru/ds-materials": "^2.0.5",
|
|
61
|
+
"@cloud-ru/ds-scroll": "^1.0.9",
|
|
62
|
+
"@cloud-ru/ds-portal-context": "^1.0.6",
|
|
63
|
+
"@cloud-ru/ds-search-private": "^1.0.24",
|
|
64
|
+
"@cloud-ru/ds-toggles": "^1.1.19",
|
|
65
|
+
"@cloud-ru/ds-truncate-string": "^1.0.23",
|
|
66
|
+
"@cloud-ru/ds-utils": "^1.4.2"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@cloud-ru/ds-locale": "1.0.0"
|
|
69
|
+
"@cloud-ru/ds-locale": "^1.0.0"
|
|
70
70
|
}
|
|
71
71
|
}
|
|
@@ -1,13 +1,19 @@
|
|
|
1
|
-
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
1
|
+
import { isMobileLayout, LayoutPresets, mergePresets, useAdaptiveLayout, useLayoutDefaults } from '@cloud-ru/ds-adaptive';
|
|
2
2
|
|
|
3
3
|
import { DesktopDroplist } from '../../../helperComponents/DesktopDroplist';
|
|
4
4
|
import { MobileDroplist } from '../../../helperComponents/MobileDroplist';
|
|
5
|
-
import { DroplistImplProps, DroplistProps, ReorderableDroplistProps } from '../types';
|
|
5
|
+
import { DroplistImplProps, DroplistLayoutDefaults, DroplistProps, ReorderableDroplistProps } from '../types';
|
|
6
|
+
|
|
7
|
+
export const DROPLIST_LAYOUT_PRESETS: LayoutPresets<DroplistLayoutDefaults> = {
|
|
8
|
+
mobile: { size: 'l', alwaysShowSearch: false },
|
|
9
|
+
};
|
|
6
10
|
|
|
7
11
|
/** @internal Общая реализация `Droplist`/`ReorderableDroplist`: свап поверхности по раскладке. */
|
|
8
12
|
function DroplistImpl({
|
|
9
13
|
children,
|
|
10
|
-
|
|
14
|
+
alwaysShowSearch,
|
|
15
|
+
size,
|
|
16
|
+
layoutPresets,
|
|
11
17
|
label,
|
|
12
18
|
actionButton,
|
|
13
19
|
slotAfterTitle,
|
|
@@ -16,11 +22,17 @@ function DroplistImpl({
|
|
|
16
22
|
}: DroplistImplProps) {
|
|
17
23
|
const { layoutType } = useAdaptiveLayout();
|
|
18
24
|
|
|
25
|
+
const resolvedProps = useLayoutDefaults<DroplistLayoutDefaults>(
|
|
26
|
+
{ size: 'm', alwaysShowSearch: true },
|
|
27
|
+
mergePresets(DROPLIST_LAYOUT_PRESETS, layoutPresets),
|
|
28
|
+
{ size, alwaysShowSearch },
|
|
29
|
+
);
|
|
30
|
+
|
|
19
31
|
if (isMobileLayout(layoutType)) {
|
|
20
32
|
return (
|
|
21
33
|
<MobileDroplist
|
|
22
34
|
{...rest}
|
|
23
|
-
|
|
35
|
+
{...resolvedProps}
|
|
24
36
|
label={label}
|
|
25
37
|
actionButton={actionButton}
|
|
26
38
|
slotAfterTitle={slotAfterTitle}
|
|
@@ -32,7 +44,7 @@ function DroplistImpl({
|
|
|
32
44
|
}
|
|
33
45
|
|
|
34
46
|
return (
|
|
35
|
-
<DesktopDroplist {...rest}
|
|
47
|
+
<DesktopDroplist {...rest} {...resolvedProps}>
|
|
36
48
|
{children}
|
|
37
49
|
</DesktopDroplist>
|
|
38
50
|
);
|
|
@@ -40,7 +52,7 @@ function DroplistImpl({
|
|
|
40
52
|
|
|
41
53
|
/**
|
|
42
54
|
* Адаптивный `Droplist`: раскладку берёт из `AdaptiveProvider` (контекст). На `mobile` рендерит
|
|
43
|
-
* список (
|
|
55
|
+
* список (по умолчанию размера `l`) в `BottomSheet` (`MobileDroplist`), иначе — анкорный popover (`DesktopDroplist`).
|
|
44
56
|
* Слоты `label` / `actionButton` / `slotAfterTitle` / `onBackButtonClick` применяются только на mobile.
|
|
45
57
|
* Чтобы всегда был popover — `withLayoutType(Droplist, 'desktop')` либо вложенный
|
|
46
58
|
* `<AdaptiveProvider layoutType='desktop'>`. Пропа `layoutType` у компонента нет.
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { useEffect, useMemo, useState } from 'react';
|
|
2
|
+
|
|
3
|
+
import { SearchState } from '../../../types';
|
|
4
|
+
import { Item } from '../../Items';
|
|
5
|
+
|
|
6
|
+
const MIN_SEARCH_OPTIONS = 10;
|
|
7
|
+
|
|
8
|
+
function countSearchOptions(items: Item[] = []): number {
|
|
9
|
+
return items.reduce((count, item) => {
|
|
10
|
+
if (item.hidden) return count;
|
|
11
|
+
return count + ('items' in item ? countSearchOptions(item.items) : 1);
|
|
12
|
+
}, 0);
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function useDroplistSearch(
|
|
16
|
+
search: SearchState | undefined,
|
|
17
|
+
alwaysShowSearch: boolean | undefined,
|
|
18
|
+
open: boolean,
|
|
19
|
+
items: Item[],
|
|
20
|
+
pinTop?: Item[],
|
|
21
|
+
pinBottom?: Item[],
|
|
22
|
+
): SearchState | undefined {
|
|
23
|
+
const enabled = Boolean(search);
|
|
24
|
+
const eligible = useMemo(
|
|
25
|
+
() =>
|
|
26
|
+
enabled &&
|
|
27
|
+
(alwaysShowSearch ||
|
|
28
|
+
countSearchOptions(items) + countSearchOptions(pinTop) + countSearchOptions(pinBottom) >= MIN_SEARCH_OPTIONS),
|
|
29
|
+
[enabled, alwaysShowSearch, items, pinTop, pinBottom],
|
|
30
|
+
);
|
|
31
|
+
// Сохраняем поле до закрытия списка, даже когда фильтрация оставила ноль совпадений.
|
|
32
|
+
const [keepSearchOpen, setKeepSearchOpen] = useState(false);
|
|
33
|
+
useEffect(() => {
|
|
34
|
+
if (!open || !enabled) setKeepSearchOpen(false);
|
|
35
|
+
else if (eligible) setKeepSearchOpen(true);
|
|
36
|
+
}, [open, enabled, eligible]);
|
|
37
|
+
|
|
38
|
+
return eligible || keepSearchOpen || search?.value ? search : undefined;
|
|
39
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DragEndEvent } from '@dnd-kit/core';
|
|
2
|
+
import { LayoutPresets } from '@cloud-ru/ds-adaptive';
|
|
2
3
|
import { BottomSheetProps } from '@cloud-ru/ds-bottom-sheet';
|
|
3
4
|
import { DropdownProps } from '@cloud-ru/ds-dropdown';
|
|
4
5
|
import { WithSupportProps } from '@cloud-ru/ds-utils';
|
|
@@ -121,6 +122,8 @@ export type ListImplProps = ListPropsCommon & {
|
|
|
121
122
|
|
|
122
123
|
/** Собственные props дроплиста — всё, что не приходит из `List`. */
|
|
123
124
|
type DroplistOwnProps = {
|
|
125
|
+
/** Показывать включённый поиск при любом количестве пунктов. */
|
|
126
|
+
alwaysShowSearch?: boolean;
|
|
124
127
|
/** Ссылка на элемент-триггер для дроплиста */
|
|
125
128
|
triggerElemRef?: RefObject<HTMLElement>;
|
|
126
129
|
/**
|
|
@@ -172,6 +175,13 @@ export type ReorderableBaseDroplistProps = DroplistOwnProps & DroplistListProps<
|
|
|
172
175
|
*/
|
|
173
176
|
export type DesktopDroplistProps = DroplistOwnProps & DroplistListProps<ListImplProps>;
|
|
174
177
|
|
|
178
|
+
export type DroplistLayoutDefaults = Pick<BaseDroplistProps, 'size' | 'alwaysShowSearch'>;
|
|
179
|
+
|
|
180
|
+
type DroplistAdaptiveProps = {
|
|
181
|
+
/** Переопределение размера списка и видимости поиска по раскладке. На mobile по умолчанию `l`. */
|
|
182
|
+
layoutPresets?: LayoutPresets<DroplistLayoutDefaults>;
|
|
183
|
+
};
|
|
184
|
+
|
|
175
185
|
/** Только mobile (`BottomSheet`)-слоты адаптивного `Droplist`. */
|
|
176
186
|
type DroplistMobileSlots = {
|
|
177
187
|
/** Только mobile (`BottomSheet`): заголовок шапки. */
|
|
@@ -187,10 +197,11 @@ type DroplistMobileSlots = {
|
|
|
187
197
|
/**
|
|
188
198
|
* Props адаптивного `Droplist` (дефолтный droplist): базовые props + mobile-слоты `BottomSheet`.
|
|
189
199
|
* Раскладку берёт из `AdaptiveProvider` (контекст): на `mobile` рендерит `MobileDroplist`
|
|
190
|
-
* (список
|
|
200
|
+
* (список размера `l` по умолчанию в `BottomSheet`), иначе — `DesktopDroplist` (анкорный popover). Mobile-слоты
|
|
191
201
|
* применяются только на mobile.
|
|
192
202
|
*/
|
|
193
203
|
export type DroplistProps = BaseDroplistProps &
|
|
204
|
+
DroplistAdaptiveProps &
|
|
194
205
|
DroplistMobileSlots &
|
|
195
206
|
Pick<BottomSheetProps, 'snapPoints' | 'withDividers'>;
|
|
196
207
|
|
|
@@ -198,10 +209,10 @@ export type DroplistProps = BaseDroplistProps &
|
|
|
198
209
|
* Props адаптивного `ReorderableDroplist`: props `ReorderableList` + popover/mobile-обвязка
|
|
199
210
|
* `Droplist`. Отдельный компонент по той же причине, что и `ReorderableList`.
|
|
200
211
|
*/
|
|
201
|
-
export type ReorderableDroplistProps = ReorderableBaseDroplistProps & DroplistMobileSlots;
|
|
212
|
+
export type ReorderableDroplistProps = ReorderableBaseDroplistProps & DroplistMobileSlots & DroplistAdaptiveProps;
|
|
202
213
|
|
|
203
214
|
/** @internal Props общей реализации адаптивного дроплиста: реализация + mobile-слоты. */
|
|
204
|
-
export type DroplistImplProps = DesktopDroplistProps & DroplistMobileSlots;
|
|
215
|
+
export type DroplistImplProps = DesktopDroplistProps & DroplistMobileSlots & DroplistAdaptiveProps;
|
|
205
216
|
|
|
206
217
|
/**
|
|
207
218
|
* @internal Props mobile-реализации (`BottomSheet`): реализация дроплиста без popover-пропов
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
DEFAULT_SIZE,
|
|
18
18
|
FOCUS_DEFERRAL_TIMEOUT,
|
|
19
19
|
} from '../../components/Lists/Droplist/constants';
|
|
20
|
+
import { useDroplistSearch } from '../../components/Lists/Droplist/useDroplistSearch';
|
|
20
21
|
import { useListItemsModel, useNewKeyboardNavigation } from '../../components/Lists/hooks';
|
|
21
22
|
import { ListPrivate } from '../../components/Lists/ListPrivate';
|
|
22
23
|
import styles from '../../components/Lists/styles.module.scss';
|
|
@@ -31,7 +32,7 @@ const NO_ITEMS: Item[] = [];
|
|
|
31
32
|
*/
|
|
32
33
|
export function DesktopDroplist({
|
|
33
34
|
items: itemsProp,
|
|
34
|
-
search,
|
|
35
|
+
search: searchProp,
|
|
35
36
|
pinBottom: pinBottomProp = NO_ITEMS,
|
|
36
37
|
pinTop: pinTopProp = NO_ITEMS,
|
|
37
38
|
footerActiveElementsRefs,
|
|
@@ -41,6 +42,7 @@ export function DesktopDroplist({
|
|
|
41
42
|
widthStrategy,
|
|
42
43
|
triggerElemRef: triggerElemRefProp,
|
|
43
44
|
container,
|
|
45
|
+
alwaysShowSearch,
|
|
44
46
|
open: openProp,
|
|
45
47
|
onOpenChange,
|
|
46
48
|
collapse = {},
|
|
@@ -65,6 +67,14 @@ export function DesktopDroplist({
|
|
|
65
67
|
onItemsReorder,
|
|
66
68
|
...props
|
|
67
69
|
}: DesktopDroplistProps) {
|
|
70
|
+
const [open = false, setOpen] = useValueControl<boolean>({
|
|
71
|
+
value: openProp,
|
|
72
|
+
defaultValue: false,
|
|
73
|
+
onChange: onOpenChange,
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
const search = useDroplistSearch(searchProp, alwaysShowSearch, open, itemsProp, pinTopProp, pinBottomProp);
|
|
77
|
+
|
|
68
78
|
const {
|
|
69
79
|
hasSearch,
|
|
70
80
|
openCollapseItems,
|
|
@@ -89,12 +99,6 @@ export function DesktopDroplist({
|
|
|
89
99
|
onItemsReorder,
|
|
90
100
|
});
|
|
91
101
|
|
|
92
|
-
const [open = false, setOpen] = useValueControl<boolean>({
|
|
93
|
-
value: openProp,
|
|
94
|
-
defaultValue: false,
|
|
95
|
-
onChange: onOpenChange,
|
|
96
|
-
});
|
|
97
|
-
|
|
98
102
|
const triggerElemRef = useRef<HTMLElement>(null);
|
|
99
103
|
const listRef = useRef<HTMLElement>(null);
|
|
100
104
|
|
|
@@ -5,6 +5,7 @@ import { cloneElement, isValidElement, MouseEvent, useMemo, useRef, useState } f
|
|
|
5
5
|
|
|
6
6
|
import { Item, ItemId, NextListItem, ReorderItem } from '../../components/Items';
|
|
7
7
|
import { OnChangeHandler } from '../../components/Lists/contexts';
|
|
8
|
+
import { useDroplistSearch } from '../../components/Lists/Droplist/useDroplistSearch';
|
|
8
9
|
import { List, ReorderableList } from '../../components/Lists/List';
|
|
9
10
|
import { BaseDroplistProps, MobileDroplistProps } from '../../components/Lists/types';
|
|
10
11
|
import { TEST_IDS } from '../../constants';
|
|
@@ -21,6 +22,7 @@ import { buildLevelItems, nextListOption, resolveItemByPath } from './utils';
|
|
|
21
22
|
export function MobileDroplist({
|
|
22
23
|
items,
|
|
23
24
|
selection,
|
|
25
|
+
alwaysShowSearch,
|
|
24
26
|
open: openProp,
|
|
25
27
|
onOpenChange,
|
|
26
28
|
children,
|
|
@@ -50,6 +52,8 @@ export function MobileDroplist({
|
|
|
50
52
|
const scrollRef = useRef<HTMLDivElement>(null);
|
|
51
53
|
const [open = false, setIsOpen] = useValueControl({ value: openProp, onChange: onOpenChange });
|
|
52
54
|
|
|
55
|
+
const visibleSearch = useDroplistSearch(search, alwaysShowSearch, open, items, rest.pinTop, rest.pinBottom);
|
|
56
|
+
|
|
53
57
|
// Стек заходов во вложенные next-list'ы: индексный путь от корня на каждый уровень.
|
|
54
58
|
// Пустой — корневой уровень. Хранится путь, а не сам айтем: айтемы пересобираются на каждом
|
|
55
59
|
// рендере, и сохранённая копия оставила бы открытый sheet в устаревшем состоянии.
|
|
@@ -166,7 +170,7 @@ export function MobileDroplist({
|
|
|
166
170
|
closeOnClick,
|
|
167
171
|
);
|
|
168
172
|
// Поиск/виртуализация/footer/actions — только на корне; sublists всегда статичны по контенту.
|
|
169
|
-
const searchable = isRoot && Boolean(
|
|
173
|
+
const searchable = isRoot && Boolean(visibleSearch);
|
|
170
174
|
const expanded = searchable || (isRoot && virtualized);
|
|
171
175
|
|
|
172
176
|
const scrollable = isRoot && (virtualized || scroll);
|
|
@@ -174,7 +178,7 @@ export function MobileDroplist({
|
|
|
174
178
|
const listCommonProps = {
|
|
175
179
|
selection: listSelection,
|
|
176
180
|
size,
|
|
177
|
-
search:
|
|
181
|
+
search: isRoot ? visibleSearch : undefined,
|
|
178
182
|
loading: isRoot ? undefined : item?.loading,
|
|
179
183
|
dataError: isRoot ? undefined : item?.dataError,
|
|
180
184
|
dataFiltered: isRoot ? undefined : item?.dataFiltered,
|