Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: update dropdown component

Steven004713d4cd1c
diff --git a/web/src/components/MenuBtnsPopup.tsx b/web/src/components/MenuBtnsPopup.tsx
deleted file mode 100644
index 69b564867..000000000
--- a/web/src/components/MenuBtnsPopup.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useEffect, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import { userService } from "../services";
-import Only from "./common/OnlyWhen";
-import showAboutSiteDialog from "./AboutSiteDialog";
-import showArchivedMemoDialog from "./ArchivedMemoDialog";
-import showResourcesDialog from "./ResourcesDialog";
-import "../less/menu-btns-popup.less";
-
-interface Props {
- shownStatus: boolean;
- setShownStatus: (status: boolean) => void;
-}
-
-const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
- const { shownStatus, setShownStatus } = props;
- const { t } = useTranslation();
- const navigate = useNavigate();
- const popupElRef = useRef<HTMLDivElement>(null);
-
- useEffect(() => {
- if (shownStatus) {
- const handleClickOutside = (event: MouseEvent) => {
- if (!popupElRef.current?.contains(event.target as Node)) {
- event.stopPropagation();
- }
- setShownStatus(false);
- };
- window.addEventListener("click", handleClickOutside, {
- capture: true,
- once: true,
- });
- }
- }, [shownStatus]);
-
- const handleResourcesBtnClick = () => {
- showResourcesDialog();
- };
-
- const handleArchivedBtnClick = () => {
- showArchivedMemoDialog();
- };
-
- const handleAboutBtnClick = () => {
- showAboutSiteDialog();
- };
-
- const handleSignOutBtnClick = async () => {
- userService
- .doSignOut()
- .then(() => {
- navigate("/auth");
- })
- .catch(() => {
- // do nth
- });
- };
-
- return (
- <div className={`menu-btns-popup ${shownStatus ? "" : "hidden"}`} ref={popupElRef}>
- <Only when={!userService.isVisitorMode()}>
- <button className="btn action-btn" onClick={handleResourcesBtnClick}>
- <span className="icon">πŸŒ„</span> {t("sidebar.resources")}
- </button>
- <button className="btn action-btn" onClick={handleArchivedBtnClick}>
- <span className="icon">πŸ—‚</span> {t("sidebar.archived")}
- </button>
- </Only>
- <button className="btn action-btn" onClick={handleAboutBtnClick}>
- <span className="icon">🀠</span> {t("common.about")}
- </button>
- <Only when={!userService.isVisitorMode()}>
- <button className="btn action-btn" onClick={handleSignOutBtnClick}>
- <span className="icon">πŸ‘‹</span> {t("common.sign-out")}
- </button>
- </Only>
- </div>
- );
-};
-
-export default MenuBtnsPopup;
diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx
index e4f2878c9..b8b54e6c6 100644
--- a/web/src/components/ResourcesDialog.tsx
+++ b/web/src/components/ResourcesDialog.tsx
@@ -154,13 +154,31 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {
<span className="field-text name-text">{resource.filename}</span>
<span className="field-text">{resource.type}</span>
<div className="buttons-container">
- <Dropdown className="actions-dropdown">
- <button onClick={() => handlPreviewBtnClick(resource)}>{t("resources.preview")}</button>
- <button onClick={() => handleCopyResourceLinkBtnClick(resource)}>{t("resources.copy-link")}</button>
- <button className="delete-btn" onClick={() => handleDeleteResourceBtnClick(resource)}>
- {t("common.delete")}
- </button>
- </Dropdown>
+ <Dropdown
+ actionsClassName="!w-32"
+ actions={
+ <>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={() => handlPreviewBtnClick(resource)}
+ >
+ {t("resources.preview")}
+ </button>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={() => handleCopyResourceLinkBtnClick(resource)}
+ >
+ {t("resources.copy-link")}
+ </button>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded text-red-600 hover:bg-gray-100"
+ onClick={() => handleDeleteResourceBtnClick(resource)}
+ >
+ {t("common.delete")}
+ </button>
+ </>
+ }
+ />
</div>
</div>
))
diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx
index 592a536f8..635025b27 100644
--- a/web/src/components/Settings/MemberSection.tsx
+++ b/web/src/components/Settings/MemberSection.tsx
@@ -139,18 +139,36 @@ const PreferencesSection = () => {
{currentUser?.id === user.id ? (
<span className="tip-text">{t("common.yourself")}</span>
) : (
- <Dropdown className="actions-dropdown">
- {user.rowStatus === "NORMAL" ? (
- <button onClick={() => handleArchiveUserClick(user)}>{t("common.archive")}</button>
- ) : (
+ <Dropdown
+ actionsClassName="!w-24"
+ actions={
<>
- <button onClick={() => handleRestoreUserClick(user)}>{t("common.restore")}</button>
- <button className="delete" onClick={() => handleDeleteUserClick(user)}>
- {t("common.delete")}
- </button>
+ {user.rowStatus === "NORMAL" ? (
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={() => handleArchiveUserClick(user)}
+ >
+ {t("common.archive")}
+ </button>
+ ) : (
+ <>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={() => handleRestoreUserClick(user)}
+ >
+ {t("common.restore")}
+ </button>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded text-red-600 hover:bg-gray-100"
+ onClick={() => handleDeleteUserClick(user)}
+ >
+ {t("common.delete")}
+ </button>
+ </>
+ )}
</>
- )}
- </Dropdown>
+ }
+ />
)}
</div>
</div>
diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsx
index a97547d1c..6afa0878e 100644
--- a/web/src/components/UserBanner.tsx
+++ b/web/src/components/UserBanner.tsx
@@ -1,18 +1,23 @@
import { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
import * as utils from "../helpers/utils";
import userService from "../services/userService";
import { locationService } from "../services";
import { useAppSelector } from "../store";
import Icon from "./Icon";
-import MenuBtnsPopup from "./MenuBtnsPopup";
+import Dropdown from "./common/Dropdown";
+import Only from "./common/OnlyWhen";
+import showResourcesDialog from "./ResourcesDialog";
+import showArchivedMemoDialog from "./ArchivedMemoDialog";
+import showAboutSiteDialog from "./AboutSiteDialog";
import "../less/user-banner.less";
const UserBanner = () => {
const { t } = useTranslation();
+ const navigate = useNavigate();
const { user, owner } = useAppSelector((state) => state.user);
const { memos, tags } = useAppSelector((state) => state.memo);
- const [shouldShowPopupBtns, setShouldShowPopupBtns] = useState(false);
const [username, setUsername] = useState("Memos");
const [createdDays, setCreatedDays] = useState(0);
const isVisitorMode = userService.isVisitorMode();
@@ -34,8 +39,27 @@ const UserBanner = () => {
locationService.clearQuery();
}, []);
- const handlePopupBtnClick = () => {
- setShouldShowPopupBtns(true);
+ const handleResourcesBtnClick = () => {
+ showResourcesDialog();
+ };
+
+ const handleArchivedBtnClick = () => {
+ showArchivedMemoDialog();
+ };
+
+ const handleAboutBtnClick = () => {
+ showAboutSiteDialog();
+ };
+
+ const handleSignOutBtnClick = async () => {
+ userService
+ .doSignOut()
+ .then(() => {
+ navigate("/auth");
+ })
+ .catch(() => {
+ // do nth
+ });
};
return (
@@ -45,10 +69,39 @@ const UserBanner = () => {
<span className="username-text">{username}</span>
{!isVisitorMode && user?.role === "HOST" ? <span className="tag">MOD</span> : null}
</div>
- <button className="action-btn menu-popup-btn" onClick={handlePopupBtnClick}>
- <Icon.MoreHorizontal className="icon-img" />
- </button>
- <MenuBtnsPopup shownStatus={shouldShowPopupBtns} setShownStatus={setShouldShowPopupBtns} />
+ <Dropdown
+ trigger={<Icon.MoreHorizontal className="w-5 h-auto cursor-pointer" />}
+ actionsClassName="!w-36"
+ actions={
+ <>
+ <Only when={!userService.isVisitorMode()}>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={handleResourcesBtnClick}
+ >
+ <span className="mr-1">πŸŒ„</span> {t("sidebar.resources")}
+ </button>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={handleArchivedBtnClick}
+ >
+ <span className="mr-1">πŸ—‚</span> {t("sidebar.archived")}
+ </button>
+ </Only>
+ <button className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100" onClick={handleAboutBtnClick}>
+ <span className="mr-1">🀠</span> {t("common.about")}
+ </button>
+ <Only when={!userService.isVisitorMode()}>
+ <button
+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"
+ onClick={handleSignOutBtnClick}
+ >
+ <span className="mr-1">πŸ‘‹</span> {t("common.sign-out")}
+ </button>
+ </Only>
+ </>
+ }
+ />
</div>
<div className="amount-text-container">
<div className="status-text memos-text">
diff --git a/web/src/components/common/Dropdown.tsx b/web/src/components/common/Dropdown.tsx
index e90db05d0..477e1fec1 100644
--- a/web/src/components/common/Dropdown.tsx
+++ b/web/src/components/common/Dropdown.tsx
@@ -1,15 +1,16 @@
import { ReactNode, useEffect, useRef } from "react";
import useToggle from "../../hooks/useToggle";
import Icon from "../Icon";
-import "../../less/common/dropdown.less";
-interface DropdownProps {
- children?: ReactNode;
+interface Props {
+ trigger?: ReactNode;
+ actions?: ReactNode;
className?: string;
+ actionsClassName?: string;
}
-const Dropdown: React.FC<DropdownProps> = (props: DropdownProps) => {
- const { children, className } = props;
+const Dropdown: React.FC<Props> = (props: Props) => {
+ const { trigger, actions, className, actionsClassName } = props;
const [dropdownStatus, toggleDropdownStatus] = useToggle(false);
const dropdownWrapperRef = useRef<HTMLDivElement>(null);
@@ -28,11 +29,25 @@ const Dropdown: React.FC<DropdownProps> = (props: DropdownProps) => {
}, [dropdownStatus]);
return (
- <div ref={dropdownWrapperRef} className={`dropdown-wrapper ${className ?? ""}`} onClick={() => toggleDropdownStatus()}>
- <span className="trigger-button">
- <Icon.MoreHorizontal className="icon-img" />
- </span>
- <div className={`action-buttons-container ${dropdownStatus ? "" : "!hidden"}`}>{children}</div>
+ <div
+ ref={dropdownWrapperRef}
+ className={`relative flex flex-col justify-start items-start select-none ${className ?? ""}`}
+ onClick={() => toggleDropdownStatus()}
+ >
+ {trigger ? (
+ trigger
+ ) : (
+ <button className="flex flex-row justify-center items-center border p-1 rounded shadow text-gray-600 cursor-pointer hover:opacity-80">
+ <Icon.MoreHorizontal className="w-4 h-auto" />
+ </button>
+ )}
+ <div
+ className={`w-auto mt-1 absolute top-full right-0 flex flex-col justify-start items-start bg-white z-1 border p-1 rounded-md shadow ${
+ actionsClassName ?? ""
+ } ${dropdownStatus ? "" : "!hidden"}`}
+ >
+ {actions}
+ </div>
</div>
);
};
diff --git a/web/src/less/common/dropdown.less b/web/src/less/common/dropdown.less
deleted file mode 100644
index 02de7b3d3..000000000
--- a/web/src/less/common/dropdown.less
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "../mixin.less";
-
-.dropdown-wrapper {
- @apply relative flex flex-col justify-start items-start select-none;
-
- > .trigger-button {
- @apply flex flex-row justify-center items-center border p-1 rounded shadow text-gray-600 cursor-pointer hover:opacity-80;
-
- > .icon-img {
- @apply w-4 h-auto;
- }
- }
-
- > .action-buttons-container {
- @apply w-28 mt-1 absolute top-full right-0 flex flex-col justify-start items-start bg-white z-1 border p-1 rounded shadow;
-
- > button {
- @apply w-full text-left px-2 text-sm leading-7 rounded hover:bg-gray-100;
- }
- }
-}
diff --git a/web/src/less/menu-btns-popup.less b/web/src/less/menu-btns-popup.less
deleted file mode 100644
index 265ce707b..000000000
--- a/web/src/less/menu-btns-popup.less
+++ /dev/null
@@ -1,13 +0,0 @@
-@import "./mixin.less";
-
-.menu-btns-popup {
- @apply absolute right-2 top-6 flex flex-col justify-start items-start mt-4 p-1 w-36 rounded-lg z-10 shadow bg-white;
-
- > .btn {
- @apply flex flex-row justify-start items-center w-full py-2 px-3 text-base rounded text-left hover:bg-gray-100;
-
- > .icon {
- @apply block w-6 text-center mr-2 text-base;
- }
- }
-}
diff --git a/web/src/less/resources-dialog.less b/web/src/less/resources-dialog.less
index c5e2e7c13..bf3256a78 100644
--- a/web/src/less/resources-dialog.less
+++ b/web/src/less/resources-dialog.less
@@ -45,12 +45,6 @@
> .buttons-container {
@apply w-full flex flex-row justify-end items-center;
-
- > .actions-dropdown {
- .delete-btn {
- @apply text-red-600;
- }
- }
}
}
diff --git a/web/src/less/settings/member-section.less b/web/src/less/settings/member-section.less
index 7edf7ad3e..7328fad7a 100644
--- a/web/src/less/settings/member-section.less
+++ b/web/src/less/settings/member-section.less
@@ -52,12 +52,6 @@
> .tip-text {
@apply text-gray-400;
}
-
- > .actions-dropdown {
- .delete {
- @apply text-red-600;
- }
- }
}
}
}