Merge branch 'bug/tooltip-behavior' into 'main'
Add useMemo to sidebar button function to prevent unecessary remounting of components See merge request vkuchenik/website-framework!67
This commit is contained in:
@@ -9,7 +9,7 @@ import { HiUsers } from "react-icons/hi2";
|
||||
import { VscThreeBars } from "react-icons/vsc";
|
||||
import { MdOutlineSecurity } from "react-icons/md";
|
||||
import { IoPersonCircleSharp } from "react-icons/io5";
|
||||
import { useState, useEffect } from "react";
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { DASHBOARD_VIEWS } from "@/constants/viewKeys";
|
||||
|
||||
export default function Sidebar({ view, onChangeView, darkMode, setDarkMode }) {
|
||||
@@ -19,22 +19,21 @@ export default function Sidebar({ view, onChangeView, darkMode, setDarkMode }) {
|
||||
const styles = recipe();
|
||||
const { toggleColorMode } = useColorMode();
|
||||
|
||||
let buttons = [];
|
||||
// Different Sidebar Button Options for Settings View
|
||||
if (view === "settings" || view === "personal" || view === "security") {
|
||||
buttons = [
|
||||
{icon: IoPersonCircleSharp, name: "Personal Info", view: "personal"},
|
||||
{icon: MdOutlineSecurity, name: "Security", view: "security"},
|
||||
]
|
||||
} else {
|
||||
buttons = [
|
||||
const buttons = useMemo(() => {
|
||||
if (["settings", "personal", "security"].includes(view)) {
|
||||
return [
|
||||
{icon: IoPersonCircleSharp, name: "Personal Info", view: "personal"},
|
||||
{icon: MdOutlineSecurity, name: "Security", view: "security"},
|
||||
];
|
||||
}
|
||||
return [
|
||||
{icon: FaHome, name: "Home", view: "mydashboard"},
|
||||
{icon: FaGlobeAmericas, name: "Global Map", view: "global"},
|
||||
{icon: FaMapMarkerAlt, name: "Regional Map", view: "regional"},
|
||||
{icon: FaVolcano, name: "Volcano", view: "volcano"},
|
||||
{icon: HiUsers, name: "Admin", view: "admin"}
|
||||
];
|
||||
};
|
||||
}, [view]);
|
||||
|
||||
const toggleSidebar = () => {
|
||||
if (isOpen) setIsOpen(false);
|
||||
|
||||
@@ -12,4 +12,7 @@ export const VIEW_LABELS = {
|
||||
regional: "Regional Map",
|
||||
volcano: "Volcano",
|
||||
admin: "Admin",
|
||||
settings: "Settings",
|
||||
personal: "Personal Info",
|
||||
security: "Security",
|
||||
};
|
||||
Reference in New Issue
Block a user