sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-18 20:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix settings provider order

Browse Source
This commit is contained in:
Eduard Gert
2026-06-11 14:34:20 +02:00
parent 0d950d46f3
commit 13b4bf93b9
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/ui/frontend/src/contexts/SettingsContext.tsx
View File

@@ -179,15 +179,15 @@ export const SettingsProvider = ({ children }: { children: ReactNode }) => {
[config, guiVersion, setField, saveField, saveFields, saveNow],
);
return (
<div className={"flex-1 min-h-0 overflow-y-auto"}>
{value ? (
<SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>
) : (
if (!value) {
return (
<div className={"flex-1 min-h-0 overflow-y-auto py-8 px-7"}>
<SettingsSkeleton />
)}
</div>
);
</div>
);
}
return <SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>;
};
export const AutostartSettingsProvider = ({ children }: { children: ReactNode }) => {

50
client/ui/frontend/src/modules/settings/SettingsPage.tsx
View File

@@ -45,14 +45,14 @@ export const SettingsPage = () => {
<SettingsNavigation />
<AppRightPanel>
<AutostartSettingsProvider>
<ScrollArea.Root
key={active}
type={"auto"}
className={"flex-1 min-h-0 overflow-hidden"}
>
<ScrollArea.Viewport className={"h-full w-full"}>
<div className={"py-8 px-7"}>
<SettingsProvider>
<SettingsProvider>
<ScrollArea.Root
key={active}
type={"auto"}
className={"flex-1 min-h-0 overflow-hidden"}
>
<ScrollArea.Viewport className={"h-full w-full"}>
<div className={"py-8 px-7"}>
<VerticalTabs.Content value={"general"}>
<SettingsGeneral />
</VerticalTabs.Content>
@@ -77,23 +77,23 @@ export const SettingsPage = () => {
<VerticalTabs.Content value={"about"}>
<SettingsAbout />
</VerticalTabs.Content>
</SettingsProvider>
</div>
</ScrollArea.Viewport>
<ScrollArea.Scrollbar
orientation={"vertical"}
className={cn(
"flex select-none touch-none transition-colors",
"w-1.5 bg-transparent py-1",
)}
>
<ScrollArea.Thumb
className={
"flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700 relative"
}
/>
</ScrollArea.Scrollbar>
</ScrollArea.Root>
</div>
</ScrollArea.Viewport>
<ScrollArea.Scrollbar
orientation={"vertical"}
className={cn(
"flex select-none touch-none transition-colors",
"w-1.5 bg-transparent py-1",
)}
>
<ScrollArea.Thumb
className={
"flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700 relative"
}
/>
</ScrollArea.Scrollbar>
</ScrollArea.Root>
</SettingsProvider>
</AutostartSettingsProvider>
</AppRightPanel>
</VerticalTabs>