Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 28 additions & 35 deletions components/course/course-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,48 +49,41 @@ export function CourseSidebar({
const { course, stages } = useCourseStore();
const { slug } = useParams<{ slug: string }>();

const [extensionGroups, setExtensionGroups] = React.useState<
ExtensionGroup[]
>([]);
const [loading, setLoading] = React.useState<boolean>(true);

const { data: extensions = [], isLoading: extensionsLoading } =
useExtensions(slug);

React.useEffect(() => {
if (!extensionsLoading) {
try {
const grouped = stages.reduce<ExtensionGroup[]>((groups, stage) => {
if (stage.stage.extension_slug) {
const extension = extensions.find(
(ext) => ext.slug === stage.stage.extension_slug,
);
const existingGroup = groups.find(
(g) => g.slug === stage.stage.extension_slug,
);

if (existingGroup) {
existingGroup.stages.push(stage);
} else {
groups.push({
title: extension?.name || "Extension",
slug: stage.stage.extension_slug,
stages: [stage],
});
}
const extensionGroups = React.useMemo(() => {
if (extensionsLoading) return [];
try {
return stages.reduce<ExtensionGroup[]>((groups, stage) => {
if (stage.stage.extension_slug) {
const extension = extensions.find(
(ext) => ext.slug === stage.stage.extension_slug,
);
const existingGroup = groups.find(
(g) => g.slug === stage.stage.extension_slug,
);

if (existingGroup) {
existingGroup.stages.push(stage);
} else {
groups.push({
title: extension?.name || "Extension",
slug: stage.stage.extension_slug,
stages: [stage],
});
}
return groups;
}, []);

setExtensionGroups(grouped);
setLoading(false);
} catch (err) {
console.error(err);
setLoading(false);
}
}
return groups;
}, []);
} catch (err) {
console.error(err);
return [];
}
}, [extensionsLoading, extensions, stages]);

const loading = extensionsLoading;

const baseStages = stages.filter((stage) => !stage.stage.extension_slug);

if (loading) return <Loading message="Loading extensions..." />;
Expand Down
3 changes: 2 additions & 1 deletion components/stage/overlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export default function Overlay({
const { currentIndex, backIndex, backDirection } = useNavigation();

useEffect(() => {
setIsVisible(visible);
const id = setTimeout(() => setIsVisible(visible), 0);
return () => clearTimeout(id);
}, [visible]);

if (!isVisible || currentIndex === backIndex) {
Expand Down
12 changes: 8 additions & 4 deletions hooks/use-mobile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@ import * as React from "react"
const MOBILE_BREAKPOINT = 768

export function useIsMobile() {
const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
const [isMobile, setIsMobile] = React.useState<boolean>(() => {
if (typeof window !== "undefined") {
return window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`).matches
}
return false
})

React.useEffect(() => {
const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
const onChange = () => {
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
setIsMobile(mql.matches)
}
mql.addEventListener("change", onChange)
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
return () => mql.removeEventListener("change", onChange)
}, [])

return !!isMobile
return isMobile
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"clsx": "^2.1.1",
"lightningcss": "^1.30.1",
"lucide-react": "^1.7.0",
"next": "16.2.3",
"next": "16.2.4",
"next-themes": "^0.4.6",
"pg": "^8.16.2",
"react": "19.2.5",
Expand Down
Loading