Merge branch 'feat/emoji' into feat/gw7782-use-modal-to-emojiPicker

packages/app/src/components/PageEditor/EmojiPicker.tsx

@@ -1,9 +1,8 @@
 import React, { FC } from 'react';
-
 import { Picker } from 'emoji-mart';
 import i18n from 'i18next';
 import { Modal } from 'reactstrap';
-
+import { isDarkMode } from '~/client/util/color-scheme';
 import EmojiPickerHelper from './EmojiPickerHelper';
 
 type Props = {
@@ -83,6 +82,8 @@ const EmojiPicker: FC<Props> = (props: Props) => {
   };
 
   const translation = getEmojiTranslation();
+  const theme = isDarkMode() ? 'dark' : 'light';
+
   return (
     <Modal isOpen={isOpen} toggle={onClose} onOpened={searchEmoji}>
       <Picker
@@ -91,6 +92,7 @@ const EmojiPicker: FC<Props> = (props: Props) => {
         title={translation.title}
         emojiTooltip
         style={{ position: 'absolute' }}
+        theme={theme}
       />
     </Modal>
   );