YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: editor resource list (#445)

Browse Source
This commit is contained in:
boojack
2022-11-12 09:04:26 +08:00
committed by GitHub
parent 79af7e8abf
commit d1aa6aa7f8
7 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/src/components/MemoEditor.tsx
View File

@ -40,8 +40,8 @@ interface State {
const MemoEditor: React.FC = () => {
const { t, i18n } = useTranslation();
const user = useAppSelector((state) => state.user.user);
const { setting } = useAppSelector((state) => state.user.user as User);
const user = useAppSelector((state) => state.user.user as User);
const setting = user.setting;
const editorState = useAppSelector((state) => state.editor);
const tags = useAppSelector((state) => state.memo.tags);
const [state, setState] = useState<State>({
@ -85,33 +85,29 @@ const MemoEditor: React.FC = () => {
}, [editorState.markMemoId]);
useEffect(() => {
if (
editorState.editMemoId &&
editorState.editMemoId !== UNKNOWN_ID &&
editorState.editMemoId !== prevGlobalStateRef.current.editMemoId
) {
if (editorState.editMemoId) {
memoService.getMemoById(editorState.editMemoId ?? UNKNOWN_ID).then((memo) => {
if (memo) {
setState({
...state,
resourceList: memo.resourceList,
});
handleEditorFocus();
editorStateService.setMemoVisibility(memo.visibility);
editorRef.current?.setContent(memo.content ?? "");
editorRef.current?.focus();
setState((state) => {
return {
...state,
resourceList: memo.resourceList,
};
});
}
});
}
prevGlobalStateRef.current = editorState;
if (editorState.editMemoId) {
storage.set({
editingMemoIdCache: editorState.editMemoId,
});
} else {
storage.remove(["editingMemoIdCache"]);
}
}, [state, editorState.editMemoId]);
prevGlobalStateRef.current = editorState;
}, [editorState.editMemoId]);
const handleKeyDown = (event: React.KeyboardEvent) => {
if (event.key === "Escape" && state.fullscreen) {
@ -241,7 +237,6 @@ const MemoEditor: React.FC = () => {
fullscreen: false,
resourceList: [],
});
editorStateService.setMemoVisibility(setting.memoVisibility);
setEditorContentCache("");
storage.remove(["editingMemoVisibilityCache"]);
editorRef.current?.setContent("");
@ -338,7 +333,7 @@ const MemoEditor: React.FC = () => {
const handleTagSeletorClick = useCallback((event: React.MouseEvent) => {
if (tagSeletorRef.current !== event.target && tagSeletorRef.current?.contains(event.target as Node)) {
editorRef.current?.insertText(`#${(event.target as HTMLElement).textContent} ` ?? "");
editorRef.current?.focus();
handleEditorFocus();
}
}, []);