@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.
Files changed (191) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/chunk-4MB64AQL.js +22 -0
  3. package/dist/chunk-4MB64AQL.js.LEGAL.txt +8 -0
  4. package/dist/chunk-4MB64AQL.js.map +7 -0
  5. package/dist/index.js +9 -25
  6. package/dist/index.js.LEGAL.txt +6 -9
  7. package/dist/index.js.map +4 -4
  8. package/dist/silke-code-editor-HZRG3D6C.js +23 -0
  9. package/dist/silke-code-editor-HZRG3D6C.js.map +7 -0
  10. package/dist/styles.css +4338 -2599
  11. package/esbuild.config.mjs +2 -1
  12. package/jest.config.js +2 -1
  13. package/package.json +12 -8
  14. package/src/_variables.scss +121 -1
  15. package/src/components/index.ts +6 -0
  16. package/src/components/silke-autocomplete-field/autocomplete-item.tsx +15 -13
  17. package/src/components/silke-autocomplete-field/autocomplete-tags.tsx +14 -7
  18. package/src/components/silke-autocomplete-field/silke-autocomplete-field.mdx +31 -4
  19. package/src/components/silke-autocomplete-field/silke-autocomplete-field.scss +8 -6
  20. package/src/components/silke-autocomplete-field/silke-autocomplete-field.tsx +64 -23
  21. package/src/components/silke-box/silke-box.scss +21 -47
  22. package/src/components/silke-box/silke-box.tsx +23 -31
  23. package/src/components/silke-breadcrumbs/silke-breadcrumb.scss +3 -3
  24. package/src/components/silke-button/index.ts +3 -1
  25. package/src/components/silke-button/silke-big-button.scss +38 -0
  26. package/src/components/silke-button/silke-big-button.tsx +49 -0
  27. package/src/components/silke-button/silke-button-set.tsx +15 -3
  28. package/src/components/silke-button/silke-button.mdx +41 -19
  29. package/src/components/silke-button/silke-button.scss +97 -90
  30. package/src/components/silke-button/silke-button.tsx +20 -5
  31. package/src/components/silke-button/silke-file-select-button.tsx +86 -0
  32. package/src/components/silke-card/silke-card-grid.tsx +9 -9
  33. package/src/components/silke-card/silke-card.mdx +23 -9
  34. package/src/components/silke-card/silke-card.scss +92 -39
  35. package/src/components/silke-card/silke-card.tsx +50 -27
  36. package/src/components/silke-checkbox/silke-checkbox.scss +39 -17
  37. package/src/components/silke-checkbox/silke-checkbox.tsx +4 -1
  38. package/src/components/silke-code-editor/index.tsx +12 -0
  39. package/src/components/silke-code-editor/silke-code-editor.mdx +97 -0
  40. package/src/components/silke-code-editor/silke-code-editor.tsx +52 -0
  41. package/src/components/silke-code-snippet/silke-code-snippet.scss +2 -10
  42. package/src/components/silke-code-snippet/silke-code-snippet.tsx +10 -3
  43. package/src/components/silke-color-palettes/silke-color-palette.tsx +11 -2
  44. package/src/components/silke-color-picker/color-picker.scss +10 -6
  45. package/src/components/silke-color-picker/silke-color-info.tsx +14 -4
  46. package/src/components/silke-color-picker/silke-color-picker-button.tsx +4 -3
  47. package/src/components/silke-color-picker/silke-color-picker.tsx +4 -2
  48. package/src/components/silke-color-picker/silke-opacity-slider.tsx +11 -12
  49. package/src/components/silke-color-swatches/silke-color-swatch-button.tsx +10 -4
  50. package/src/components/silke-color-swatches/silke-swatches.tsx +2 -2
  51. package/src/components/silke-content-column/index.ts +1 -0
  52. package/src/components/silke-content-column/silke-content-column.mdx +7 -0
  53. package/src/components/silke-content-column/silke-content-column.scss +39 -0
  54. package/src/components/silke-content-column/silke-content-column.tsx +14 -0
  55. package/src/components/silke-context-menu/silke-context-menu-item.tsx +9 -4
  56. package/src/components/silke-context-menu/silke-context-menu.mdx +16 -12
  57. package/src/components/silke-context-menu/silke-context-menu.scss +16 -0
  58. package/src/components/silke-context-menu/silke-context-menu.tsx +62 -39
  59. package/src/components/silke-css-number-field/silke-css-context.tsx +1 -0
  60. package/src/components/silke-css-number-field/silke-css-number-field.scss +18 -3
  61. package/src/components/silke-css-number-field/silke-css-number-field.tsx +32 -13
  62. package/src/components/silke-css-number-field/utils.ts +2 -0
  63. package/src/components/silke-divider/silke-divider.scss +4 -2
  64. package/src/components/silke-drawer/silke-drawer.scss +3 -3
  65. package/src/components/silke-drawer/silke-drawer.tsx +3 -3
  66. package/src/components/silke-form/silke-form.tsx +1 -9
  67. package/src/components/silke-form-schema/fields/array-field-inline.tsx +2 -3
  68. package/src/components/silke-form-schema/fields/array-field-modal.tsx +1 -1
  69. package/src/components/silke-form-schema/fields/array-field.tsx +2 -2
  70. package/src/components/silke-form-schema/fields/event-field.tsx +120 -0
  71. package/src/components/silke-form-schema/fields/icon-field.tsx +1 -1
  72. package/src/components/silke-form-schema/fields/image-field.tsx +1 -1
  73. package/src/components/silke-form-schema/fields/link-field.tsx +8 -1
  74. package/src/components/silke-form-schema/fields/number-field.tsx +24 -8
  75. package/src/components/silke-form-schema/fields/object-field.tsx +1 -1
  76. package/src/components/silke-form-schema/fields/select-field.tsx +9 -2
  77. package/src/components/silke-form-schema/fields/styles.scss +2 -2
  78. package/src/components/silke-form-schema/fields/toggle-field.tsx +14 -13
  79. package/src/components/silke-form-schema/fields/upload-field.tsx +37 -0
  80. package/src/components/silke-form-schema/fields/utils/generate-image.ts +3 -4
  81. package/src/components/silke-form-schema/fields/utils/generate-title.ts +1 -3
  82. package/src/components/silke-form-schema/index.ts +1 -0
  83. package/src/components/silke-form-schema/silke-extended-fields-context.tsx +22 -0
  84. package/src/components/silke-form-schema/silke-schema-field.tsx +19 -6
  85. package/src/components/silke-icon/silke-icon.scss +3 -2
  86. package/src/components/silke-icon/silke-icon.tsx +7 -3
  87. package/src/components/silke-icon/silke-shape.tsx +3 -2
  88. package/src/components/silke-icon-picker/emoji-tab.tsx +2 -2
  89. package/src/components/silke-icon-picker/icons-tab.tsx +1 -1
  90. package/src/components/silke-icon-picker/silke-icon-picker.tsx +1 -1
  91. package/src/components/silke-iframe-portal/index.ts +4 -0
  92. package/src/components/silke-iframe-portal/silke-iframe-context.ts +6 -0
  93. package/src/components/silke-iframe-portal/silke-iframe-css-link.tsx +20 -0
  94. package/src/components/silke-iframe-portal/silke-iframe-portal.mdx +34 -0
  95. package/src/components/silke-iframe-portal/silke-iframe-portal.tsx +77 -0
  96. package/src/components/silke-iframe-portal/silke-iframe-script.tsx +20 -0
  97. package/src/components/silke-link/silke-link.scss +2 -2
  98. package/src/components/silke-link/silke-link.tsx +8 -9
  99. package/src/components/silke-list/silke-list.scss +1 -1
  100. package/src/components/silke-list-card/index.ts +1 -0
  101. package/src/components/silke-list-card/silke-list-card.mdx +50 -0
  102. package/src/components/silke-list-card/silke-list-card.scss +57 -0
  103. package/src/components/silke-list-card/silke-list-card.tsx +65 -0
  104. package/src/components/silke-loader/index.ts +1 -0
  105. package/src/components/silke-loader/silke-loader-overlay.tsx +63 -0
  106. package/src/components/silke-loader/silke-loader.scss +112 -0
  107. package/src/components/silke-loader/silke-loader.tsx +1 -0
  108. package/src/components/silke-modal/silke-confirmation-modal.tsx +1 -1
  109. package/src/components/silke-modal/silke-modal.mdx +1 -1
  110. package/src/components/silke-modal/silke-modal.scss +16 -10
  111. package/src/components/silke-modal/silke-modal.tsx +65 -47
  112. package/src/components/silke-navigation-link/silke-navigation-link.scss +69 -41
  113. package/src/components/silke-navigation-link/silke-navigation-link.tsx +26 -14
  114. package/src/components/silke-notification/confetti.tsx +164 -0
  115. package/src/components/silke-notification/silke-notification.mdx +137 -20
  116. package/src/components/silke-notification/silke-notification.scss +116 -89
  117. package/src/components/silke-notification/silke-notification.tsx +44 -113
  118. package/src/components/silke-object-field/silke-object-field.tsx +1 -1
  119. package/src/components/silke-overflow-menu/silke-overflow-menu.mdx +2 -2
  120. package/src/components/silke-overflow-menu/silke-overflow-menu.scss +12 -4
  121. package/src/components/silke-overflow-menu/silke-overflow-menu.tsx +53 -30
  122. package/src/components/silke-popover/silke-popover.mdx +2 -2
  123. package/src/components/silke-popover/silke-popover.tsx +23 -5
  124. package/src/components/silke-progress-indicator/silke-progress-indicator.scss +5 -5
  125. package/src/components/silke-radio-button/silke-radio-button-group.tsx +1 -1
  126. package/src/components/silke-radio-button/silke-radio-button.scss +24 -9
  127. package/src/components/silke-search-field/silke-search-field.tsx +10 -5
  128. package/src/components/silke-select-field/silke-select-field.mdx +11 -5
  129. package/src/components/silke-skeleton/silke-skeleton.scss +2 -2
  130. package/src/components/silke-slider/range-slider.scss +13 -10
  131. package/src/components/silke-slider/silke-slider.tsx +5 -0
  132. package/src/components/silke-sortable-list/silke-nested-sortable-item.tsx +105 -0
  133. package/src/components/silke-sortable-list/silke-nested-sortable-list.scss +37 -25
  134. package/src/components/silke-sortable-list/silke-nested-sortable-list.tsx +180 -127
  135. package/src/components/silke-sortable-list/silke-nested-sortable-utils.ts +53 -23
  136. package/src/components/silke-sortable-list/silke-sortable-item-wrapper.tsx +1 -1
  137. package/src/components/silke-sortable-list/silke-sortable-list.mdx +12 -16
  138. package/src/components/silke-sortable-list/silke-sortable-list.scss +39 -29
  139. package/src/components/silke-sortable-list/silke-sortable-list.tsx +27 -15
  140. package/src/components/silke-steps/index.ts +1 -0
  141. package/src/components/silke-steps/silke-steps.mdx +60 -0
  142. package/src/components/silke-steps/silke-steps.scss +14 -0
  143. package/src/components/silke-steps/silke-steps.tsx +53 -0
  144. package/src/components/silke-table/silke-table.mdx +44 -13
  145. package/src/components/silke-table/silke-table.scss +19 -9
  146. package/src/components/silke-table/silke-table.tsx +80 -71
  147. package/src/components/silke-table/table-row.tsx +11 -6
  148. package/src/components/silke-tabs/silke-tab.tsx +4 -0
  149. package/src/components/silke-tabs/silke-tabs.scss +18 -15
  150. package/src/components/silke-tabs/silke-tabs.tsx +4 -7
  151. package/src/components/silke-tag/silke-tag.mdx +36 -2
  152. package/src/components/silke-tag/silke-tag.scss +49 -30
  153. package/src/components/silke-tag/silke-tag.tsx +21 -6
  154. package/src/components/silke-text/silke-text-types.ts +2 -1
  155. package/src/components/silke-text/silke-text.mdx +28 -20
  156. package/src/components/silke-text/silke-text.scss +8 -7
  157. package/src/components/silke-text/silke-title.scss +1 -1
  158. package/src/components/silke-text-field/silke-text-field-outline.tsx +4 -4
  159. package/src/components/silke-text-field/silke-text-field.mdx +32 -14
  160. package/src/components/silke-text-field/silke-text-field.scss +41 -23
  161. package/src/components/silke-text-field/silke-text-field.tsx +13 -5
  162. package/src/components/silke-text-field/text-field-context.tsx +1 -1
  163. package/src/components/silke-theme-editor/index.ts +1 -0
  164. package/src/components/silke-theme-editor/silke-theme-editor.tsx +165 -0
  165. package/src/components/silke-tile/silke-tile.scss +13 -18
  166. package/src/components/silke-tile/silke-tile.tsx +11 -17
  167. package/src/components/silke-toggle/silke-toggle.scss +17 -9
  168. package/src/components/silke-toggle/silke-toggle.tsx +1 -1
  169. package/src/components/silke-toolbar/silke-toolbar.scss +1 -1
  170. package/src/components/silke-tooltip/silke-definition-tooltip.tsx +14 -6
  171. package/src/components/silke-tooltip/silke-icon-tooltip.tsx +48 -34
  172. package/src/components/silke-tooltip/silke-interactive-tooltip.tsx +5 -3
  173. package/src/components/silke-tooltip/silke-tooltip.mdx +69 -2
  174. package/src/components/silke-tooltip/silke-tooltip.scss +71 -46
  175. package/src/components/silke-tooltip/silke-tooltip.tsx +142 -52
  176. package/src/components/silke-tooltip/utils.ts +93 -0
  177. package/src/components/silke-upload-field/silke-upload-field.mdx +14 -0
  178. package/src/components/silke-upload-field/silke-upload-field.scss +26 -17
  179. package/src/components/silke-upload-field/silke-upload-field.tsx +37 -14
  180. package/src/docs/app.tsx +118 -25
  181. package/src/docs/components/code-block/code-block.scss +0 -2
  182. package/src/docs/components/code-block/code-block.tsx +17 -9
  183. package/src/hooks/drag-and-drop/use-drag.tsx +5 -1
  184. package/src/hooks/drag-and-drop/use-drop.tsx +5 -4
  185. package/src/icons.tsx +194 -10
  186. package/src/index.mdx +66 -1
  187. package/src/main.tsx +5 -2
  188. package/src/silke-theme-provider.tsx +51 -3
  189. package/src/styles/core.scss +56 -91
  190. package/webpack.docs.ts +1 -3
  191. 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 { SilkeIcon } from '../silke-icon';
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?: string[];
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
- targetItem: Item<T>,
32
- placement: 'before' | 'after' | 'inside',
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
- onCollapsed: (collapsed: string[]) => void;
38
- onClick?: (e: MouseEvent, item: Item<T>) => void;
39
- } & BoxProps;
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
- onCollapsed,
51
- onClick,
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] = useState<{ index: number; state: number }>();
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.children) {
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 = items.filter((item) => !(item.key in parentMap)).map((item) => item.key);
84
+ const rootItemKeys =
85
+ rootItems || items.filter((item) => !(item.key in parentMap)).map((item) => item.key);
73
86
 
74
- const computedStates = generatedComputedStates(itemMap, rootItemKeys, selected, collapsed);
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
- if (onCollapsed) {
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, onCollapsed],
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
- onClick?.(e.nativeEvent, item);
116
+ onItemClick?.(e.nativeEvent, item);
97
117
  }
