Skip to content

Commit 7a2e355

Browse files
authored
Add shared skeleton loader primitives (#998)
1 parent 9ee5aee commit 7a2e355

3 files changed

Lines changed: 237 additions & 14 deletions

File tree

‎desktop/src/shared/styles/globals.css‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
@import "tw-animate-css";
33
@config "../../../tailwind.config.js";
44

5+
.sprout-arc-spinner {
6+
animation: sprout-arc-spinner-spin 500ms linear infinite;
7+
}
8+
9+
@keyframes sprout-arc-spinner-spin {
10+
to {
11+
transform: rotate(360deg);
12+
}
13+
}
14+
515
.buzz-emoji-mart {
616
align-items: stretch;
717
display: flex;
@@ -837,6 +847,121 @@
837847
}
838848
}
839849

850+
:root {
851+
--skel-pulse-dur: 1000ms;
852+
--skel-pulse-count: infinite;
853+
--skel-pulse-min: 0.5;
854+
--skel-reveal-dur: 400ms;
855+
--skel-reveal-blur: 2px;
856+
--skel-reveal-ease: ease-in-out;
857+
}
858+
859+
.t-skel {
860+
position: relative;
861+
}
862+
863+
.t-skel[data-layout="flow"] {
864+
display: grid;
865+
}
866+
867+
.t-skel-skeleton,
868+
.t-skel-content {
869+
inset: 0;
870+
position: absolute;
871+
}
872+
873+
.t-skel[data-layout="flow"] > .t-skel-skeleton,
874+
.t-skel[data-layout="flow"] > .t-skel-content {
875+
grid-area: 1 / 1;
876+
width: 100%;
877+
}
878+
879+
.t-skel[data-layout="flow"] > .t-skel-skeleton {
880+
inset: auto;
881+
position: relative;
882+
}
883+
884+
.t-skel[data-layout="flow"] > .t-skel-content,
885+
.t-skel[data-layout="flow"].is-revealed > .t-skel-skeleton {
886+
inset: 0;
887+
position: absolute;
888+
}
889+
890+
.t-skel[data-layout="flow"].is-revealed > .t-skel-content {
891+
inset: auto;
892+
position: relative;
893+
}
894+
895+
.t-skel-skeleton {
896+
filter: blur(0);
897+
opacity: 1;
898+
transition:
899+
opacity var(--skel-reveal-dur) var(--skel-reveal-ease),
900+
filter var(--skel-reveal-dur) var(--skel-reveal-ease);
901+
z-index: 1;
902+
}
903+
904+
.t-skel-content {
905+
filter: blur(var(--skel-reveal-blur));
906+
opacity: 0;
907+
pointer-events: none;
908+
transition:
909+
opacity var(--skel-reveal-dur) var(--skel-reveal-ease),
910+
filter var(--skel-reveal-dur) var(--skel-reveal-ease);
911+
z-index: 2;
912+
}
913+
914+
.t-skel.is-revealed .t-skel-skeleton {
915+
filter: blur(var(--skel-reveal-blur));
916+
opacity: 0;
917+
pointer-events: none;
918+
}
919+
920+
.t-skel.is-revealed .t-skel-content {
921+
filter: blur(0);
922+
opacity: 1;
923+
pointer-events: auto;
924+
}
925+
926+
.t-skel.is-resetting .t-skel-skeleton,
927+
.t-skel.is-resetting .t-skel-content {
928+
transition: none;
929+
}
930+
931+
.t-skel-bar.is-pulsing,
932+
.t-skel-skeleton.is-pulsing > :not(:has(.t-skel-bar)) {
933+
animation: t-skel-pulse var(--skel-pulse-dur) ease-in-out
934+
var(--skel-pulse-count);
935+
}
936+
937+
.t-skel.is-revealed .t-skel-bar.is-pulsing,
938+
.t-skel.is-revealed .t-skel-skeleton.is-pulsing > :not(:has(.t-skel-bar)) {
939+
animation: none;
940+
}
941+
942+
@keyframes t-skel-pulse {
943+
0%,
944+
100% {
945+
opacity: 1;
946+
}
947+
948+
50% {
949+
opacity: var(--skel-pulse-min);
950+
}
951+
}
952+
953+
@media (prefers-reduced-motion: reduce) {
954+
.t-skel-skeleton,
955+
.t-skel-content {
956+
transition: none;
957+
}
958+
959+
.t-skel-bar.is-pulsing,
960+
.t-skel-skeleton.is-pulsing > :not(:has(.t-skel-bar)) {
961+
animation: none;
962+
}
963+
}
964+
840965
@layer components {
841966
.buzz-startup-shell {
842967
min-height: 100dvh;

‎desktop/src/shared/ui/skeleton.tsx‎

Lines changed: 89 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,99 @@
1+
import * as React from "react";
2+
13
import { cn } from "@/shared/lib/cn";
24

3-
function Skeleton({
5+
type SkeletonProps = React.HTMLAttributes<HTMLDivElement> & {
6+
pulsing?: boolean;
7+
};
8+
9+
function Skeleton({ className, pulsing = true, ...props }: SkeletonProps) {
10+
return (
11+
<div
12+
aria-hidden="true"
13+
className={cn(
14+
"t-skel-bar rounded-md bg-primary/10",
15+
pulsing && "is-pulsing",
16+
className,
17+
)}
18+
{...props}
19+
/>
20+
);
21+
}
22+
23+
type SkeletonRevealProps = React.HTMLAttributes<HTMLDivElement> & {
24+
contentClassName?: string;
25+
layout?: "absolute" | "flow";
26+
loading: boolean;
27+
skeleton: React.ReactNode;
28+
skeletonClassName?: string;
29+
};
30+
31+
function SkeletonReveal({
32+
children,
433
className,
34+
contentClassName,
35+
layout = "flow",
36+
loading,
37+
skeleton,
38+
skeletonClassName,
539
...props
6-
}: React.HTMLAttributes<HTMLDivElement>) {
40+
}: SkeletonRevealProps) {
41+
const rootRef = React.useRef<HTMLDivElement>(null);
42+
const previousLoadingRef = React.useRef(loading);
43+
const [isResetting, setIsResetting] = React.useState(false);
44+
45+
React.useLayoutEffect(() => {
46+
const wasLoading = previousLoadingRef.current;
47+
previousLoadingRef.current = loading;
48+
49+
if (!loading || wasLoading) return;
50+
51+
setIsResetting(true);
52+
rootRef.current?.getBoundingClientRect();
53+
54+
const reset = () => setIsResetting(false);
55+
const frameId = globalThis.requestAnimationFrame
56+
? globalThis.requestAnimationFrame(reset)
57+
: globalThis.setTimeout(reset, 0);
58+
59+
return () => {
60+
if (typeof frameId === "number") {
61+
if (globalThis.cancelAnimationFrame) {
62+
globalThis.cancelAnimationFrame(frameId);
63+
} else {
64+
globalThis.clearTimeout(frameId);
65+
}
66+
}
67+
};
68+
}, [loading]);
69+
770
return (
871
<div
9-
className={cn("animate-pulse rounded-md bg-primary/10", className)}
72+
className={cn(
73+
"t-skel",
74+
!loading && "is-revealed",
75+
isResetting && "is-resetting",
76+
className,
77+
)}
78+
data-layout={layout}
79+
data-state={loading ? "loading" : "loaded"}
80+
ref={rootRef}
1081
{...props}
11-
/>
82+
>
83+
<div
84+
aria-hidden="true"
85+
className={cn("t-skel-skeleton is-pulsing", skeletonClassName)}
86+
>
87+
{skeleton}
88+
</div>
89+
<div
90+
aria-hidden={loading}
91+
className={cn("t-skel-content", contentClassName)}
92+
>
93+
{children}
94+
</div>
95+
</div>
1296
);
1397
}
1498

15-
export { Skeleton };
99+
export { Skeleton, SkeletonReveal };

‎desktop/src/shared/ui/spinner.tsx‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
1-
import { Loader2 } from "lucide-react";
1+
import type * as React from "react";
22

33
import { cn } from "@/shared/lib/cn";
44

5-
type SpinnerProps = React.ComponentPropsWithoutRef<"svg"> & {
5+
type SpinnerProps = React.ComponentPropsWithoutRef<"span"> & {
66
className?: string;
7-
size?: number;
7+
size?: number | string;
88
};
99

1010
export function Spinner({
11+
children,
1112
className,
1213
size,
1314
role = "status",
1415
"aria-label": ariaLabel = "Loading",
16+
"aria-hidden": ariaHidden,
17+
style,
1518
...rest
1619
}: SpinnerProps) {
20+
const isDecorative = ariaHidden === true || ariaHidden === "true";
21+
1722
return (
18-
<Loader2
19-
className={cn("animate-spin", className)}
20-
size={size}
21-
role={role}
22-
aria-label={ariaLabel}
23+
<span
24+
aria-hidden={ariaHidden}
25+
className={cn(
26+
"sprout-arc-spinner inline-block h-6 w-6 shrink-0 rounded-full border-4 border-current/10 border-t-current",
27+
className,
28+
)}
29+
role={isDecorative ? undefined : role}
30+
style={{
31+
...(size === undefined ? null : { height: size, width: size }),
32+
...style,
33+
}}
2334
{...rest}
24-
/>
35+
>
36+
{children}
37+
{isDecorative ? null : <span className="sr-only">{ariaLabel}</span>}
38+
</span>
2539
);
2640
}

0 commit comments

Comments
 (0)