mirror of
https://github.com/CommunityOx/ox_lib.git
synced 2026-08-17 15:06:02 +01:00
feat(web/menu): menu list focus trapping
This commit is contained in:
@@ -22,17 +22,17 @@ interface DialogProps {
|
||||
cancel?: boolean;
|
||||
}
|
||||
|
||||
debugData<DialogProps>([
|
||||
{
|
||||
action: "sendAlert",
|
||||
data: {
|
||||
header: "Hello there",
|
||||
content: "General kenobi \n Markdown works",
|
||||
centered: true,
|
||||
cancel: true,
|
||||
},
|
||||
},
|
||||
]);
|
||||
// debugData<DialogProps>([
|
||||
// {
|
||||
// action: "sendAlert",
|
||||
// data: {
|
||||
// header: "Hello there",
|
||||
// content: "General kenobi \n Markdown works",
|
||||
// centered: true,
|
||||
// cancel: true,
|
||||
// },
|
||||
// },
|
||||
// ]);
|
||||
|
||||
const AlertDialog: React.FC = () => {
|
||||
const { locale } = useLocales();
|
||||
@@ -77,10 +77,7 @@ const AlertDialog: React.FC = () => {
|
||||
{locale.ui.cancel}
|
||||
</Button>
|
||||
)}
|
||||
<Button
|
||||
colorScheme={dialogData.cancel ? "blue" : undefined}
|
||||
onClick={() => closeAlert("confirm")}
|
||||
>
|
||||
<Button colorScheme={dialogData.cancel ? "blue" : undefined} onClick={() => closeAlert("confirm")}>
|
||||
{locale.ui.confirm}
|
||||
</Button>
|
||||
</AlertDialogFooter>
|
||||
|
||||
@@ -35,7 +35,7 @@ const ListItem = forwardRef<Array<HTMLDivElement | null>, Props>(({ item, index
|
||||
<Text color="#909296" textTransform="uppercase" fontSize={12} verticalAlign="middle">
|
||||
{item.label}
|
||||
</Text>
|
||||
<Text>Nice cool</Text>
|
||||
<Text>hello</Text>
|
||||
</Stack>
|
||||
<Spacer />
|
||||
<FontAwesomeIcon icon="arrows-left-right" fontSize={20} color="#909296" />
|
||||
|
||||
@@ -4,6 +4,7 @@ import { useNuiEvent } from "../../../hooks/useNuiEvent";
|
||||
import { debugData } from "../../../utils/debugData";
|
||||
import ListItem from "./ListItem";
|
||||
import Header from "./Header";
|
||||
import FocusTrap from "focus-trap-react";
|
||||
|
||||
interface MenuSettings {
|
||||
position?: "top-left" | "top-right" | "bottom-left" | "bottom-right";
|
||||
@@ -42,7 +43,7 @@ const ListMenu: React.FC = () => {
|
||||
const [visible, setVisible] = useState(false);
|
||||
const listRefs = useRef<Array<HTMLDivElement | null>>([]);
|
||||
|
||||
const moveMenu = (e: KeyboardEvent) => {
|
||||
const moveMenu = (e: React.KeyboardEvent<HTMLDivElement>) => {
|
||||
switch (e.code) {
|
||||
case "ArrowDown":
|
||||
setSelected((selected) => {
|
||||
@@ -63,12 +64,6 @@ const ListMenu: React.FC = () => {
|
||||
listRefs.current[selected]?.focus();
|
||||
}, [selected]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!visible) return document.removeEventListener("keyup", moveMenu);
|
||||
|
||||
document.addEventListener("keyup", moveMenu);
|
||||
}, [visible]);
|
||||
|
||||
useNuiEvent("setMenu", (data: MenuSettings) => {
|
||||
if (!data.position) data.position = "top-left";
|
||||
setMenu(data);
|
||||
@@ -86,6 +81,7 @@ const ListMenu: React.FC = () => {
|
||||
bg="#141517"
|
||||
position="absolute"
|
||||
fontFamily="Nunito"
|
||||
onKeyDown={(e) => moveMenu(e)}
|
||||
mt={menu.position === "top-left" || menu.position === "top-right" ? 5 : 0}
|
||||
ml={menu.position === "top-left" || menu.position === "bottom-left" ? 5 : 0}
|
||||
mr={menu.position === "top-right" || menu.position === "bottom-right" ? 5 : 0}
|
||||
@@ -95,11 +91,13 @@ const ListMenu: React.FC = () => {
|
||||
bottom={menu.position === "bottom-left" || menu.position === "bottom-right" ? 1 : undefined}
|
||||
>
|
||||
<Header title={menu.title} />
|
||||
<Stack direction="column" p={2} overflowY="scroll">
|
||||
{menu.items.map((item, index) => (
|
||||
<ListItem index={index} item={item} ref={listRefs} key={`menu-item-${index}`} />
|
||||
))}
|
||||
</Stack>
|
||||
<FocusTrap active={visible}>
|
||||
<Stack direction="column" p={2} overflowY="scroll">
|
||||
{menu.items.map((item, index) => (
|
||||
<ListItem index={index} item={item} ref={listRefs} key={`menu-item-${index}`} />
|
||||
))}
|
||||
</Stack>
|
||||
</FocusTrap>
|
||||
</Box>
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user