From 95bbe221956a65fb2e2b35c83f2857e220cdac30 Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 11 Jan 2025 12:04:14 -0700 Subject: [PATCH] Removing react child trick because it does not always work. --- app/src/components/Nav.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/components/Nav.js b/app/src/components/Nav.js index 5fc50ad8..04f171e2 100644 --- a/app/src/components/Nav.js +++ b/app/src/components/Nav.js @@ -2,7 +2,7 @@ import React from "react"; import {Link, NavLink} from "react-router-dom"; import {Dropdown, Icon as SIcon, Menu} from "semantic-ui-react"; import {Media, SettingsContext, StatusContext, ThemeContext} from "../contexts/contexts"; -import {DarkModeToggle, HotspotStatusIcon, isReactChildNull, useLocalStorage} from "./Common"; +import {DarkModeToggle, HotspotStatusIcon, useLocalStorage} from "./Common"; import {ShareButton} from "./Share"; import {useCPUTemperature, useIOStats, useLoad, useMemoryStats, usePowerStats, useWROLMode} from "../hooks/customHooks"; import {SearchIconButton} from "./Search"; @@ -60,15 +60,12 @@ function MenuLink({link}) { } function NavIconWrapper({children}) { - // Do not add margins around empty react element to avoid filling up navbar. - let emptyChild = false; - try { - emptyChild = !children || isReactChildNull(children); - } catch (e) { - console.debug('Failed to get children of react element'); + if (children) { + return
{children}
+ } else { + // Do not use navbar space if children is empty. + return } - const style = emptyChild ? {} : {marginTop: '0.8em', marginLeft: '1.5em'}; - return
{children}
} function useNavColorSetting() {