From b92da8f123de15e626c7ecdcd921ad15a2e7270f Mon Sep 17 00:00:00 2001 From: boojack Date: Sat, 11 Feb 2023 22:54:13 +0800 Subject: [PATCH] fix: check localsetting exists (#1076) --- web/src/components/Memo.tsx | 4 ++-- web/src/components/Settings/PreferencesSection.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsx index 8d3edf49..c256a965 100644 --- a/web/src/components/Memo.tsx +++ b/web/src/components/Memo.tsx @@ -34,7 +34,6 @@ const Memo: React.FC = (props: Props) => { const locationStore = useLocationStore(); const userStore = useUserStore(); const memoStore = useMemoStore(); - const { localSetting } = userStore.state.user as User; const [displayTimeStr, setDisplayTimeStr] = useState(getFormatedMemoTimeStr(memo.displayTs, i18n.language)); const memoContainerRef = useRef(null); const isVisitorMode = userStore.isVisitorMode(); @@ -152,7 +151,8 @@ const Memo: React.FC = (props: Props) => { }; const handleMemoContentDoubleClick = (e: React.MouseEvent) => { - if (!localSetting.enableDoubleClickEditing) { + const loginUser = userStore.state.user; + if (loginUser && !loginUser.localSetting.enableDoubleClickEditing) { return; } const targetEl = e.target as HTMLElement; diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx index fa76484d..53d39f61 100644 --- a/web/src/components/Settings/PreferencesSection.tsx +++ b/web/src/components/Settings/PreferencesSection.tsx @@ -1,11 +1,11 @@ import { Select, Switch, Option } from "@mui/joy"; +import React from "react"; import { useTranslation } from "react-i18next"; import { useGlobalStore, useUserStore } from "../../store/module"; import { VISIBILITY_SELECTOR_ITEMS, MEMO_DISPLAY_TS_OPTION_SELECTOR_ITEMS } from "../../helpers/consts"; import AppearanceSelect from "../AppearanceSelect"; import LocaleSelect from "../LocaleSelect"; import "../../less/settings/preferences-section.less"; -import React from "react"; const PreferencesSection = () => { const { t } = useTranslation();