@kirana-ui/solid 0.1.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (208) hide show
  1. package/dom/accordion.js +9 -6
  2. package/dom/agent.js +3 -0
  3. package/dom/autosize.js +1 -1
  4. package/dom/avatar.js +39 -14
  5. package/dom/button.js +1 -1
  6. package/dom/calendar.js +78 -19
  7. package/dom/carousel.js +6 -6
  8. package/dom/checkbox-group-context.js +3 -0
  9. package/dom/checkbox-group.js +38 -0
  10. package/dom/checkbox.js +9 -5
  11. package/dom/collapsible.js +3 -3
  12. package/dom/combobox.js +72 -14
  13. package/dom/command.js +10 -9
  14. package/dom/date-field.js +7 -3
  15. package/dom/date-picker.js +9 -3
  16. package/dom/dialog.js +13 -3
  17. package/dom/field.js +3 -3
  18. package/dom/fieldset.js +2 -2
  19. package/dom/form.js +1 -1
  20. package/dom/hover-popup.js +3 -3
  21. package/dom/index.js +1 -0
  22. package/dom/input.js +1 -1
  23. package/dom/label.js +1 -1
  24. package/dom/listbox.js +5 -5
  25. package/dom/menu.js +11 -11
  26. package/dom/menubar.js +1 -1
  27. package/dom/message-scroller.js +4 -4
  28. package/dom/navigation-menu.js +18 -21
  29. package/dom/number-field.js +39 -6
  30. package/dom/otp.js +6 -5
  31. package/dom/pagination.js +3 -3
  32. package/dom/popover.js +37 -8
  33. package/dom/primitive.js +92 -0
  34. package/dom/qr-code.js +3 -3
  35. package/dom/radio-group.js +7 -6
  36. package/dom/resizable.js +3 -3
  37. package/dom/runtime.js +23 -7
  38. package/dom/scroll-area.js +5 -5
  39. package/dom/select.js +26 -13
  40. package/dom/separator.js +1 -1
  41. package/dom/slider.js +11 -8
  42. package/dom/switch.js +3 -3
  43. package/dom/tabs.js +5 -5
  44. package/dom/testing.js +3 -0
  45. package/dom/toast.js +57 -20
  46. package/dom/toggle-group.js +1 -1
  47. package/dom/toggle.js +1 -1
  48. package/dom/toolbar.js +4 -4
  49. package/dom/value-bar.js +3 -3
  50. package/llms.txt +1846 -252
  51. package/package.json +34 -2
  52. package/server/accordion.js +9 -6
  53. package/server/agent.js +3 -0
  54. package/server/autosize.js +1 -1
  55. package/server/avatar.js +39 -14
  56. package/server/button.js +1 -1
  57. package/server/calendar.js +78 -19
  58. package/server/carousel.js +6 -6
  59. package/server/checkbox-group-context.js +3 -0
  60. package/server/checkbox-group.js +38 -0
  61. package/server/checkbox.js +9 -5
  62. package/server/collapsible.js +3 -3
  63. package/server/combobox.js +72 -14
  64. package/server/command.js +10 -9
  65. package/server/date-field.js +7 -3
  66. package/server/date-picker.js +9 -3
  67. package/server/dialog.js +13 -3
  68. package/server/field.js +3 -3
  69. package/server/fieldset.js +2 -2
  70. package/server/form.js +1 -1
  71. package/server/hover-popup.js +3 -3
  72. package/server/index.js +1 -0
  73. package/server/input.js +1 -1
  74. package/server/label.js +1 -1
  75. package/server/listbox.js +5 -5
  76. package/server/menu.js +11 -11
  77. package/server/menubar.js +1 -1
  78. package/server/message-scroller.js +4 -4
  79. package/server/navigation-menu.js +18 -15
  80. package/server/number-field.js +39 -6
  81. package/server/otp.js +6 -5
  82. package/server/pagination.js +3 -3
  83. package/server/popover.js +37 -8
  84. package/server/primitive.js +92 -0
  85. package/server/qr-code.js +3 -3
  86. package/server/radio-group.js +7 -6
  87. package/server/resizable.js +3 -3
  88. package/server/runtime.js +23 -7
  89. package/server/scroll-area.js +5 -5
  90. package/server/select.js +26 -13
  91. package/server/separator.js +1 -1
  92. package/server/slider.js +11 -8
  93. package/server/switch.js +3 -3
  94. package/server/tabs.js +5 -5
  95. package/server/testing.js +3 -0
  96. package/server/toast.js +57 -20
  97. package/server/toggle-group.js +1 -1
  98. package/server/toggle.js +1 -1
  99. package/server/toolbar.js +4 -4
  100. package/server/value-bar.js +3 -3
  101. package/skills/kirana-ui-primitives/SKILL.md +163 -0
  102. package/src/accordion.jsx +10 -7
  103. package/src/agent.js +3 -0
  104. package/src/autosize.jsx +1 -1
  105. package/src/avatar.jsx +17 -10
  106. package/src/button.jsx +1 -1
  107. package/src/calendar.jsx +72 -16
  108. package/src/carousel.jsx +6 -6
  109. package/src/checkbox-group-context.js +3 -0
  110. package/src/checkbox-group.jsx +33 -0
  111. package/src/checkbox.jsx +8 -4
  112. package/src/collapsible.jsx +3 -3
  113. package/src/combobox.jsx +70 -13
  114. package/src/command.jsx +10 -8
  115. package/src/date-field.jsx +7 -3
  116. package/src/date-picker.jsx +8 -2
  117. package/src/dialog.jsx +12 -2
  118. package/src/field.jsx +3 -3
  119. package/src/fieldset.jsx +2 -2
  120. package/src/form.jsx +1 -1
  121. package/src/hover-popup.jsx +3 -3
  122. package/src/index.js +1 -0
  123. package/src/input.jsx +1 -1
  124. package/src/label.jsx +1 -1
  125. package/src/listbox.jsx +6 -6
  126. package/src/menu.jsx +11 -11
  127. package/src/menubar.jsx +1 -1
  128. package/src/message-scroller.jsx +4 -4
  129. package/src/navigation-menu.jsx +14 -13
  130. package/src/number-field.jsx +26 -6
  131. package/src/otp.jsx +6 -4
  132. package/src/pagination.jsx +3 -3
  133. package/src/popover.jsx +35 -5
  134. package/src/primitive.jsx +81 -0
  135. package/src/qr-code.jsx +3 -3
  136. package/src/radio-group.jsx +7 -7
  137. package/src/resizable.jsx +3 -3
  138. package/src/runtime.jsx +21 -7
  139. package/src/scroll-area.jsx +5 -5
  140. package/src/select.jsx +29 -14
  141. package/src/separator.jsx +1 -1
  142. package/src/slider.jsx +12 -8
  143. package/src/switch.jsx +3 -3
  144. package/src/tabs.jsx +6 -6
  145. package/src/testing.js +3 -0
  146. package/src/toast.jsx +38 -10
  147. package/src/toggle-group.jsx +2 -2
  148. package/src/toggle.jsx +1 -1
  149. package/src/toolbar.jsx +4 -4
  150. package/src/value-bar.jsx +3 -3
  151. package/types/accordion.d.ts +21 -19
  152. package/types/agent.d.ts +1 -0
  153. package/types/alert-dialog.d.ts +1 -0
  154. package/types/autocomplete.d.ts +1 -0
  155. package/types/autosize.d.ts +4 -1
  156. package/types/avatar.d.ts +14 -6
  157. package/types/button.d.ts +4 -2
  158. package/types/calendar.d.ts +48 -19
  159. package/types/carousel.d.ts +18 -10
  160. package/types/checkbox-group-context.d.ts +3 -0
  161. package/types/checkbox-group.d.ts +13 -0
  162. package/types/checkbox.d.ts +10 -6
  163. package/types/collapsible.d.ts +11 -7
  164. package/types/combobox.d.ts +102 -64
  165. package/types/command.d.ts +29 -17
  166. package/types/context-menu.d.ts +1 -0
  167. package/types/date-field.d.ts +20 -9
  168. package/types/date-picker.d.ts +26 -34
  169. package/types/dialog.d.ts +47 -31
  170. package/types/direction.d.ts +1 -0
  171. package/types/drawer.d.ts +1 -0
  172. package/types/field.d.ts +19 -11
  173. package/types/fieldset.d.ts +8 -3
  174. package/types/form.d.ts +5 -2
  175. package/types/hover-card.d.ts +16 -10
  176. package/types/hover-popup.d.ts +23 -13
  177. package/types/index.d.ts +15 -1
  178. package/types/input.d.ts +4 -3
  179. package/types/label.d.ts +4 -1
  180. package/types/listbox.d.ts +18 -20
  181. package/types/menu.d.ts +56 -42
  182. package/types/menubar.d.ts +6 -4
  183. package/types/message-scroller.d.ts +12 -6
  184. package/types/meter.d.ts +16 -7
  185. package/types/navigation-menu.d.ts +35 -29
  186. package/types/number-field.d.ts +22 -7
  187. package/types/otp.d.ts +18 -10
  188. package/types/pagination.d.ts +18 -10
  189. package/types/popover.d.ts +52 -13
  190. package/types/primitive.d.ts +50 -0
  191. package/types/progress.d.ts +16 -7
  192. package/types/qr-code.d.ts +10 -4
  193. package/types/radio-group.d.ts +18 -17
  194. package/types/resizable.d.ts +12 -7
  195. package/types/runtime.d.ts +36 -12
  196. package/types/scroll-area.d.ts +17 -9
  197. package/types/select.d.ts +55 -46
  198. package/types/separator.d.ts +5 -3
  199. package/types/slider.d.ts +25 -13
  200. package/types/switch.d.ts +7 -4
  201. package/types/tabs.d.ts +20 -16
  202. package/types/testing.d.ts +1 -0
  203. package/types/toast.d.ts +40 -16
  204. package/types/toggle-group.d.ts +6 -11
  205. package/types/toggle.d.ts +4 -3
  206. package/types/toolbar.d.ts +19 -14
  207. package/types/tooltip.d.ts +16 -10
  208. package/types/value-bar.d.ts +21 -10
