@vev/silke 1.0.10 → 1.0.12
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 +9 -0
- package/dist/chunk-4MB64AQL.js +22 -0
- package/dist/chunk-4MB64AQL.js.LEGAL.txt +8 -0
- package/dist/chunk-4MB64AQL.js.map +7 -0
- package/dist/index.js +9 -25
- package/dist/index.js.LEGAL.txt +6 -9
- package/dist/index.js.map +4 -4
- package/dist/silke-code-editor-HZRG3D6C.js +23 -0
- package/dist/silke-code-editor-HZRG3D6C.js.map +7 -0
- package/dist/styles.css +4338 -2599
- package/esbuild.config.mjs +2 -1
- package/jest.config.js +2 -1
- package/package.json +12 -8
- package/src/_variables.scss +121 -1
- package/src/components/index.ts +6 -0
- package/src/components/silke-autocomplete-field/autocomplete-item.tsx +15 -13
- package/src/components/silke-autocomplete-field/autocomplete-tags.tsx +14 -7
- package/src/components/silke-autocomplete-field/silke-autocomplete-field.mdx +31 -4
- package/src/components/silke-autocomplete-field/silke-autocomplete-field.scss +8 -6
- package/src/components/silke-autocomplete-field/silke-autocomplete-field.tsx +64 -23
- package/src/components/silke-box/silke-box.scss +21 -47
- package/src/components/silke-box/silke-box.tsx +23 -31
- package/src/components/silke-breadcrumbs/silke-breadcrumb.scss +3 -3
- package/src/components/silke-button/index.ts +3 -1
- package/src/components/silke-button/silke-big-button.scss +38 -0
- package/src/components/silke-button/silke-big-button.tsx +49 -0
- package/src/components/silke-button/silke-button-set.tsx +15 -3
- package/src/components/silke-button/silke-button.mdx +41 -19
- package/src/components/silke-button/silke-button.scss +97 -90
- package/src/components/silke-button/silke-button.tsx +20 -5
- package/src/components/silke-button/silke-file-select-button.tsx +86 -0
- package/src/components/silke-card/silke-card-grid.tsx +9 -9
- package/src/components/silke-card/silke-card.mdx +23 -9
- package/src/components/silke-card/silke-card.scss +92 -39
- package/src/components/silke-card/silke-card.tsx +50 -27
- package/src/components/silke-checkbox/silke-checkbox.scss +39 -17
- package/src/components/silke-checkbox/silke-checkbox.tsx +4 -1
- package/src/components/silke-code-editor/index.tsx +12 -0
- package/src/components/silke-code-editor/silke-code-editor.mdx +97 -0
- package/src/components/silke-code-editor/silke-code-editor.tsx +52 -0
- package/src/components/silke-code-snippet/silke-code-snippet.scss +2 -10
- package/src/components/silke-code-snippet/silke-code-snippet.tsx +10 -3
- package/src/components/silke-color-palettes/silke-color-palette.tsx +11 -2
- package/src/components/silke-color-picker/color-picker.scss +10 -6
- package/src/components/silke-color-picker/silke-color-info.tsx +14 -4
- package/src/components/silke-color-picker/silke-color-picker-button.tsx +4 -3
- package/src/components/silke-color-picker/silke-color-picker.tsx +4 -2
- package/src/components/silke-color-picker/silke-opacity-slider.tsx +11 -12
- package/src/components/silke-color-swatches/silke-color-swatch-button.tsx +10 -4
- package/src/components/silke-color-swatches/silke-swatches.tsx +2 -2
- package/src/components/silke-content-column/index.ts +1 -0
- package/src/components/silke-content-column/silke-content-column.mdx +7 -0
- package/src/components/silke-content-column/silke-content-column.scss +39 -0
- package/src/components/silke-content-column/silke-content-column.tsx +14 -0
- package/src/components/silke-context-menu/silke-context-menu-item.tsx +9 -4
- package/src/components/silke-context-menu/silke-context-menu.mdx +16 -12
- package/src/components/silke-context-menu/silke-context-menu.scss +16 -0
- package/src/components/silke-context-menu/silke-context-menu.tsx +62 -39
- package/src/components/silke-css-number-field/silke-css-context.tsx +1 -0
- package/src/components/silke-css-number-field/silke-css-number-field.scss +18 -3
- package/src/components/silke-css-number-field/silke-css-number-field.tsx +32 -13
- package/src/components/silke-css-number-field/utils.ts +2 -0
- package/src/components/silke-divider/silke-divider.scss +4 -2
- package/src/components/silke-drawer/silke-drawer.scss +3 -3
- package/src/components/silke-drawer/silke-drawer.tsx +3 -3
- package/src/components/silke-form/silke-form.tsx +1 -9
- package/src/components/silke-form-schema/fields/array-field-inline.tsx +2 -3
- package/src/components/silke-form-schema/fields/array-field-modal.tsx +1 -1
- package/src/components/silke-form-schema/fields/array-field.tsx +2 -2
- package/src/components/silke-form-schema/fields/event-field.tsx +120 -0
- package/src/components/silke-form-schema/fields/icon-field.tsx +1 -1
- package/src/components/silke-form-schema/fields/image-field.tsx +1 -1
- package/src/components/silke-form-schema/fields/link-field.tsx +8 -1
- package/src/components/silke-form-schema/fields/number-field.tsx +24 -8
- package/src/components/silke-form-schema/fields/object-field.tsx +1 -1
- package/src/components/silke-form-schema/fields/select-field.tsx +9 -2
- package/src/components/silke-form-schema/fields/styles.scss +2 -2
- package/src/components/silke-form-schema/fields/toggle-field.tsx +14 -13
- package/src/components/silke-form-schema/fields/upload-field.tsx +37 -0
- package/src/components/silke-form-schema/fields/utils/generate-image.ts +3 -4
- package/src/components/silke-form-schema/fields/utils/generate-title.ts +1 -3
- package/src/components/silke-form-schema/index.ts +1 -0
- package/src/components/silke-form-schema/silke-extended-fields-context.tsx +22 -0
- package/src/components/silke-form-schema/silke-schema-field.tsx +19 -6
- package/src/components/silke-icon/silke-icon.scss +3 -2
- package/src/components/silke-icon/silke-icon.tsx +7 -3
- package/src/components/silke-icon/silke-shape.tsx +3 -2
- package/src/components/silke-icon-picker/emoji-tab.tsx +2 -2
- package/src/components/silke-icon-picker/icons-tab.tsx +1 -1
- package/src/components/silke-icon-picker/silke-icon-picker.tsx +1 -1
- package/src/components/silke-iframe-portal/index.ts +4 -0
- package/src/components/silke-iframe-portal/silke-iframe-context.ts +6 -0
- package/src/components/silke-iframe-portal/silke-iframe-css-link.tsx +20 -0
- package/src/components/silke-iframe-portal/silke-iframe-portal.mdx +34 -0
- package/src/components/silke-iframe-portal/silke-iframe-portal.tsx +77 -0
- package/src/components/silke-iframe-portal/silke-iframe-script.tsx +20 -0
- package/src/components/silke-link/silke-link.scss +2 -2
- package/src/components/silke-link/silke-link.tsx +8 -9
- package/src/components/silke-list/silke-list.scss +1 -1
- package/src/components/silke-list-card/index.ts +1 -0
- package/src/components/silke-list-card/silke-list-card.mdx +50 -0
- package/src/components/silke-list-card/silke-list-card.scss +57 -0
- package/src/components/silke-list-card/silke-list-card.tsx +65 -0
- package/src/components/silke-loader/index.ts +1 -0
- package/src/components/silke-loader/silke-loader-overlay.tsx +63 -0
- package/src/components/silke-loader/silke-loader.scss +112 -0
- package/src/components/silke-loader/silke-loader.tsx +1 -0
- package/src/components/silke-modal/silke-confirmation-modal.tsx +1 -1
- package/src/components/silke-modal/silke-modal.mdx +1 -1
- package/src/components/silke-modal/silke-modal.scss +16 -10
- package/src/components/silke-modal/silke-modal.tsx +65 -47
- package/src/components/silke-navigation-link/silke-navigation-link.scss +69 -41
- package/src/components/silke-navigation-link/silke-navigation-link.tsx +26 -14
- package/src/components/silke-notification/confetti.tsx +164 -0
- package/src/components/silke-notification/silke-notification.mdx +137 -20
- package/src/components/silke-notification/silke-notification.scss +116 -89
- package/src/components/silke-notification/silke-notification.tsx +44 -113
- package/src/components/silke-object-field/silke-object-field.tsx +1 -1
- package/src/components/silke-overflow-menu/silke-overflow-menu.mdx +2 -2
- package/src/components/silke-overflow-menu/silke-overflow-menu.scss +12 -4
- package/src/components/silke-overflow-menu/silke-overflow-menu.tsx +53 -30
- package/src/components/silke-popover/silke-popover.mdx +2 -2
- package/src/components/silke-popover/silke-popover.tsx +23 -5
- package/src/components/silke-progress-indicator/silke-progress-indicator.scss +5 -5
- package/src/components/silke-radio-button/silke-radio-button-group.tsx +1 -1
- package/src/components/silke-radio-button/silke-radio-button.scss +24 -9
- package/src/components/silke-search-field/silke-search-field.tsx +10 -5
- package/src/components/silke-select-field/silke-select-field.mdx +11 -5
- package/src/components/silke-skeleton/silke-skeleton.scss +2 -2
- package/src/components/silke-slider/range-slider.scss +13 -10
- package/src/components/silke-slider/silke-slider.tsx +5 -0
- package/src/components/silke-sortable-list/silke-nested-sortable-item.tsx +105 -0
- package/src/components/silke-sortable-list/silke-nested-sortable-list.scss +37 -25
- package/src/components/silke-sortable-list/silke-nested-sortable-list.tsx +180 -127
- package/src/components/silke-sortable-list/silke-nested-sortable-utils.ts +53 -23
- package/src/components/silke-sortable-list/silke-sortable-item-wrapper.tsx +1 -1
- package/src/components/silke-sortable-list/silke-sortable-list.mdx +12 -16
- package/src/components/silke-sortable-list/silke-sortable-list.scss +39 -29
- package/src/components/silke-sortable-list/silke-sortable-list.tsx +27 -15
- package/src/components/silke-steps/index.ts +1 -0
- package/src/components/silke-steps/silke-steps.mdx +60 -0
- package/src/components/silke-steps/silke-steps.scss +14 -0
- package/src/components/silke-steps/silke-steps.tsx +53 -0
- package/src/components/silke-table/silke-table.mdx +44 -13
- package/src/components/silke-table/silke-table.scss +19 -9
- package/src/components/silke-table/silke-table.tsx +80 -71
- package/src/components/silke-table/table-row.tsx +11 -6
- package/src/components/silke-tabs/silke-tab.tsx +4 -0
- package/src/components/silke-tabs/silke-tabs.scss +18 -15
- package/src/components/silke-tabs/silke-tabs.tsx +4 -7
- package/src/components/silke-tag/silke-tag.mdx +36 -2
- package/src/components/silke-tag/silke-tag.scss +49 -30
- package/src/components/silke-tag/silke-tag.tsx +21 -6
- package/src/components/silke-text/silke-text-types.ts +2 -1
- package/src/components/silke-text/silke-text.mdx +28 -20
- package/src/components/silke-text/silke-text.scss +8 -7
- package/src/components/silke-text/silke-title.scss +1 -1
- package/src/components/silke-text-field/silke-text-field-outline.tsx +4 -4
- package/src/components/silke-text-field/silke-text-field.mdx +32 -14
- package/src/components/silke-text-field/silke-text-field.scss +41 -23
- package/src/components/silke-text-field/silke-text-field.tsx +13 -5
- package/src/components/silke-text-field/text-field-context.tsx +1 -1
- package/src/components/silke-theme-editor/index.ts +1 -0
- package/src/components/silke-theme-editor/silke-theme-editor.tsx +165 -0
- package/src/components/silke-tile/silke-tile.scss +13 -18
- package/src/components/silke-tile/silke-tile.tsx +11 -17
- package/src/components/silke-toggle/silke-toggle.scss +17 -9
- package/src/components/silke-toggle/silke-toggle.tsx +1 -1
- package/src/components/silke-toolbar/silke-toolbar.scss +1 -1
- package/src/components/silke-tooltip/silke-definition-tooltip.tsx +14 -6
- package/src/components/silke-tooltip/silke-icon-tooltip.tsx +48 -34
- package/src/components/silke-tooltip/silke-interactive-tooltip.tsx +5 -3
- package/src/components/silke-tooltip/silke-tooltip.mdx +69 -2
- package/src/components/silke-tooltip/silke-tooltip.scss +71 -46
- package/src/components/silke-tooltip/silke-tooltip.tsx +142 -52
- package/src/components/silke-tooltip/utils.ts +93 -0
- package/src/components/silke-upload-field/silke-upload-field.mdx +14 -0
- package/src/components/silke-upload-field/silke-upload-field.scss +26 -17
- package/src/components/silke-upload-field/silke-upload-field.tsx +37 -14
- package/src/docs/app.tsx +118 -25
- package/src/docs/components/code-block/code-block.scss +0 -2
- package/src/docs/components/code-block/code-block.tsx +17 -9
- package/src/hooks/drag-and-drop/use-drag.tsx +5 -1
- package/src/hooks/drag-and-drop/use-drop.tsx +5 -4
- package/src/icons.tsx +194 -10
- package/src/index.mdx +66 -1
- package/src/main.tsx +5 -2
- package/src/silke-theme-provider.tsx +51 -3
- package/src/styles/core.scss +56 -91
- package/webpack.docs.ts +1 -3
- package/webpack.config.ts +0 -131
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { Mouse } from '@vev/utils';
|
|
2
|
-
import { clamp, difference, keyBy, uniq } from 'lodash';
|
|
1
|
+
import { Keyboard, Mouse } from '@vev/utils';
|
|
2
|
+
import { at, clamp, difference, keyBy, last, sum, uniq } from 'lodash';
|
|
3
3
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
4
4
|
import { BoxProps, SilkeBox } from '../silke-box';
|
|
5
|
-
import {
|
|
5
|
+
import { SilkeNestedSortableItem } from './silke-nested-sortable-item';
|
|
6
6
|
import styles from './silke-nested-sortable-list.scss';
|
|
7
7
|
import {
|
|
8
8
|
generatedComputedStates,
|
|
9
9
|
getIndentLevel,
|
|
10
|
+
getMouseHorizontalIndentTarget,
|
|
10
11
|
getParents,
|
|
11
|
-
getPlacementString,
|
|
12
12
|
hasState,
|
|
13
13
|
isParentOfSelf,
|
|
14
14
|
Item,
|
|
@@ -17,89 +17,121 @@ import {
|
|
|
17
17
|
} from './silke-nested-sortable-utils';
|
|
18
18
|
|
|
19
19
|
type SilkeNestedSortableListProps<T> = {
|
|
20
|
+
/** Items in the root to start from, fallback is to use items with no parents */
|
|
21
|
+
rootItems?: string[];
|
|
20
22
|
items: Item<T>[];
|
|
21
23
|
selected?: string[];
|
|
22
|
-
collapsed?:
|
|
24
|
+
collapsed?: (item: Item<T>) => boolean;
|
|
25
|
+
classNameItem?: string | ((item: Item<T>) => string);
|
|
23
26
|
children: RenderFunction<T>;
|
|
24
|
-
onSort:
|
|
25
|
-
updateList: Item<T>[],
|
|
26
|
-
dropItem: Item<T>,
|
|
27
|
-
placement: 'before' | 'after' | 'inside',
|
|
28
|
-
) => void;
|
|
27
|
+
onSort?: (updateList: Item<T>[], parentKey: string | undefined, childIndex: number) => void;
|
|
29
28
|
canHaveChildren?: (item: Item<T>) => boolean;
|
|
29
|
+
canDrag?: (selected: string[]) => boolean;
|
|
30
30
|
canSort?: (
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
parentKey: string | undefined,
|
|
32
|
+
childIndex: number,
|
|
33
33
|
parents: string[],
|
|
34
34
|
selected: string[],
|
|
35
35
|
) => boolean | number;
|
|
36
36
|
/** Triggered when collapsed arrow is pressed,gives the updated collapse list */
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
onCollapse?: (item: Item<T>, doCollapse: boolean) => void;
|
|
38
|
+
onItemClick?: (e: MouseEvent, item: Item<T>) => void;
|
|
39
|
+
onItemDoubleClick?: (e: React.MouseEvent, item: Item<T>) => void;
|
|
40
|
+
onItemMouseEnter?: (e: React.MouseEvent, item: Item<T>) => void;
|
|
41
|
+
onItemMouseLeave?: (e: React.MouseEvent, item: Item<T>) => void;
|
|
42
|
+
onItemContextMenu?: (e: React.MouseEvent, item: Item<T>) => void;
|
|
43
|
+
} & Omit<BoxProps, 'children'>;
|
|
40
44
|
|
|
41
45
|
export function SilkeNestedSortableList<T>({
|
|
46
|
+
rootItems,
|
|
42
47
|
items,
|
|
43
48
|
selected,
|
|
44
49
|
collapsed,
|
|
45
50
|
children,
|
|
46
51
|
className,
|
|
52
|
+
classNameItem,
|
|
47
53
|
onSort,
|
|
48
54
|
canHaveChildren,
|
|
49
55
|
canSort,
|
|
50
|
-
|
|
51
|
-
|
|
56
|
+
canDrag,
|
|
57
|
+
onCollapse,
|
|
58
|
+
onItemClick,
|
|
59
|
+
onItemDoubleClick,
|
|
60
|
+
onItemMouseEnter,
|
|
61
|
+
onItemMouseLeave,
|
|
62
|
+
onItemContextMenu,
|
|
52
63
|
...rest
|
|
53
64
|
}: SilkeNestedSortableListProps<T>) {
|
|
54
65
|
const ref = useRef<HTMLDivElement>(null);
|
|
55
66
|
const [pendingClickItem, setPendingClickItem] = useState<Item<T>>();
|
|
56
67
|
const [startDrag, setStartDrag] = useState(false);
|
|
57
|
-
const [dropState, setDropState] =
|
|
68
|
+
const [dropState, setDropState] =
|
|
69
|
+
useState<{ index: number; state: number; childIndex: number; top: number }>();
|
|
58
70
|
|
|
59
71
|
let cl = styles.list;
|
|
60
72
|
if (className) cl += ' ' + className;
|
|
61
73
|
if (dropState) cl += ' ' + styles.dragging;
|
|
62
74
|
|
|
63
|
-
const [computedStates, parentMap] = useMemo(() => {
|
|
75
|
+
const [computedStates, parentMap, itemMap] = useMemo(() => {
|
|
64
76
|
const itemMap = keyBy(items, 'key');
|
|
65
77
|
const parentMap: { [key: string]: string } = {};
|
|
66
78
|
for (const item of items) {
|
|
67
|
-
if (item
|
|
79
|
+
if (item?.children) {
|
|
68
80
|
for (const childKey of item.children) parentMap[childKey] = item.key;
|
|
69
81
|
}
|
|
70
82
|
}
|
|
71
83
|
|
|
72
|
-
const rootItemKeys =
|
|
84
|
+
const rootItemKeys =
|
|
85
|
+
rootItems || items.filter((item) => !(item.key in parentMap)).map((item) => item.key);
|
|
73
86
|
|
|
74
|
-
const computedStates = generatedComputedStates(
|
|
87
|
+
const computedStates = generatedComputedStates(
|
|
88
|
+
itemMap,
|
|
89
|
+
rootItemKeys,
|
|
90
|
+
selected,
|
|
91
|
+
collapsed,
|
|
92
|
+
canHaveChildren,
|
|
93
|
+
);
|
|
75
94
|
|
|
76
|
-
return [computedStates, parentMap];
|
|
77
|
-
}, [items, selected, collapsed]);
|
|
95
|
+
return [computedStates, parentMap, itemMap];
|
|
96
|
+
}, [items, selected, collapsed, rootItems, canHaveChildren]);
|
|
78
97
|
|
|
79
98
|
const handleCollapse = useCallback(
|
|
80
99
|
(item: Item<T>) => {
|
|
81
|
-
|
|
82
|
-
if (collapsed?.includes(item.key)) onCollapsed(collapsed.filter((k) => k !== item.key));
|
|
83
|
-
else onCollapsed([...(collapsed || []), item.key]);
|
|
84
|
-
}
|
|
100
|
+
onCollapse?.(item, !collapsed?.(item));
|
|
85
101
|
},
|
|
86
|
-
[collapsed,
|
|
102
|
+
[collapsed, onCollapse],
|
|
87
103
|
);
|
|
88
104
|
const handleItemMouseDown = useCallback(
|
|
89
105
|
(e: React.MouseEvent<HTMLDivElement>, item: Item<T>) => {
|
|
106
|
+
if (e.button === 2 && onItemContextMenu) return onItemContextMenu(e, item);
|
|
107
|
+
if (e.button !== 0) return;
|
|
108
|
+
|
|
109
|
+
const shouldDragBeDone = onSort && (!canDrag || canDrag(selected || []));
|
|
90
110
|
// If already selected we have to wait to see if the user wants to drag or not, will be handled in mouse up of drag
|
|
91
111
|
// If not selected we can handle the mouse event immediately
|
|
92
|
-
if (selected?.includes(item.key)) {
|
|
112
|
+
if (shouldDragBeDone && selected?.includes(item.key)) {
|
|
93
113
|
setPendingClickItem(item);
|
|
94
114
|
} else {
|
|
95
115
|
setPendingClickItem(undefined);
|
|
96
|
-
|
|
116
|
+
onItemClick?.(e.nativeEvent, item);
|
|
97
117
|
}
|
|
98
|
-
setStartDrag(true);
|
|
118
|
+
if (shouldDragBeDone) setStartDrag(true);
|
|
99
119
|
},
|
|
100
|
-
[
|
|
120
|
+
[onItemClick, onSort, canDrag, onItemContextMenu, selected],
|
|
101
121
|
);
|
|
102
122
|
|
|
123
|
+
useEffect(() => {
|
|
124
|
+
if (selected?.length) {
|
|
125
|
+
// Timing out for a while to not make the list jumpy when user clicks fast around
|
|
126
|
+
const timeout = setTimeout(() => {
|
|
127
|
+
const el = ref.current?.querySelector('.' + styles.selected) as HTMLElement | undefined;
|
|
128
|
+
if (el) (el as any).scrollIntoViewIfNeeded?.();
|
|
129
|
+
}, 500);
|
|
130
|
+
|
|
131
|
+
return () => clearTimeout(timeout);
|
|
132
|
+
}
|
|
133
|
+
}, [selected?.join(',')]);
|
|
134
|
+
|
|
103
135
|
useEffect(() => {
|
|
104
136
|
const listEl = ref.current;
|
|
105
137
|
if (!startDrag || !listEl) return;
|
|
@@ -109,32 +141,45 @@ export function SilkeNestedSortableList<T>({
|
|
|
109
141
|
offsets.push([el.offsetTop, el.offsetHeight]);
|
|
110
142
|
});
|
|
111
143
|
|
|
144
|
+
Keyboard.onKey('Escape', () => {
|
|
145
|
+
setStartDrag(false);
|
|
146
|
+
setDropState(undefined);
|
|
147
|
+
});
|
|
148
|
+
|
|
112
149
|
let dragState: 'pending' | 'dragging' = 'pending';
|
|
113
|
-
let dropState: {
|
|
150
|
+
let dropState: {
|
|
151
|
+
index: number;
|
|
152
|
+
state: number;
|
|
153
|
+
parentKey: string;
|
|
154
|
+
childIndex: number;
|
|
155
|
+
top: number;
|
|
156
|
+
};
|
|
114
157
|
const handleMouseMove = (e: MouseEvent) => {
|
|
115
158
|
if (!selected || !selected.length) return;
|
|
116
159
|
if (dragState === 'pending') {
|
|
117
160
|
if (Mouse.getDownDist() > 10) dragState = 'dragging';
|
|
118
161
|
} else {
|
|
119
162
|
const { top } = listEl.getBoundingClientRect();
|
|
120
|
-
const
|
|
163
|
+
const cursorOffsetY = e.pageY - top;
|
|
121
164
|
let index = -1;
|
|
122
165
|
|
|
123
|
-
if (
|
|
166
|
+
if (cursorOffsetY > offsets[0][0]) {
|
|
124
167
|
for (index = 0; index < offsets.length; index++) {
|
|
125
168
|
const [top, height] = offsets[index];
|
|
126
|
-
if (
|
|
169
|
+
if (cursorOffsetY <= top + height) break;
|
|
127
170
|
}
|
|
128
171
|
}
|
|
129
172
|
|
|
130
173
|
let placementState: number = ItemState.placeBefore;
|
|
131
|
-
|
|
174
|
+
let dropLineTopPos = 0;
|
|
132
175
|
if (index === -1) {
|
|
133
176
|
placementState = ItemState.placeBefore;
|
|
134
177
|
index = 0;
|
|
135
178
|
} else if (index === computedStates.length) {
|
|
136
179
|
placementState = ItemState.placeAfter;
|
|
137
180
|
index = computedStates.length - 1;
|
|
181
|
+
// Place dropline after last element in list
|
|
182
|
+
dropLineTopPos = sum(last(offsets) || []);
|
|
138
183
|
} else {
|
|
139
184
|
const [targetState, targetItem] = computedStates[index];
|
|
140
185
|
const allowChildren = canHaveChildren
|
|
@@ -146,31 +191,62 @@ export function SilkeNestedSortableList<T>({
|
|
|
146
191
|
hasState(targetState, ItemState.collapsed) || !targetItem?.children?.length;
|
|
147
192
|
|
|
148
193
|
const insideBottomPos = offset[0] + offset[1] + (isTargetCollapsed ? -10 : 0);
|
|
194
|
+
dropLineTopPos = offset[0];
|
|
149
195
|
|
|
150
196
|
if (
|
|
151
197
|
allowChildren &&
|
|
152
198
|
!isTargetSelected &&
|
|
153
|
-
|
|
154
|
-
|
|
199
|
+
cursorOffsetY > offset[0] + 10 &&
|
|
200
|
+
cursorOffsetY < insideBottomPos
|
|
155
201
|
) {
|
|
156
202
|
placementState = ItemState.placeInside;
|
|
157
|
-
} else if (
|
|
203
|
+
} else if (cursorOffsetY > offset[0] + offset[1] / 2) {
|
|
158
204
|
placementState = ItemState.placeAfter;
|
|
205
|
+
dropLineTopPos += offset[1];
|
|
159
206
|
}
|
|
160
207
|
}
|
|
161
208
|
|
|
162
|
-
|
|
163
|
-
|
|
209
|
+
let [, targetItem] = computedStates[index];
|
|
210
|
+
|
|
211
|
+
let parentKey: string;
|
|
212
|
+
let childIndex = 0;
|
|
213
|
+
|
|
214
|
+
if (placementState === ItemState.placeInside) {
|
|
215
|
+
parentKey = targetItem.key;
|
|
216
|
+
} else {
|
|
217
|
+
if (placementState === ItemState.placeAfter) {
|
|
218
|
+
const mouseIndentLevels = Math.ceil(e.pageX - Mouse.pageDownX) / 24;
|
|
219
|
+
targetItem = getMouseHorizontalIndentTarget(
|
|
220
|
+
targetItem,
|
|
221
|
+
mouseIndentLevels,
|
|
222
|
+
itemMap,
|
|
223
|
+
parentMap,
|
|
224
|
+
);
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
parentKey = parentMap[targetItem.key];
|
|
228
|
+
const parent = itemMap[parentKey];
|
|
229
|
+
childIndex = parent?.children?.indexOf(targetItem.key) || 0;
|
|
230
|
+
if (placementState === ItemState.placeAfter) childIndex++;
|
|
231
|
+
}
|
|
164
232
|
|
|
165
|
-
const
|
|
166
|
-
|
|
233
|
+
const parents = [parentKey, ...getParents(parentKey, parentMap)].filter(Boolean);
|
|
234
|
+
const allowSort = !canSort || canSort(parentKey, childIndex, parents, selected);
|
|
167
235
|
const selectionParentOfSelf = selected.some((key) =>
|
|
168
236
|
isParentOfSelf(parentMap[targetItem.key], key, parentMap),
|
|
169
237
|
);
|
|
170
238
|
|
|
171
239
|
if (!allowSort || selectionParentOfSelf) placementState |= ItemState.placementInvalid;
|
|
172
240
|
|
|
173
|
-
|
|
241
|
+
const indent = parents.length;
|
|
242
|
+
|
|
243
|
+
dropState = {
|
|
244
|
+
index,
|
|
245
|
+
state: placementState | indent,
|
|
246
|
+
childIndex,
|
|
247
|
+
parentKey,
|
|
248
|
+
top: dropLineTopPos,
|
|
249
|
+
};
|
|
174
250
|
setDropState(dropState);
|
|
175
251
|
}
|
|
176
252
|
};
|
|
@@ -179,18 +255,13 @@ export function SilkeNestedSortableList<T>({
|
|
|
179
255
|
setStartDrag(false);
|
|
180
256
|
setDropState(undefined);
|
|
181
257
|
if (dragState === 'pending') {
|
|
182
|
-
if (pendingClickItem &&
|
|
258
|
+
if (pendingClickItem && onItemClick) onItemClick(e, pendingClickItem);
|
|
183
259
|
return;
|
|
184
260
|
}
|
|
185
261
|
if (dropState && selected && !hasState(dropState.state, ItemState.placementInvalid)) {
|
|
186
|
-
const
|
|
187
|
-
|
|
188
|
-
const placeAfter = hasState(dropState.state, ItemState.placeAfter);
|
|
189
|
-
const placeInside = hasState(dropState.state, ItemState.placeInside);
|
|
190
|
-
|
|
191
|
-
const parentKey = placeInside ? targetItem.key : parentMap[targetItem.key];
|
|
192
|
-
|
|
262
|
+
const { parentKey, childIndex, index, state } = dropState;
|
|
193
263
|
const newItems = items.slice();
|
|
264
|
+
let currentChildIndex = childIndex;
|
|
194
265
|
for (let i = 0; i < newItems.length; i++) {
|
|
195
266
|
const item = newItems[i];
|
|
196
267
|
const { children } = item;
|
|
@@ -204,22 +275,31 @@ export function SilkeNestedSortableList<T>({
|
|
|
204
275
|
|
|
205
276
|
if (item.key === parentKey) {
|
|
206
277
|
const newChildren = (newItems[i].children || []).slice();
|
|
207
|
-
let childIndex = placeInside ? 0 : children?.indexOf(targetItem.key) || 0;
|
|
208
|
-
|
|
209
|
-
if (placeAfter) childIndex++;
|
|
210
278
|
|
|
211
279
|
// Have to offset index if child existed in the children array above the position we're inserting at
|
|
212
|
-
|
|
280
|
+
currentChildIndex -= selected.reduce((offset, key) => {
|
|
213
281
|
const index = children ? children.indexOf(key) : -1;
|
|
214
|
-
return index !== -1 && index <
|
|
282
|
+
return index !== -1 && index < currentChildIndex ? offset + 1 : offset;
|
|
215
283
|
}, 0);
|
|
216
284
|
|
|
217
|
-
newChildren.splice(
|
|
285
|
+
newChildren.splice(currentChildIndex, 0, ...uniq(selected));
|
|
218
286
|
newItems[i] = { ...newItems[i], children: newChildren };
|
|
219
287
|
}
|
|
220
288
|
}
|
|
289
|
+
// If no parent we notify about the list change by just sorting the main list
|
|
290
|
+
if (!parentKey) {
|
|
291
|
+
let atIndex = index;
|
|
292
|
+
if (hasState(state, ItemState.placeAfter) && atIndex > 0) atIndex++;
|
|
293
|
+
const selectedItems = selected.map((key) => {
|
|
294
|
+
const index = newItems.findIndex((item) => item.key === key);
|
|
295
|
+
const [item] = newItems.splice(index, 1);
|
|
296
|
+
if (index < atIndex) atIndex--;
|
|
297
|
+
return item;
|
|
298
|
+
});
|
|
299
|
+
newItems.splice(atIndex, 0, ...selectedItems);
|
|
300
|
+
}
|
|
221
301
|
|
|
222
|
-
onSort(newItems,
|
|
302
|
+
onSort?.(newItems, parentKey, childIndex);
|
|
223
303
|
}
|
|
224
304
|
};
|
|
225
305
|
Mouse.on('mousemove', handleMouseMove);
|
|
@@ -228,83 +308,56 @@ export function SilkeNestedSortableList<T>({
|
|
|
228
308
|
Mouse.off('mousemove', handleMouseMove);
|
|
229
309
|
Mouse.off('mouseup', handleMouseUp);
|
|
230
310
|
};
|
|
231
|
-
}, [startDrag, selected, computedStates,
|
|
311
|
+
}, [startDrag, selected, computedStates, onItemClick, canHaveChildren, canSort, parentMap]);
|
|
232
312
|
|
|
313
|
+
const isClassNameItemAFunction = typeof classNameItem === 'function';
|
|
233
314
|
return (
|
|
234
|
-
<SilkeBox
|
|
235
|
-
{
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
315
|
+
<SilkeBox data-dragging={Boolean(dropState)} className={cl} column {...(rest as any)}>
|
|
316
|
+
<div ref={ref} style={{ position: 'relative' }}>
|
|
317
|
+
{startDrag && dropState && (
|
|
318
|
+
<DropPoint state={dropState?.state || 0} top={dropState?.top || 0} />
|
|
319
|
+
)}
|
|
320
|
+
{computedStates.map(([state, item], index) => (
|
|
321
|
+
<SilkeNestedSortableItem
|
|
322
|
+
key={index + item.key}
|
|
323
|
+
item={item}
|
|
324
|
+
className={isClassNameItemAFunction ? classNameItem(item) : classNameItem}
|
|
325
|
+
state={
|
|
326
|
+
state |
|
|
327
|
+
(startDrag && index === dropState?.index
|
|
328
|
+
? dropState.state & (ItemState.placeInside | ItemState.placementInvalid)
|
|
329
|
+
: 0)
|
|
330
|
+
}
|
|
331
|
+
index={index}
|
|
332
|
+
onMouseDown={handleItemMouseDown}
|
|
333
|
+
onDoubleClick={onItemDoubleClick}
|
|
334
|
+
onMouseEnter={onItemMouseEnter}
|
|
335
|
+
onMouseLeave={onItemMouseLeave}
|
|
336
|
+
onCollapseToggle={onCollapse && handleCollapse}
|
|
337
|
+
>
|
|
338
|
+
{item.render || children}
|
|
339
|
+
</SilkeNestedSortableItem>
|
|
340
|
+
))}
|
|
341
|
+
</div>
|
|
247
342
|
</SilkeBox>
|
|
248
343
|
);
|
|
249
344
|
}
|
|
250
345
|
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
state
|
|
254
|
-
index: number;
|
|
255
|
-
children: RenderFunction<T>;
|
|
256
|
-
onMouseDown?: (e: React.MouseEvent<HTMLDivElement>, item: Item<T>) => void;
|
|
257
|
-
onCollapseToggle: (item: Item<T>) => void;
|
|
258
|
-
};
|
|
259
|
-
|
|
260
|
-
function SilkeNestedSortableItem<T>({
|
|
261
|
-
item,
|
|
262
|
-
index,
|
|
263
|
-
state,
|
|
264
|
-
children,
|
|
265
|
-
onCollapseToggle,
|
|
266
|
-
onMouseDown,
|
|
267
|
-
}: SilkeNestedSortableItemProps<T>) {
|
|
268
|
-
let cl = styles.item;
|
|
269
|
-
const hasChildren = !!item.children?.length;
|
|
270
|
-
const indent = getIndentLevel(state);
|
|
271
|
-
|
|
272
|
-
if (hasState(state, ItemState.selected)) cl += ' ' + styles.selected;
|
|
273
|
-
if (hasState(state, ItemState.roundTop)) cl += ' ' + styles.roundTop;
|
|
274
|
-
if (hasState(state, ItemState.roundBottom)) cl += ' ' + styles.roundBottom;
|
|
275
|
-
if (hasState(state, ItemState.childOfSelected)) cl += ' ' + styles.childOfSelected;
|
|
276
|
-
if (hasState(state, ItemState.childOfSelected)) cl += ' ' + styles.childOfSelected;
|
|
346
|
+
function DropPoint({ state, top }: { state: number; top: number }) {
|
|
347
|
+
// Handled by outlining the element
|
|
348
|
+
if (hasState(state, ItemState.placeInside)) return null;
|
|
277
349
|
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
if (hasState(state, ItemState.placeInside)) cl += ' ' + styles.placeInside;
|
|
350
|
+
const indent = getIndentLevel(state);
|
|
351
|
+
let cl = styles.dropPoint;
|
|
281
352
|
if (hasState(state, ItemState.placementInvalid)) cl += ' ' + styles.placementInvalid;
|
|
282
|
-
|
|
283
|
-
if (hasChildren) cl += ' ' + styles.hasChildren;
|
|
284
|
-
if (item.disabled) cl += ' ' + styles.disabled;
|
|
285
353
|
if (indent) cl += ' ' + styles[`indent${indent}`];
|
|
354
|
+
|
|
286
355
|
return (
|
|
287
356
|
<div
|
|
288
357
|
className={cl}
|
|
289
|
-
style={
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
<SilkeBox
|
|
294
|
-
className={styles.expand}
|
|
295
|
-
tabIndex={1}
|
|
296
|
-
size="s"
|
|
297
|
-
align="center"
|
|
298
|
-
onClick={(e: React.MouseEvent<HTMLDivElement>) => {
|
|
299
|
-
if (hasChildren) e.stopPropagation();
|
|
300
|
-
onCollapseToggle(item);
|
|
301
|
-
}}
|
|
302
|
-
>
|
|
303
|
-
{hasChildren && (
|
|
304
|
-
<SilkeIcon icon={hasState(state, ItemState.collapsed) ? 'caret.right' : 'caret.down'} />
|
|
305
|
-
)}
|
|
306
|
-
</SilkeBox>
|
|
307
|
-
{children(item, index)}
|
|
308
|
-
</div>
|
|
358
|
+
style={{
|
|
359
|
+
top,
|
|
360
|
+
}}
|
|
361
|
+
/>
|
|
309
362
|
);
|
|
310
363
|
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { Dictionary } from 'lodash';
|
|
1
|
+
import { Dictionary, last } from 'lodash';
|
|
2
2
|
|
|
3
|
-
export type RenderFunction<T> = (item: Item<T>, index: number) => React.
|
|
4
|
-
export type Item<T> = {
|
|
3
|
+
export type RenderFunction<T> = (item: Item<T>, index: number) => React.ReactElement;
|
|
4
|
+
export type Item<T> = T & {
|
|
5
5
|
key: string;
|
|
6
|
-
value?: T;
|
|
7
6
|
/** Not selectable and no hover interactions */
|
|
8
7
|
disabled?: boolean;
|
|
9
8
|
children?: string[];
|
|
10
9
|
render?: RenderFunction<T>;
|
|
11
10
|
className?: string;
|
|
11
|
+
/** Override the default behavior with checking for children length */
|
|
12
|
+
showExpandIcon?: boolean;
|
|
12
13
|
style?: React.CSSProperties;
|
|
13
14
|
};
|
|
14
15
|
|
|
@@ -24,15 +25,16 @@ export enum ItemState {
|
|
|
24
25
|
indentBit6 = 1 << 5,
|
|
25
26
|
|
|
26
27
|
collapsed = 1 << 6,
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
28
|
+
canHaveChildren = 1 << 7,
|
|
29
|
+
selected = 1 << 8,
|
|
30
|
+
childOfSelected = 1 << 9,
|
|
31
|
+
roundTop = 1 << 10,
|
|
32
|
+
roundBottom = 1 << 11,
|
|
33
|
+
|
|
34
|
+
placeAfter = 1 << 12,
|
|
35
|
+
placeBefore = 1 << 13,
|
|
36
|
+
placeInside = 1 << 14,
|
|
37
|
+
placementInvalid = 1 << 15,
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
function getComputedState(
|
|
@@ -40,10 +42,11 @@ function getComputedState(
|
|
|
40
42
|
selected?: boolean,
|
|
41
43
|
childOfSelected?: boolean,
|
|
42
44
|
collapsed?: boolean,
|
|
45
|
+
canHaveChildren?: boolean,
|
|
43
46
|
indent = 0,
|
|
44
47
|
): number {
|
|
45
48
|
let state = indent;
|
|
46
|
-
const prevSelected = hasState(prevState, ItemState.selected);
|
|
49
|
+
const prevSelected = hasState(prevState, ItemState.selected | ItemState.childOfSelected);
|
|
47
50
|
|
|
48
51
|
if (selected) {
|
|
49
52
|
state |= ItemState.selected;
|
|
@@ -58,6 +61,7 @@ function getComputedState(
|
|
|
58
61
|
}
|
|
59
62
|
if (childOfSelected) state |= ItemState.childOfSelected;
|
|
60
63
|
if (collapsed) state |= ItemState.collapsed;
|
|
64
|
+
if (canHaveChildren) state |= ItemState.canHaveChildren;
|
|
61
65
|
|
|
62
66
|
return state;
|
|
63
67
|
}
|
|
@@ -74,17 +78,27 @@ export function generatedComputedStates<T>(
|
|
|
74
78
|
itemMap: Dictionary<Item<T>> = {},
|
|
75
79
|
itemKeys: string[],
|
|
76
80
|
selected?: string[],
|
|
77
|
-
collapsed?:
|
|
81
|
+
collapsed?: (item: Item<T>) => boolean,
|
|
82
|
+
canHaveChildren?: (item: Item<T>) => boolean,
|
|
78
83
|
isChildOfSelected?: boolean,
|
|
79
84
|
indent = 0,
|
|
80
85
|
computedStates: [number, Item<T>][] = [],
|
|
81
86
|
): [number, Item<T>][] {
|
|
82
87
|
for (const itemKey of itemKeys) {
|
|
83
88
|
const item = itemMap[itemKey];
|
|
89
|
+
if (!item) continue;
|
|
84
90
|
const prevState = computedStates[computedStates.length - 1]?.[0] || 0;
|
|
85
91
|
const isSelected = selected?.includes(item.key);
|
|
86
|
-
const isCollapsed = collapsed?.
|
|
87
|
-
const
|
|
92
|
+
const isCollapsed = collapsed?.(item) || false;
|
|
93
|
+
const canHaveChildrenValue = canHaveChildren?.(item) || !!item.children?.length;
|
|
94
|
+
const state = getComputedState(
|
|
95
|
+
prevState,
|
|
96
|
+
isSelected,
|
|
97
|
+
isChildOfSelected,
|
|
98
|
+
isCollapsed,
|
|
99
|
+
canHaveChildrenValue,
|
|
100
|
+
indent,
|
|
101
|
+
);
|
|
88
102
|
|
|
89
103
|
if (
|
|
90
104
|
prevState &&
|
|
@@ -102,6 +116,7 @@ export function generatedComputedStates<T>(
|
|
|
102
116
|
item.children,
|
|
103
117
|
selected,
|
|
104
118
|
collapsed,
|
|
119
|
+
canHaveChildren,
|
|
105
120
|
isSelected || isChildOfSelected,
|
|
106
121
|
indent + 1,
|
|
107
122
|
computedStates,
|
|
@@ -125,12 +140,6 @@ export function getParents(itemKey: string, parentMap: { [key: string]: string }
|
|
|
125
140
|
return parents;
|
|
126
141
|
}
|
|
127
142
|
|
|
128
|
-
export function getPlacementString(state: number): 'after' | 'before' | 'inside' {
|
|
129
|
-
if (hasState(state, ItemState.placeAfter)) return 'after';
|
|
130
|
-
else if (hasState(state, ItemState.placeInside)) return 'inside';
|
|
131
|
-
return 'before';
|
|
132
|
-
}
|
|
133
|
-
|
|
134
143
|
export function isParentOfSelf(
|
|
135
144
|
targetKey: string,
|
|
136
145
|
itemKey: string,
|
|
@@ -149,3 +158,24 @@ export function debugLogState(message: string, state: number) {
|
|
|
149
158
|
}
|
|
150
159
|
console.groupEnd();
|
|
151
160
|
}
|
|
161
|
+
/**
|
|
162
|
+
* If the users hovers the end of a group the might be trying to move it to the end of the parent of the group
|
|
163
|
+
* This function checks based on the mouse indent level which parent is the best target
|
|
164
|
+
*/
|
|
165
|
+
export function getMouseHorizontalIndentTarget<T>(
|
|
166
|
+
target: Item<T>,
|
|
167
|
+
deltaMouseIndent: number,
|
|
168
|
+
itemMap: { [key: string]: Item<T> },
|
|
169
|
+
parentMap: { [key: string]: string },
|
|
170
|
+
): Item<T> {
|
|
171
|
+
// Can only indent negative direction so if greater than -1 then don't try to move target
|
|
172
|
+
if (deltaMouseIndent > -1) return target;
|
|
173
|
+
const parentKey = parentMap[target.key];
|
|
174
|
+
const parent = itemMap[parentKey];
|
|
175
|
+
// target needs to be the last in the parent
|
|
176
|
+
if (last(parent?.children) === target.key) {
|
|
177
|
+
return getMouseHorizontalIndentTarget(parent, deltaMouseIndent + 1, itemMap, parentMap);
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
return target;
|
|
181
|
+
}
|