@vev/silke 1.0.15 → 1.0.17

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 (85) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/chunk-SOFGXMET.js +22 -0
  3. package/dist/chunk-SOFGXMET.js.LEGAL.txt +11 -0
  4. package/dist/{chunk-KMZFUBRE.js.map → chunk-SOFGXMET.js.map} +3 -3
  5. package/dist/index.js +44 -9
  6. package/dist/index.js.LEGAL.txt +45 -21
  7. package/dist/index.js.map +4 -4
  8. package/dist/silke-code-editor-3Y2KM5KB.js +25 -0
  9. package/dist/silke-code-editor-3Y2KM5KB.js.LEGAL.txt +0 -0
  10. package/dist/silke-code-editor-3Y2KM5KB.js.map +7 -0
  11. package/dist/styles.css +351 -425
  12. package/esbuild.config.mjs +47 -43
  13. package/jest.config.js +1 -2
  14. package/package.json +4 -4
  15. package/src/components/silke-autocomplete-field/autocomplete-item.tsx +33 -7
  16. package/src/components/silke-autocomplete-field/autocomplete-tags.tsx +6 -2
  17. package/src/components/silke-autocomplete-field/autocomplete-types.ts +4 -0
  18. package/src/components/silke-autocomplete-field/silke-autocomplete-field.mdx +67 -24
  19. package/src/components/silke-autocomplete-field/silke-autocomplete-field.scss +32 -13
  20. package/src/components/silke-autocomplete-field/silke-autocomplete-field.spec.tsx +24 -111
  21. package/src/components/silke-autocomplete-field/silke-autocomplete-field.tsx +305 -219
  22. package/src/components/silke-box/silke-box.scss +9 -10
  23. package/src/components/silke-box/silke-box.tsx +9 -0
  24. package/src/components/silke-button/silke-button.scss +3 -3
  25. package/src/components/silke-color-picker/silke-color-info.tsx +2 -18
  26. package/src/components/silke-context-menu/silke-context-menu.tsx +0 -1
  27. package/src/components/silke-css-number-field/silke-css-number-field.mdx +43 -4
  28. package/src/components/silke-css-number-field/silke-css-number-field.scss +47 -14
  29. package/src/components/silke-css-number-field/silke-css-number-field.tsx +114 -186
  30. package/src/components/silke-css-number-field/utils.ts +25 -0
  31. package/src/components/silke-drawer/silke-drawer.tsx +0 -14
  32. package/src/components/silke-form/silke-form.tsx +1 -1
  33. package/src/components/silke-form-schema/fields/array-field-inline.tsx +1 -1
  34. package/src/components/silke-form-schema/fields/array-field-modal.tsx +1 -1
  35. package/src/components/silke-form-schema/fields/array-field.tsx +2 -2
  36. package/src/components/silke-form-schema/fields/event-field.tsx +1 -1
  37. package/src/components/silke-form-schema/fields/icon-field.tsx +1 -1
  38. package/src/components/silke-form-schema/fields/image-field.tsx +1 -1
  39. package/src/components/silke-form-schema/fields/layout-field.tsx +1 -1
  40. package/src/components/silke-form-schema/fields/link-field.tsx +1 -1
  41. package/src/components/silke-form-schema/fields/number-field.tsx +1 -1
  42. package/src/components/silke-form-schema/fields/object-field.tsx +1 -1
  43. package/src/components/silke-form-schema/fields/select-field.tsx +1 -1
  44. package/src/components/silke-form-schema/fields/string-field.tsx +1 -1
  45. package/src/components/silke-form-schema/fields/toggle-field.tsx +1 -1
  46. package/src/components/silke-form-schema/fields/upload-field.tsx +1 -1
  47. package/src/components/silke-form-schema/fields/utils/generate-image.ts +1 -1
  48. package/src/components/silke-form-schema/fields/utils/generate-title.ts +6 -5
  49. package/src/components/silke-form-schema/schema-utils.ts +1 -1
  50. package/src/components/silke-form-schema/silke-form-schema.tsx +1 -1
  51. package/src/components/silke-form-schema/silke-schema-context.tsx +1 -1
  52. package/src/components/silke-form-schema/silke-schema-field.tsx +1 -1
  53. package/src/components/silke-form-schema/silke-schema-fields.tsx +1 -1
  54. package/src/components/silke-image/silke-image.scss +2 -2
  55. package/src/components/silke-modal/silke-modal.tsx +11 -2
  56. package/src/components/silke-navigation-link/silke-navigation-link.scss +12 -2
  57. package/src/components/silke-navigation-link/silke-navigation-link.tsx +21 -17
  58. package/src/components/silke-notification/silke-notification.scss +1 -1
  59. package/src/components/silke-overflow-menu/silke-overflow-menu.tsx +1 -2
  60. package/src/components/silke-popover/silke-popover.tsx +1 -20
  61. package/src/components/silke-select-field/silke-select-field.mdx +137 -7
  62. package/src/components/silke-select-field/silke-select-field.spec.tsx +45 -128
  63. package/src/components/silke-sortable-list/silke-nested-sortable-item.tsx +17 -2
  64. package/src/components/silke-sortable-list/silke-nested-sortable-list.tsx +6 -2
  65. package/src/components/silke-sortable-list/silke-nested-sortable-utils.ts +6 -0
  66. package/src/components/silke-table/silke-table.tsx +1 -1
  67. package/src/components/silke-tag/silke-tag.tsx +3 -3
  68. package/src/components/silke-text-field/silke-text-field-item.tsx +12 -7
  69. package/src/components/silke-text-field/silke-text-field-outline.tsx +39 -42
  70. package/src/components/silke-text-field/silke-text-field.mdx +73 -6
  71. package/src/components/silke-text-field/silke-text-field.scss +153 -247
  72. package/src/components/silke-text-field/silke-text-field.tsx +4 -3
  73. package/src/components/silke-tooltip/silke-icon-tooltip.tsx +2 -1
  74. package/src/docs/app.tsx +9 -16
  75. package/src/hooks/form/use-form-field.ts +1 -1
  76. package/src/hooks/index.ts +1 -0
  77. package/src/hooks/use-drop-zone.ts +0 -3
  78. package/src/hooks/use-uniq-id.ts +6 -0
  79. package/src/icons.tsx +9 -1
  80. package/tsconfig.json +1 -1
  81. package/webpack.docs.ts +1 -1
  82. package/dist/chunk-KMZFUBRE.js +0 -22
  83. package/dist/chunk-KMZFUBRE.js.LEGAL.txt +0 -8
  84. package/dist/silke-code-editor-UX2ML2WG.js +0 -23
  85. package/dist/silke-code-editor-UX2ML2WG.js.map +0 -7