98
- setStartDrag(true);
118
+ if (shouldDragBeDone) setStartDrag(true);
99
119
  },
100
- [onClick, selected],
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: { index: number; state: number };
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 offsetY = e.pageY - top;
163
+ const cursorOffsetY = e.pageY - top;
121
164
  let index = -1;
122
165
 
123
- if (offsetY > offsets[0][0]) {
166
+ if (cursorOffsetY > offsets[0][0]) {
124
167
  for (index = 0; index < offsets.length; index++) {
125
168
  const [top, height] = offsets[index];
126
- if (offsetY <= top + height) break;
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
- offsetY > offset[0] + 10 &&
154
- offsetY < insideBottomPos
199
+ cursorOffsetY > offset[0] + 10 &&
200
+ cursorOffsetY < insideBottomPos
155
201
  ) {
156
202
  placementState = ItemState.placeInside;
157
- } else if (offsetY > offset[0] + offset[1] / 2) {
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
- const [, targetItem] = computedStates[index];
163
- const parents = getParents(targetItem.key, parentMap);
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 allowSort =
166
- !canSort || canSort(targetItem, getPlacementString(placementState), parents, selected);
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
- dropState = { index, state: placementState };
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 && onClick) onClick(e, 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 [, targetItem] = computedStates[dropState.index];
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
- childIndex -= selected.reduce((offset, key) => {
280
+ currentChildIndex -= selected.reduce((offset, key) => {
213
281
  const index = children ? children.indexOf(key) : -1;
214
- return index !== -1 && index < childIndex ? offset + 1 : offset;
282
+ return index !== -1 && index < currentChildIndex ? offset + 1 : offset;
215
283
  }, 0);
216
284
 
217
- newChildren.splice(childIndex, 0, ...uniq(selected));
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, targetItem, getPlacementString(dropState.state));
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, onClick, canHaveChildren, canSort, parentMap]);
311
+ }, [startDrag, selected, computedStates, onItemClick, canHaveChildren, canSort, parentMap]);
232
312
 
