Skip to content

refactor(web): adopt <DataState> in routine panels #1714

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

Merged
Skords-01 merged 1 commit into from
May 4, 2026
Merged

refactor(web): adopt <DataState> in routine panels #1714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 29 additions & 14 deletions apps/web/src/modules/routine/RoutineTimeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*/

import { Banner } from "@shared/components/ui/Banner";
import {
DataState,
type DataStateQueryLike,
} from "@shared/components/ui/DataState";
import { PullToRefresh } from "@shared/components/ui/PullToRefresh";
import { SectionErrorBoundary } from "@shared/components/ui/SectionErrorBoundary";
import { SkeletonHabitRow } from "@shared/components/ui/Skeleton";
Expand Down Expand Up @@ -46,6 +50,25 @@ export function RoutineTimeline({
onPullRefresh,
onPullRefreshError,
}: RoutineTimelineProps) {
const calendarBusy = isHabitPending && mainTab === "calendar";
const calendarQuery: DataStateQueryLike<true> = {
data: calendarBusy ? undefined : (true as const),
isLoading: calendarBusy,
};

const calendarLoadingSkeleton = (
<div className="px-4 pt-2 space-y-2 motion-safe:animate-pulse">
{[0, 1, 2, 3].map((i) => (
<SkeletonHabitRow
key={i}
shimmer
module="routine"
style={{ animationDelay: `${i * 40}ms` }}
/>
))}
</div>
);

return (
<div className="flex-1 overflow-hidden flex flex-col min-h-0">
<PullToRefresh
Expand Down Expand Up @@ -84,20 +107,12 @@ export function RoutineTimeline({
actions={calendarActions}
>
<SectionErrorBoundary title="Не вдалось показати «Календар»">
{isHabitPending && mainTab === "calendar" ? (
<div className="px-4 pt-2 space-y-2 motion-safe:animate-pulse">
{[0, 1, 2, 3].map((i) => (
<SkeletonHabitRow
key={i}
shimmer
module="routine"
style={{ animationDelay: `${i * 40}ms` }}
/>
))}
</div>
) : (
<RoutineCalendarPanel hidden={mainTab !== "calendar"} />
)}
<DataState
query={calendarQuery}
skeleton={calendarLoadingSkeleton}
>
{() => <RoutineCalendarPanel hidden={mainTab !== "calendar"} />}
</DataState>
</SectionErrorBoundary>
</RoutineCalendarProvider>

Expand Down
Loading