Skip to content

refactor(web): adopt <DataState> in nutrition panels #1713

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 nutrition panels #1713

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
77 changes: 48 additions & 29 deletions apps/web/src/modules/nutrition/NutritionApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import {
SkeletonText,
Skeleton,
} from "@shared/components/ui/Skeleton";
import {
DataState,
type DataStateQueryLike,
} from "@shared/components/ui/DataState";
import type { NutritionDayPlan } from "./hooks/useNutritionUiState";
import { NutritionHeader } from "./components/NutritionHeader";
import { NutritionBottomNav } from "./components/NutritionBottomNav";
import { SubTabs } from "./components/SubTabs";
Expand Down Expand Up @@ -413,6 +418,27 @@ export default function NutritionApp({
toast.error("Не вдалося оновити дані. Перевір з'єднання.");
}, [toast]);

const dayPlanQuery: DataStateQueryLike<NutritionDayPlan | null> = {
data: dayPlanBusy ? undefined : dayPlan,
isLoading: dayPlanBusy,
};

const dayPlanLoadingSkeleton = (
<div className="space-y-3 motion-safe:animate-in motion-safe:fade-in">
<div className="flex items-center justify-between px-1 pb-1">
<SkeletonText shimmer className="w-32" />
<Skeleton shimmer className="w-20 h-6 rounded-full" />
</div>
{[0, 1, 2].map((i) => (
<SkeletonMealCard
key={i}
shimmer
style={{ animationDelay: `${i * 60}ms` }}
/>
))}
</div>
);

return (
<ModuleAccentProvider module="nutrition" asShellRoot>
<NutritionHeader busy={busy} onBackToHub={onBackToHub} />
Expand Down Expand Up @@ -624,36 +650,29 @@ export default function NutritionApp({
{ id: "recipes", label: "Рецепти" },
]}
/>
{menuSubTab === "plan" && dayPlanBusy ? (
<div className="space-y-3 motion-safe:animate-in motion-safe:fade-in">
<div className="flex items-center justify-between px-1 pb-1">
<SkeletonText shimmer className="w-32" />
<Skeleton shimmer className="w-20 h-6 rounded-full" />
</div>
{[0, 1, 2].map((i) => (
<SkeletonMealCard
key={i}
shimmer
style={{ animationDelay: `${i * 60}ms` }}
{menuSubTab === "plan" ? (
<DataState
query={dayPlanQuery}
skeleton={dayPlanLoadingSkeleton}
>
{() => (
<DailyPlanCard
prefs={prefs}
setPrefs={setPrefs}
pantryItems={pantry.effectiveItems}
busy={busy}
dayPlan={dayPlan}
dayPlanBusy={dayPlanBusy}
fetchDayPlan={() => fetchDayPlan(null)}
regenMeal={(mealType) => fetchDayPlan(mealType)}
addMealToLog={addMealFromPlan}
weekPlan={weekPlan}
weekPlanRaw={weekPlanRaw}
weekPlanBusy={weekPlanBusy}
fetchWeekPlan={fetchWeekPlan}
/>
))}
</div>
) : menuSubTab === "plan" ? (
<DailyPlanCard
prefs={prefs}
setPrefs={setPrefs}
pantryItems={pantry.effectiveItems}
busy={busy}
dayPlan={dayPlan}
dayPlanBusy={dayPlanBusy}
fetchDayPlan={() => fetchDayPlan(null)}
regenMeal={(mealType) => fetchDayPlan(mealType)}
addMealToLog={addMealFromPlan}
weekPlan={weekPlan}
weekPlanRaw={weekPlanRaw}
weekPlanBusy={weekPlanBusy}
fetchWeekPlan={fetchWeekPlan}
/>
)}
</DataState>
) : (
<RecipesCard
busy={busy}
Expand Down
Loading