@vev/silke 1.0.8 → 1.0.11

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 (53) hide show
  1. package/dist/index.js +20 -20
  2. package/dist/index.js.map +3 -3
  3. package/dist/styles.css +1257 -1071
  4. package/dist/types/components/silke-autocomplete-field/silke-autocomplete-field.d.ts +1 -0
  5. package/dist/types/components/silke-autocomplete-field/silke-autocomplete-field.js +42 -18
  6. package/dist/types/components/silke-autocomplete-field/silke-autocomplete-field.js.map +1 -1
  7. package/dist/types/components/silke-box/silke-box.d.ts +1 -1
  8. package/dist/types/components/silke-form-schema/fields/icon-field.d.ts +4 -0
  9. package/dist/types/components/silke-form-schema/fields/icon-field.js +59 -0
  10. package/dist/types/components/silke-form-schema/fields/icon-field.js.map +1 -0
  11. package/dist/types/components/silke-form-schema/fields/image-field.js +7 -10
  12. package/dist/types/components/silke-form-schema/fields/image-field.js.map +1 -1
  13. package/dist/types/components/silke-form-schema/fields/select-field.js +1 -1
  14. package/dist/types/components/silke-form-schema/fields/select-field.js.map +1 -1
  15. package/dist/types/components/silke-form-schema/index.d.ts +1 -0
  16. package/dist/types/components/silke-form-schema/index.js +1 -0
  17. package/dist/types/components/silke-form-schema/index.js.map +1 -1
  18. package/dist/types/components/silke-form-schema/silke-form-schema.js +3 -34
  19. package/dist/types/components/silke-form-schema/silke-form-schema.js.map +1 -1
  20. package/dist/types/components/silke-form-schema/silke-schema-field.js +2 -0
  21. package/dist/types/components/silke-form-schema/silke-schema-field.js.map +1 -1
  22. package/dist/types/components/silke-sortable-list/index.d.ts +1 -0
  23. package/dist/types/components/silke-sortable-list/index.js +1 -0
  24. package/dist/types/components/silke-sortable-list/index.js.map +1 -1
  25. package/dist/types/components/silke-sortable-list/silke-nested-sortable-list.d.ts +17 -0
  26. package/dist/types/components/silke-sortable-list/silke-nested-sortable-list.js +230 -0
  27. package/dist/types/components/silke-sortable-list/silke-nested-sortable-list.js.map +1 -0
  28. package/dist/types/components/silke-sortable-list/silke-nested-sortable-utils.d.ts +41 -0
  29. package/dist/types/components/silke-sortable-list/silke-nested-sortable-utils.js +110 -0
  30. package/dist/types/components/silke-sortable-list/silke-nested-sortable-utils.js.map +1 -0
  31. package/dist/types/icons.d.ts +1 -0
  32. package/dist/types/icons.js +1 -0
  33. package/dist/types/icons.js.map +1 -1
  34. package/esbuild-sass-modules.mjs +8 -3
  35. package/package.json +5 -5
  36. package/src/_variables.scss +2 -1
  37. package/src/components/silke-autocomplete-field/silke-autocomplete-field.spec.tsx +84 -1
  38. package/src/components/silke-autocomplete-field/silke-autocomplete-field.tsx +59 -16
  39. package/src/components/silke-box/silke-box.scss +0 -3
  40. package/src/components/silke-box/silke-box.tsx +1 -1
  41. package/src/components/silke-card/silke-card.scss +6 -6
  42. package/src/components/silke-form-schema/fields/icon-field.tsx +53 -0
  43. package/src/components/silke-form-schema/fields/image-field.tsx +6 -10
  44. package/src/components/silke-form-schema/index.ts +1 -0
  45. package/src/components/silke-form-schema/silke-form-schema.tsx +1 -19
  46. package/src/components/silke-form-schema/silke-schema-field.tsx +2 -0
  47. package/src/components/silke-sortable-list/index.ts +1 -0
  48. package/src/components/silke-sortable-list/silke-nested-sortable-list.scss +102 -0
  49. package/src/components/silke-sortable-list/silke-nested-sortable-list.tsx +310 -0
  50. package/src/components/silke-sortable-list/silke-nested-sortable-utils.spec.ts +57 -0
  51. package/src/components/silke-sortable-list/silke-nested-sortable-utils.ts +151 -0
  52. package/src/components/silke-sortable-list/silke-sortable-list.mdx +90 -2
  53. package/src/icons.tsx +1 -0
