From 893dd2c85e56115a4b93157943ce4b4d96d92810 Mon Sep 17 00:00:00 2001 From: Steven Date: Thu, 18 Jan 2024 14:52:57 +0800 Subject: [PATCH] chore: add disable filter to renderer context --- web/src/components/MemoContent/Tag.tsx | 11 +++++++++-- web/src/components/MemoContent/index.tsx | 2 ++ web/src/components/MemoContent/types/context.ts | 1 + web/src/components/MemoView.tsx | 16 +++++++++------- web/src/components/ShareMemoDialog.tsx | 2 +- web/src/pages/Home.tsx | 2 +- web/src/pages/UserProfile.tsx | 2 +- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/web/src/components/MemoContent/Tag.tsx b/web/src/components/MemoContent/Tag.tsx index 258103a0..99ccc305 100644 --- a/web/src/components/MemoContent/Tag.tsx +++ b/web/src/components/MemoContent/Tag.tsx @@ -1,3 +1,4 @@ +import classNames from "classnames"; import { useContext } from "react"; import { useFilterStore } from "@/store/module"; import { RendererContext } from "./types"; @@ -11,7 +12,7 @@ const Tag: React.FC = ({ content }: Props) => { const filterStore = useFilterStore(); const handleTagClick = () => { - if (context.readonly) { + if (context.disableFilter) { return; } @@ -24,7 +25,13 @@ const Tag: React.FC = ({ content }: Props) => { }; return ( - + #{content} ); diff --git a/web/src/components/MemoContent/index.tsx b/web/src/components/MemoContent/index.tsx index 93c043ee..7f3126ff 100644 --- a/web/src/components/MemoContent/index.tsx +++ b/web/src/components/MemoContent/index.tsx @@ -9,6 +9,7 @@ interface Props { nodes: Node[]; memoId?: number; readonly?: boolean; + disableFilter?: boolean; className?: string; onClick?: (e: React.MouseEvent) => void; } @@ -35,6 +36,7 @@ const MemoContent: React.FC = (props: Props) => { nodes, memoId, readonly: !allowEdit, + disableFilter: props.disableFilter, }} >
diff --git a/web/src/components/MemoContent/types/context.ts b/web/src/components/MemoContent/types/context.ts index 59851e5d..719b5991 100644 --- a/web/src/components/MemoContent/types/context.ts +++ b/web/src/components/MemoContent/types/context.ts @@ -5,6 +5,7 @@ interface Context { nodes: Node[]; memoId?: number; readonly?: boolean; + disableFilter?: boolean; } export const RendererContext = createContext({ diff --git a/web/src/components/MemoView.tsx b/web/src/components/MemoView.tsx index 9439a47e..c0500fd0 100644 --- a/web/src/components/MemoView.tsx +++ b/web/src/components/MemoView.tsx @@ -32,7 +32,7 @@ interface Props { memo: Memo; showCreator?: boolean; showVisibility?: boolean; - showPinnedStyle?: boolean; + showPinned?: boolean; className?: string; } @@ -166,7 +166,7 @@ const MemoView: React.FC = (props: Props) => { return (
@@ -189,7 +189,7 @@ const MemoView: React.FC = (props: Props) => { {displayTime} - {props.showPinnedStyle && memo.pinned && ( + {props.showPinned && memo.pinned && ( <> @@ -217,10 +217,12 @@ const MemoView: React.FC = (props: Props) => {
- - {memo.pinned ? : } - {memo.pinned ? t("common.unpin") : t("common.pin")} - + {props.showPinned && ( + + {memo.pinned ? : } + {memo.pinned ? t("common.unpin") : t("common.pin")} + + )} {t("common.edit")} diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx index 305a0269..55c249ae 100644 --- a/web/src/components/ShareMemoDialog.tsx +++ b/web/src/components/ShareMemoDialog.tsx @@ -112,7 +112,7 @@ const ShareMemoDialog: React.FC = (props: Props) => { > {getDateTimeString(memo.displayTime)}
- +
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 0c82e356..031c6385 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -73,7 +73,7 @@ const Home = () => {
{sortedMemos.map((memo) => ( - + ))} {isRequesting ? (
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index f72c9534..e3c695d2 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -107,7 +107,7 @@ const UserProfile = () => {
{sortedMemos.map((memo) => ( - + ))} {isRequesting ? (