sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-20 12:29:09 +02: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
client/ui/frontend/src/contexts/SettingsContext.tsx
+8 -8
View File
@@ -179,15 +179,15 @@ export const SettingsProvider = ({ children }: { children: ReactNode }) => {
[config, guiVersion, setField, saveField, saveFields, saveNow], [config, guiVersion, setField, saveField, saveFields, saveNow],
); );
return ( if (!value) {
<div className={"flex-1 min-h-0 overflow-y-auto"}> return (
{value ? ( <div className={"flex-1 min-h-0 overflow-y-auto py-8 px-7"}>
<SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>
) : (
<SettingsSkeleton /> <SettingsSkeleton />
)} </div>
</div> );
); }
return <SettingsContext.Provider value={value}>{children}</SettingsContext.Provider>;
}; };
export const AutostartSettingsProvider = ({ children }: { children: ReactNode }) => { export const AutostartSettingsProvider = ({ children }: { children: ReactNode }) => {
client/ui/frontend/src/modules/settings/SettingsPage.tsx
+25 -25
View File
@@ -45,14 +45,14 @@ export const SettingsPage = () => {
<SettingsNavigation /> <SettingsNavigation />
<AppRightPanel> <AppRightPanel>
<AutostartSettingsProvider> <AutostartSettingsProvider>
<ScrollArea.Root <SettingsProvider>
key={active} <ScrollArea.Root
type={"auto"} key={active}
className={"flex-1 min-h-0 overflow-hidden"} type={"auto"}
> className={"flex-1 min-h-0 overflow-hidden"}
<ScrollArea.Viewport className={"h-full w-full"}> >
<div className={"py-8 px-7"}> <ScrollArea.Viewport className={"h-full w-full"}>
<SettingsProvider> <div className={"py-8 px-7"}>
<VerticalTabs.Content value={"general"}> <VerticalTabs.Content value={"general"}>
<SettingsGeneral /> <SettingsGeneral />
</VerticalTabs.Content> </VerticalTabs.Content>
@@ -77,23 +77,23 @@ export const SettingsPage = () => {
<VerticalTabs.Content value={"about"}> <VerticalTabs.Content value={"about"}>
<SettingsAbout /> <SettingsAbout />
</VerticalTabs.Content> </VerticalTabs.Content>
</SettingsProvider> </div>
</div> </ScrollArea.Viewport>
</ScrollArea.Viewport> <ScrollArea.Scrollbar
<ScrollArea.Scrollbar orientation={"vertical"}
orientation={"vertical"} className={cn(
className={cn( "flex select-none touch-none transition-colors",
"flex select-none touch-none transition-colors", "w-1.5 bg-transparent py-1",
"w-1.5 bg-transparent py-1", )}
)} >
> <ScrollArea.Thumb
<ScrollArea.Thumb className={
className={ "flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700 relative"
"flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700 relative" }
} />
/> </ScrollArea.Scrollbar>
</ScrollArea.Scrollbar> </ScrollArea.Root>
</ScrollArea.Root> </SettingsProvider>
</AutostartSettingsProvider> </AutostartSettingsProvider>
</AppRightPanel> </AppRightPanel>
</VerticalTabs> </VerticalTabs>