@@ -1,8 +1,10 @@
1
1
  import React from 'react';
2
2
  import { render, screen } from '@testing-library/react';
3
- import { SilkeAutocompleteField } from './silke-autocomplete-field';
3
+ import { SilkeAutocompleteField, useMatchingItemsOnTop } from './silke-autocomplete-field';
4
4
  import { ARROW_DOWN, ENTER, ESCAPE } from '../../../jest/keys';
5
5
  import userEvent from '@testing-library/user-event';
6
+ import { renderHook } from '@testing-library/react-hooks';
7
+ import { getSearchReg } from '@vev/utils';
6
8
 
7
9
  type Item = {
8
10
  label: string;
@@ -179,4 +181,85 @@ describe('silke-autocomplete-field', () => {
179
181
 
180
182
  expect(onChange).toHaveBeenCalledWith('lion');
181
183
  });
184
+
185
+ describe('useMatchingItemsOnTop', () => {
186
+ const abbaItem = { label: 'abba', value: 'zzz' };
187
+
188
+ const items: Item[] = [
189
+ makeItem('cure'),
190
+ makeItem('cat'),
191
+ makeItem('lion'),
192
+ makeItem('lio'),
193
+ makeItem('bear'),
194
+ makeItem('deer'),
195
+ makeItem('Fish'),
196
+ ];
197
+
198
+ let sortedItems: Item[];
199
+
200
+ beforeEach(() => {
201
+ sortedItems = [...items, abbaItem].sort((a, b) => {
202
+ return a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1;
203
+ });
204
+ });
205
+
206
+ it('Returns all items if no search string', () => {
207
+ const { result } = renderHook(() => useMatchingItemsOnTop(sortedItems, undefined));
208
+ expect(result.current).toEqual(sortedItems);
209
+ });
210
+
211
+ it('Places items with full string match at the start', () => {
212
+ const { result } = renderHook(() => useMatchingItemsOnTop(sortedItems, 'LIO'));
213
+ expect(result.current).toEqual([
214
+ makeItem('lio'),
215
+ makeItem('lion'),
216
+ abbaItem,
217
+ makeItem('bear'),
218
+ makeItem('cat'),
219
+ makeItem('cure'),
220
+ makeItem('deer'),
221
+ makeItem('Fish'),
222
+ ]);
223
+ });
224
+
225
+ it('Places items with full string match at the start', () => {
226
+ const { result } = renderHook(() => useMatchingItemsOnTop(sortedItems, 'lion'));
227
+ expect(result.current).toEqual([
228
+ makeItem('lion'),
229
+ abbaItem,
230
+ makeItem('bear'),
231
+ makeItem('cat'),
232
+ makeItem('cure'),
233
+ makeItem('deer'),
234
+ makeItem('Fish'),
235
+ makeItem('lio'),
236
+ ]);
237
+ });
238
+
239
+ it('Places items with full string match on the VALUE at the start', () => {
240
+ const { result } = renderHook(() => useMatchingItemsOnTop(sortedItems, 'zzz'));
241
+ expect(result.current).toEqual([
242
+ abbaItem,
243
+ makeItem('bear'),
244
+ makeItem('cat'),
245
+ makeItem('cure'),
246
+ makeItem('deer'),
247
+ makeItem('Fish'),
248
+ makeItem('lio'),
249
+ makeItem('lion'),
250
+ ]);
251
+ });
252
+
253
+ it('Matches with start of string only', () => {
254
+ const items = [...sortedItems, makeItem('KAN (Professional, 2 users)')];
255
+ const { result } = renderHook(() => useMatchingItemsOnTop(items, 'KAN'));
256
+ expect(result.current).toEqual([makeItem('KAN (Professional, 2 users)'), ...sortedItems]);
257
+ });
258
+
259
+ it('Returns items as-they-are if selectedItem === searchString', () => {
260
+ const items = [makeItem('a'), makeItem('b'), makeItem('c'), makeItem('d')];
261
+ const { result } = renderHook(() => useMatchingItemsOnTop(items, 'd', 'd'));
262
+ expect(result.current).toEqual(items);
263
+ });
264
+ });
182
265
  });