313
+ const isClassNameItemAFunction = typeof classNameItem === 'function';
233
314
  return (
234
- <SilkeBox ref={ref} className={cl} column {...rest}>
235
- {computedStates.map(([state, item], index) => (
236
- <SilkeNestedSortableItem
237
- key={item.key}
238
- item={item}
239
- state={state | (index === dropState?.index ? dropState.state : 0)}
240
- index={index}
241
- onMouseDown={handleItemMouseDown}
242
- onCollapseToggle={handleCollapse}
243
- >
244
- {item.render || children}
245
- </SilkeNestedSortableItem>
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
- type SilkeNestedSortableItemProps<T> = {
252
- item: Item<T>;
253
- state: number;
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
- if (hasState(state, ItemState.placeAfter)) cl += ' ' + styles.placeAfter;
279
- if (hasState(state, ItemState.placeBefore)) cl += ' ' + styles.placeBefore;
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={item.style}
290
- tabIndex={item.disabled ? undefined : 0}
291
- onMouseDown={!item.disabled && onMouseDown ? (e) => onMouseDown(e, item) : undefined}
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.ReactNode;
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
- selected = 1 << 7,
28
- childOfSelected = 1 << 8,
29
- roundTop = 1 << 9,
30
- roundBottom = 1 << 10,
31
-
32
- placeAfter = 1 << 11,
33
- placeBefore = 1 << 12,
34
- placeInside = 1 << 13,
35
- placementInvalid = 1 << 14,
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?: string[],
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?.includes(item.key);
87
- const state = getComputedState(prevState, isSelected, isChildOfSelected, isCollapsed, indent);
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
+ }
@@ -7,7 +7,7 @@ type SilkeSortableItemWrapperProps<T> = {
7
7
  index: number;
8
8
  listId: string;
9
9
  triggerState: 'over' | 'drop';
10
- children: React.ReactNode;
10
+ children: React.ReactElement;
11
11
  onSort: (sortedItems: T[]) => void;
12
12
  };
13
13