chore: update emoji picker toggle logic (#244)

web/src/components/Editor/EmojiPicker.tsx

@@ -1,41 +1,38 @@
-import { forwardRef, useEffect } from "react";
 import Picker, { IEmojiPickerProps } from "emoji-picker-react";
-
+import { useEffect } from "react";
-type EmojiPickerElement = HTMLDivElement;
 
 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) => {
+export const EmojiPicker: React.FC<Props> = (props: Props) => {
-  const { isShowEmojiPicker, onEmojiClick, handleChangeIsShowEmojiPicker } = 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 () => {
+      window.addEventListener("click", handleClickOutside, {
-        // Unbind the event listener on clean up
+        capture: true,
-        document.removeEventListener("mousedown", handleClickOutside);
+        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;

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);
@@ -311,15 +325,15 @@ const MemoEditor = () => {
                 )}
               </div>
             </div>
+            <button className="action-btn">
+              <Icon.Smile className="icon-img" onClick={handleEmojiPickerBtnClick} />
+            </button>
             <button className="action-btn">
               <Icon.CheckSquare className="icon-img" onClick={handleCheckBoxBtnClick} />
             </button>
             <button className="action-btn">
               <Icon.Code className="icon-img" onClick={handleCodeBlockBtnClick} />
             </button>
-            <button className="action-btn">
-              <Icon.Smile className="icon-img" onClick={() => handleChangeIsShowEmojiPicker(!state.isShowEmojiPicker)} />
-            </button>
             <button className="action-btn">
               <Icon.Image className="icon-img" onClick={handleUploadFileBtnClick} />
               <span className={`tip-text ${state.isUploadingResource ? "!block" : ""}`}>Uploading</span>
@@ -330,25 +344,13 @@ const MemoEditor = () => {
           </>
         }
       />
-      {state.isShowEmojiPicker && (
       <EmojiPicker
+        shouldShow={state.shouldShowEmojiPicker}
         onEmojiClick={handleEmojiClick}
-          isShowEmojiPicker={state.isShowEmojiPicker}
+        onShouldShowEmojiPickerChange={handleChangeShouldShowEmojiPicker}
-          handleChangeIsShowEmojiPicker={handleChangeIsShowEmojiPicker}
       />
-      )}
     </div>
   );
 };
 
-function getEditorContentCache(): string {
-  return storage.get(["editorContentCache"]).editorContentCache ?? "";
-}
-
-function setEditorContentCache(content: string) {
-  storage.set({
-    editorContentCache: content,
-  });
-}
-
 export default MemoEditor;