@glasshome/ui 1.22.0 → 1.23.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.
- package/dist/index.js +2 -2
- package/dist/lib/alert-tones.d.ts +1 -0
- package/dist/solid/alert.d.ts +2 -0
- package/dist/solid/index.js +112 -99
- package/dist/solid/toggle-group.d.ts +2 -0
- package/dist/{utils-D5blHO4O.js → utils-o6ev-9h_.js} +466 -466
- package/package.json +1 -1
- package/src/lib/alert-tones.ts +1 -0
- package/src/lib/button-variants.ts +4 -4
- package/src/solid/alert.tsx +19 -2
- package/src/solid/dialog-parts.tsx +4 -3
- package/src/solid/preview-tile.tsx +6 -4
- package/src/solid/toggle-group.tsx +11 -2
- package/src/styles/globals.css +8 -0
package/package.json
CHANGED
package/src/lib/alert-tones.ts
CHANGED
|
@@ -66,6 +66,7 @@ export function alertIconBgStyle(color: string): Record<string, string> {
|
|
|
66
66
|
opacity: "0.32",
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
|
+
export const ALERT_SM_CLASS = "items-center gap-2 py-1.5 pr-1.5 pl-3";
|
|
69
70
|
export const ALERT_CONTENT_CLASS = "relative z-10 min-w-0 flex-1";
|
|
70
71
|
export const ALERT_TITLE_CLASS = "font-semibold text-base leading-snug";
|
|
71
72
|
export const ALERT_DESCRIPTION_CLASS = "gh-alert-desc text-foreground/80 text-sm leading-snug";
|
|
@@ -20,9 +20,9 @@ export const buttonVariants = cva({
|
|
|
20
20
|
base: "transition-glass focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 rounded-lg text-sm font-medium whitespace-nowrap outline-none focus-visible:ring-[3px] active:scale-[0.97] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
|
|
21
21
|
variants: {
|
|
22
22
|
variant: {
|
|
23
|
-
default: `glass glass-tint ${CONTROL_GLASS} [--glass-text:0%] [--glass-tone:var(--primary)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--primary)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--primary)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:
|
|
24
|
-
destructive: `glass glass-tint ${CONTROL_GLASS} focus-visible:ring-destructive/30 [--glass-text:0%] [--glass-tone:var(--destructive)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--destructive)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--destructive)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:
|
|
25
|
-
secondary: `glass glass-tint ${CONTROL_GLASS} [--glass-text:0%] [--glass-tone:var(--accent)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--accent)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--accent)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:
|
|
23
|
+
default: `glass glass-tint ${CONTROL_GLASS} [--glass-text:0%] [--glass-tone:var(--primary)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--primary)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--primary)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:70%]`,
|
|
24
|
+
destructive: `glass glass-tint ${CONTROL_GLASS} focus-visible:ring-destructive/30 [--glass-text:0%] [--glass-tone:var(--destructive)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--destructive)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--destructive)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:70%]`,
|
|
25
|
+
secondary: `glass glass-tint ${CONTROL_GLASS} [--glass-text:0%] [--glass-tone:var(--accent)] [--glass-wash:55%] hover:[--glass-edge:color-mix(in_srgb,var(--accent)_60%,transparent)] hover:[--glass-wash:65%] dark:[color:oklch(from_var(--glass-tone)_calc((0.74_-_l)*100)_0_0)] dark:[--glass-tone:oklch(from_var(--accent)_calc(l_+_clamp(0,(l_-_0.74)*10,0.1))_c_h)] dark:[--glass-wash:62%] dark:hover:[--glass-wash:70%]`,
|
|
26
26
|
outline: OUTLINE_SURFACE,
|
|
27
27
|
ghost: "hover:bg-muted hover:text-foreground dark:hover:bg-muted/50",
|
|
28
28
|
link: "text-primary-tint-foreground underline-offset-4 hover:underline",
|
|
@@ -32,7 +32,7 @@ export const buttonVariants = cva({
|
|
|
32
32
|
sm: "h-8 gap-1.5 px-3 has-[>svg]:px-2.5",
|
|
33
33
|
lg: "h-10 px-6 has-[>svg]:px-4",
|
|
34
34
|
icon: "size-9 p-2",
|
|
35
|
-
xl: "h-[72px] gap-3.5 rounded-full pr-7 pl-3 text-left text-[17px] font-semibold [&_svg:not([class*='size-'])]:size-5",
|
|
35
|
+
xl: "h-[72px] gap-3.5 rounded-full pr-7 pl-3 text-left text-[17px] font-semibold [--glass-lift:0.25] hover:-translate-y-0.5 hover:[--glass-lift:0.7] hover:[--glass-light:0.24] active:translate-y-0 [&_svg:not([class*='size-'])]:size-5",
|
|
36
36
|
none: "",
|
|
37
37
|
},
|
|
38
38
|
},
|
package/src/solid/alert.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
ALERT_DESCRIPTION_CLASS,
|
|
14
14
|
ALERT_ICON_BG_CLASS,
|
|
15
15
|
ALERT_ICON_PATHS,
|
|
16
|
+
ALERT_SM_CLASS,
|
|
16
17
|
ALERT_TITLE_CLASS,
|
|
17
18
|
ALERT_TONES,
|
|
18
19
|
type AlertTone,
|
|
@@ -28,6 +29,8 @@ type AlertProps = ComponentProps<"div"> & {
|
|
|
28
29
|
icon?: JSX.Element;
|
|
29
30
|
title?: JSX.Element;
|
|
30
31
|
action?: JSX.Element;
|
|
32
|
+
/** `sm`: a one-line note inside a list, with tighter padding and smaller text. */
|
|
33
|
+
size?: "default" | "sm";
|
|
31
34
|
};
|
|
32
35
|
|
|
33
36
|
// Lets `AlertTitle`, used as a child, pick up the same tone colour the
|
|
@@ -38,14 +41,28 @@ type AlertProps = ComponentProps<"div"> & {
|
|
|
38
41
|
const AlertToneContext = createContext<() => string>();
|
|
39
42
|
|
|
40
43
|
const Alert: Component<AlertProps> = (props) => {
|
|
41
|
-
const [local, rest] = splitProps(props, [
|
|
44
|
+
const [local, rest] = splitProps(props, [
|
|
45
|
+
"class",
|
|
46
|
+
"tone",
|
|
47
|
+
"icon",
|
|
48
|
+
"title",
|
|
49
|
+
"action",
|
|
50
|
+
"children",
|
|
51
|
+
"size",
|
|
52
|
+
]);
|
|
42
53
|
const toneKey = () => local.tone ?? "info";
|
|
43
54
|
const tone = () => ALERT_TONES[toneKey()];
|
|
44
55
|
return (
|
|
45
56
|
<div
|
|
46
57
|
data-slot="alert"
|
|
47
58
|
role={local.tone === "destructive" ? "alert" : "status"}
|
|
48
|
-
|
|
59
|
+
data-size={local.size ?? "default"}
|
|
60
|
+
class={cn(
|
|
61
|
+
ALERT_CLASS,
|
|
62
|
+
"glass glass-tint",
|
|
63
|
+
local.size === "sm" && ALERT_SM_CLASS,
|
|
64
|
+
local.class,
|
|
65
|
+
)}
|
|
49
66
|
style={{ "--glass-tone": tone().color, color: "var(--foreground)" }}
|
|
50
67
|
{...rest}
|
|
51
68
|
>
|
|
@@ -67,7 +67,8 @@ export const ANCHORED_PANEL = `${OVERLAY_SURFACE} ${ANCHORED_MOTION} fixed flex
|
|
|
67
67
|
|
|
68
68
|
export const MODAL_SCRIM = `${SCRIM_MOTION} fixed inset-0 ${Z_CLASS.overlay} ${SCRIM_CLASS}`;
|
|
69
69
|
|
|
70
|
-
const MODAL_HEADER =
|
|
70
|
+
const MODAL_HEADER =
|
|
71
|
+
"flex shrink-0 items-start gap-4 px-6 pt-6 pb-3 in-data-[slot=bottom-sheet-content]:px-4 [[data-slot=bottom-sheet-handle]+&]:pt-1";
|
|
71
72
|
const MODAL_HEADER_MEDIA = "flex shrink-0 items-center";
|
|
72
73
|
/* `grow`, not `flex-1`: a zero basis would make the text column shrink to a
|
|
73
74
|
* word per line beside a wide action instead of pushing it onto the next line
|
|
@@ -85,10 +86,10 @@ const MODAL_HEADER_ACTION = "flex shrink-0 items-center gap-2";
|
|
|
85
86
|
* - The reserved scrollbar lives inside the right inset, so the content column
|
|
86
87
|
* ends where the Header's and Footer's do. */
|
|
87
88
|
const MODAL_BODY =
|
|
88
|
-
"gh-scroll gh-stagger flex min-h-0 flex-1 flex-col gap-4 overflow-y-auto overscroll-contain [touch-action:pan-y_pinch-zoom] [scrollbar-gutter:stable] pl-6 pr-[calc(var(--spacing)*6-var(--scrollbar-w))] pt-6 pb-6 [[data-slot$='-header']~&]:pt-3 [&:has(~[data-slot$='-footer'])]:pb-3";
|
|
89
|
+
"gh-scroll gh-stagger flex min-h-0 flex-1 flex-col gap-4 overflow-y-auto overscroll-contain [touch-action:pan-y_pinch-zoom] [scrollbar-gutter:stable] pl-6 pr-[calc(var(--spacing)*6-var(--scrollbar-w))] pt-6 pb-6 [[data-slot$='-header']~&]:pt-3 [&:has(~[data-slot$='-footer'])]:pb-3 in-data-[slot=bottom-sheet-content]:pl-4 in-data-[slot=bottom-sheet-content]:pr-[calc(var(--spacing)*4-var(--scrollbar-w))] [[data-slot=bottom-sheet-handle]+&]:pt-1";
|
|
89
90
|
|
|
90
91
|
const MODAL_FOOTER =
|
|
91
|
-
"gh-stagger flex shrink-0 flex-col-reverse gap-2 px-6 pt-3 pb-6 sm:flex-row sm:justify-end";
|
|
92
|
+
"gh-stagger flex shrink-0 flex-col-reverse gap-2 px-6 pt-3 pb-6 sm:flex-row sm:justify-end in-data-[slot=bottom-sheet-content]:px-4";
|
|
92
93
|
|
|
93
94
|
export const MODAL_TITLE = "font-semibold text-foreground text-lg leading-none tracking-tight";
|
|
94
95
|
export const MODAL_DESCRIPTION = "text-muted-foreground text-sm";
|
|
@@ -68,17 +68,19 @@ export function PreviewTile(props: {
|
|
|
68
68
|
<Show when={props.caption ?? true} fallback={<span class="sr-only">{props.label}</span>}>
|
|
69
69
|
<span
|
|
70
70
|
data-slot="preview-tile-caption"
|
|
71
|
-
class="text-
|
|
71
|
+
class="text-foreground flex min-w-0 items-center gap-1 text-xs font-medium"
|
|
72
72
|
>
|
|
73
73
|
<Show when={props.icon}>
|
|
74
|
-
{(icon) =>
|
|
74
|
+
{(icon) => (
|
|
75
|
+
<Icon icon={icon()} width={12} height={12} aria-hidden="true" class="shrink-0" />
|
|
76
|
+
)}
|
|
75
77
|
</Show>
|
|
76
|
-
{props.label}
|
|
78
|
+
<span class="truncate">{props.label}</span>
|
|
77
79
|
</span>
|
|
78
80
|
<Show when={props.meta}>
|
|
79
81
|
<span
|
|
80
82
|
data-slot="preview-tile-meta"
|
|
81
|
-
class="text-muted-foreground
|
|
83
|
+
class="text-muted-foreground -mt-1 truncate text-[11px] leading-tight"
|
|
82
84
|
>
|
|
83
85
|
{props.meta}
|
|
84
86
|
</span>
|
|
@@ -31,6 +31,8 @@ const ToggleGroup: ParentComponent<
|
|
|
31
31
|
VariantProps<typeof toggleVariants> & {
|
|
32
32
|
/** CSS colour for the selected segment's glass. Default `var(--primary)`. */
|
|
33
33
|
tone?: string;
|
|
34
|
+
/** One row that scrolls sideways when it outgrows its container, instead of wrapping. */
|
|
35
|
+
scroll?: boolean;
|
|
34
36
|
}
|
|
35
37
|
> = (props) => {
|
|
36
38
|
const [local, rest] = splitProps(props, [
|
|
@@ -38,6 +40,7 @@ const ToggleGroup: ParentComponent<
|
|
|
38
40
|
"variant",
|
|
39
41
|
"size",
|
|
40
42
|
"tone",
|
|
43
|
+
"scroll",
|
|
41
44
|
"children",
|
|
42
45
|
] as const);
|
|
43
46
|
// Read `multiple` without splitting it out: Kobalte's root is a single/multiple
|
|
@@ -49,8 +52,10 @@ const ToggleGroup: ParentComponent<
|
|
|
49
52
|
data-slot="toggle-group"
|
|
50
53
|
data-variant={local.variant}
|
|
51
54
|
data-size={local.size}
|
|
55
|
+
data-scroll={local.scroll ? "" : undefined}
|
|
52
56
|
class={cn(
|
|
53
57
|
`group/toggle-group flex w-fit max-w-full flex-wrap items-center gap-y-1 rounded-lg ${TRACK_SURFACE} p-1 data-[variant=outline]:shadow-xs`,
|
|
58
|
+
local.scroll && "[scrollbar-width:none] flex-nowrap overflow-x-auto",
|
|
54
59
|
local.class,
|
|
55
60
|
)}
|
|
56
61
|
{...rest}
|
|
@@ -65,8 +70,12 @@ const ToggleGroup: ParentComponent<
|
|
|
65
70
|
activeSelector="[data-pressed]"
|
|
66
71
|
indicatorClass="rounded-md"
|
|
67
72
|
indicatorTone={local.tone}
|
|
68
|
-
wrapped
|
|
69
|
-
class=
|
|
73
|
+
wrapped={!local.scroll}
|
|
74
|
+
class={
|
|
75
|
+
local.scroll
|
|
76
|
+
? "flex w-max flex-nowrap items-center"
|
|
77
|
+
: "flex w-full flex-wrap items-center gap-y-1"
|
|
78
|
+
}
|
|
70
79
|
>
|
|
71
80
|
{local.children}
|
|
72
81
|
</SlidingIndicator>
|
package/src/styles/globals.css
CHANGED
|
@@ -450,6 +450,14 @@
|
|
|
450
450
|
.gh-alert-desc:not(:first-child) {
|
|
451
451
|
margin-top: 0.125rem;
|
|
452
452
|
}
|
|
453
|
+
[data-slot="alert"][data-size="sm"] .gh-alert-desc {
|
|
454
|
+
font-size: var(--text-xs);
|
|
455
|
+
line-height: var(--text-xs--line-height);
|
|
456
|
+
}
|
|
457
|
+
[data-slot="alert"][data-size="sm"] .gh-alert-icon-bg {
|
|
458
|
+
transform: scale(0.5);
|
|
459
|
+
transform-origin: bottom right;
|
|
460
|
+
}
|
|
453
461
|
|
|
454
462
|
/* Carousel `wipe` puts every slide in one grid cell. This is
|
|
455
463
|
* structural, so it ships as real CSS: a Tailwind arbitrary variant written in
|