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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: remove `useListStyle` hook (#1434)
boojackfab3dac70ace
diff --git a/web/src/components/ResourceItem.tsx b/web/src/components/ResourceItem.tsxindex 164ac8c8d..8c3110157 100644--- a/web/src/components/ResourceItem.tsx+++ b/web/src/components/ResourceItem.tsx@@ -22,12 +22,12 @@ const ResourceItem = ({};return (- <div key={resource.id} className="px-2 py-2 w-full grid grid-cols-7">- <span className="w-full m-auto truncate col-span-1 justify-center">+ <div key={resource.id} className="px-2 py-2 w-full grid grid-cols-10">+ <span className="w-4 m-auto truncate justify-center"><input type="checkbox" onClick={handleSelectBtnClick}></input></span>- <span className="w-full m-auto truncate text-base pr-2 last:pr-0 col-span-1">{resource.id}</span>- <span className="w-full m-auto truncate text-base pr-2 last:pr-0 col-span-4" onClick={() => handleRenameBtnClick(resource)}>+ <span className="w-full m-auto truncate text-base pr-2 last:pr-0 col-span-2">{resource.id}</span>+ <span className="w-full m-auto truncate text-base pr-2 last:pr-0 col-span-6" onClick={() => handleRenameBtnClick(resource)}>{resource.filename}</span><div className="w-full flex flex-row justify-between items-center mb-2">diff --git a/web/src/hooks/index.ts b/web/src/hooks/index.tsindex b9e50af18..2ca0fc05c 100644--- a/web/src/hooks/index.ts+++ b/web/src/hooks/index.ts@@ -1,5 +1,4 @@export * from "./useDebounce";-export * from "./useListStyle";export * from "./useLoading";export * from "./useTimeoutFn";export * from "./useToggle";diff --git a/web/src/hooks/useListStyle.ts b/web/src/hooks/useListStyle.tsdeleted file mode 100644index 528bae369..000000000--- a/web/src/hooks/useListStyle.ts+++ /dev/null@@ -1,17 +0,0 @@-import { useState } from "react";--const useListStyle = () => {- // true is Table Style, false is Grid Style- const [listStyle, setListStyle] = useState(false);-- return {- listStyle: listStyle,- setToTableStyle: () => {- setListStyle(true);- },- setToGridStyle: () => {- setListStyle(false);- },- };-};-export default useListStyle;diff --git a/web/src/pages/ResourcesDashboard.tsx b/web/src/pages/ResourcesDashboard.tsxindex 0657de802..8e00db2e9 100644--- a/web/src/pages/ResourcesDashboard.tsx+++ b/web/src/pages/ResourcesDashboard.tsx@@ -4,7 +4,6 @@ import { useEffect, useMemo, useState } from "react";import { toast } from "react-hot-toast";import { useTranslation } from "react-i18next";import useLoading from "@/hooks/useLoading";-import useListStyle from "@/hooks/useListStyle";import { useResourceStore } from "@/store/module";import { getResourceUrl } from "@/utils/resource";import Icon from "@/components/Icon";@@ -24,9 +23,8 @@ const ResourcesDashboard = () => {const resourceStore = useResourceStore();const resources = resourceStore.state.resources;const [selectedList, setSelectedList] = useState<Array<ResourceId>>([]);- const [isVisible, setIsVisible] = useState<boolean>(false);+ const [listStyle, setListStyle] = useState<"GRID" | "TABLE">("GRID");const [queryText, setQueryText] = useState<string>("");- const { listStyle, setToTableStyle, setToGridStyle } = useListStyle();const [dragActive, setDragActive] = useState(false);useEffect(() => {@@ -41,14 +39,6 @@ const ResourcesDashboard = () => {});}, []);- useEffect(() => {- if (selectedList.length === 0) {- setIsVisible(false);- } else {- setIsVisible(true);- }- }, [selectedList]);-const handleCheckBtnClick = (resourceId: ResourceId) => {setSelectedList([...selectedList, resourceId]);};@@ -102,12 +92,8 @@ const ResourcesDashboard = () => {}};- const handleStyleChangeBtnClick = (listStyleValue: boolean) => {- if (listStyleValue) {- setToTableStyle();- } else {- setToGridStyle();- }+ const handleStyleChangeBtnClick = (listStyle: "GRID" | "TABLE") => {+ setListStyle(listStyle);setSelectedList([]);};@@ -160,7 +146,7 @@ const ResourcesDashboard = () => {resources.filter((res: Resource) => (queryText === "" ? true : res.filename.toLowerCase().includes(queryText.toLowerCase()))).map((resource) =>- listStyle ? (+ listStyle === "TABLE" ? (<ResourceItemkey={resource.id}resource={resource}@@ -241,7 +227,7 @@ const ResourcesDashboard = () => {<ResourceSearchBar setQuery={handleSearchResourceInputChange} /></div><div className="w-full flex flex-row justify-end items-center space-x-2 mt-3 z-1">- {isVisible && (+ {selectedList.length > 0 && (<Button onClick={() => handleDeleteSelectedBtnClick()} color="danger"><Icon.Trash2 className="w-4 h-auto" /></Button>@@ -273,17 +259,17 @@ const ResourcesDashboard = () => {<div className="flex rounded-lg cursor-pointer h-8 overflow-clip border dark:border-zinc-600"><divclassName={`flex justify-center items-center px-3 ${- !listStyle ? "bg-white dark:bg-zinc-700" : "bg-gray-200 dark:bg-zinc-800 opacity-60"+ listStyle === "GRID" ? "bg-white dark:bg-zinc-700" : "bg-gray-200 dark:bg-zinc-800 opacity-60"}`}- onClick={() => handleStyleChangeBtnClick(false)}+ onClick={() => handleStyleChangeBtnClick("GRID")}><Icon.Grid className="w-4 h-auto opacity-80" /></div><divclassName={`flex justify-center items-center px-3 ${- listStyle ? "bg-white dark:bg-zinc-700" : "bg-gray-200 dark:bg-zinc-800 opacity-60"+ listStyle === "TABLE" ? "bg-white dark:bg-zinc-700" : "bg-gray-200 dark:bg-zinc-800 opacity-60"}`}- onClick={() => handleStyleChangeBtnClick(true)}+ onClick={() => handleStyleChangeBtnClick("TABLE")}><Icon.List className="w-4 h-auto opacity-80" /></div>@@ -297,16 +283,16 @@ const ResourcesDashboard = () => {) : (<divclassName={- listStyle+ listStyle === "TABLE"? "flex flex-col justify-start items-start w-full": "w-full h-auto grid grid-cols-2 md:grid-cols-4 md:px-6 gap-6"}>- {listStyle && (- <div className="px-2 py-2 w-full grid grid-cols-7 border-b dark:border-b-zinc-600">- <span>{t("resources.select")}</span>- <span className="field-text id-text">ID</span>- <span className="field-text name-text">{t("resources.name")}</span>+ {listStyle === "TABLE" && (+ <div className="px-2 py-2 w-full grid grid-cols-10 border-b dark:border-b-zinc-600">+ <span></span>+ <span className="col-span-2">ID</span>+ <span className="col-span-6">{t("resources.name")}</span><span></span></div>)}