feat: visibility click filter (#463)

* feat: visibility click filter

* update

Co-authored-by: boojack <stevenlgtm@gmail.com>
This commit is contained in:
Zeng1998 2022-11-13 21:23:40 +08:00 committed by GitHub
parent a90acdabb3
commit d208731f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 5 deletions

View File

@ -195,6 +195,15 @@ const Memo: React.FC<Props> = (props: Props) => {
editorStateService.setEditMemoWithId(memo.id);
};
const handleMemoVisibilityClick = (visibility: Visibility) => {
const currVisibilityQuery = locationService.getState().query?.visibility;
if (currVisibilityQuery === visibility) {
locationService.setMemoVisibilityQuery(undefined);
} else {
locationService.setMemoVisibilityQuery(visibility);
}
};
return (
<div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned ? "pinned" : ""}`} ref={memoContainerRef}>
{memo.pinned && <div className="corner-container"></div>}
@ -204,7 +213,12 @@ const Memo: React.FC<Props> = (props: Props) => {
{displayTimeStr}
</span>
{memo.visibility !== "PRIVATE" && !isVisitorMode && (
<span className={`status-text ${memo.visibility.toLocaleLowerCase()}`}>{memo.visibility}</span>
<span
className={`status-text ${memo.visibility.toLocaleLowerCase()}`}
onClick={() => handleMemoVisibilityClick(memo.visibility)}
>
{memo.visibility}
</span>
)}
</div>
{!isVisitorMode && (

View File

@ -9,9 +9,9 @@ import "../less/memo-filter.less";
const MemoFilter = () => {
const { t } = useTranslation();
const query = useAppSelector((state) => state.location.query);
const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query;
const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId, visibility } = query;
const shortcut = shortcutId ? shortcutService.getShortcutById(shortcutId) : null;
const showFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut);
const showFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut || visibility);
return (
<div className={`filter-query-container ${showFilter ? "" : "!hidden"}`}>
@ -40,6 +40,14 @@ const MemoFilter = () => {
>
<Icon.Box className="icon-text" /> {t(getTextWithMemoType(memoType as MemoSpecType))}
</div>
<div
className={"filter-item-container " + (visibility ? "" : "!hidden")}
onClick={() => {
locationService.setMemoVisibilityQuery(undefined);
}}
>
<Icon.Eye className="icon-text" /> {visibility}
</div>
{duration && duration.from < duration.to ? (
<div
className="filter-item-container"

View File

@ -17,9 +17,9 @@ const MemoList = () => {
const { memos, isFetching } = useAppSelector((state) => state.memo);
const [isComplete, setIsComplete] = useState<boolean>(false);
const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId } = query ?? {};
const { tag: tagQuery, duration, type: memoType, text: textQuery, shortcutId, visibility } = query ?? {};
const shortcut = shortcutId ? shortcutService.getShortcutById(shortcutId) : null;
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut);
const showMemoFilter = Boolean(tagQuery || (duration && duration.from < duration.to) || memoType || textQuery || shortcut || visibility);
const shownMemos =
showMemoFilter || shortcut
@ -65,6 +65,9 @@ const MemoList = () => {
if (textQuery && !memo.content.toLowerCase().includes(textQuery.toLowerCase())) {
shouldShow = false;
}
if (visibility) {
shouldShow = memo.visibility === visibility;
}
return shouldShow;
})

View File

@ -59,6 +59,7 @@ const locationService = {
duration: undefined,
text: undefined,
shortcutId: undefined,
visibility: undefined,
})
);
updateLocationUrl();
@ -116,6 +117,15 @@ const locationService = {
);
updateLocationUrl();
},
setMemoVisibilityQuery: (visibility?: Visibility) => {
store.dispatch(
setQuery({
visibility: visibility,
})
);
updateLocationUrl();
},
};
export default locationService;

View File

@ -11,6 +11,7 @@ export interface Query {
type?: MemoSpecType;
text?: string;
shortcutId?: ShortcutId;
visibility?: Visibility;
}
interface State {
@ -52,6 +53,7 @@ const getStateFromLocation = () => {
to,
};
}
state.query.visibility = (urlParams.get("visibility") as Visibility) ?? undefined;
}
return state;