@@ -81,8 +81,47 @@ const filter = ({ label, subLabel, value }: Entry<any>, search: RegExp): boolean
81
81
  (label ? search.test(label) : false) ||
82
82
  (subLabel ? search.test(subLabel) : false);
83
83
 
84
+ const normalizeString = (str?: string | number): string =>
85
+ str ? str.toString().toLowerCase() : '';
86
+
87
+ /**
88
+ * Checks if any of an `Entry`'s fields match the query
89
+ * @param entry
90
+ * @param searchString Text string to search for
91
+ */
92
+ const filterString = ({ label, subLabel, value }: Entry<any>, searchString: string): boolean => {
93
+ const normalizedSearchString = normalizeString(searchString);
94
+
95
+ return (
96
+ normalizeString(label).startsWith(normalizedSearchString) ||
97
+ normalizeString(value).startsWith(normalizedSearchString) ||
98
+ normalizeString(subLabel).startsWith(normalizedSearchString)
99
+ );
100
+ };
101
+
84
102
  const sorter: SilkeAutocompleteFieldProps<any>['sort'] = () => 0;
85
103
 
104
+ const putMatchingItemsOnTop = (filteredItems: Entry<any>[], searchString: string): Entry<any>[] => {
105
+ const itemsWithMatch = filteredItems.filter((item) => filterString(item, searchString));
106
+ const itemsWithNoMatch = filteredItems.filter((item) => !filterString(item, searchString));
107
+
108
+ return [...itemsWithMatch, ...itemsWithNoMatch];
109
+ };
110
+
111
+ export const useMatchingItemsOnTop = (
112
+ filteredItems: Entry<any>[],
113
+ searchString?: string,
114
+ selectedLabel?: string,
115
+ ): Entry<any>[] => {
116
+ return useMemo(
117
+ () =>
118
+ !searchString || searchString === selectedLabel
119
+ ? filteredItems
120
+ : putMatchingItemsOnTop(filteredItems, searchString),
121
+ [searchString, filteredItems, selectedLabel],
122
+ );
123
+ };
124
+
86
125
  export function SilkeAutocompleteField<T>(props: SilkeAutocompleteFieldProps<T>) {
87
126
  const {
88
127
  disableSearch,
@@ -182,20 +221,24 @@ export function SilkeAutocompleteField<T>(props: SilkeAutocompleteFieldProps<T>)
182
221
  }
183
222
  };
184
223
 
185
- const [filteredItems, isHidingResults] = useMemo(() => {
186
- let filtered = items as Entry<T>[];
187
- if (searchText && searchText !== selectedLabel) {
188
- const searchReg = getSearchReg(searchText);
189
- filtered = items.filter((entry) => {
190
- if (searchText.length < minChars) return false;
191
- return filter(entry, searchReg);
192
- });
193
- }
224
+ const searchReg = useMemo(() => {
225
+ return searchText && searchText !== selectedLabel ? getSearchReg(searchText) : undefined;
226
+ }, [searchText, selectedLabel]);
227
+
228
+ const filteredItems = useMemo(() => {
229
+ return searchReg ? items.filter((entry) => filter(entry, searchReg)) : items;
230
+ }, [searchReg, items]);
231
+
232
+ const itemsWithMatchingOnTop = useMatchingItemsOnTop(filteredItems, searchText, selectedLabel);
194
233
 
195
- return [filtered.slice(0, maxDisplayedItems), filtered.length > maxDisplayedItems] as const;
196
- }, [searchText, items, minChars, selectedLabel, maxDisplayedItems]);
234
+ const [displayedItems, isHidingResults]: [Entry<T>[], boolean] = useMemo(() => {
235
+ return [
236
+ itemsWithMatchingOnTop.slice(0, maxDisplayedItems),
237
+ itemsWithMatchingOnTop.length > maxDisplayedItems,
238
+ ];
239
+ }, [itemsWithMatchingOnTop, maxDisplayedItems]);
197
240
 
