changed the swipeable drawer to use a different variant when closed so the faded background doesn't linger
This commit is contained in:
parent
4c8664841f
commit
2c4aceb13c
4 changed files with 22 additions and 24 deletions
|
|
@ -129,7 +129,6 @@ export default function Header(props: Props) {
|
|||
<HeaderButtons hasTeams={hasTeams} team={team} user={user} />
|
||||
</Box>
|
||||
</Toolbar>
|
||||
|
||||
</AppBar>
|
||||
<SideNavigator open={navOpen} onOpen={() => {setNavOpen(true)}} onClose={() => {setNavOpen(false)}} />
|
||||
{isMobile && <BottomNavigator setNavOpen={() => {setNavOpen(true)}} sideIsOpen={navOpen} />}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ export default function DraggableTabs(props: DraggableTabsProps) {
|
|||
const { startNode, endNode, children, ...tabsProps } = props;
|
||||
const [selectedValue, setSelectedValue] = useState<any>(tabsProps.value);
|
||||
const initialChildren = React.Children.toArray(children);
|
||||
// const [tabOrder, setTabOrder] = useState<number[]>([]);
|
||||
const [hoveredIndex, setHoveredIndex] = useState<number>(-1); // Track hovered tab
|
||||
const tabRefs = useRef<(HTMLDivElement | null)[]>([]); // Refs for each tab
|
||||
const [{ as, user }] = useGlobalState()
|
||||
|
|
@ -30,21 +29,20 @@ export default function DraggableTabs(props: DraggableTabsProps) {
|
|||
// Get tab order from cache
|
||||
const [tabOrder, setTabOrder] = useState<number[]>(() => {
|
||||
const storedValue = localStorage.getItem(cacheKey);
|
||||
console.log(storedValue)
|
||||
console.log(JSON.parse(storedValue!))
|
||||
console.log(storedValue !== null)
|
||||
return storedValue !== null ? JSON.parse(storedValue) : [];
|
||||
});
|
||||
|
||||
// save tab order to cache when it changes
|
||||
useEffect(() => {
|
||||
console.log(tabOrder)
|
||||
// console.log(initialChildren.length)
|
||||
localStorage.setItem(cacheKey, JSON.stringify(tabOrder));
|
||||
}, [tabOrder]);
|
||||
|
||||
useEffect(() => {
|
||||
const newOrder = initialChildren.map((_, index) => index);
|
||||
if (tabOrder.length < 1) setTabOrder(newOrder);
|
||||
// const oddOnesOut = newOrder.filter(item => !tabOrder.includes(item))
|
||||
// setTabOrder([...oddOnesOut, ...tabOrder])
|
||||
tabRefs.current = new Array(newOrder.length).fill(null); // Initialize refs
|
||||
}, [initialChildren.length]);
|
||||
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ export default function SideNavigator(props: Props) {
|
|||
</ListItemButton>
|
||||
</Tooltip>
|
||||
)}
|
||||
{(IsOmniAir || user.hasFeature("admin")) && (
|
||||
{(IsOmniAir() || user.hasFeature("admin")) && (
|
||||
<Tooltip title="Aviation Map" placement="right">
|
||||
<ListItemButton
|
||||
id="tour-aviation-map"
|
||||
|
|
@ -258,7 +258,8 @@ export default function SideNavigator(props: Props) {
|
|||
|
||||
return (
|
||||
<SwipeableDrawer
|
||||
variant={width === "xs" || width === "sm" ? "temporary" : "permanent"}
|
||||
// variant={width === "xs" || width === "sm" ? "temporary" : "permanent"}
|
||||
variant={!open ? "permanent" : width === "xs" || width === "sm" ? "temporary" : "permanent"}
|
||||
classes={{
|
||||
paper: classNames(
|
||||
classes.sideMenu,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue