diff --git a/src/assets/icon/workspace/Vector.svg b/src/assets/icon/workspace/Vector.svg new file mode 100644 index 0000000..62803d8 --- /dev/null +++ b/src/assets/icon/workspace/Vector.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icon/workspace/building.svg b/src/assets/icon/workspace/building.svg new file mode 100644 index 0000000..cd3534c --- /dev/null +++ b/src/assets/icon/workspace/building.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/workspace/edit-contained.svg b/src/assets/icon/workspace/edit-contained.svg new file mode 100644 index 0000000..1420a4f --- /dev/null +++ b/src/assets/icon/workspace/edit-contained.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/workspace/message-circle-warning.svg b/src/assets/icon/workspace/message-circle-warning.svg new file mode 100644 index 0000000..ffcc22d --- /dev/null +++ b/src/assets/icon/workspace/message-circle-warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/workspace/plus.svg b/src/assets/icon/workspace/plus.svg new file mode 100644 index 0000000..a644997 --- /dev/null +++ b/src/assets/icon/workspace/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icon/workspace/search.svg b/src/assets/icon/workspace/search.svg new file mode 100644 index 0000000..06ca731 --- /dev/null +++ b/src/assets/icon/workspace/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icon/workspace/uploadImg.svg b/src/assets/icon/workspace/uploadImg.svg new file mode 100644 index 0000000..37c18ee --- /dev/null +++ b/src/assets/icon/workspace/uploadImg.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/workspace/userProfile.svg b/src/assets/icon/workspace/userProfile.svg new file mode 100644 index 0000000..4aedf75 --- /dev/null +++ b/src/assets/icon/workspace/userProfile.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icon/workspace/warning.svg b/src/assets/icon/workspace/warning.svg new file mode 100644 index 0000000..d2077bb --- /dev/null +++ b/src/assets/icon/workspace/warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx index 6b56792..57202a1 100644 --- a/src/components/common/button/Button.tsx +++ b/src/components/common/button/Button.tsx @@ -70,7 +70,7 @@ export default function Button({ {leftIcon} )} - {children} + {children} ); } diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx index 501c258..160da39 100644 --- a/src/components/common/dropdownmenu/DropdownMenu.tsx +++ b/src/components/common/dropdownmenu/DropdownMenu.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useRef, useState } from "react"; +import React, { useEffect, useId, useRef, useState } from "react"; import { twMerge } from "tailwind-merge"; export type TMenuItem = { @@ -12,13 +12,16 @@ export function DropdownMenu({ trigger, items, className, + "aria-label": ariaLabel, }: { trigger: React.ReactNode; items: TMenuItem[]; className?: string; + "aria-label"?: string; }) { const [open, setOpen] = useState(false); const ref = useRef(null); + const menuId = useId(); useEffect(() => { const onDocClick = (e: MouseEvent) => { @@ -38,7 +41,8 @@ export function DropdownMenu({ tabIndex={0} aria-haspopup="menu" aria-expanded={open} - aria-controls="dropdown-menu" + aria-controls={menuId} + aria-label={ariaLabel} onClick={() => setOpen((v) => !v)} onKeyDown={(e) => { if (e.key === "Enter" || e.key === " ") { @@ -51,9 +55,9 @@ export function DropdownMenu({ {open && (