Skip to content

EM-2615: Improve custom canvas loadings #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ako-hk wants to merge 4 commits into
base: main
Choose a base branch
from
Open

EM-2615: Improve custom canvas loadings #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b24a967
feat: use customCanvasReady event
ako-hk Jan 8, 2026
3b19ad6
feat: add loading state
ako-hk Jan 8, 2026
a0d4512
fix: change the flag state
ako-hk Jan 8, 2026
ed33a34
feat: use both customCanvasReady and componentsLoad
ako-hk Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions app/components/Embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ const createClientContext = (theme?: string): Record<string, string> => {
*/
const LoadingOverlay = ({ className }: { className?: string }) => {
return (
<div
className={cn(
embeddable.loadingOverlay,
className
)}
>
<div className={cn(embeddable.loadingOverlay, className)}>
<div className="embeddable-spinner" />
<div>Loading your dashboard</div>
</div>
Expand All @@ -53,6 +48,7 @@ export default function Embeddable({
}: EmbeddableProps) {
const [isScriptLoaded, scriptError] = useEmbeddableScriptTag();
const [loadedEmbiddableKey, setLoadedEmbiddableKey] = useState<string>("");
const [loading, setLoading] = useState(true);
const [token, tokenError, tokenLoading] = useGetToken(
customCanvasState,
userEmail,
Expand All @@ -69,18 +65,25 @@ export default function Embeddable({
const handleComponentsLoad = useCallback(() => {
setLoadedEmbiddableKey(embeddableInstanceKey);
}, [embeddableInstanceKey]);
const handlecustomCanvasReady = useCallback(() => {
setLoading(false);
}, []);

useEffect(() => {
const element = ref.current;
if (element) {
element.addEventListener("componentsLoad", handleComponentsLoad);
element.addEventListener("customCanvasReady", handlecustomCanvasReady);

return () => {
element.removeEventListener("componentsLoad", handleComponentsLoad);
element.removeEventListener(
"customCanvasReady",
handlecustomCanvasReady
);
};
}
}, [handleComponentsLoad]);

}, [handleComponentsLoad, handlecustomCanvasReady]);
if (!token) {
return (
<div className="relative">
Expand All @@ -104,7 +107,7 @@ export default function Embeddable({
{/* Loading overlay - shown when components are not loaded */}
<LoadingOverlay
className={
areComponentsLoaded || !tokenLoading || isScriptLoaded
areComponentsLoaded || !tokenLoading || isScriptLoaded || !loading
? "hidden"
: "flex"
}
Expand Down