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: update emoji picker toggle logic (#244)
boojack52c8ac2ad315
diff --git a/web/src/components/Editor/EmojiPicker.tsx b/web/src/components/Editor/EmojiPicker.tsxindex 7fdd97287..191c9e4d2 100644--- a/web/src/components/Editor/EmojiPicker.tsx+++ b/web/src/components/Editor/EmojiPicker.tsx@@ -1,41 +1,38 @@-import { forwardRef, useEffect } from "react";import Picker, { IEmojiPickerProps } from "emoji-picker-react";--type EmojiPickerElement = HTMLDivElement;+import { useEffect } from "react";interface Props {- isShowEmojiPicker: boolean;+ shouldShow: boolean;onEmojiClick: IEmojiPickerProps["onEmojiClick"];- handleChangeIsShowEmojiPicker: (status: boolean) => void;+ onShouldShowEmojiPickerChange: (status: boolean) => void;}-export const EmojiPicker = forwardRef<EmojiPickerElement, Props>((props: Props, ref) => {- const { isShowEmojiPicker, onEmojiClick, handleChangeIsShowEmojiPicker } = props;+export const EmojiPicker: React.FC<Props> = (props: Props) => {+ const { shouldShow, onEmojiClick, onShouldShowEmojiPickerChange } = props;useEffect(() => {- if (isShowEmojiPicker) {+ if (shouldShow) {const handleClickOutside = (event: MouseEvent) => {+ event.stopPropagation();const emojiWrapper = document.querySelector(".emoji-picker-react");const isContains = emojiWrapper?.contains(event.target as Node);if (!isContains) {- handleChangeIsShowEmojiPicker(false);+ onShouldShowEmojiPickerChange(false);}};- document.addEventListener("mousedown", handleClickOutside);- return () => {- // Unbind the event listener on clean up- document.removeEventListener("mousedown", handleClickOutside);- };++ window.addEventListener("click", handleClickOutside, {+ capture: true,+ once: true,+ });}- }, [isShowEmojiPicker]);+ }, [shouldShow]);return (- <div className="emoji-picker" ref={ref}>+ <div className={`emoji-picker ${shouldShow ? "" : "hidden"}`}><Picker onEmojiClick={onEmojiClick} disableSearchBar /></div>);-});--EmojiPicker.displayName = "EmojiPicker";+};export default EmojiPicker;diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex ae8be5cf2..796c48c4f 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -11,13 +11,23 @@ import Editor, { EditorRefActions } from "./Editor/Editor";import EmojiPicker from "./Editor/EmojiPicker";import "../less/memo-editor.less";+const getEditorContentCache = (): string => {+ return storage.get(["editorContentCache"]).editorContentCache ?? "";+};++const setEditorContentCache = (content: string) => {+ storage.set({+ editorContentCache: content,+ });+};+interface State {- isShowEmojiPicker: boolean;fullscreen: boolean;isUploadingResource: boolean;+ shouldShowEmojiPicker: boolean;}-const MemoEditor = () => {+const MemoEditor: React.FC = () => {const { t, i18n } = useTranslation();const user = useAppSelector((state) => state.user.user);const editorState = useAppSelector((state) => state.editor);@@ -25,7 +35,7 @@ const MemoEditor = () => {const [state, setState] = useState<State>({isUploadingResource: false,fullscreen: false,- isShowEmojiPicker: false,+ shouldShowEmojiPicker: false,});const editorRef = useRef<EditorRefActions>(null);const prevGlobalStateRef = useRef(editorState);@@ -182,6 +192,10 @@ const MemoEditor = () => {setEditorContentCache(content);}, []);+ const handleEmojiPickerBtnClick = () => {+ handleChangeShouldShowEmojiPicker(!state.shouldShowEmojiPicker);+ };+const handleCheckBoxBtnClick = () => {if (!editorRef.current) {return;@@ -249,10 +263,10 @@ const MemoEditor = () => {}}, []);- const handleChangeIsShowEmojiPicker = (status: boolean) => {+ const handleChangeShouldShowEmojiPicker = (status: boolean) => {setState({...state,- isShowEmojiPicker: status,+ shouldShowEmojiPicker: status,});};@@ -262,7 +276,7 @@ const MemoEditor = () => {}editorRef.current.insertText(`${emojiObject.emoji}`);- handleChangeIsShowEmojiPicker(false);+ handleChangeShouldShowEmojiPicker(false);};const isEditing = Boolean(editorState.editMemoId && editorState.editMemoId !== UNKNOWN_ID);@@ -312,13 +326,13 @@ const MemoEditor = () => {</div></div><button className="action-btn">- <Icon.CheckSquare className="icon-img" onClick={handleCheckBoxBtnClick} />+ <Icon.Smile className="icon-img" onClick={handleEmojiPickerBtnClick} /></button><button className="action-btn">- <Icon.Code className="icon-img" onClick={handleCodeBlockBtnClick} />+ <Icon.CheckSquare className="icon-img" onClick={handleCheckBoxBtnClick} /></button><button className="action-btn">- <Icon.Smile className="icon-img" onClick={() => handleChangeIsShowEmojiPicker(!state.isShowEmojiPicker)} />+ <Icon.Code className="icon-img" onClick={handleCodeBlockBtnClick} /></button><button className="action-btn"><Icon.Image className="icon-img" onClick={handleUploadFileBtnClick} />@@ -330,25 +344,13 @@ const MemoEditor = () => {</>}/>- {state.isShowEmojiPicker && (- <EmojiPicker- onEmojiClick={handleEmojiClick}- isShowEmojiPicker={state.isShowEmojiPicker}- handleChangeIsShowEmojiPicker={handleChangeIsShowEmojiPicker}- />- )}+ <EmojiPicker+ shouldShow={state.shouldShowEmojiPicker}+ onEmojiClick={handleEmojiClick}+ onShouldShowEmojiPickerChange={handleChangeShouldShowEmojiPicker}+ /></div>);};-function getEditorContentCache(): string {- return storage.get(["editorContentCache"]).editorContentCache ?? "";-}--function setEditorContentCache(content: string) {- storage.set({- editorContentCache: content,- });-}-export default MemoEditor;