@@ -30,50 +30,54 @@ const cli = meow(
30
30
  const watch = cli.flags.watch || cli.flags.serve || false;
31
31
  buildSilke(watch);
32
32
 
33
- function buildSilke(watch) {
33
+ async function buildSilke(watch) {
34
34
  console.log(`🚧 @vev/silke building`);
35
35
  const time = Date.now();
36
- return esbuild
37
- .build({
38
- entryPoints: [path.resolve(__dirname, './src/index.ts')],
39
- outdir: path.resolve(__dirname, './dist'),
40
- bundle: true,
41
- sourcemap: true,
42
- minify: watch !== true,
43
- splitting: true,
44
- format: 'esm',
45
- legalComments: 'linked',
46
- watch,
47
- target: ['es2020'],
48
- external: Object.keys(pkg.peerDependencies || {}),
49
- allowOverwrite: true,
50
- plugins: [
51
- {
52
- name: 'raw',
53
- setup(build) {
54
- build.onResolve({ filter: /\.raw\..+$/i }, (args) => {
55
- return {
56
- path: path.isAbsolute(args.path)
57
- ? args.path
58
- : path.join(args.resolveDir, args.path),
59
- namespace: 'raw-loader',
60
- };
61
- });
62
- build.onLoad({ filter: /\.raw\..+$/i, namespace: 'raw-loader' }, async (args) => {
63
- return {
64
- contents: await fs.promises.readFile(args.path.replace(/\?raw$/, '')),
65
- loader: 'text',
66
- };
67
- });
68
- },
36
+
37
+ const config = {
38
+ entryPoints: [path.resolve(__dirname, './src/index.ts')],
39
+ outdir: path.resolve(__dirname, './dist'),
40
+ bundle: true,
41
+ minify: true,
42
+ sourcemap: true,
43
+ splitting: true,
44
+ format: 'esm',
45
+ legalComments: 'linked',
46
+ target: ['es2020'],
47
+ external: Object.keys(pkg.peerDependencies || {}),
48
+ allowOverwrite: true,
49
+ plugins: [
50
+ {
51
+ name: 'raw',
52
+ setup(build) {
53
+ build.onResolve({ filter: /\.raw\..+$/i }, (args) => {
54
+ return {
55
+ path: path.isAbsolute(args.path)
56
+ ? args.path
57
+ : path.join(args.resolveDir, args.path),
58
+ namespace: 'raw-loader',
59
+ };
60
+ });
61
+ build.onLoad({ filter: /\.raw\..+$/i, namespace: 'raw-loader' }, async (args) => {
62
+ return {
63
+ contents: await fs.promises.readFile(args.path.replace(/\?raw$/, '')),
64
+ loader: 'text',
65
+ };
66
+ });
69
67
  },
70
- esbuildSassModulesPlugin(),
71
- ],
72
- })
73
- .then(() => {
74
- console.log(`✅ @vev/silke done building, used ${Date.now() - time}ms`);
75
- })
76
- .catch((e) => {
77
- console.log(e);
78
- });
68
+ },
69
+ esbuildSassModulesPlugin(),
70
+ ],
71
+ }
72
+
73
+ if (watch) {
74
+ // don't minify
75
+ const context = await esbuild.context({ ...config, minify: false });
76
+
77
+ await context.watch();
78
+ } else {
79
+ await esbuild.build(config);
80
+
81
+ console.log(`✅ @vev/silke done building, used ${Date.now() - time}ms`);
82
+ }
79
83
  }
package/jest.config.js CHANGED
@@ -6,12 +6,11 @@ const packageName = package.name.split('@vev/').pop();
6
6
 
7
7
  module.exports = {
8
8
  ...base,
9
- name: packageName,
10
9
  displayName: packageName,
11
10
  rootDir: '../..',
12
11
  roots: [`<rootDir>/packages/${packageName}`],
13
12
  testRegex: `(packages/${packageName}/.*/__tests__/.*|\\.(spec|test))\\.tsx?$`,
14
- testURL: 'http://localhost/',
13
+ testEnvironmentOptions: { url: 'http://localhost/', },
15
14
  moduleDirectories: ['node_modules', 'src'],
16
15
  testEnvironment: 'jsdom',
17
16
  setupFiles: [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vev/silke",
3
- "version": "1.0.15",
3
+ "version": "1.0.17",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/types/index.d.ts",
@@ -14,7 +14,7 @@
14
14
  "watch": "run-p watch:tsc watch:code",
15
15
  "watch:code": "node esbuild.config.mjs --watch",
16
16
  "watch:tsc": "tsc --project ./tsconfig.json --noEmit --watch",
17
- "clean": "del dist",
17
+ "clean": "del-cli dist",
18
18
  "tsc": "tsc --project ./tsconfig.json --noEmit"
19
19
  },
20
20
  "peerDependencies": {
@@ -30,8 +30,8 @@
30
30
  "@mdx-js/mdx": "^2.0.0-next.9",
31
31
  "@mdx-js/react": "^2.1.2",
32
32
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
33
- "@vev/react": "0.0.4",
34
- "@vev/utils": "1.0.8",
33
+ "@vev/react": "0.1.1",
34
+ "@vev/utils": "1.1.1",
35
35
  "@uiw/react-codemirror": "^4.12.3",
36
36
  "@uiw/codemirror-theme-dracula": "^4.12.3",
37
37
  "classnames": ">=2.2.0",
@@ -1,9 +1,11 @@
1
- import React, { useRef } from 'react';
1
+ import React, { useEffect, useRef } from 'react';
2
2
  import { BoxSize, SilkeBox } from '../silke-box';
3
3
  import { SilkeCheckbox } from '../silke-checkbox';
4
4
  import { SilkeText } from '../silke-text';
5
5
  import { Data, Entry } from './autocomplete-types';
6
6
  import styles from './silke-autocomplete-field.scss';
7
+ import { SilkeIcon } from '../silke-icon';
8
+ import { EmojiType } from '@vev/utils';
7
9
 
8
10
  export interface AutocompleteRenderItemProps<U> {
9
11
  item: U;
@@ -35,20 +37,32 @@ export default function AutocompleteItem<T, U extends Entry<T>>({
35
37
  const isDisabled = (item as Data<T>).disabled;
36
38
  const ref = useRef<HTMLDivElement>(null);
37
39
 
38
- const cn = highlight
39
- ? styles.autocompleteItem + ' ' + styles.autocompleteItemHighlight
40
- : styles.autocompleteItem;
40
+ const cl = styles.autocompleteItem;
41
+
42
+ useEffect(() => {
43
+ const el = ref.current;
44
+ if (highlight) (el as any)?.scrollIntoViewIfNeeded?.();
45
+ }, [highlight]);
46
+
47
+ let iconSize: BoxSize = size || 'm';
48
+ if (size === 'm') iconSize = 'base';
49
+ if (size === 'base') iconSize = 's';
50
+ // if (size === 's') iconSize = 's';
51
+ // else if (size === 'xs') iconSize = 's';
52
+ // console.log('###### SIZE', size);
41
53
 
42
54
  return (
43
55
  <SilkeBox
44
56
  ref={ref}
57
+ role="option"
45
58
  height={size || 'm'}
46
- hPad={ItemRender ? undefined : 's'}
59
+ hPad={ItemRender || item.icon || item.image ? undefined : 's'}
60
+ bg={highlight ? 'neutral-30' : undefined}
47
61
  bgHover={isDisabled ? undefined : 'neutral-30'}
48
62
  vAlign="center"
49
- gap="xs"
63
+ gap={item.icon || item.image ? 'xxs' : 'xs'}
50
64
  rounded={size === 's' ? 'tiny' : 'small'}
51
- className={cn}
65
+ className={cl}
52
66
  onMouseDown={
53
67
  isDisabled ? (e: React.MouseEvent<HTMLButtonElement>) => e.preventDefault() : onMouseDown
54
68
  }
@@ -62,6 +76,18 @@ export default function AutocompleteItem<T, U extends Entry<T>>({
62
76
  <SilkeCheckbox value={selected} style={{ pointerEvents: 'none' }} />
63
77
  </SilkeBox>
64
78
  )}
79
+
80
+ {item.image && (
81
+ <SilkeBox size={iconSize} align="center" pad="xs">
82
+ <SilkeIcon icon={{ type: EmojiType.upload, value: { url: item.image } }} />
83
+ </SilkeBox>
84
+ )}
85
+
86
+ {item.icon && (
87
+ <SilkeBox size={iconSize} align="center">
88
+ <SilkeIcon icon={item.icon} />
89
+ </SilkeBox>
90
+ )}
65
91
  <SilkeText
66
92
  tag={size === 's' ? 'small' : undefined}
67
93
  overflow
@@ -11,7 +11,7 @@ export interface AutocompleteTagsProps<T> {
11
11
  }
12
12
 
13
13
  export default function AutocompleteTags<T>({
14
- showMaxTags = 3,
14
+ showMaxTags = 10,
15
15
  items,
16
16
  onRemove,
17
17
  onRemoveAll,
@@ -26,7 +26,11 @@ export default function AutocompleteTags<T>({
26
26
  kind="blue"
27
27
  key={i}
28
28
  label={item.label}
29
- onRemove={() => onRemove(item.value)}
29
+ onRemove={(e) => {
30
+ e.stopPropagation();
31
+ e.preventDefault();
32
+ onRemove(item.value);
33
+ }}
30
34
  id={`tag_${i}`}
31
35
  />
32
36
  ))}
@@ -1,4 +1,6 @@
1
+ import { IEmojiIcon } from '@vev/utils';
1
2
  import { FormFieldProps } from '../silke-form';
3
+ import { SilkeIcons } from '../silke-icon';
2
4
 
3
5
  /**
4
6
  * Defines data for the Autocomplete
@@ -17,6 +19,7 @@ export interface Data<T> {
17
19
  * Image URL
18
20
  */
19
21
  image?: string;
22
+ icon?: IEmojiIcon | SilkeIcons;
20
23
  label: string;
21
24
  /**
22
25
  * Description
@@ -27,6 +30,7 @@ export interface Data<T> {
27
30
 
28
31
  export interface Divider {
29
32
  image?: string;
33
+ icon?: IEmojiIcon | SilkeIcons;
30
34
  label?: string;
31
35
  subLabel?: string;
32
36
  divider: true;
@@ -3,22 +3,31 @@ const items = ipsum.list((i) => ({ value: i, label: ipsum.name() }));
3
3
  const [value, setValue] = React.useState("");
4
4
  <>
5
5
  <h5>Value: {value || "No value"}</h5>
6
- <SilkeAutocompleteField
7
- label="Default"
8
- name="Foobar"
9
- onChange={setValue}
10
- value={value}
11
- items={items}
12
- />
13
- <h5>Value: {value || "No value"}</h5>
14
- <SilkeAutocompleteField
15
- label="Default"
16
- kind="ghost"
17
- name="Foobar"
18
- onChange={setValue}
19
- value={value}
20
- items={items}
21
- />
6
+ <SilkeTextField name="test" label="Text before" />
7
+ {["default", "zombie", "ghost"].map((kind) => (
8
+ <SilkeBox key={kind} gap="s">
9
+ <SilkeAutocompleteField
10
+ label={kind}
11
+ kind={kind}
12
+ name="Foobar"
13
+ placeholder="Placeholder"
14
+ onChange={setValue}
15
+ value={value}
16
+ items={items}
17
+ />
18
+ <SilkeAutocompleteField
19
+ label={kind}
20
+ kind={kind}
21
+ size="xs"
22
+ name="Foobar"
23
+ placeholder="Placeholder"
24
+ onChange={setValue}
25
+ value={value}
26
+ items={items}
27
+ />
28
+ </SilkeBox>
29
+ ))}
30
+ <SilkeTextField name="test" label="Text after" />
22
31
  </>;
23
32
  ```
24
33
 
@@ -29,14 +38,19 @@ const items = ipsum.list((i) => ({ value: i, label: ipsum.name() }));
29
38
  const [value, setValue] = React.useState([]);
30
39
  <>
31
40
  <h5>Value: {value.join(", ") || "No value"}</h5>
32
- <SilkeAutocompleteField
33
- label="Default"
34
- name="Foobar"
35
- multiple
36
- onChange={setValue}
37
- value={value}
38
- items={items}
39
- />
41
+ {["default", "zombie", "ghost"].map((kind) => (
42
+ <SilkeAutocompleteField
43
+ key={kind}
44
+ label={kind}
45
+ kind={kind}
46
+ placeholder="Select multiple"
47
+ name="Foobar"
48
+ multiple
49
+ onChange={setValue}
50
+ value={value}
51
+ items={items}
52
+ />
53
+ ))}
40
54
  </>;
41
55
  ```
42
56
 
@@ -81,3 +95,32 @@ const items = values.map((i) => ({ value: i.toLowerCase(), label: i }));
81
95
  showMaxTags={Infinity}
82
96
  />;
83
97
  ```
98
+
99
+ ## Autocomplete with icon
100
+
101
+ ```js
102
+ const items = ipsum.list((i) => ({
103
+ value: i,
104
+ label: ipsum.name(),
105
+ icon: "html5",
106
+ }));
107
+ const [value, setValue] = React.useState("");
108
+ <>
109
+ <h5>Value: {value || "No value"}</h5>
110
+ <SilkeTextField name="test" label="Text before" />
111
+ {["default", "zombie", "ghost"].map((kind) => (
112
+ <SilkeBox key={kind} gap="s">
113
+ <SilkeAutocompleteField
114
+ label={kind}
115
+ kind={kind}
116
+ name="Foobar"
117
+ placeholder="Placeholder"
118
+ onChange={setValue}
119
+ value={value}
120
+ items={items}
121
+ />
122
+ </SilkeBox>
123
+ ))}
124
+ <SilkeTextField name="test" label="Text after" />
125
+ </>;
126
+ ```
@@ -1,27 +1,46 @@
1
1
  @use '../../variables' as *;
2
- .clickable,
3
- .clickable input {
2
+ .root {
4
3
  cursor: pointer;
5
4
  user-select: none;
5
+ &:hover,
6
+ &.ghost,
7
+ &.open {
8
+ .downIcon {
9
+ opacity: 1;
10
+ transform: translateY(2px);
11
+ }
12
+ }
13
+
14
+ &.open:not(.ghost){
15
+ --text-field-bg: var(--color-neutral-20);
16
+ --text-field-hover-bg: var(--color-neutral-20);
17
+ --text-field-focus-border-color: transparent;
18
+ }
19
+
6
20
  }
7
21
 
8
22
  .autocompleteItem {
9
- background: transparent;
10
23
  cursor: pointer;
11
24
  }
12
25
 
13
- .autocompleteItemHighlight {
14
- background: var(--color-neutral-30);
26
+ .downIcon {
27
+ background: transparent;
28
+ outline: none;
29
+ border: none;
30
+ font-size: 0.845em;
31
+ // opacity: 0;
32
+ transform: translateY(0);
33
+ // color: var(--text-field-placeholder-color);
34
+ transition: opacity 0.5s ease-in-out, transform 0.3s ease-out;
15
35
  }
16
36
 
17
- .autocompleteDropdown {
18
- border-radius: 8px;
19
- padding:$space-xs;
20
- filter: drop-shadow(0px 4px 16px rgba(0, 0, 0, 0.2));
21
- margin-top: 2px;
37
+ .placeholder {
38
+ color: var(--text-field-disabled-placeholder-color);
39
+ font-size: var(--text-field-font-size);
22
40
  }
23
41
 
24
- .dropdownIcon {
25
- font-size: 12px;
26
- color: var(--color-neutral-70);
42
+ .hiddenSearch{
43
+ width:0;height:0;
44
+ overflow: hidden;
45
+ opacity: 0;
27
46
  }
@@ -1,10 +1,8 @@
1
+ import { act, render, screen } from '@testing-library/react';
2
+ import userEvent from '@testing-library/user-event';
1
3
  import React from 'react';
2
- import { render, screen } from '@testing-library/react';
3
- import { SilkeAutocompleteField, useMatchingItemsOnTop } from './silke-autocomplete-field';
4
4
  import { ARROW_DOWN, ENTER, ESCAPE } from '../../../jest/keys';
5
- import userEvent from '@testing-library/user-event';
6
- import { renderHook } from '@testing-library/react-hooks';
7
- import { getSearchReg } from '@vev/utils';
5
+ import { SilkeAutocompleteField } from './silke-autocomplete-field';
8
6
 
9
7
  type Item = {
10
8
  label: string;
@@ -32,7 +30,7 @@ describe('silke-autocomplete-field', () => {
32
30
  render(<SilkeAutocompleteField items={items} label="Animal" />);
33
31
  const input = screen.getByLabelText('Animal');
34
32
 
35
- await user.click(input);
33
+ await act(async () => await user.click(input));
36
34
 
37
35
  const list = screen.getByRole('listbox');
38
36
 
@@ -46,16 +44,14 @@ describe('silke-autocomplete-field', () => {
46
44
 
47
45
  render(<SilkeAutocompleteField items={items} label="Animal" />);
48
46
  const input = screen.getByLabelText('Animal');
49
-
50
- await user.click(input);
47
+ await act(async () => await user.click(input));
51
48
 
52
49
  const list = screen.getByRole('listbox');
53
50
 
54
51
  items.forEach((item) => {
55
52
  expect(list.textContent).toContain(item.label);
56
53
  });
57
-
58
- await user.keyboard(ESCAPE);
54
+ await act(async () => await user.keyboard(ESCAPE));
59
55
 
60
56
  const list2 = await screen.queryAllByRole('listbox');
61
57
  expect(list2).toHaveLength(0);
@@ -67,11 +63,11 @@ describe('silke-autocomplete-field', () => {
67
63
  render(<SilkeAutocompleteField items={items} label="Animal" />);
68
64
 
69
65
  const input = screen.getByLabelText('Animal');
70
- await input.focus();
66
+ act(() => input.focus());
71
67
 
72
- await user.keyboard(ARROW_DOWN);
68
+ await act(async () => await user.keyboard(ARROW_DOWN));
73
69
 
74
- await user.keyboard('C');
70
+ await act(async () => await user.keyboard('C'));
75
71
 
76
72
  const listbox = screen.getByRole('listbox');
77
73
 
@@ -83,7 +79,7 @@ describe('silke-autocomplete-field', () => {
83
79
  expect(listbox.textContent).not.toContain(label);
84
80
  });
85
81
 
86
- await user.keyboard('A');
82
+ await act(async () => await user.keyboard('A'));
87
83
 
88
84
  ['cat'].forEach((label) => {
89
85
  expect(listbox.textContent).toContain(label);
@@ -111,12 +107,12 @@ describe('silke-autocomplete-field', () => {
111
107
  );
112
108
 
113
109
  const input = screen.getByLabelText('Animal');
114
- await input.focus();
110
+ act(() => input.focus());
115
111
 
116
- await user.keyboard('banana');
112
+ await act(async () => await user.keyboard('banana'));
117
113
 
118
114
  const addButton = screen.getByText('+ Add item "banana"');
119
- await user.click(addButton);
115
+ await act(async () => await user.click(addButton));
120
116
 
121
117
  expect(onAdd).toHaveBeenCalledWith('banana');
122
118
  });
@@ -138,11 +134,11 @@ describe('silke-autocomplete-field', () => {
138
134
  );
139
135
 
140
136
  const input = screen.getByLabelText('Animal');
141
- await input.focus();
137
+ act(() => input.focus());
142
138
 
143
- await user.keyboard('banana');
139
+ await act(async () => await user.keyboard('banana'));
144
140
 
145
- await user.keyboard(ENTER);
141
+ await act(async () => await user.keyboard(ENTER));
146
142
 
147
143
  expect(onAdd).toHaveBeenCalledWith('banana');
148
144
  });
@@ -155,13 +151,12 @@ describe('silke-autocomplete-field', () => {
155
151
 
156
152
  const input = screen.getByLabelText('Animal');
157
153
 
158
- await user.click(input);
154
+ await act(async () => await user.click(input));
159
155
 
160
156
  const bearItem = screen.getByText('bear');
161
- await user.click(bearItem);
157
+ await act(async () => await user.click(bearItem));
162
158
 
163
159
  expect(onChange).toHaveBeenCalledWith('bear');
164
- expect(input).toHaveFocus();
165
160
  });
166
161
 
167
162
  it('Is possible to select item by using keyboard only', async () => {
@@ -171,95 +166,13 @@ describe('silke-autocomplete-field', () => {
171
166
  render(<SilkeAutocompleteField label="Animal" onChange={onChange} items={items} />);
172
167
 
173
168
  const input = screen.getByLabelText('Animal');
174
- await input.focus();
175
-
176
- await user.keyboard(ARROW_DOWN);
177
- await user.keyboard(ARROW_DOWN);
178
- await user.keyboard(ARROW_DOWN);
179
-
180
- await user.keyboard(ENTER);
169
+ act(() => input.focus());
181
170
 
182
- expect(onChange).toHaveBeenCalledWith('lion');
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
- });
171
+ await act(async () => await user.keyboard(ARROW_DOWN));
172
+ await act(async () => await user.keyboard(ARROW_DOWN));
173
+ await act(async () => await user.keyboard(ARROW_DOWN));
174
+ await act(async () => await user.keyboard(ENTER));
210
175
 
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
- });
176
+ expect(onChange).toHaveBeenCalledWith('bear');
264
177
  });
265
178
  });