@@ -22,7 +22,7 @@ function Root(props) {
22
22
  value: made,
23
23
  get children() {
24
24
  return _$createComponent(Part, _$mergeProps({
25
- get part() {
25
+ get of() {
26
26
  return made.root;
27
27
  },
28
28
  tag: "div"
@@ -31,19 +31,19 @@ function Root(props) {
31
31
  });
32
32
  }
33
33
  const Viewport = props => _$createComponent(Part, _$mergeProps({
34
- get part() {
34
+ get of() {
35
35
  return useScroller().viewport;
36
36
  },
37
37
  tag: "div"
38
38
  }, props));
39
39
  const Content = props => _$createComponent(Part, _$mergeProps({
40
- get part() {
40
+ get of() {
41
41
  return useScroller().content;
42
42
  },
43
43
  tag: "div"
44
44
  }, props));
45
45
  const Button = props => _$createComponent(Part, _$mergeProps({
46
- get part() {
46
+ get of() {
47
47
  return useScroller().button;
48
48
  },
49
49
  tag: "button"
@@ -1,10 +1,6 @@
1
1
  import { memo as _$memo } from "solid-js/web";
2
- import { ssr as _$ssr } from "solid-js/web";
3
- import { escape as _$escape } from "solid-js/web";
4
- import { ssrHydrationKey as _$ssrHydrationKey } from "solid-js/web";
5
2
  import { createComponent as _$createComponent } from "solid-js/web";
6
3
  import { mergeProps as _$mergeProps } from "solid-js/web";
7
- var _tmpl$ = ["<li", ">", "</li>"];
8
4
  import { defined, within } from "@kirana-ui/core";
9
5
  import { createNavigationMenu } from "@kirana-ui/core/navigation-menu";
10
6
  import { Show, createContext, createUniqueId, onCleanup, onMount, splitProps, untrack, useContext } from "solid-js";
@@ -42,7 +38,7 @@ function Root(props) {
42
38
  value: made,
43
39
  get children() {
44
40
  return _$createComponent(Part, _$mergeProps({
45
- get part() {
41
+ get of() {
46
42
  return made.root;
47
43
  },
48
44
  tag: "nav"
@@ -50,16 +46,23 @@ function Root(props) {
50
46
  }
51
47
  });
52
48
  }
53
- /** `value` tells this item from the others; an item that is only a link needs none. */
49
+ /** `value` tells this item from the others; an item that is given none makes its own. */
54
50
  function Item(props) {
55
- const value = untrack(() => props.value);
56
- if (value === undefined) return _$ssr(_tmpl$, _$ssrHydrationKey(), _$escape(props.children));
57
- const item = useNavigation().item(value);
51
+ const [local, rest] = splitProps(props, ["value"]);
52
+ const made = useNavigation();
53
+ const generated = createUniqueId();
54
+ const value = untrack(() => local.value);
55
+ const item = made.item(value === undefined ? generated : value);
58
56
  onMount(() => onCleanup(item.mount()));
59
57
  return _$createComponent(ItemContext.Provider, {
60
58
  value: item,
61
59
  get children() {
62
- return _$ssr(_tmpl$, _$ssrHydrationKey(), _$escape(props.children));
60
+ return _$createComponent(Part, _$mergeProps({
61
+ get of() {
62
+ return made.itemPart;
63
+ },
64
+ tag: "li"
65
+ }, rest));
63
66
  }
64
67
  });
65
68
  }
@@ -78,7 +81,7 @@ function Content(props) {
78
81
  },
79
82
  get children() {
80
83
  return _$createComponent(Part, _$mergeProps({
81
- get part() {
84
+ get of() {
82
85
  return item.content;
83
86
  },
84
87
  tag: "div"
@@ -94,7 +97,7 @@ function Link(props) {
94
97
  }));
95
98
  const part = useNavigation().link(() => defined(options.get()));
96
99
  return _$createComponent(Part, _$mergeProps({
97
- part: part,
100
+ of: part,
98
101
  tag: "a"
99
102
  }, rest));
100
103
  }
@@ -109,20 +112,20 @@ const Portal = props => _$createComponent(BodyPortal, {
109
112
  function Positioner(props) {
110
113
  const made = useNavigation();
111
114
  return _$createComponent(Part, _$mergeProps({
112
- get part() {
115
+ get of() {
113
116
  return made.positioner;
114
117
  },
115
118
  tag: "div"
116
119
  }, () => positioned(props, made.positioning)));
117
120
  }
118
121
  const part = (name, tag) => props => _$createComponent(Part, _$mergeProps({
119
- get part() {
122
+ get of() {
120
123
  return useNavigation()[name];
121
124
  },
122
125
  tag: tag
123
126
  }, props));
124
127
  const itemPart = (name, tag) => props => _$createComponent(Part, _$mergeProps({
125
- get part() {
128
+ get of() {
126
129
  return useItem()[name];
127
130
  },
128
131
  tag: tag
@@ -1,10 +1,10 @@
1
1
  import { mergeProps as _$mergeProps } from "solid-js/web";
2
2
  import { createComponent as _$createComponent } from "solid-js/web";
3
- import { within } from "@kirana-ui/core";
3
+ import { defined, within } from "@kirana-ui/core";
4
4
  import { createNumberField } from "@kirana-ui/core/number-field";
5
- import { Show, createContext, createUniqueId, splitProps, useContext } from "solid-js";
5
+ import { Show, createComputed, createContext, createUniqueId, splitProps, useContext } from "solid-js";
6
6
  import { FieldContext } from "./field-context.js";
7
- import { Part, controller, fromSignal } from "./runtime.js";
7
+ import { Part, Portal, controller, fromSignal } from "./runtime.js";
8
8
  const Context = createContext();
9
9
  function useNumberField() {
10
10
  const made = useContext(Context);
@@ -42,7 +42,7 @@ function Root(props) {
42
42
  value: made,
43
43
  get children() {
44
44
  return _$createComponent(Part, _$mergeProps({
45
- get part() {
45
+ get of() {
46
46
  return made.root;
47
47
  },
48
48
  tag: "div"
@@ -54,7 +54,7 @@ function Root(props) {
54
54
  },
55
55
  get children() {
56
56
  return _$createComponent(Part, {
57
- get part() {
57
+ get of() {
58
58
  return made.hidden;
59
59
  },
60
60
  tag: "input"
@@ -67,13 +67,46 @@ function Root(props) {
67
67
  });
68
68
  }
69
69
  const part = (name, tag) => props => _$createComponent(Part, _$mergeProps({
70
- get part() {
70
+ get of() {
71
71
  return useNumberField()[name];
72
72
  },
73
73
  tag: tag
74
74
  }, props));
75
+ /** Pressed and dragged to change the number; `direction`, `pixelSensitivity`, `teleportDistance`. */
76
+ function ScrubArea(props) {
77
+ const [local, rest] = splitProps(props, ["direction", "pixelSensitivity", "teleportDistance"]);
78
+ const made = useNumberField();
79
+ createComputed(() => made.scrub.set(defined({
80
+ ...local
81
+ })));
82
+ return _$createComponent(Part, _$mergeProps({
83
+ get of() {
84
+ return made.scrubArea;
85
+ },
86
+ tag: "span"
87
+ }, rest));
88
+ }
89
+ /** Drawn in place of the pointer while it is locked for a drag, at the end of `<body>`. */
90
+ function ScrubAreaCursor(props) {
91
+ const made = useNumberField();
92
+ return _$createComponent(Portal, {
93
+ get mounted() {
94
+ return made.scrubAreaCursor.mounted;
95
+ },
96
+ get children() {
97
+ return _$createComponent(Part, _$mergeProps({
98
+ get of() {
99
+ return made.scrubAreaCursor.part;
100
+ },
101
+ tag: "span"
102
+ }, props));
103
+ }
104
+ });
105
+ }
75
106
  export const NumberField = {
76
107
  Root,
108
+ ScrubArea,
109
+ ScrubAreaCursor,
77
110
  Group: part("group", "div"),
78
111
  Input: part("input", "input"),
79
112
  Increment: part("increment", "button"),
package/server/otp.js CHANGED
@@ -11,7 +11,7 @@ function useOtp() {
11
11
  return made;
12
12
  }
13
13
  function Root(props) {
14
- const [local, rest] = splitProps(props, ["length", "value", "defaultValue", "onValueChange", "onComplete", "mode", "disabled", "name", "form", "id"]);
14
+ const [local, rest] = splitProps(props, ["length", "value", "defaultValue", "onValueChange", "onComplete", "mode", "pattern", "disabled", "name", "form", "id"]);
15
15
  const generated = createUniqueId();
16
16
  const made = controller(createOtp, () => ({
17
17
  id: local.id ?? generated,
@@ -19,6 +19,7 @@ function Root(props) {
19
19
  value: local.value,
20
20
  defaultValue: local.defaultValue,
21
21
  mode: local.mode,
22
+ pattern: local.pattern,
22
23
  disabled: local.disabled,
23
24
  name: local.name,
24
25
  form: local.form,
@@ -29,7 +30,7 @@ function Root(props) {
29
30
  value: made,
30
31
  get children() {
31
32
  return _$createComponent(Part, _$mergeProps({
32
- get part() {
33
+ get of() {
33
34
  return made.root;
34
35
  },
35
36
  tag: "div"
@@ -46,7 +47,7 @@ function Slot(props) {
46
47
  value: slot,
47
48
  get children() {
48
49
  return _$createComponent(Part, _$mergeProps({
49
- get part() {
50
+ get of() {
50
51
  return slot.part;
51
52
  },
52
53
  tag: "div"
@@ -70,7 +71,7 @@ function Caret(props) {
70
71
  },
71
72
  get children() {
72
73
  return _$createComponent(Part, _$mergeProps({
73
- get part() {
74
+ get of() {
74
75
  return made.caretPart;
75
76
  },
76
77
  tag: "div"
@@ -79,7 +80,7 @@ function Caret(props) {
79
80
  });
80
81
  }
81
82
  const part = (name, tag) => props => _$createComponent(Part, _$mergeProps({
82
- get part() {
83
+ get of() {
83
84
  return useOtp()[name];
84
85
  },
85
86
  tag: tag
@@ -27,7 +27,7 @@ function Root(props) {
27
27
  value: made,
28
28
  get children() {
29
29
  return _$createComponent(Part, _$mergeProps({
30
- get part() {
30
+ get of() {
31
31
  return made.root;
32
32
  },
33
33
  tag: "nav"
@@ -52,14 +52,14 @@ function Item(props) {
52
52
  const [local, rest] = splitProps(props, ["page"]);
53
53
  const made = usePagination();
54
54
  return _$createComponent(Part, _$mergeProps({
55
- get part() {
55
+ get of() {
56
56
  return made.item(local.page);
57
57
  },
58
58
  tag: "button"
59
59
  }, rest));
60
60
  }
61
61
  const part = (name, tag) => props => _$createComponent(Part, _$mergeProps({
62
- get part() {
62
+ get of() {
63
63
  return usePagination()[name];
64
64
  },
65
65
  tag: tag
package/server/popover.js CHANGED
@@ -4,6 +4,10 @@ import { defined } from "@kirana-ui/core";
4
4
  import { createPopover } from "@kirana-ui/core/popover";
5
5
  import { createComputed, createContext, createUniqueId, splitProps, useContext } from "solid-js";
6
6
  import { Part, Portal as BodyPortal, controller } from "./runtime.js";
7
+ /**
8
+ * The popover its parts are inside. Exported for a component that is made of one (a date picker
9
+ * provides its own to the popover's parts).
10
+ */
7
11
  const Context = createContext();
8
12
  /** For a component made of this one's parts: a date picker. */
9
13
  export { Context as PopoverContext };
@@ -17,6 +21,7 @@ function Root(props) {
17
21
  const made = controller(createPopover, () => ({
18
22
  id: props.id ?? generated,
19
23
  open: props.open,
24
+ modal: props.modal,
20
25
  defaultOpen: props.defaultOpen,
21
26
  onOpenChange: (open, details) => props.onOpenChange?.(open, details)
22
27
  }));
@@ -35,35 +40,59 @@ const Portal = props => _$createComponent(BodyPortal, {
35
40
  return props.children;
36
41
  }
37
42
  });
38
- /** A positioner's own props, written where its placement reads them, before its element attaches. */
43
+ /**
44
+ * A positioner's own props, written where its placement reads them, before its element
45
+ * attaches: the one place they are named. Gives back what is left, for the part's element.
46
+ */
39
47
  export function positioned(props, positioning) {
40
- const [local, rest] = splitProps(props, ["side", "align", "sideOffset", "alignOffset", "collisionPadding"]);
41
- createComputed(() => positioning.set(defined({
42
- ...local
43
- })));
48
+ const [local, rest] = splitProps(props, ["side", "align", "sideOffset", "alignOffset", "collisionPadding", "collisionBoundary", "collisionAvoidance", "sticky", "arrowPadding", "positionMethod", "anchor"]);
49
+ createComputed(() => {
50
+ const anchor = local.anchor;
51
+ positioning.set(defined({
52
+ ...local,
53
+ // A function is asked here, so a change of the signal it reads is followed; and given
54
+ // whole while it has nothing, to be asked again as the popup is placed.
55
+ anchor: typeof anchor === "function" ? anchor() ?? anchor : anchor
56
+ }));
57
+ });
44
58
  return rest;
45
59
  }
46
60
  function Positioner(props) {
47
61
  const made = usePopover();
48
62
  return _$createComponent(Part, _$mergeProps({
49
- get part() {
63
+ get of() {
50
64
  return made.positioner;
51
65
  },
52
66
  tag: "div"
53
67
  }, () => positioned(props, made.positioning)));
54
68
  }
55
69
  const part = (name, tag) => props => _$createComponent(Part, _$mergeProps({
56
- get part() {
70
+ get of() {
57
71
  return usePopover()[name];
58
72
  },
59
73
  tag: tag
60
74
  }, props));
75
+ function Trigger(props) {
76
+ const [local, rest] = splitProps(props, ["openOnHover", "delay", "closeDelay"]);
77
+ const made = usePopover();
78
+ createComputed(() => made.hovering.set(defined({
79
+ ...local
80
+ })));
81
+ return _$createComponent(Part, _$mergeProps({
82
+ get of() {
83
+ return made.trigger;
84
+ },
85
+ tag: "button"
86
+ }, rest));
87
+ }
61
88
  export const Popover = {
62
89
  Root,
63
90
  Portal,
91
+ Backdrop: part("backdrop", "div"),
64
92
  Positioner,
65
- Trigger: part("trigger", "button"),
93
+ Trigger,
66
94
  Popup: part("popup", "div"),
95
+ Arrow: part("arrow", "div"),
67
96
  Title: part("title", "h2"),
68
97
  Description: part("description", "p"),
69
98
  Close: part("close", "button")
@@ -0,0 +1,92 @@
1
+ import { mergeProps as _$mergeProps } from "solid-js/web";
2
+ import { memo as _$memo } from "solid-js/web";
3
+ import { createComponent as _$createComponent } from "solid-js/web";
4
+ import { mergeProps as layer, stateAttributes } from "@kirana-ui/core";
5
+ import { Show, children, createMemo, splitProps } from "solid-js";
6
+ import { Dynamic } from "solid-js/web";
7
+ /**
8
+ * A plain element of one's own (a badge, a breadcrumb's link) with the composition a part has:
9
+ * `as` for another tag (a `div` unless said), or `render` for the caller's own element, given the
10
+ * props to spread and the state. `state` is written as `data-*` attributes under the attributes
11
+ * given. Merge the component's own props with its caller's through `mergeProps`, as a part's
12
+ * are merged.
13
+ */
14
+ export function Primitive(props) {
15
+ const [local, rest] = splitProps(props, ["as", "render", "state", "children"]);
16
+ const marks = () => stateAttributes(local.state ?? {});
17
+ return _$createComponent(Show, {
18
+ get when() {
19
+ return local.render;
20
+ },
21
+ get fallback() {
22
+ return _$createComponent(Dynamic, _$mergeProps({
23
+ get component() {
24
+ return local.as ?? "div";
25
+ }
26
+ }, marks, rest, {
27
+ get children() {
28
+ return local.children;
29
+ }
30
+ }));
31
+ },
32
+ children: render => {
33
+ // Resolved once, as a part's are: a change of the props hands the same nodes over again.
34
+ const held = children(() => local.children);
35
+ const handed = createMemo(() => {
36
+ const given = {
37
+ ...marks()
38
+ };
39
+ for (const key of Object.keys(rest)) given[key] = rest[key];
40
+ return {
41
+ ...given,
42
+ children: held()
43
+ };
44
+ });
45
+ return render()(handed, () => local.state ?? {});
46
+ }
47
+ });
48
+ }
49
+ /** One key of several sets, by a part's rule. */
50
+ function mergedValue(sets, key) {
51
+ if (key === "ref") {
52
+ // Solid hands a component a function whatever was written: each set's gets the element.
53
+ const refs = sets.map(set => set?.ref).filter(ref => typeof ref === "function");
54
+ if (refs.length < 2) return refs[0];
55
+ return element => {
56
+ for (const ref of refs) ref(element);
57
+ };
58
+ }
59
+ let merged = {};
60
+ for (const set of sets) if (set && key in set) merged = layer(merged, {
61
+ [key]: set[key]
62
+ });
63
+ return merged[key];
64
+ }
65
+ /**
66
+ * Several sets of props as one, for a component's own props and its caller's: a later set
67
+ * wins an attribute it gives (one it leaves `undefined` stays), classes join, styles are
68
+ * merged property by property, the handlers of an event run in order until one calls
69
+ * `event.preventKiranaHandler()`, which stops those after it, and every `ref` gets the
70
+ * element. It reads its sets when a prop is read, so a component's props stay reactive: spread
71
+ * it (`<Primitive {...mergeProps({ class: "badge" }, props)} />`). Not solid-js's
72
+ * `mergeProps`, where a later class replaces an earlier one: import one under another name
73
+ * where both are used.
74
+ */
75
+ export function mergeProps(...sets) {
76
+ const keys = () => {
77
+ const all = new Set();
78
+ for (const set of sets) if (set) for (const key of Object.keys(set)) all.add(key);
79
+ return [...all];
80
+ };
81
+ const given = sets;
82
+ return new Proxy({}, {
83
+ get: (_, key) => typeof key === "string" ? mergedValue(given, key) : undefined,
84
+ has: (_, key) => typeof key === "string" && keys().includes(key),
85
+ ownKeys: () => keys(),
86
+ getOwnPropertyDescriptor: (_, key) => typeof key === "string" && keys().includes(key) ? {
87
+ configurable: true,
88
+ enumerable: true,
89
+ get: () => mergedValue(given, key)
90
+ } : undefined
91
+ });
92
+ }
package/server/qr-code.js CHANGED
@@ -21,7 +21,7 @@ function Root(props) {
21
21
  value: made,
22
22
  get children() {
23
23
  return _$createComponent(Part, _$mergeProps({
24
- get part() {
24
+ get of() {
25
25
  return made.root;
26
26
  },
27
27
  tag: "div"
@@ -30,13 +30,13 @@ function Root(props) {
30
30
  });
31
31
  }
32
32
  const Frame = props => _$createComponent(Part, _$mergeProps({
33
- get part() {
33
+ get of() {
34
34
  return useQrCode().frame;
35
35
  },
36
36
  tag: "svg"
37
37
  }, props));
38
38
  const Pattern = props => _$createComponent(Part, _$mergeProps({
39
- get part() {
39
+ get of() {
40
40
  return useQrCode().pattern;
41
41
  },
42
42
  tag: "path"
@@ -36,7 +36,7 @@ function Root(props) {
36
36
  value: made,
37
37
  get children() {
38
38
  return _$createComponent(Part, _$mergeProps({
39
- get part() {
39
+ get of() {
40
40
  return made.root;
41
41
  },
42
42
  tag: "div"
@@ -45,11 +45,12 @@ function Root(props) {
45
45
  });
46
46
  }
47
47
  function Item(props) {
48
- const [local, rest] = splitProps(props, ["value", "disabled", "children"]);
48
+ const [local, rest] = splitProps(props, ["value", "disabled", "id", "children"]);
49
49
  // An item is its value for as long as it is in the page.
50
50
  const value = untrack(() => local.value);
51
51
  const options = toSignal(() => ({
52
- disabled: local.disabled
52
+ disabled: local.disabled,
53
+ id: local.id
53
54
  }));
54
55
  const read = () => defined(options.get());
55
56
  const group = useRadioGroup();
@@ -57,14 +58,14 @@ function Item(props) {
57
58
  value: value,
58
59
  get children() {
59
60
  return _$createComponent(Part, _$mergeProps({
60
- get part() {
61
+ get of() {
61
62
  return group.item(value, read);
62
63
  },
63
64
  tag: "span"
64
65
  }, rest, {
65
66
  get children() {
66
67
  return [local.children, _$createComponent(Part, {
67
- get part() {
68
+ get of() {
68
69
  return group.itemInput(value, read);
69
70
  },
70
71
  tag: "input"
@@ -86,7 +87,7 @@ function Indicator(props) {
86
87
  },
87
88
  get children() {
88
89
  return _$createComponent(Part, _$mergeProps({
89
- get part() {
90
+ get of() {
90
91
  return indicator.part;
91
92
  },
92
93
  tag: "span"
@@ -28,7 +28,7 @@ function Group(props) {
28
28
  value: made,
29
29
  get children() {
30
30
  return _$createComponent(Part, _$mergeProps({
31
- get part() {
31
+ get of() {
32
32
  return made.group;
33
33
  },
34
34
  tag: "div"
@@ -43,7 +43,7 @@ function Panel(props) {
43
43
  }));
44
44
  const part = useResizable().panel(() => defined(options.get()));
45
45
  return _$createComponent(Part, _$mergeProps({
46
- part: part,
46
+ of: part,
47
47
  tag: "div"
48
48
  }, rest));
49
49
  }
@@ -54,7 +54,7 @@ function Handle(props) {
54
54
  }));
55
55
  const part = useResizable().handle(() => defined(options.get()));
56
56
  return _$createComponent(Part, _$mergeProps({
57
- part: part,
57
+ of: part,
58
58
  tag: "div"
59
59
  }, rest));
60
60
  }
package/server/runtime.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { mergeProps as _$mergeProps } from "solid-js/web";
2
2
  import { memo as _$memo } from "solid-js/web";
3
3
  import { createComponent as _$createComponent } from "solid-js/web";
4
- import { mergeProps, sameProps, signal } from "@kirana-ui/core";
4
+ import { mergeProps, sameProps, signal, stateOf } from "@kirana-ui/core";
5
5
  import { Show, children, createComputed, createContext, createRenderEffect, createMemo, createSignal, getOwner, onCleanup, onMount, runWithOwner, splitProps, untrack, useContext } from "solid-js";
6
6
  import { Dynamic, Portal as SolidPortal, isServer } from "solid-js/web";
7
7
  /** A core signal as a Solid accessor: tracked by whatever calls it. */
@@ -36,12 +36,15 @@ function toSolid(props) {
36
36
  return out;
37
37
  }
38
38
  /**
39
- * A part's element (or the caller's, through `render`), with the caller's props merged under the
40
- * part's and the part's DOM work attached once the element is in the page.
39
+ * The element of a part (`of`), or the caller's through `render`, with the caller's props merged under the
40
+ * part's and the part's DOM work attached once the element is in the page. What the part holds
41
+ * is its children here: with `as` they are the element's, and with `render` they are handed to
42
+ * the caller's function as the `children` of its props, so a control drawn as another element
43
+ * keeps the native input a form and a label reach.
41
44
  */
42
45
  export function Part(props) {
43
- const [local, caller] = splitProps(props, ["part", "tag", "as", "render", "children"]);
44
- const own = fromSignal(untrack(() => local.part).props);
46
+ const [local, caller] = splitProps(props, ["of", "tag", "as", "render", "children"]);
47
+ const own = fromSignal(untrack(() => local.of).props);
45
48
  // Solid hands over an element before it is in the page: the part's DOM work (focus, measures,
46
49
  // the starting style) waits for the mount that follows. It belongs to this component, not to
47
50
  // the effect that spreads the props (which hands the ref over again, and is torn down, each time
@@ -51,8 +54,11 @@ export function Part(props) {
51
54
  const attach = element => {
52
55
  if (element === attached) return;
53
56
  attached = element;
54
- const part = untrack(() => local.part);
57
+ const part = untrack(() => local.of);
55
58
  runWithOwner(owner, () => onMount(() => onCleanup(part.attach(element))));
59
+ // The caller's own `ref` (Solid hands a component a function, whatever was written).
60
+ const theirs = untrack(() => caller.ref);
61
+ if (typeof theirs === "function") theirs(element);
56
62
  };
57
63
  const merged = createMemo(() => {
58
64
  const theirs = {};
@@ -62,6 +68,7 @@ export function Part(props) {
62
68
  ref: attach
63
69
  };
64
70
  });
71
+ const state = () => stateOf(own());
65
72
  return _$createComponent(Show, {
66
73
  get when() {
67
74
  return local.render;
@@ -77,7 +84,16 @@ export function Part(props) {
77
84
  }
78
85
  }));
79
86
  },
80
- children: render => render()(merged)
87
+ children: render => {
88
+ // Resolved once: a change of the part's props hands the same nodes over again, and
89
+ // the element keeps them.
90
+ const held = children(() => local.children);
91
+ const handed = createMemo(() => ({
92
+ ...merged(),
93
+ children: held()
94
+ }));
95
+ return render()(handed, state);
96
+ }
81
97
  });
82
98
  }
83
99
  /**
@@ -22,7 +22,7 @@ function Root(props) {
22
22
  value: made,
23
23
  get children() {
24
24
  return _$createComponent(Part, _$mergeProps({
25
- get part() {
25
+ get of() {
26
26
  return made.root;
27
27
  },
28
28
  tag: "div"
@@ -44,7 +44,7 @@ function Scrollbar(props) {
44
44
  },
45
45
  get children() {
46
46
  return _$createComponent(Part, _$mergeProps({
47
- get part() {
47
+ get of() {
48
48
  return bar.part;
49
49
  },
50
50
  tag: "div"
@@ -58,7 +58,7 @@ function Thumb(props) {
58
58
  const bar = useContext(ScrollbarContext);
59
59
  if (!bar) throw new Error("A ScrollArea.Thumb must be inside <ScrollArea.Scrollbar>");
60
60
  return _$createComponent(Part, _$mergeProps({
61
- get part() {
61
+ get of() {
62
62
  return bar.thumb;
63
63
  },
64
64
  tag: "div"
@@ -75,7 +75,7 @@ function Corner(props) {
75
75
  },
76
76
  get children() {
77
77
  return _$createComponent(Part, _$mergeProps({
78
- get part() {
78
+ get of() {
79
79
  return corner.part;
80
80
  },
81
81
  tag: "div"
@@ -84,7 +84,7 @@ function Corner(props) {
84
84
  });
85
85
  }
86
86
  const part = name => props => _$createComponent(Part, _$mergeProps({
87
- get part() {
87
+ get of() {
88
88
  return useScrollArea()[name];
89
89
  },
90
90
  tag: "div"