@atlaskit/emoji 65.0.0 → 65.2.0

package/dist/esm/components/common/EmojiErrorMessage.js

@@ -1,61 +1,26 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
-import { PureComponent } from 'react';
 import Tooltip from '@atlaskit/tooltip';
 
-var EmojiErrorMessage = /*#__PURE__*/function (_PureComponent) {
-  _inherits(EmojiErrorMessage, _PureComponent);
-
-  var _super = _createSuper(EmojiErrorMessage);
-
-  function EmojiErrorMessage() {
-    _classCallCheck(this, EmojiErrorMessage);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(EmojiErrorMessage, [{
-    key: "renderWithTooltip",
-    value: function renderWithTooltip() {
-      return jsx("div", {
-        css: this.props.messageStyles
-      }, jsx(Tooltip, {
-        content: this.props.message,
-        position: "top"
-      }, jsx(ErrorIcon, {
-        label: "Error",
-        size: "medium"
-      })));
-    }
-  }, {
-    key: "renderInline",
-    value: function renderInline() {
-      return jsx("div", {
-        css: this.props.messageStyles
-      }, jsx(ErrorIcon, {
-        label: "Error",
-        size: "small"
-      }), " ", this.props.message);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      return this.props.tooltip ? this.renderWithTooltip() : this.renderInline();
-    }
-  }]);
-
-  return EmojiErrorMessage;
-}(PureComponent);
-
-export { EmojiErrorMessage as default };
+var EmojiErrorMessage = function EmojiErrorMessage(props) {
+  var messageStyles = props.messageStyles,
+      message = props.message,
+      tooltip = props.tooltip;
+  return tooltip ? jsx("div", {
+    css: messageStyles
+  }, jsx(Tooltip, {
+    content: message,
+    position: "top"
+  }, jsx(ErrorIcon, {
+    label: "Error",
+    size: "medium"
+  }))) : jsx("div", {
+    css: messageStyles
+  }, jsx(ErrorIcon, {
+    label: "Error",
+    size: "small"
+  }), " ", message);
+};
+
+export default EmojiErrorMessage;

package/dist/esm/components/common/EmojiPreviewComponent.js

@@ -9,6 +9,7 @@ export var EmojiPreviewComponent = function EmojiPreviewComponent(_ref) {
   }, jsx("span", {
     css: previewImg
   }, jsx(CachingEmoji, {
+    key: emoji.id || emoji.shortName,
     emoji: emoji
   })), jsx("div", {
     css: previewText

package/dist/esm/components/common/EmojiUploadPicker.js

@@ -1,19 +1,10 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 /** @jsx jsx */
 import { jsx } from '@emotion/core';
-import React, { Fragment } from 'react';
-import { PureComponent } from 'react';
+import React, { Fragment, useEffect, useState } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl-next';
 import TextField from '@atlaskit/textfield';
 import * as ImageUtil from '../../util/image';
@@ -41,310 +32,253 @@ var toEmojiName = function toEmojiName(uploadName) {
   return "".concat(name.substr(0, 1).toLocaleUpperCase()).concat(name.substr(1));
 };
 
-var ChooseEmojiFile = /*#__PURE__*/function (_PureComponent) {
-  _inherits(ChooseEmojiFile, _PureComponent);
-
-  var _super = _createSuper(ChooseEmojiFile);
-
-  function ChooseEmojiFile() {
-    var _this;
-
-    _classCallCheck(this, ChooseEmojiFile);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+var ChooseEmojiFile = function ChooseEmojiFile(props) {
+  var _props$name = props.name,
+      name = _props$name === void 0 ? '' : _props$name,
+      onChooseFile = props.onChooseFile,
+      onClick = props.onClick,
+      onNameChange = props.onNameChange,
+      onUploadCancelled = props.onUploadCancelled,
+      errorMessage = props.errorMessage,
+      intl = props.intl;
+  var formatMessage = intl.formatMessage;
+  var disableChooser = !name;
+  var fileChooserButtonDescriptionId = 'choose.emoji.file.button.screen.reader.description.id';
+
+  var onKeyDownHandler = function onKeyDownHandler(event) {
+    if (event.key === 'Escape') {
+      onUploadCancelled();
     }
+  };
+
+  return jsx("div", {
+    css: emojiUpload
+  }, jsx("div", {
+    css: uploadChooseFileMessage
+  }, jsx(FormattedMessage, messages.addCustomEmojiLabel, function (message) {
+    return jsx("h5", null, message);
+  })), jsx("div", {
+    css: uploadChooseFileRow
+  }, jsx("span", {
+    css: uploadChooseFileEmojiName
+  }, jsx(TextField, {
+    placeholder: formatMessage(messages.emojiPlaceholder),
+    "aria-label": formatMessage(messages.emojiNameAriaLabel),
+    maxLength: maxNameLength,
+    onChange: onNameChange,
+    onKeyDown: onKeyDownHandler,
+    value: name,
+    isCompact: true,
+    autoFocus: true
+  })), jsx("span", {
+    css: uploadChooseFileBrowse
+  }, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, function (screenReaderDescription) {
+    return jsx(Fragment, null, jsx("span", {
+      hidden: true,
+      id: fileChooserButtonDescriptionId
+    }, screenReaderDescription), jsx(FileChooser, {
+      label: formatMessage(messages.emojiChooseFileTitle),
+      onChange: onChooseFile,
+      onClick: onClick,
+      accept: "image/png,image/jpeg,image/gif",
+      ariaDescribedBy: fileChooserButtonDescriptionId,
+      isDisabled: disableChooser
+    }));
+  }))), jsx("div", {
+    css: emojiUploadBottom
+  }, !errorMessage ? jsx("p", null, jsx(FormattedMessage, messages.emojiImageRequirements)) : jsx(EmojiErrorMessage, {
+    messageStyles: emojiChooseFileErrorMessage,
+    message: errorMessage
+  })));
+};
 
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "onKeyDown", function (event) {
-      if (event.key === 'Escape') {
-        _this.props.onUploadCancelled();
+var EmojiUploadPicker = function EmojiUploadPicker(props) {
+  var errorMessage = props.errorMessage,
+      initialUploadName = props.initialUploadName,
+      onUploadEmoji = props.onUploadEmoji,
+      onFileChooserClicked = props.onFileChooserClicked,
+      onUploadCancelled = props.onUploadCancelled,
+      intl = props.intl;
+
+  var _useState = useState(errorMessage ? UploadStatus.Error : UploadStatus.Waiting),
+      _useState2 = _slicedToArray(_useState, 2),
+      uploadStatus = _useState2[0],
+      setUploadStatus = _useState2[1];
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      chooseEmojiErrorMessage = _useState4[0],
+      setChooseEmojiErrorMessage = _useState4[1];
+
+  var _useState5 = useState(initialUploadName && sanitizeName(initialUploadName)),
+      _useState6 = _slicedToArray(_useState5, 2),
+      name = _useState6[0],
+      setName = _useState6[1];
+
+  var _useState7 = useState(),
+      _useState8 = _slicedToArray(_useState7, 2),
+      filename = _useState8[0],
+      setFilename = _useState8[1];
+
+  var _useState9 = useState(),
+      _useState10 = _slicedToArray(_useState9, 2),
+      previewImage = _useState10[0],
+      setPreviewImage = _useState10[1];
+
+  useEffect(function () {
+    if (errorMessage) {
+      setUploadStatus(UploadStatus.Error);
+      return;
+    } else {
+      if (uploadStatus === UploadStatus.Error) {
+        setUploadStatus(UploadStatus.Waiting);
       }
-    });
-
-    return _this;
-  }
-
-  _createClass(ChooseEmojiFile, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          _this$props$name = _this$props.name,
-          name = _this$props$name === void 0 ? '' : _this$props$name,
-          onChooseFile = _this$props.onChooseFile,
-          onClick = _this$props.onClick,
-          onNameChange = _this$props.onNameChange,
-          errorMessage = _this$props.errorMessage,
-          intl = _this$props.intl;
-      var formatMessage = intl.formatMessage;
-      var disableChooser = !name;
-      var fileChooserButtonDescriptionId = 'choose.emoji.file.button.screen.reader.description.id'; // Note: FileChooser.accept does not work in Electron due to a bug: https://product-fabric.atlassian.net/browse/FS-1626
-
-      return jsx("div", {
-        css: emojiUpload
-      }, jsx("div", {
-        css: uploadChooseFileMessage
-      }, jsx(FormattedMessage, messages.addCustomEmojiLabel, function (message) {
-        return jsx("h5", null, message);
-      })), jsx("div", {
-        css: uploadChooseFileRow
-      }, jsx("span", {
-        css: uploadChooseFileEmojiName
-      }, jsx(TextField, {
-        placeholder: formatMessage(messages.emojiPlaceholder),
-        "aria-label": formatMessage(messages.emojiNameAriaLabel),
-        maxLength: maxNameLength,
-        onChange: onNameChange,
-        onKeyDown: this.onKeyDown,
-        value: name,
-        isCompact: true,
-        autoFocus: true
-      })), jsx("span", {
-        css: uploadChooseFileBrowse
-      }, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, function (screenReaderDescription) {
-        return jsx(Fragment, null, jsx("span", {
-          hidden: true,
-          id: fileChooserButtonDescriptionId
-        }, screenReaderDescription), jsx(FileChooser, {
-          label: formatMessage(messages.emojiChooseFileTitle),
-          onChange: onChooseFile,
-          onClick: onClick,
-          accept: "image/png,image/jpeg,image/gif",
-          ariaDescribedBy: fileChooserButtonDescriptionId,
-          isDisabled: disableChooser
-        }));
-      }))), jsx("div", {
-        css: emojiUploadBottom
-      }, !errorMessage ? jsx("p", null, jsx(FormattedMessage, messages.emojiImageRequirements)) : jsx(EmojiErrorMessage, {
-        messageStyles: emojiChooseFileErrorMessage,
-        message: errorMessage
-      })));
     }
-  }]);
-
-  return ChooseEmojiFile;
-}(PureComponent);
-
-export var EmojiUploadPicker = /*#__PURE__*/function (_PureComponent2) {
-  _inherits(EmojiUploadPicker, _PureComponent2);
-
-  var _super2 = _createSuper(EmojiUploadPicker);
-
-  function EmojiUploadPicker(props) {
-    var _this2;
-
-    _classCallCheck(this, EmojiUploadPicker);
-
-    _this2 = _super2.call(this, props);
-
-    _defineProperty(_assertThisInitialized(_this2), "state", {
-      uploadStatus: UploadStatus.Waiting,
-      chooseEmojiErrorMessage: undefined
-    });
-
-    _defineProperty(_assertThisInitialized(_this2), "onNameChange", function (event) {
-      var newName = sanitizeName(event.target.value);
-
-      if (_this2.state.name !== newName) {
-        _this2.setState({
-          name: newName
-        });
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this2), "onAddEmoji", function () {
-      var onUploadEmoji = _this2.props.onUploadEmoji;
-      var _this2$state = _this2.state,
-          filename = _this2$state.filename,
-          name = _this2$state.name,
-          previewImage = _this2$state.previewImage,
-          uploadStatus = _this2$state.uploadStatus;
-
-      if (uploadStatus === UploadStatus.Uploading) {
-        return;
-      }
-
-      if (filename && name && previewImage) {
-        var notifyUpload = function notifyUpload(size) {
-          var width = size.width,
-              height = size.height;
-
-          _this2.setState({
-            uploadStatus: UploadStatus.Uploading
-          });
-
-          onUploadEmoji({
-            name: toEmojiName(name),
-            shortName: ":".concat(name, ":"),
-            filename: filename,
-            dataURL: previewImage,
-            width: width,
-            height: height
-          }, uploadStatus === UploadStatus.Error);
-        };
-
-        ImageUtil.getNaturalImageSize(previewImage).then(function (size) {
-          notifyUpload(size);
-        }).catch(function (error) {
-          debug('getNaturalImageSize error', error); // Just set arbitrary size, worse case is it may render
-          // in wrong aspect ratio in some circumstances.
-
-          notifyUpload({
-            width: 32,
-            height: 32
-          });
-        });
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this2), "errorOnUpload", function (event) {
-      debug('File load error: ', event);
-
-      _this2.setState({
-        chooseEmojiErrorMessage: messages.emojiUploadFailed
-      });
+  }, [errorMessage, uploadStatus]);
+  useEffect(function () {
+    if (initialUploadName) {
+      setName(sanitizeName(initialUploadName));
+    }
+  }, [initialUploadName]);
 
-      _this2.cancelChooseFile();
-    });
+  var onNameChange = function onNameChange(event) {
+    var newName = sanitizeName(event.target.value);
 
-    _defineProperty(_assertThisInitialized(_this2), "onFileLoad", function (file) {
-      return function (f) {
-        return ImageUtil.parseImage(f.target.result).then(function () {
-          var state = {
-            previewImage: f.target.result,
-            filename: file.name
-          };
+    if (name !== newName) {
+      setName(newName);
+    }
+  };
 
-          _this2.setState(state);
-        }).catch(function () {
-          _this2.setState({
-            chooseEmojiErrorMessage: messages.emojiInvalidImage
-          });
+  var onAddEmoji = function onAddEmoji() {
+    if (uploadStatus === UploadStatus.Uploading) {
+      return;
+    }
 
-          _this2.cancelChooseFile();
-        });
+    if (filename && name && previewImage) {
+      var notifyUpload = function notifyUpload(size) {
+        var width = size.width,
+            height = size.height;
+        setUploadStatus(UploadStatus.Uploading);
+        onUploadEmoji({
+          name: toEmojiName(name),
+          shortName: ":".concat(name, ":"),
+          filename: filename,
+          dataURL: previewImage,
+          width: width,
+          height: height
+        }, uploadStatus === UploadStatus.Error, clearUploadPicker);
       };
-    });
-
-    _defineProperty(_assertThisInitialized(_this2), "cancelChooseFile", function () {
-      _this2.setState({
-        previewImage: undefined
-      });
-    });
 
-    _defineProperty(_assertThisInitialized(_this2), "onChooseFile", function (event) {
-      var files = event.target.files;
+      ImageUtil.getNaturalImageSize(previewImage).then(function (size) {
+        notifyUpload(size);
+      }).catch(function (error) {
+        debug('getNaturalImageSize error', error); // Just set arbitrary size, worse case is it may render
+        // in wrong aspect ratio in some circumstances.
 
-      if (files.length) {
-        var reader = new FileReader();
-        var file = files[0];
-
-        if (ImageUtil.hasFileExceededSize(file)) {
-          _this2.setState({
-            chooseEmojiErrorMessage: messages.emojiImageTooBig
-          });
-
-          _this2.cancelChooseFile();
-
-          return;
-        }
-
-        reader.addEventListener('load', _this2.onFileLoad(file));
-        reader.addEventListener('abort', _this2.errorOnUpload);
-        reader.addEventListener('error', _this2.errorOnUpload);
-        reader.readAsDataURL(file);
-      } else {
-        _this2.cancelChooseFile();
-      }
-    });
-
-    _defineProperty(_assertThisInitialized(_this2), "clearUploadPicker", function () {
-      _this2.setState({
-        name: undefined,
-        previewImage: undefined,
-        uploadStatus: UploadStatus.Waiting
+        notifyUpload({
+          width: 32,
+          height: 32
+        });
       });
-    });
-
-    if (props.errorMessage) {
-      _this2.state.uploadStatus = UploadStatus.Error;
-    }
-
-    if (props.initialUploadName) {
-      _this2.state.name = sanitizeName(props.initialUploadName);
     }
+  };
+
+  var errorOnUpload = function errorOnUpload(event) {
+    debug('File load error: ', event);
+    setChooseEmojiErrorMessage(messages.emojiUploadFailed);
+    cancelChooseFile();
+  };
+
+  var onFileLoad = function onFileLoad(file) {
+    return /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(f) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.prev = 0;
+                setFilename(file.name);
+                _context.next = 4;
+                return ImageUtil.parseImage(f.target.result);
+
+              case 4:
+                setPreviewImage(f.target.result);
+                _context.next = 11;
+                break;
+
+              case 7:
+                _context.prev = 7;
+                _context.t0 = _context["catch"](0);
+                setChooseEmojiErrorMessage(messages.emojiInvalidImage);
+                cancelChooseFile();
+
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, null, [[0, 7]]);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  };
 
-    return _this2;
-  }
-
-  _createClass(EmojiUploadPicker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      var updatedState = {};
-
-      if (nextProps.errorMessage) {
-        updatedState.uploadStatus = UploadStatus.Error;
-      } else {
-        if (this.state.uploadStatus === UploadStatus.Error) {
-          updatedState.uploadStatus = UploadStatus.Waiting;
-        }
-      }
+  var cancelChooseFile = function cancelChooseFile() {
+    setPreviewImage(undefined);
+  };
 
-      if (nextProps.initialUploadName) {
-        if (!this.state.name) {
-          updatedState.name = sanitizeName(nextProps.initialUploadName);
-        }
-      }
+  var onChooseFile = function onChooseFile(event) {
+    var files = event.target.files;
 
-      this.setState(updatedState);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this3 = this;
-
-      var _this$props2 = this.props,
-          errorMessage = _this$props2.errorMessage,
-          onUploadCancelled = _this$props2.onUploadCancelled,
-          intl = _this$props2.intl;
-      var _this$state = this.state,
-          name = _this$state.name,
-          previewImage = _this$state.previewImage,
-          uploadStatus = _this$state.uploadStatus,
-          chooseEmojiErrorMessage = _this$state.chooseEmojiErrorMessage;
-
-      var cancelUpload = function cancelUpload() {
-        _this3.clearUploadPicker();
-
-        onUploadCancelled();
-      };
+    if (files.length) {
+      var reader = new FileReader();
+      var file = files[0];
 
-      if (name && previewImage) {
-        return jsx(EmojiUploadPreview, {
-          errorMessage: errorMessage,
-          name: name,
-          onAddEmoji: this.onAddEmoji,
-          onUploadCancelled: cancelUpload,
-          previewImage: previewImage,
-          uploadStatus: uploadStatus
-        });
+      if (ImageUtil.hasFileExceededSize(file)) {
+        setChooseEmojiErrorMessage(messages.emojiImageTooBig);
+        cancelChooseFile();
+        return;
       }
 
-      return jsx(ChooseEmojiFile, {
-        name: name,
-        onChooseFile: this.onChooseFile,
-        onClick: this.props.onFileChooserClicked,
-        onNameChange: this.onNameChange,
-        onUploadCancelled: cancelUpload,
-        errorMessage: chooseEmojiErrorMessage ? jsx(FormattedMessage, chooseEmojiErrorMessage) : undefined,
-        intl: intl
-      });
+      reader.addEventListener('load', onFileLoad(file));
+      reader.addEventListener('abort', errorOnUpload);
+      reader.addEventListener('error', errorOnUpload);
+      reader.readAsDataURL(file);
+    } else {
+      cancelChooseFile();
     }
-  }]);
+  };
+
+  var clearUploadPicker = function clearUploadPicker() {
+    setName(undefined);
+    setPreviewImage(undefined);
+    setUploadStatus(UploadStatus.Waiting);
+  };
+
+  var cancelUpload = function cancelUpload() {
+    clearUploadPicker();
+    onUploadCancelled();
+  };
+
+  return jsx(React.Fragment, null, name && previewImage ? jsx(EmojiUploadPreview, {
+    errorMessage: errorMessage,
+    name: name,
+    onAddEmoji: onAddEmoji,
+    onUploadCancelled: cancelUpload,
+    previewImage: previewImage,
+    uploadStatus: uploadStatus
+  }) : jsx(ChooseEmojiFile, {
+    name: name,
+    onChooseFile: onChooseFile,
+    onClick: onFileChooserClicked,
+    onNameChange: onNameChange,
+    onUploadCancelled: cancelUpload,
+    errorMessage: chooseEmojiErrorMessage ? jsx(FormattedMessage, chooseEmojiErrorMessage) : undefined,
+    intl: intl
+  }));
+};
 
-  return EmojiUploadPicker;
-}(PureComponent);
-export default injectIntl(EmojiUploadPicker, {
-  forwardRef: true
-});
+export default injectIntl(EmojiUploadPicker);