brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

Browse source
This commit is contained in:
csawatzky 2025-03-28 15:54:29 -06:00
commit 6f0921bf95
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bin/BinYards.tsx
View file

@ -547,7 +547,7 @@ export default function BinYard(props: Props) {
<ListItemText secondary="Share Yard" />
</MenuItem>
)}
<MenuItem
{/* <MenuItem
onClick={() => {
moveLeft(yardIndex);
setMenuAnchorEl(null);
@ -570,7 +570,7 @@ export default function BinYard(props: Props) {
<KeyboardArrowRightIcon />
</ListItemIcon>
<ListItemText secondary="Move Right" />
</MenuItem>
</MenuItem> */}
{permissions.includes(pond.Permission.PERMISSION_USERS) && (
<MenuItem
onClick={() => {

14
src/common/DraggableTabs.tsx
View file

@ -1,6 +1,6 @@
import { Tabs, TabsProps } from "@mui/material";
import { darken, Tabs, TabsProps } from "@mui/material";
import React, { useEffect, useState, useRef } from "react";
import AnimatedTabs from "./AnimatedTabs";
// import AnimatedTabs from "./AnimatedTabs";
interface DraggableTabsProps extends TabsProps {
children: React.ReactNode;
@ -96,6 +96,13 @@ export default function DraggableTabs(props: DraggableTabsProps) {
onDragStart: (e: React.DragEvent<HTMLDivElement>) => handleDragStart(e, currentIndex),
onDragOver: (e: React.DragEvent<HTMLDivElement>) => handleDragOver(e, currentIndex),
onDrop: handleDrop,
style: {
...(hoveredIndex === currentIndex && {
background: "rgba(150, 150, 150, 0.1)",
border: "1px double blue",
borderStyle: "hidden hidden hidden dotted",
}),
},
});
}
return child;
@ -104,5 +111,6 @@ export default function DraggableTabs(props: DraggableTabsProps) {
const orderedChildren = tabOrder.map((index) => enhancedChildren[index]);
const allTabs = [...startTabs, ...orderedChildren, ...endTabs];
return <AnimatedTabs {...tabsProps} value={selectedValue}>{allTabs}</AnimatedTabs>;
// return <AnimatedTabs {...tabsProps} value={selectedValue}>{allTabs}</AnimatedTabs>;
return <Tabs {...tabsProps} value={selectedValue}>{allTabs}</Tabs>;
}