WIP

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

app/soapbox/features/account-gallery/components/media-item.tsx

@@ -103,7 +103,7 @@ const MediaItem: React.FC<IMediaItem> = ({ attachment, onOpenMedia }) => {
   } else if (attachment.type === 'audio') {
     const remoteURL = attachment.remote_url || '';
     const fileExtensionLastIndex = remoteURL.lastIndexOf('.');
-    const fileExtension = remoteURL.substr(fileExtensionLastIndex + 1).toUpperCase();
+    const fileExtension = remoteURL.slice(fileExtensionLastIndex + 1).toUpperCase();
     thumbnail = (
       <div className='media-gallery__item-thumbnail'>
         <span className='media-gallery__item__icons'><Icon src={require('@tabler/icons/volume.svg')} /></span>

app/soapbox/features/emoji/components/emoji-picker-dropdown.tsx

@@ -1,17 +1,21 @@
 import { supportsPassiveEvents } from 'detect-passive-events';
+import { Map as ImmutableMap } from 'immutable';
 import React, { useEffect, useState, useLayoutEffect } from 'react';
 import { createPortal } from 'react-dom';
 import { defineMessages, useIntl } from 'react-intl';
 import { usePopper } from 'react-popper';
+import { createSelector } from 'reselect';
 
-import { useSettings } from 'soapbox/hooks';
+import { useEmoji } from 'soapbox/actions/emojis';
+import { changeSetting } from 'soapbox/actions/settings';
+import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks';
 import { isMobile } from 'soapbox/is-mobile';
+import { RootState } from 'soapbox/store';
 
 import { buildCustomEmojis } from '../../emoji';
 import { EmojiPicker as EmojiPickerAsync } from '../../ui/util/async-components';
 
 import type { EmojiPick } from 'emoji-mart';
-import type { List } from 'immutable';
 import type { Emoji, CustomEmoji, NativeEmoji } from 'soapbox/features/emoji';
 
 let EmojiPicker: any; // load asynchronously
@@ -43,17 +47,73 @@ export const messages = defineMessages({
   skins_6: { id: 'emoji_button.skins_6', defaultMessage: 'Dark' },
 });
 
-// TODO: fix types
-interface IEmojiPickerDropdown {
-  custom_emojis: List<any>
-  frequentlyUsedEmojis: string[]
-  intl: any
-  onPickEmoji: (emoji: Emoji) => void
-  onSkinTone: () => void
-  condensed: boolean
-  render: any
+export interface IEmojiPickerDropdown {
+  onPickEmoji?: (emoji: Emoji) => void
+  condensed?: boolean
+  render: React.FC<{
+    setPopperReference: React.Ref<HTMLButtonElement>
+    title?: string
+    visible?: boolean
+    loading?: boolean
+    handleToggle: (e: Event) => void
+  }>
 }
 
+const perLine = 8;
+const lines   = 2;
+
+const DEFAULTS = [
+  '+1',
+  'grinning',
+  'kissing_heart',
+  'heart_eyes',
+  'laughing',
+  'stuck_out_tongue_winking_eye',
+  'sweat_smile',
+  'joy',
+  'yum',
+  'disappointed',
+  'thinking_face',
+  'weary',
+  'sob',
+  'sunglasses',
+  'heart',
+  'ok_hand',
+];
+
+export const getFrequentlyUsedEmojis = createSelector([
+  (state: RootState) => state.settings.get('frequentlyUsedEmojis', ImmutableMap()),
+], (emojiCounters: ImmutableMap<string, number>) => {
+  let emojis = emojiCounters
+    .keySeq()
+    .sort((a, b) => emojiCounters.get(a)! - emojiCounters.get(b)!)
+    .reverse()
+    .slice(0, perLine * lines)
+    .toArray();
+
+  if (emojis.length < DEFAULTS.length) {
+    const uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji));
+    emojis = emojis.concat(uniqueDefaults.slice(0, DEFAULTS.length - emojis.length));
+  }
+
+  return emojis;
+});
+
+const getCustomEmojis = createSelector([
+  (state: RootState) => state.custom_emojis,
+], emojis => emojis.filter(e => e.get('visible_in_picker')).sort((a, b) => {
+  const aShort = a.get('shortcode')!.toLowerCase();
+  const bShort = b.get('shortcode')!.toLowerCase();
+
+  if (aShort < bShort) {
+    return -1;
+  } else if (aShort > bShort) {
+    return 1;
+  } else {
+    return 0;
+  }
+}));
+
 // Fixes render bug where popover has a delayed position update
 const RenderAfter = ({ children, update }: any) => {
   const [nextTick, setNextTick] = useState(false);
@@ -75,13 +135,17 @@ const RenderAfter = ({ children, update }: any) => {
 
 const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 
-const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ custom_emojis, frequentlyUsedEmojis, onPickEmoji, onSkinTone, condensed, render: Render }) => {
+const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ onPickEmoji, condensed, render: Render }) => {
   const intl = useIntl();
+  const dispatch = useAppDispatch();
   const settings = useSettings();
   const title = intl.formatMessage(messages.emoji);
   const userTheme = settings.get('themeMode');
   const theme = (userTheme === 'dark' || userTheme === 'light') ? userTheme : 'auto';
 
+  const customEmojis = useAppSelector((state) => getCustomEmojis(state));
+  const frequentlyUsedEmojis = useAppSelector((state) => getFrequentlyUsedEmojis(state));
+
   const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
   const [popperReference, setPopperReference] = useState<HTMLButtonElement | null>(null);
   const [containerElement, setContainerElement] = useState<HTMLDivElement | null>(null);
@@ -108,24 +172,36 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ custom_emojis, fr
   const handlePick = (emoji: EmojiPick) => {
     setVisible(false);
 
+    let pickedEmoji: Emoji;
+
     if (emoji.native) {
-      onPickEmoji({
+      pickedEmoji = {
         id: emoji.id,
         colons: emoji.shortcodes,
         custom: false,
         native: emoji.native,
         unified: emoji.unified,
-      } as NativeEmoji);
+      } as NativeEmoji;
     } else {
-      onPickEmoji({
+      pickedEmoji = {
         id: emoji.id,
         colons: emoji.shortcodes,
         custom: true,
         imageUrl: emoji.src,
-      } as CustomEmoji);
+      } as CustomEmoji;
+
+      dispatch(useEmoji(pickedEmoji)); // eslint-disable-line react-hooks/rules-of-hooks
+
+      if (onPickEmoji) {
+        onPickEmoji(pickedEmoji);
+      }
     }
   };
 
+  const handleSkinTone = (skinTone: string) => {
+    dispatch(changeSetting(['skinTone'], skinTone));
+  };
+
   const getI18n = () => {
     return {
       search: intl.formatMessage(messages.emoji_search),
@@ -216,12 +292,12 @@ const EmojiPickerDropdown: React.FC<IEmojiPickerDropdown> = ({ custom_emojis, fr
             <RenderAfter update={update}>
               {!loading && (
                 <EmojiPicker
-                  custom={[{ emojis: buildCustomEmojis(custom_emojis) }]}
+                  custom={[{ emojis: buildCustomEmojis(customEmojis) }]}
                   title={title}
                   onEmojiSelect={handlePick}
                   recent={frequentlyUsedEmojis}
                   perLine={8}
-                  skin={onSkinTone}
+                  skin={handleSkinTone}
                   emojiSize={22}
                   emojiButtonSize={34}
                   set='twitter'

app/soapbox/features/emoji/containers/emoji-picker-dropdown-container.jsx

@@ -1,119 +0,0 @@
-import classNames from 'classnames';
-import { Map as ImmutableMap } from 'immutable';
-import React from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-
-import { IconButton } from 'soapbox/components/ui';
-
-import { useEmoji } from '../../../actions/emojis';
-import { getSettings, changeSetting } from '../../../actions/settings';
-import EmojiPickerDropdown from '../components/emoji-picker-dropdown';
-
-const perLine = 8;
-const lines   = 2;
-
-const DEFAULTS = [
-  '+1',
-  'grinning',
-  'kissing_heart',
-  'heart_eyes',
-  'laughing',
-  'stuck_out_tongue_winking_eye',
-  'sweat_smile',
-  'joy',
-  'yum',
-  'disappointed',
-  'thinking_face',
-  'weary',
-  'sob',
-  'sunglasses',
-  'heart',
-  'ok_hand',
-];
-
-export const getFrequentlyUsedEmojis = createSelector([
-  state => state.settings.get('frequentlyUsedEmojis', ImmutableMap()),
-], emojiCounters => {
-  let emojis = emojiCounters
-    .keySeq()
-    .sort((a, b) => emojiCounters.get(a) - emojiCounters.get(b))
-    .reverse()
-    .slice(0, perLine * lines)
-    .toArray();
-
-  if (emojis.length < DEFAULTS.length) {
-    const uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji));
-    emojis = emojis.concat(uniqueDefaults.slice(0, DEFAULTS.length - emojis.length));
-  }
-
-  return emojis;
-});
-
-const getCustomEmojis = createSelector([
-  state => state.custom_emojis,
-], emojis => emojis.filter(e => e.get('visible_in_picker')).sort((a, b) => {
-  const aShort = a.get('shortcode').toLowerCase();
-  const bShort = b.get('shortcode').toLowerCase();
-
-  if (aShort < bShort) {
-    return -1;
-  } else if (aShort > bShort) {
-    return 1;
-  } else {
-    return 0;
-  }
-}));
-
-const mapStateToProps = state => ({
-  custom_emojis: getCustomEmojis(state),
-  skinTone: getSettings(state).get('skinTone'),
-  frequentlyUsedEmojis: getFrequentlyUsedEmojis(state),
-});
-
-const mapDispatchToProps = (dispatch, { onPickEmoji }) => ({
-  onSkinTone: skinTone => {
-    dispatch(changeSetting(['skinTone'], skinTone));
-  },
-
-  onPickEmoji: emoji => {
-    dispatch(useEmoji(emoji)); // eslint-disable-line react-hooks/rules-of-hooks
-
-    if (onPickEmoji) {
-      onPickEmoji(emoji);
-    }
-  },
-});
-
-const Container = connect(mapStateToProps, mapDispatchToProps)(EmojiPickerDropdown);
-
-const EmojiPickerDropdownWrapper = (props) => {
-  return (
-    <Container
-      render={
-        ({ setPopperReference, title, visible, loading, handleToggle }) => (
-          <IconButton
-            className={classNames({
-              'text-gray-400 hover:text-gray-600': true,
-              'pulse-loading': visible && loading,
-            })}
-            ref={setPopperReference}
-            src={require('@tabler/icons/mood-happy.svg')}
-            title={title}
-            aria-label={title}
-            aria-expanded={visible}
-            role='button'
-            onClick={handleToggle}
-            onKeyDown={handleToggle}
-            tabIndex={0}
-          />
-        )
-      }
-
-      {...props}
-    />
-  );
-};
-
-
-export default EmojiPickerDropdownWrapper;

app/soapbox/features/emoji/containers/emoji-picker-dropdown-container.tsx

@@ -0,0 +1,37 @@
+import clsx from 'clsx';
+import React from 'react';
+
+import { IconButton } from 'soapbox/components/ui';
+
+import EmojiPickerDropdown, { IEmojiPickerDropdown } from '../components/emoji-picker-dropdown';
+
+const EmojiPickerDropdownWrapper = (props: Omit<IEmojiPickerDropdown, 'render'>) => {
+  return (
+    <EmojiPickerDropdown
+      render={
+        ({ setPopperReference, title, visible, loading, handleToggle }: any) => (
+          <IconButton
+            className={clsx({
+              'text-gray-400 hover:text-gray-600': true,
+              'pulse-loading': visible && loading,
+            })}
+            ref={setPopperReference}
+            src={require('@tabler/icons/mood-happy.svg')}
+            title={title}
+            aria-label={title}
+            aria-expanded={visible}
+            role='button'
+            onClick={handleToggle}
+            onKeyDown={handleToggle}
+            tabIndex={0}
+          />
+        )
+      }
+
+      {...props}
+    />
+  );
+};
+
+
+export default EmojiPickerDropdownWrapper;

app/soapbox/features/emoji/mapping.ts

@@ -8,8 +8,8 @@ function replaceAll(str: string, find: string, replace: string) {
 
 interface UnicodeMap {
   [s: string]: {
-    unified: string,
-    shortcode: string,
+    unified: string
+    shortcode: string
   }
 }
 

app/soapbox/features/emoji/search.ts

@@ -41,7 +41,7 @@ const search = (str: string, { maxResults = 5, custom }: searchOptions = {}, cus
     .flatMap(id => {
     // @ts-ignore
       if (id[0] === 'c') {
-        const { shortcode, static_url } = custom_emojis.get((id as string).substr(1)).toJS();
+        const { shortcode, static_url } = custom_emojis.get((id as string).slice(1)).toJS();
 
         return {
           id: shortcode,
@@ -51,10 +51,10 @@ const search = (str: string, { maxResults = 5, custom }: searchOptions = {}, cus
         };
       }
 
-      const { skins } = data.emojis[(id as string).substr(1)];
+      const { skins } = data.emojis[(id as string).slice(1)];
 
       return {
-        id: (id as string).substr(1),
+        id: (id as string).slice(1),
         colons: ':' + id + ':',
         unified: skins[0].unified,
         native: skins[0].native,