Revert Emoji back to a functional component

missive · Sep 30, 2017 · 22d1a03 · 22d1a03
1 parent fdb88da
commit 22d1a03
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 84 deletions.
diff --git a/src/components/category.js b/src/components/category.js
@@ -146,20 +146,20 @@ export default class Category extends React.Component {
       </div>
 
       {emojis && emojis.map((emoji) =>
-        <Emoji emoji={emoji} {...emojiProps} />
+        Emoji({ emoji: emoji, ...emojiProps })
       )}
 
       {emojis && !emojis.length &&
         <div>
           <div>
-            <Emoji
-              {...emojiProps}
-              size={38}
-              emoji='sleuth_or_spy'
-              onOver={null}
-              onLeave={null}
-              onClick={null}
-            />
+            {Emoji({
+              ...emojiProps,
+              size: 38,
+              emoji: 'sleuth_or_spy',
+              onOver: null,
+              onLeave: null,
+              onClick: null,
+            })}
           </div>
 
           <div className='emoji-mart-no-results-label'>

diff --git a/src/components/emoji.js b/src/components/emoji.js
@@ -23,98 +23,87 @@ const _getSanitizedData = (props) => {
   return getSanitizedData(emoji, skin, set)
 }
 
-export default class Emoji extends React.PureComponent {
+const _handleClick = (e, props) => {
+  if (!props.onClick) { return }
+  var { onClick } = props,
+      emoji = _getSanitizedData(props)
 
-  constructor (props) {
-    super(props)
-
-    this.handleClick = this.handleClick.bind(this)
-    this.handleEnter = this.handleEnter.bind(this)
-    this.handleLeave = this.handleLeave.bind(this)
-  }
-
-  handleClick (e) {
-    if (!this.props.onClick) { return }
+  onClick(emoji, e)
+}
 
-    const { onClick } = this.props,
-        emoji = _getSanitizedData(this.props)
+const _handleOver = (e, props) => {
+  if (!props.onOver) { return }
+  var { onOver } = props,
+      emoji = _getSanitizedData(props)
 
-    onClick(emoji, e)
-  }
+  onOver(emoji, e)
+}
 
-  handleEnter (e) {
-    if (!this.props.onOver) { return }
+const _handleLeave = (e, props) => {
+  if (!props.onLeave) { return }
+  var { onLeave } = props,
+      emoji = _getSanitizedData(props)
 
-    const { onOver } = this.props,
-        emoji = _getSanitizedData(this.props)
+  onLeave(emoji, e)
+}
 
-    onOver(emoji, e)
+const Emoji = (props) => {
+  for (let k in Emoji.defaultProps) {
+    if (props[k] == undefined && Emoji.defaultProps[k] != undefined) {
+      props[k] = Emoji.defaultProps[k]
+    }
   }
 
-  handleLeave (e) {
-    if (!this.props.onLeave) { return }
-
-    const { onLeave } = this.props,
-        emoji = _getSanitizedData(this.props)
+  var { unified, custom, imageUrl } = _getData(props),
+      style = {},
+      children = props.children
 
-    onLeave(emoji, e)
+  if (!unified && !custom) {
+    return null
   }
 
-  render () {
-    var props = this.props;
+  if (props.native && unified) {
+    style = { fontSize: props.size }
+    children = unifiedToNative(unified)
 
-    var { unified, custom, imageUrl } = _getData(props),
-        style = {},
-        children = props.children
+    if (props.forceSize) {
+      style.display = 'inline-block'
+      style.width = props.size
+      style.height = props.size
+    }
+  } else if (custom) {
+    style = {
+      width: props.size,
+      height: props.size,
+      display: 'inline-block',
+      backgroundImage: `url(${imageUrl})`,
+      backgroundSize: '100%',
+    }
+  } else {
+    let setHasEmoji = _getData(props)[`has_img_${props.set}`]
 
-    if (!unified && !custom) {
+    if (!setHasEmoji) {
       return null
     }
 
-    if (props.native && unified) {
-      style = { fontSize: props.size }
-      children = unifiedToNative(unified)
-
-      if (props.forceSize) {
-        style.display = 'inline-block'
-        style.width = props.size
-        style.height = props.size
-      }
-    } else if (custom) {
-      style = {
-        width: props.size,
-        height: props.size,
-        display: 'inline-block',
-        backgroundImage: `url(${imageUrl})`,
-        backgroundSize: '100%',
-      }
-    } else {
-      let setHasEmoji = _getData(props)[`has_img_${props.set}`]
-
-      if (!setHasEmoji) {
-        return null
-      }
-
-      style = {
-        width: props.size,
-        height: props.size,
-        display: 'inline-block',
-        backgroundImage: `url(${props.backgroundImageFn(props.set, props.sheetSize)})`,
-        backgroundSize: `${100 * SHEET_COLUMNS}%`,
-        backgroundPosition: _getPosition(props),
-      }
+    style = {
+      width: props.size,
+      height: props.size,
+      display: 'inline-block',
+      backgroundImage: `url(${props.backgroundImageFn(props.set, props.sheetSize)})`,
+      backgroundSize: `${100 * SHEET_COLUMNS}%`,
+      backgroundPosition: _getPosition(props),
     }
-
-    return <span
-      key={props.emoji.id || props.emoji}
-      onClick={this.handleClick}
-      onMouseEnter={this.handleEnter}
-      onMouseLeave={this.handleLeave}
-      className='emoji-mart-emoji'>
-      <span style={style}>{children}</span>
-    </span>
   }
 
+  return <span
+    key={props.emoji.id || props.emoji}
+    onClick={(e) => _handleClick(e, props)}
+    onMouseEnter={(e) => _handleOver(e, props)}
+    onMouseLeave={(e) => _handleLeave(e, props)}
+    className='emoji-mart-emoji'>
+    <span style={style}>{children}</span>
+  </span>
 }
 
 Emoji.propTypes = {
@@ -145,3 +134,5 @@ Emoji.defaultProps = {
   onLeave: (() => {}),
   onClick: (() => {}),
 }
+
+export default Emoji
diff --git a/src/components/preview.js b/src/components/preview.js
@@ -31,7 +31,7 @@ export default class Preview extends React.PureComponent {
 
       return <div className='emoji-mart-preview'>
         <div className='emoji-mart-preview-emoji'>
-          <Emoji key={emoji.id} emoji={emoji} {...emojiProps} />
+          {Emoji({ key: emoji.id, emoji: emoji, ...emojiProps })}
         </div>
 
         <div className='emoji-mart-preview-data'>
@@ -51,7 +51,7 @@ export default class Preview extends React.PureComponent {
     } else {
       return <div className='emoji-mart-preview'>
         <div className='emoji-mart-preview-emoji'>
-          {idleEmoji && idleEmoji.length && <Emoji emoji={idleEmoji} {...emojiProps} />}
+          {idleEmoji && idleEmoji.length && Emoji({ emoji: idleEmoji, ...emojiProps })}
         </div>
 
         <div className='emoji-mart-preview-data'>