198
- const filteredDataEntries = filteredItems.filter((entry) => !entry.divider) as Data<T>[];
241
+ const filteredDataEntries = displayedItems.filter((entry) => !entry.divider) as Data<T>[];
199
242
 
200
243
  const isItemSelected = (item: string): boolean => {
201
244
  return form.value.map((s: string) => s.toUpperCase())?.includes(item.trim().toUpperCase());
@@ -238,7 +281,7 @@ export function SilkeAutocompleteField<T>(props: SilkeAutocompleteFieldProps<T>)
238
281
  );
239
282
 
240
283
  const findItem = (item: string) => {
241
- return items.find((listItem) => {
284
+ return filteredItems.find((listItem) => {
242
285
  return (listItem.label || listItem.value).toUpperCase() === item.toUpperCase().trim();
243
286
  });
244
287
  };
@@ -267,8 +310,8 @@ export function SilkeAutocompleteField<T>(props: SilkeAutocompleteFieldProps<T>)
267
310
  useWindowResize(updatePlacement);
268
311
 
269
312
  const getIndexOfFirstSelectedItem = () => {
270
- for (let i = 0; i < items.length; i++) {
271
- if (isSelected(items[i].value)) {
313
+ for (let i = 0; i < filteredItems.length; i++) {
314
+ if (isSelected(filteredItems[i].value)) {
272
315
  return i;
273
316
  }
274
317
  }
@@ -467,7 +510,7 @@ export function SilkeAutocompleteField<T>(props: SilkeAutocompleteFieldProps<T>)
467
510
  }
468
511
  }}
469
512
  >
470
- {filteredItems.sort(sort).map((item, i) =>
513
+ {displayedItems.sort(sort).map((item, i) =>
471
514
  item.divider ? (
472
515
  <hr style={{ margin: '4px 0' }} />
473
516
  ) : (
@@ -19,9 +19,6 @@ $colors: "transparent" transparent,
19
19
  "neutral-low-dart" var(--color-neutral-low-dark);
20
20
 
21
21
  .box {
22
- margin: 0;
23
- padding: 0;
24
-
25
22
  &.debug,
26
23
  &.debug .box {
27
24
  outline: 1px solid red;
@@ -10,7 +10,7 @@ import React, {
10
10
  import { Link, LinkProps as RouterLinkProps } from 'react-router-dom';
11
11
  import styles from './silke-box.scss';
12
12
 
13
- export type BoxSpace = 'xxs' | 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl' | 'xxxl' | boolean;
13
+ export type BoxSpace = 'xxs' | 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl' | 'xxxl' | 'none' | boolean;
14
14
  export type BoxSize = 'xs' | 's' | 'base' | 'm' | 'l' | 'xl' | 'xxl';
15
15
  export type BoxColor =
16
16
  | 'transparent'
@@ -85,13 +85,13 @@ $focus-border-width: 2px;
85
85
  text-decoration: underline;
86
86
  }
87
87
  }
88
- }
89
88
 
90
- .tags {
91
- position: absolute;
92
- display:flex;
93
- top:$space-m;
94
- right:$space-m;
89
+ .tags {
90
+ position: absolute;
91
+ display:flex;
92
+ top:$space-m;
93
+ right:$space-m;
94
+ }
95
95
  }
96
96
 
97
97
  .small {
@@ -0,0 +1,53 @@
1
+ import React, { useCallback } from 'react';
2
+ import { SilkeBox } from '../../silke-box';
3
+ import { SilkeButton } from '../../silke-button';
4
+ import { SilkeIcon, SilkeIcons } from '../../silke-icon';
5
+ import { SilkeTextSmall } from '../../silke-text';
6
+ import { IconField as IconFieldType, SchemaFieldProps } from '@vev/react';
7
+ import { useSchemaContext } from '../silke-schema-context';
8
+ import { getTitle } from './string-field';
9
+ import { EmojiType } from '@vev/utils';
10
+
11
+ const IconField = ({ value, schema, onChange }: SchemaFieldProps<IconFieldType>) => {
12
+ const { actions } = useSchemaContext();
13
+ const handleDeleteShape = useCallback(() => {
14
+ onChange(null);
15
+ }, [onChange]);
16
+
17
+ const handleSelectShape = useCallback(async () => {
18
+ if (!actions) return;
19
+ actions.shapeLibraryOpen((shape: any) => {
20
+ console.log(shape);
21
+ if (!shape || !shape.path) return;
22
+ onChange({ key: shape.key, name: shape.name, path: shape.path });
23
+ actions.shapeLibraryClose();
24
+ });
25
+ }, [onChange, actions]);
26
+
27
+ return (
28
+ <SilkeBox flex vPad="s" align="center" style={{ justifyContent: 'space-between' }}>
29
+ <SilkeTextSmall>{getTitle(schema)}</SilkeTextSmall>
30
+ {schema.description && (
31
+ <SilkeTextSmall color="secondary">{schema.description}</SilkeTextSmall>
32
+ )}
33
+ <SilkeBox align="center">
34
+ <SilkeBox style={{ height: '20px', width: '20px', marginRight: '20px' }}>
35
+ <SilkeIcon
36
+ icon={
37
+ {
38
+ type: EmojiType.icon,
39
+ value: value ? value.path : '',
40
+ } as SilkeIcons
41
+ }
42
+ />
43
+ </SilkeBox>
44
+ <SilkeButton size="m" icon="edit" kind="ghost" onClick={handleSelectShape} />
45
+ {value?.path && (
46
+ <SilkeButton size="m" icon="delete" kind="ghost" onClick={handleDeleteShape} />
47
+ )}
48
+ </SilkeBox>
49
+ </SilkeBox>
50
+ );
51
+ };
52
+
53
+ export default IconField;
@@ -15,16 +15,12 @@ const ImageField = ({ value, schema, onChange }: SchemaFieldProps<ImageFieldType
15
15
  }, [onChange]);
16
16
 
17
17
  const handleSelectImage = useCallback(() => {
18
- const getImage = async () => {
19
- if (!actions) return;
20
- actions.imageLibraryOpen((image: any) => {
21
- if (!image || !image.url) return;
22
- onChange({ key: image.key, url: image.url });
23
- actions.imageLibraryClose();
24
- });
25
- };
26
-
27
- getImage();
18
+ if (!actions) return;
19
+ actions.imageLibraryOpen((image: any) => {
20
+ if (!image || !image.url) return;
21
+ onChange({ key: image.key, url: image.url });
22
+ actions.imageLibraryClose();
23
+ });
28
24
  }, [onChange, actions]);
29
25
 
30
26
  return (
@@ -1,2 +1,3 @@
1
1
  export * from './silke-form-schema';
2
2
  export * from './silke-schema-fields';
3
+ export * from './schema-utils';
@@ -1,8 +1,6 @@
1
1
  import { Schema, SchemaContextModel } from '@vev/react';
2
- import React, { useEffect, useState } from 'react';
2
+ import React from 'react';
3
3
  import { SilkeForm, SilkeFormProps } from '../silke-form';
4
- import { SilkeSkeleton } from '../silke-skeleton';
5
- import { getSchemaInitialValue } from './schema-utils';
6
4
  import { SilkeSchemaContext } from './silke-schema-context';
7
5
  import { SilkeSchemaFields } from './silke-schema-fields';
8
6
 
@@ -15,22 +13,6 @@ type SilkeFormSchemaProps<T> = {
15
13
  // currentPage { title: string; key: string; path?: string };
16
14
 
17
15
  export function SilkeFormSchema<T>({ schema, value, context, ...rest }: SilkeFormSchemaProps<T>) {
18
- const [loading, setLoading] = useState(true);
19
-
20
- useEffect(() => {
21
- if (!schema || !schema.length) return;
22
-
23
- getSchemaInitialValue<T>(schema, context).then((initValue) => {
24
- // console.log('got initial value', initValue);
25
- rest.onChange?.({ ...initValue, ...value } as T);
26
- setLoading(false);
27
- });
28
- }, [JSON.stringify(schema)]); // Only run once
29
-
30
- if (loading) {
31
- return <SilkeSkeleton kind="multiline" />;
32
- }
33
-
34
16
  return (
35
17
  <SilkeSchemaContext context={context}>
36
18
  <SilkeForm {...rest} value={value}>
@@ -16,6 +16,7 @@ import StringField from './fields/string-field';
16
16
  import ToggleField from './fields/toggle-field';
17
17
  import LinkField from './fields/link-field';
18
18
  import LayoutField from './fields/layout-field';
19
+ import IconField from './fields/icon-field';
19
20
 
20
21
  type SilkeSchemaFieldProps = {
21
22
  field: VevProps;
@@ -33,6 +34,7 @@ const SCHEMA_FIELD_COMPONENTS: SchemaFieldComponents = {
33
34
  select: SelectField,
34
35
  link: LinkField,
35
36
  layout: LayoutField,
37
+ icon: IconField,
36
38
  };
37
39
 
38
40
  export function SilkeSchemaField({ field, value: fieldValue, noPad }: SilkeSchemaFieldProps) {
@@ -1 +1,2 @@
1
1
  export * from './silke-sortable-list';
2
+ export * from './silke-nested-sortable-list';
@@ -0,0 +1,102 @@
1
+ $indent-size: 24px;
2
+ $border-radius: var(--border-radius-small);
3
+ .list {
4
+ --item-selection-color: var(--color-brand-secondary-dark);
5
+ --item-hover-color: var(--color-neutral-low-medium);
6
+ position: relative;
7
+ &:hover {
8
+ .expand {
9
+ opacity: 1;
10
+ }
11
+ }
12
+ &:not(.dragging) {
13
+ .item {
14
+ &:not(.disabled) {
15
+ &:focus-visible {
16
+ outline: 1px solid var(--item-hover-color);
17
+ }
18
+ &:hover:not(.selected) {
19
+ background-color: var(--item-hover-color);
20
+ }
21
+ }
22
+ }
23
+ }
24
+ }
25
+
26
+ .item {
27
+ --indent-size: 0px;
28
+ position: relative;
29
+ user-select: none;
30
+ cursor: default;
31
+ display: flex;
32
+ align-items: center;
33
+ outline: none;
34
+ border: none;
35
+ }
36
+ .selected {
37
+ background: var(--item-selection-color);
38
+ }
39
+
40
+ .roundTop {
41
+ border-top-left-radius: $border-radius;
42
+ border-top-right-radius: $border-radius;
43
+ }
44
+
45
+ .roundBottom {
46
+ border-bottom-left-radius: $border-radius;
47
+ border-bottom-right-radius: $border-radius;
48
+ }
49
+
50
+ .childOfSelected {
51
+ background: rgba(255, 255, 255, 0.1);
52
+ }
53
+
54
+ .expand {
55
+ outline: none;
56
+ color: var(--color-neutral-high-dark);
57
+ opacity: 0;
58
+ font-size: 12px;
59
+ transition: opacity 0.2s ease-in-out;
60
+ }
61
+
62
+ .dropLine {
63
+ position: absolute;
64
+ background: white;
65
+ height: 3px;
66
+ width: 100%;
67
+ }
68
+
69
+ .placeAfter::before,
70
+ .placeBefore::before,
71
+ .placeInside::before {
72
+ position: absolute;
73
+ inset: -1px 0 -1px calc(var(--indent-size) + 8px);
74
+ display: block;
75
+ content: "";
76
+ pointer-events: none;
77
+ transition: all 0.1s ease-out;
78
+ border: 0px solid white;
79
+ }
80
+ .placeAfter::before {
81
+ border-bottom-width: 2px;
82
+ }
83
+ .placeBefore::before {
84
+ border-top-width: 2px;
85
+ }
86
+ .placeInside::before {
87
+ border-width: 2px;
88
+ border-radius: 8px;
89
+ left: var(--indent-size);
90
+ }
91
+
92
+ .placementInvalid::before {
93
+ border-color: var(--color-feedback-warning-spark);
94
+ }
95
+
96
+ /** Indent levels */
97
+ @for $i from 1 through 10 {
98
+ .indent#{$i} {
99
+ padding-left: $indent-size * $i;
100
+ --indent-size: #{$indent-size * $i};
101
+ }
102
+ }