@glasshome/ui 1.37.0 → 1.37.1

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.
@@ -14,4 +14,6 @@ type PopoverContentProps = ComponentProps<typeof PopoverPrimitive.Content> & {
14
14
  };
15
15
  declare const PopoverContent: Component<PopoverContentProps>;
16
16
  declare const PopoverAnchor: Component<ComponentProps<typeof PopoverPrimitive.Anchor>>;
17
- export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger };
17
+ /** The control, inside a PopoverAnchor, that opens its popover. */
18
+ declare const useAnchorTrigger: () => ((el: HTMLElement) => void) | undefined;
19
+ export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger, useAnchorTrigger };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@glasshome/ui",
3
- "version": "1.37.0",
3
+ "version": "1.37.1",
4
4
  "description": "SolidJS component library for GlassHome, built on Kobalte",
5
5
  "keywords": [
6
6
  "components",
@@ -2,6 +2,7 @@ import { type JSX, Show, splitProps } from "solid-js";
2
2
  import { PICKER_TRIGGER } from "../lib/picker-classes.js";
3
3
  import { cn } from "../lib/utils.js";
4
4
  import { Icon } from "./icon.js";
5
+ import { useAnchorTrigger } from "./popover.js";
5
6
 
6
7
  export interface PickerTriggerProps extends Omit<
7
8
  JSX.ButtonHTMLAttributes<HTMLButtonElement>,
@@ -25,11 +26,17 @@ export function PickerTrigger(props: PickerTriggerProps) {
25
26
  "clearLabel",
26
27
  "class",
27
28
  "children",
29
+ "ref",
28
30
  ]);
31
+ const anchorTrigger = useAnchorTrigger();
29
32
 
30
33
  return (
31
34
  <div class="relative">
32
35
  <button
36
+ ref={(el) => {
37
+ anchorTrigger?.(el);
38
+ if (typeof own.ref === "function") own.ref(el);
39
+ }}
33
40
  type="button"
34
41
  data-slot={own.slot}
35
42
  data-expanded={own.open || undefined}
@@ -122,8 +122,19 @@ const PopoverContent: Component<PopoverContentProps> = (props) => {
122
122
  );
123
123
  };
124
124
 
125
+ /** Inside a PopoverAnchor: names the control that opens the popover, so focus goes back to it on close. */
126
+ const AnchorTriggerContext = createContext<(el: HTMLElement) => void>();
127
+
125
128
  const PopoverAnchor: Component<ComponentProps<typeof PopoverPrimitive.Anchor>> = (props) => {
126
- return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;
129
+ const popover = usePopoverContext();
130
+ return (
131
+ <AnchorTriggerContext.Provider value={popover.setTriggerRef}>
132
+ <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />
133
+ </AnchorTriggerContext.Provider>
134
+ );
127
135
  };
128
136
 
129
- export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger };
137
+ /** The control, inside a PopoverAnchor, that opens its popover. */
138
+ const useAnchorTrigger = () => useContext(AnchorTriggerContext);
139
+
140
+ export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger, useAnchorTrigger };