@atlaskit/emoji 64.4.1 → 64.5.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/emoji
 
+## 64.5.2
+
+### Patch Changes
+
+- [`a424e62b264`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a424e62b264) - Changes to support Node 16 Typescript definitions from `@types/node`.
+
+## 64.5.1
+
+### Patch Changes
+
+- [`cb2392f6d33`](https://bitbucket.org/atlassian/atlassian-frontend/commits/cb2392f6d33) - Upgrade to TypeScript 4.2.4
+- Updated dependencies
+
+## 64.5.0
+
+### Minor Changes
+
+- [`fcb3b3f77e2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fcb3b3f77e2) - Context Provider to convert legacy providers to non legacy providers
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 64.4.1
 
 ### Patch Changes

package/dist/cjs/api/EmojiResource.js

@@ -52,13 +52,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  *
  * Follow this up with an isUploadSupported() check to see if the provider is actually
  * configured to support uploads.
+ * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates
  */
 var supportsUploadFeature = function supportsUploadFeature(emojiProvider) {
-  var _ref = emojiProvider,
-      isUploadSupported = _ref.isUploadSupported,
-      prepareForUpload = _ref.prepareForUpload,
-      uploadCustomEmoji = _ref.uploadCustomEmoji;
-  return !!(isUploadSupported && prepareForUpload && uploadCustomEmoji);
+  var emojiUploadProvider = emojiProvider;
+  return !!emojiUploadProvider.isUploadSupported && !!emojiUploadProvider.uploadCustomEmoji && !!emojiUploadProvider.prepareForUpload;
 };
 
 exports.supportsUploadFeature = supportsUploadFeature;

package/dist/cjs/components/common/CachingEmoji.js

@@ -27,8 +27,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _EmojiUtils = require("../../api/EmojiUtils");
@@ -47,6 +45,8 @@ var _analytics = require("../../util/analytics");
 
 var _constants = require("../../util/constants");
 
+var _EmojiContext = require("../../context/EmojiContext");
+
 var _excluded = ["placeholderSize"],
     _excluded2 = ["children", "placeholderSize"];
 
@@ -100,7 +100,7 @@ var CachingMediaEmoji = /*#__PURE__*/function (_PureComponent) {
     var _this;
 
     (0, _classCallCheck2.default)(this, CachingMediaEmoji);
-    _this = _super.call(this, props, context);
+    _this = _super.call(this, props);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mounted", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleLoadError", function (_emojiId, emoji) {
       var invalidImage = _this.state.invalidImage;
@@ -152,6 +152,10 @@ var CachingMediaEmoji = /*#__PURE__*/function (_PureComponent) {
     value: function loadEmoji(emoji, context, forceLoad) {
       var _this2 = this;
 
+      if (!context) {
+        return;
+      }
+
       if (!context.emoji) {
         return undefined;
       }
@@ -243,8 +247,6 @@ var CachingMediaEmoji = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 
 exports.CachingMediaEmoji = CachingMediaEmoji;
-(0, _defineProperty2.default)(CachingMediaEmoji, "contextTypes", {
-  emoji: _propTypes.default.object
-});
+(0, _defineProperty2.default)(CachingMediaEmoji, "contextType", _EmojiContext.EmojiContext);
 var _default = CachingEmoji;
 exports.default = _default;

package/dist/cjs/components/common/ResourcedEmojiComponent.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _constants = require("../../util/constants");
@@ -37,6 +35,8 @@ var _EmojiPlaceholder = _interopRequireDefault(require("./EmojiPlaceholder"));
 
 var _analytics = require("../../util/analytics");
 
+var _LegacyEmojiContextProvider = _interopRequireDefault(require("../../context/LegacyEmojiContextProvider"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -64,15 +64,6 @@ var ResourcedEmojiComponent = /*#__PURE__*/function (_Component) {
   }
 
   (0, _createClass2.default)(ResourcedEmojiComponent, [{
-    key: "getChildContext",
-    value: function getChildContext() {
-      return {
-        emoji: {
-          emojiProvider: this.props.emojiProvider
-        }
-      };
-    }
-  }, {
     key: "refreshEmoji",
     value: function refreshEmoji(emojiProvider, emojiId) {
       var _this2 = this;
@@ -176,17 +167,21 @@ var ResourcedEmojiComponent = /*#__PURE__*/function (_Component) {
           shortName = _this$props$emojiId.shortName,
           id = _this$props$emojiId.id,
           fallback = _this$props$emojiId.fallback;
-      return /*#__PURE__*/_react.default.createElement("span", {
+      var emojiContextValue = {
+        emoji: {
+          emojiProvider: this.props.emojiProvider
+        }
+      };
+      return /*#__PURE__*/_react.default.createElement(_LegacyEmojiContextProvider.default, {
+        emojiContextValue: emojiContextValue
+      }, /*#__PURE__*/_react.default.createElement("span", {
         "data-emoji-id": id,
         "data-emoji-short-name": shortName,
         "data-emoji-text": fallback || shortName
-      }, element);
+      }, element));
     }
   }]);
   return ResourcedEmojiComponent;
 }(_react.Component);
 
-exports.default = ResourcedEmojiComponent;
-(0, _defineProperty2.default)(ResourcedEmojiComponent, "childContextTypes", {
-  emoji: _propTypes.default.object
-});
+exports.default = ResourcedEmojiComponent;

package/dist/cjs/components/picker/EmojiPickerComponent.js

@@ -25,8 +25,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _core = require("@emotion/core");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = require("react");
 
 var _reactIntlNext = require("react-intl-next");
@@ -57,6 +55,8 @@ var _analytics = require("../../util/analytics");
 
 var _styles = require("./styles");
 
+var _LegacyEmojiContextProvider = _interopRequireDefault(require("../../context/LegacyEmojiContextProvider"));
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -383,15 +383,6 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
   }
 
   (0, _createClass2.default)(EmojiPickerComponent, [{
-    key: "getChildContext",
-    value: function getChildContext() {
-      return {
-        emoji: {
-          emojiProvider: this.props.emojiProvider
-        }
-      };
-    }
-  }, {
     key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
       this.openTime = Date.now();
@@ -570,7 +561,14 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
         return _this4.fireAnalytics(analytic('picker'));
       });
       var formattedErrorMessage = uploadErrorMessage ? (0, _core.jsx)(_reactIntlNext.FormattedMessage, uploadErrorMessage) : null;
-      var picker = (0, _core.jsx)("div", {
+      var emojiContextValue = {
+        emoji: {
+          emojiProvider: this.props.emojiProvider
+        }
+      };
+      var picker = (0, _core.jsx)(_LegacyEmojiContextProvider.default, {
+        emojiContextValue: emojiContextValue
+      }, (0, _core.jsx)("div", {
         css: _styles.emojiPicker,
         ref: this.handlePickerRef,
         "data-emoji-picker-container": true
@@ -608,7 +606,7 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
       }), (0, _core.jsx)(_EmojiPickerFooter.default, {
         selectedEmoji: selectedEmoji,
         isUploading: uploading
-      }));
+      })));
       return picker;
     }
   }]);
@@ -616,9 +614,6 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 
 exports.default = EmojiPickerComponent;
-(0, _defineProperty2.default)(EmojiPickerComponent, "childContextTypes", {
-  emoji: _propTypes.default.object
-});
 (0, _defineProperty2.default)(EmojiPickerComponent, "defaultProps", {
   onSelection: function onSelection() {}
 });

package/dist/cjs/components/picker/EmojiPickerList.js

@@ -27,8 +27,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _core = require("@emotion/core");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _List = require("react-virtualized/dist/commonjs/List");
@@ -51,10 +49,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
@@ -250,14 +244,6 @@ var EmojiPickerVirtualList = /*#__PURE__*/function (_PureComponent) {
   }
 
   (0, _createClass2.default)(EmojiPickerVirtualList, [{
-    key: "getChildContext",
-    value: function getChildContext() {
-      var emoji = this.context.emoji;
-      return {
-        emoji: _objectSpread({}, emoji)
-      };
-    }
-  }, {
     key: "UNSAFE_componentWillUpdate",
     value: function UNSAFE_componentWillUpdate(nextProps, nextState) {
       if (this.props.emojis !== nextProps.emojis || this.props.selectedTone !== nextProps.selectedTone || this.props.loading !== nextProps.loading || this.props.query !== nextProps.query) {
@@ -345,12 +331,6 @@ var EmojiPickerVirtualList = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 
 exports.default = EmojiPickerVirtualList;
-(0, _defineProperty2.default)(EmojiPickerVirtualList, "contextTypes", {
-  emoji: _propTypes.default.object
-});
-(0, _defineProperty2.default)(EmojiPickerVirtualList, "childContextTypes", {
-  emoji: _propTypes.default.object
-});
 (0, _defineProperty2.default)(EmojiPickerVirtualList, "defaultProps", {
   onEmojiSelected: function onEmojiSelected() {},
   onEmojiActive: function onEmojiActive() {},

package/dist/cjs/components/typeahead/EmojiTypeAheadComponent.js

@@ -25,8 +25,6 @@ var _core = require("@emotion/core");
 
 var _uuid = _interopRequireDefault(require("uuid"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = require("react");
 
 var _constants = require("../../util/constants");
@@ -45,6 +43,8 @@ var _EmojiTypeAheadList = _interopRequireDefault(require("./EmojiTypeAheadList")
 
 var _styles = require("./styles");
 
+var _LegacyEmojiContextProvider = _interopRequireDefault(require("../../context/LegacyEmojiContextProvider"));
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
@@ -205,15 +205,6 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
   }
 
   (0, _createClass2.default)(EmojiTypeAheadComponent, [{
-    key: "getChildContext",
-    value: function getChildContext() {
-      return {
-        emoji: {
-          emojiProvider: this.props.emojiProvider
-        }
-      };
-    }
-  }, {
     key: "componentDidMount",
     value: function componentDidMount() {
       var emojiProvider = this.props.emojiProvider;
@@ -324,7 +315,14 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
       var style = {
         display: visible ? 'block' : 'none'
       };
-      return (0, _core.jsx)("div", {
+      var emojiContextValue = {
+        emoji: {
+          emojiProvider: this.props.emojiProvider
+        }
+      };
+      return (0, _core.jsx)(_LegacyEmojiContextProvider.default, {
+        emojiContextValue: emojiContextValue
+      }, (0, _core.jsx)("div", {
         style: style,
         className: 'ak-emoji-typeahead',
         css: _styles.emojiTypeAhead
@@ -333,16 +331,13 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
         onEmojiSelected: recordUsageOnSelection,
         ref: this.onEmojiListRef,
         loading: loading
-      }));
+      })));
     }
   }]);
   return EmojiTypeAheadComponent;
 }(_react.PureComponent);
 
 exports.default = EmojiTypeAheadComponent;
-(0, _defineProperty2.default)(EmojiTypeAheadComponent, "childContextTypes", {
-  emoji: _propTypes.default.object
-});
 (0, _defineProperty2.default)(EmojiTypeAheadComponent, "defaultProps", {
   onSelection: function onSelection() {},
   onOpen: function onOpen() {},

package/dist/cjs/components/typeahead/EmojiTypeAheadItem.js

@@ -35,6 +35,8 @@ var _EmojiPreviewComponent = require("../common/EmojiPreviewComponent");
 
 var _styles = require("./styles");
 
+var _LegacyEmojiContextProvider = _interopRequireDefault(require("../../context/LegacyEmojiContextProvider"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -87,7 +89,7 @@ var EmojiTypeAheadItem = /*#__PURE__*/function (_PureComponent) {
           selected = _this$props3.selected,
           emoji = _this$props3.emoji;
       var classes = [_styles.typeAheadItem, selected && _styles.selected];
-      return (0, _core.jsx)("div", {
+      return (0, _core.jsx)(_LegacyEmojiContextProvider.default, null, (0, _core.jsx)("div", {
         className: "ak-emoji-typeahead-item ".concat(selected ? _styles.typeaheadSelected : ''),
         css: classes,
         onMouseDown: this.onEmojiSelected,
@@ -97,7 +99,7 @@ var EmojiTypeAheadItem = /*#__PURE__*/function (_PureComponent) {
         css: _styles.typeAheadItemRow
       }, emoji && (0, _core.jsx)(_EmojiPreviewComponent.EmojiPreviewComponent, {
         emoji: emoji
-      })));
+      }))));
     }
   }]);
   return EmojiTypeAheadItem;

package/dist/cjs/context/EmojiContext.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EmojiContext = void 0;
+
+var _react = require("react");
+
+var EmojiContext = /*#__PURE__*/(0, _react.createContext)(null);
+exports.EmojiContext = EmojiContext;

package/dist/cjs/context/EmojiContextProvider.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EmojiContextProvider = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _EmojiContext = require("./EmojiContext");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var EmojiContextProvider = function EmojiContextProvider(_ref) {
+  var children = _ref.children,
+      emojiContextValue = _ref.emojiContextValue;
+  var memoizedEmojiContextValue = (0, _react.useMemo)(function () {
+    return emojiContextValue;
+  }, [emojiContextValue]);
+  return /*#__PURE__*/_react.default.createElement(_EmojiContext.EmojiContext.Provider, {
+    value: memoizedEmojiContextValue
+  }, children);
+};
+
+exports.EmojiContextProvider = EmojiContextProvider;

package/dist/cjs/context/LegacyEmojiContextProvider.js

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _EmojiContextProvider = require("./EmojiContextProvider");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
+
+/**
+ * Legacy Context Priority Passthrough ...
+ * If component finds legacy context, then use it, otherwise use the passed through context
+ */
+var LegacyEmojiContextProvider = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(LegacyEmojiContextProvider, _Component);
+
+  var _super = _createSuper(LegacyEmojiContextProvider);
+
+  function LegacyEmojiContextProvider(props, context) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, LegacyEmojiContextProvider);
+    _this = _super.call(this, props, context);
+    _this.state = {
+      prioritisedContextValue: context.emoji ? context : _this.props.emojiContextValue
+    };
+    return _this;
+  }
+
+  (0, _createClass2.default)(LegacyEmojiContextProvider, [{
+    key: "render",
+    value: function render() {
+      if (this.state.prioritisedContextValue) {
+        return /*#__PURE__*/_react.default.createElement(_EmojiContextProvider.EmojiContextProvider, {
+          emojiContextValue: this.state.prioritisedContextValue
+        }, this.props.children);
+      }
+
+      return this.props.children;
+    }
+  }]);
+  return LegacyEmojiContextProvider;
+}(_react.Component);
+
+exports.default = LegacyEmojiContextProvider;
+(0, _defineProperty2.default)(LegacyEmojiContextProvider, "contextTypes", {
+  emoji: _propTypes.default.object
+});

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "64.4.1",
+	"version": "64.5.2",
 	"sideEffects": false
 }

package/dist/es2019/api/EmojiResource.js

@@ -15,14 +15,11 @@ import { ufoExperiences } from '../util/analytics';
  *
  * Follow this up with an isUploadSupported() check to see if the provider is actually
  * configured to support uploads.
+ * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates
  */
 export const supportsUploadFeature = emojiProvider => {
-  const {
-    isUploadSupported,
-    prepareForUpload,
-    uploadCustomEmoji
-  } = emojiProvider;
-  return !!(isUploadSupported && prepareForUpload && uploadCustomEmoji);
+  const emojiUploadProvider = emojiProvider;
+  return !!emojiUploadProvider.isUploadSupported && !!emojiUploadProvider.uploadCustomEmoji && !!emojiUploadProvider.prepareForUpload;
 };
 export class EmojiResource extends AbstractResource {
   constructor(config) {

package/dist/es2019/components/common/CachingEmoji.js

@@ -1,6 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import PropTypes from 'prop-types';
 import React from 'react';
 import { PureComponent } from 'react';
 import { shouldUseAltRepresentation } from '../../api/EmojiUtils';
@@ -11,6 +10,7 @@ import EmojiPlaceholder from './EmojiPlaceholder';
 import { UfoErrorBoundary } from './UfoErrorBoundary';
 import { sampledUfoRenderedEmoji, ufoExperiences, useSampledUFOComponentExperience } from '../../util/analytics';
 import { SAMPLING_RATE_EMOJI_RENDERED_EXP } from '../../util/constants';
+import { EmojiContext } from '../../context/EmojiContext';
 
 /**
  * Renders an emoji from a cached image, if required.
@@ -46,7 +46,7 @@ export const CachingEmoji = props => {
 
 export class CachingMediaEmoji extends PureComponent {
   constructor(props, context) {
-    super(props, context);
+    super(props);
 
     _defineProperty(this, "mounted", false);
 
@@ -95,6 +95,10 @@ export class CachingMediaEmoji extends PureComponent {
   }
 
   loadEmoji(emoji, context, forceLoad) {
+    if (!context) {
+      return;
+    }
+
     if (!context.emoji) {
       return undefined;
     }
@@ -192,8 +196,6 @@ export class CachingMediaEmoji extends PureComponent {
 
 }
 
-_defineProperty(CachingMediaEmoji, "contextTypes", {
-  emoji: PropTypes.object
-});
+_defineProperty(CachingMediaEmoji, "contextType", EmojiContext);
 
 export default CachingEmoji;

package/dist/es2019/components/common/ResourcedEmojiComponent.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import PropTypes from 'prop-types';
 import React from 'react';
 import { Component } from 'react';
 import { defaultEmojiHeight } from '../../util/constants';
@@ -7,6 +6,7 @@ import { isPromise } from '../../util/type-helpers';
 import CachingEmoji from './CachingEmoji';
 import EmojiPlaceholder from './EmojiPlaceholder';
 import { sampledUfoRenderedEmoji } from '../../util/analytics';
+import LegacyEmojiContextProvider from '../../context/LegacyEmojiContextProvider';
 export default class ResourcedEmojiComponent extends Component {
   constructor(props) {
     super(props);
@@ -19,14 +19,6 @@ export default class ResourcedEmojiComponent extends Component {
     };
   }
 
-  getChildContext() {
-    return {
-      emoji: {
-        emojiProvider: this.props.emojiProvider
-      }
-    };
-  }
-
   refreshEmoji(emojiProvider, emojiId) {
     const foundEmoji = emojiProvider.findByEmojiId(emojiId);
 
@@ -126,15 +118,18 @@ export default class ResourcedEmojiComponent extends Component {
       id,
       fallback
     } = this.props.emojiId;
-    return /*#__PURE__*/React.createElement("span", {
+    const emojiContextValue = {
+      emoji: {
+        emojiProvider: this.props.emojiProvider
+      }
+    };
+    return /*#__PURE__*/React.createElement(LegacyEmojiContextProvider, {
+      emojiContextValue: emojiContextValue
+    }, /*#__PURE__*/React.createElement("span", {
       "data-emoji-id": id,
       "data-emoji-short-name": shortName,
       "data-emoji-text": fallback || shortName
-    }, element);
+    }, element));
   }
 
-}
-
-_defineProperty(ResourcedEmojiComponent, "childContextTypes", {
-  emoji: PropTypes.object
-});
+}