@atlaskit/emoji 69.0.6 → 69.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/cjs/components/common/EmojiDeletePreview.js +2 -2
  3. package/dist/cjs/components/common/LoadingEmojiComponent.js +2 -2
  4. package/dist/cjs/components/compiled/common/EmojiDeletePreview.js +2 -2
  5. package/dist/cjs/components/compiled/picker/EmojiPickerComponent.js +2 -2
  6. package/dist/cjs/components/picker/EmojiPickerComponent.js +2 -2
  7. package/dist/cjs/components/typeahead/EmojiTypeAheadComponent.js +2 -2
  8. package/dist/cjs/components/typeahead/EmojiTypeAheadList.js +2 -2
  9. package/dist/cjs/util/analytics/analytics.js +1 -1
  10. package/dist/es2019/components/common/EmojiDeletePreview.js +2 -2
  11. package/dist/es2019/components/common/LoadingEmojiComponent.js +2 -2
  12. package/dist/es2019/components/compiled/common/EmojiDeletePreview.js +2 -2
  13. package/dist/es2019/components/compiled/picker/EmojiPickerComponent.js +2 -2
  14. package/dist/es2019/components/picker/EmojiPickerComponent.js +2 -2
  15. package/dist/es2019/components/typeahead/EmojiTypeAheadComponent.js +2 -2
  16. package/dist/es2019/components/typeahead/EmojiTypeAheadList.js +2 -2
  17. package/dist/es2019/util/analytics/analytics.js +1 -1
  18. package/dist/esm/components/common/EmojiDeletePreview.js +2 -2
  19. package/dist/esm/components/common/LoadingEmojiComponent.js +2 -2
  20. package/dist/esm/components/compiled/common/EmojiDeletePreview.js +2 -2
  21. package/dist/esm/components/compiled/picker/EmojiPickerComponent.js +2 -2
  22. package/dist/esm/components/picker/EmojiPickerComponent.js +2 -2
  23. package/dist/esm/components/typeahead/EmojiTypeAheadComponent.js +2 -2
  24. package/dist/esm/components/typeahead/EmojiTypeAheadList.js +2 -2
  25. package/dist/esm/util/analytics/analytics.js +1 -1
  26. package/package.json +6 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/emoji
2
2
 
3
+ ## 69.0.7
4
+
5
+ ### Patch Changes
6
+
7
+ - [#132929](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/132929)
8
+ [`17079e4180214`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/17079e4180214) -
9
+ Add FG to rollout react 18 emoji changes to Jira/BB
10
+ - Updated dependencies
11
+
3
12
  ## 69.0.6
4
13
 
5
14
  ### Patch Changes
package/dist/cjs/components/common/EmojiDeletePreview.js CHANGED
@@ -74,7 +74,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
74
74
  return (0, _createClass2.default)(EmojiDeletePreview, [{
75
75
  key: "UNSAFE_componentWillUpdate",
76
76
  value: function UNSAFE_componentWillUpdate(nextProps) {
77
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
77
+ if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
78
78
  if (nextProps.emoji.id !== this.props.emoji.id) {
79
79
  this.setState({
80
80
  error: false
@@ -85,7 +85,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
85
85
  }, {
86
86
  key: "componentDidUpdate",
87
87
  value: function componentDidUpdate(prevProps) {
88
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
88
+ if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
89
89
  if (prevProps.emoji.id !== this.props.emoji.id) {
90
90
  this.setState({
91
91
  error: false
package/dist/cjs/components/common/LoadingEmojiComponent.js CHANGED
@@ -51,14 +51,14 @@ var LoadingEmojiComponent = exports.default = /*#__PURE__*/function (_Component)
51
51
  }, {
52
52
  key: "UNSAFE_componentWillReceiveProps",
53
53
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
54
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
54
+ if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
55
55
  this.loadEmojiProvider(nextProps.emojiProvider);
56
56
  }
57
57
  }
58
58
  }, {
59
59
  key: "componentDidUpdate",
60
60
  value: function componentDidUpdate(prevProps) {
61
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
61
+ if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
62
62
  if (this.props !== prevProps) {
63
63
  this.loadEmojiProvider(this.props.emojiProvider);
64
64
  }
package/dist/cjs/components/compiled/common/EmojiDeletePreview.js CHANGED
@@ -78,7 +78,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
78
78
  return (0, _createClass2.default)(EmojiDeletePreview, [{
79
79
  key: "UNSAFE_componentWillUpdate",
80
80
  value: function UNSAFE_componentWillUpdate(nextProps) {
81
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
81
+ if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
82
82
  if (nextProps.emoji.id !== this.props.emoji.id) {
83
83
  this.setState({
84
84
  error: false
@@ -89,7 +89,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
89
89
  }, {
90
90
  key: "componentDidUpdate",
91
91
  value: function componentDidUpdate(prevProps) {
92
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
92
+ if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
93
93
  if (prevProps.emoji.id !== this.props.emoji.id) {
94
94
  this.setState({
95
95
  error: false
package/dist/cjs/components/compiled/picker/EmojiPickerComponent.js CHANGED
@@ -124,7 +124,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
124
124
  toneEmoji = _useState28[0],
125
125
  setToneEmoji = _useState28[1];
126
126
  var emojiPickerList = (0, _react.useMemo)(function () {
127
- return (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') ? /*#__PURE__*/(0, _react.createRef)() : /*#__PURE__*/(0, _react.createRef)();
127
+ return (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/(0, _react.createRef)() : /*#__PURE__*/(0, _react.createRef)();
128
128
  }, []);
129
129
  var openTime = (0, _react.useRef)(0);
130
130
  var isMounting = (0, _react.useRef)(true);
@@ -511,7 +511,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
511
511
  dynamicCategories: dynamicCategories,
512
512
  disableCategories: disableCategories,
513
513
  onCategorySelected: onCategorySelected
514
- }), (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') ? /*#__PURE__*/React.createElement(_EmojiPickerList.EmojiPickerVirtualListInternalNew, {
514
+ }), (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/React.createElement(_EmojiPickerList.EmojiPickerVirtualListInternalNew, {
515
515
  emojis: filteredEmojis,
516
516
  currentUser: currentUser,
517
517
  onEmojiSelected: recordUsageOnSelection,
package/dist/cjs/components/picker/EmojiPickerComponent.js CHANGED
@@ -104,7 +104,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
104
104
  toneEmoji = _useState28[0],
105
105
  setToneEmoji = _useState28[1];
106
106
  var emojiPickerList = (0, _react.useMemo)(function () {
107
- return (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') ? /*#__PURE__*/(0, _react.createRef)() : /*#__PURE__*/(0, _react.createRef)();
107
+ return (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/(0, _react.createRef)() : /*#__PURE__*/(0, _react.createRef)();
108
108
  }, []);
109
109
  var openTime = (0, _react.useRef)(0);
110
110
  var isMounting = (0, _react.useRef)(true);
@@ -489,7 +489,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
489
489
  dynamicCategories: dynamicCategories,
490
490
  disableCategories: disableCategories,
491
491
  onCategorySelected: onCategorySelected
492
- }), (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') ? (0, _react2.jsx)(_EmojiPickerList.EmojiPickerVirtualListInternalNew, {
492
+ }), (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? (0, _react2.jsx)(_EmojiPickerList.EmojiPickerVirtualListInternalNew, {
493
493
  emojis: filteredEmojis,
494
494
  currentUser: currentUser,
495
495
  onEmojiSelected: recordUsageOnSelection,
package/dist/cjs/components/typeahead/EmojiTypeAheadComponent.js CHANGED
@@ -194,7 +194,7 @@ var EmojiTypeAheadComponent = exports.default = /*#__PURE__*/function (_PureComp
194
194
  }, {
195
195
  key: "UNSAFE_componentWillReceiveProps",
196
196
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
197
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
197
+ if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
198
198
  var prevEmojiProvider = this.props.emojiProvider;
199
199
  var nextEmojiProvider = nextProps.emojiProvider;
200
200
  if (prevEmojiProvider !== nextEmojiProvider) {
@@ -209,7 +209,7 @@ var EmojiTypeAheadComponent = exports.default = /*#__PURE__*/function (_PureComp
209
209
  }, {
210
210
  key: "componentDidUpdate",
211
211
  value: function componentDidUpdate(prevProps) {
212
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
212
+ if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
213
213
  if (prevProps !== this.props) {
214
214
  var prevEmojiProvider = prevProps.emojiProvider;
215
215
  var nextEmojiProvider = this.props.emojiProvider;
package/dist/cjs/components/typeahead/EmojiTypeAheadList.js CHANGED
@@ -102,7 +102,7 @@ var EmojiTypeAheadList = exports.default = /*#__PURE__*/function (_PureComponent
102
102
  return (0, _createClass2.default)(EmojiTypeAheadList, [{
103
103
  key: "UNSAFE_componentWillReceiveProps",
104
104
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
105
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
105
+ if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
106
106
  // adjust selection
107
107
  var emojis = nextProps.emojis;
108
108
  var selectedKey = this.state.selectedKey;
@@ -133,7 +133,7 @@ var EmojiTypeAheadList = exports.default = /*#__PURE__*/function (_PureComponent
133
133
  var selectedEmoji = emojis[selectedIndex];
134
134
  this.revealItem(selectedEmoji.id || selectedEmoji.shortName);
135
135
  }
136
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji')) {
136
+ if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
137
137
  if (prevProps !== this.props) {
138
138
  // adjust selection
139
139
  if (!selectedKey) {
package/dist/cjs/util/analytics/analytics.js CHANGED
@@ -20,7 +20,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
20
20
  actionSubjectId: actionSubjectId,
21
21
  attributes: _objectSpread({
22
22
  packageName: "@atlaskit/emoji",
23
- packageVersion: "69.0.6"
23
+ packageVersion: "69.0.7"
24
24
  }, attributes)
25
25
  };
26
26
  };
package/dist/es2019/components/common/EmojiDeletePreview.js CHANGED
@@ -54,7 +54,7 @@ class EmojiDeletePreview extends Component {
54
54
  };
55
55
  }
56
56
  UNSAFE_componentWillUpdate(nextProps) {
57
- if (!fg('platform_editor_react18_elements_emoji')) {
57
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
58
58
  if (nextProps.emoji.id !== this.props.emoji.id) {
59
59
  this.setState({
60
60
  error: false
@@ -63,7 +63,7 @@ class EmojiDeletePreview extends Component {
63
63
  }
64
64
  }
65
65
  componentDidUpdate(prevProps) {
66
- if (fg('platform_editor_react18_elements_emoji')) {
66
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
67
67
  if (prevProps.emoji.id !== this.props.emoji.id) {
68
68
  this.setState({
69
69
  error: false
package/dist/es2019/components/common/LoadingEmojiComponent.js CHANGED
@@ -27,12 +27,12 @@ export default class LoadingEmojiComponent extends Component {
27
27
  }
28
28
  }
29
29
  UNSAFE_componentWillReceiveProps(nextProps) {
30
- if (!fg('platform_editor_react18_elements_emoji')) {
30
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
31
31
  this.loadEmojiProvider(nextProps.emojiProvider);
32
32
  }
33
33
  }
34
34
  componentDidUpdate(prevProps) {
35
- if (fg('platform_editor_react18_elements_emoji')) {
35
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
36
36
  if (this.props !== prevProps) {
37
37
  this.loadEmojiProvider(this.props.emojiProvider);
38
38
  }
package/dist/es2019/components/compiled/common/EmojiDeletePreview.js CHANGED
@@ -56,7 +56,7 @@ class EmojiDeletePreview extends Component {
56
56
  };
57
57
  }
58
58
  UNSAFE_componentWillUpdate(nextProps) {
59
- if (!fg('platform_editor_react18_elements_emoji')) {
59
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
60
60
  if (nextProps.emoji.id !== this.props.emoji.id) {
61
61
  this.setState({
62
62
  error: false
@@ -65,7 +65,7 @@ class EmojiDeletePreview extends Component {
65
65
  }
66
66
  }
67
67
  componentDidUpdate(prevProps) {
68
- if (fg('platform_editor_react18_elements_emoji')) {
68
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
69
69
  if (prevProps.emoji.id !== this.props.emoji.id) {
70
70
  this.setState({
71
71
  error: false
package/dist/es2019/components/compiled/picker/EmojiPickerComponent.js CHANGED
@@ -68,7 +68,7 @@ const EmojiPickerComponent = ({
68
68
  const [uploadErrorMessage, setUploadErrorMessage] = useState();
69
69
  const [emojiToDelete, setEmojiToDelete] = useState();
70
70
  const [toneEmoji, setToneEmoji] = useState();
71
- const emojiPickerList = useMemo(() => fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef(), []);
71
+ const emojiPickerList = useMemo(() => fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef(), []);
72
72
  const openTime = useRef(0);
73
73
  const isMounting = useRef(true);
74
74
  const previousEmojiProvider = useRef(emojiProvider);
@@ -443,7 +443,7 @@ const EmojiPickerComponent = ({
443
443
  dynamicCategories: dynamicCategories,
444
444
  disableCategories: disableCategories,
445
445
  onCategorySelected: onCategorySelected
446
- }), fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/React.createElement(EmojiPickerListNew, {
446
+ }), fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/React.createElement(EmojiPickerListNew, {
447
447
  emojis: filteredEmojis,
448
448
  currentUser: currentUser,
449
449
  onEmojiSelected: recordUsageOnSelection,
package/dist/es2019/components/picker/EmojiPickerComponent.js CHANGED
@@ -53,7 +53,7 @@ const EmojiPickerComponent = ({
53
53
  const [uploadErrorMessage, setUploadErrorMessage] = useState();
54
54
  const [emojiToDelete, setEmojiToDelete] = useState();
55
55
  const [toneEmoji, setToneEmoji] = useState();
56
- const emojiPickerList = useMemo(() => fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef(), []);
56
+ const emojiPickerList = useMemo(() => fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef(), []);
57
57
  const openTime = useRef(0);
58
58
  const isMounting = useRef(true);
59
59
  const previousEmojiProvider = useRef(emojiProvider);
@@ -431,7 +431,7 @@ const EmojiPickerComponent = ({
431
431
  dynamicCategories: dynamicCategories,
432
432
  disableCategories: disableCategories,
433
433
  onCategorySelected: onCategorySelected
434
- }), fg('platform_editor_react18_elements_emoji') ? jsx(EmojiPickerListNew, {
434
+ }), fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? jsx(EmojiPickerListNew, {
435
435
  emojis: filteredEmojis,
436
436
  currentUser: currentUser,
437
437
  onEmojiSelected: recordUsageOnSelection,
package/dist/es2019/components/typeahead/EmojiTypeAheadComponent.js CHANGED
@@ -161,7 +161,7 @@ export default class EmojiTypeAheadComponent extends PureComponent {
161
161
  this.selected = false;
162
162
  }
163
163
  UNSAFE_componentWillReceiveProps(nextProps) {
164
- if (!fg('platform_editor_react18_elements_emoji')) {
164
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
165
165
  const prevEmojiProvider = this.props.emojiProvider;
166
166
  const nextEmojiProvider = nextProps.emojiProvider;
167
167
  if (prevEmojiProvider !== nextEmojiProvider) {
@@ -174,7 +174,7 @@ export default class EmojiTypeAheadComponent extends PureComponent {
174
174
  }
175
175
  }
176
176
  componentDidUpdate(prevProps) {
177
- if (fg('platform_editor_react18_elements_emoji')) {
177
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
178
178
  if (prevProps !== this.props) {
179
179
  const prevEmojiProvider = prevProps.emojiProvider;
180
180
  const nextEmojiProvider = this.props.emojiProvider;
package/dist/es2019/components/typeahead/EmojiTypeAheadList.js CHANGED
@@ -82,7 +82,7 @@ export default class EmojiTypeAheadList extends PureComponent {
82
82
  };
83
83
  }
84
84
  UNSAFE_componentWillReceiveProps(nextProps) {
85
- if (!fg('platform_editor_react18_elements_emoji')) {
85
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
86
86
  // adjust selection
87
87
  const {
88
88
  emojis
@@ -118,7 +118,7 @@ export default class EmojiTypeAheadList extends PureComponent {
118
118
  const selectedEmoji = emojis[selectedIndex];
119
119
  this.revealItem(selectedEmoji.id || selectedEmoji.shortName);
120
120
  }
121
- if (fg('platform_editor_react18_elements_emoji')) {
121
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
122
122
  if (prevProps !== this.props) {
123
123
  // adjust selection
124
124
  if (!selectedKey) {
package/dist/es2019/util/analytics/analytics.js CHANGED
@@ -8,7 +8,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
8
8
  actionSubjectId,
9
9
  attributes: {
10
10
  packageName: "@atlaskit/emoji",
11
- packageVersion: "69.0.6",
11
+ packageVersion: "69.0.7",
12
12
  ...attributes
13
13
  }
14
14
  });
package/dist/esm/components/common/EmojiDeletePreview.js CHANGED
@@ -66,7 +66,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
66
66
  return _createClass(EmojiDeletePreview, [{
67
67
  key: "UNSAFE_componentWillUpdate",
68
68
  value: function UNSAFE_componentWillUpdate(nextProps) {
69
- if (!fg('platform_editor_react18_elements_emoji')) {
69
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
70
70
  if (nextProps.emoji.id !== this.props.emoji.id) {
71
71
  this.setState({
72
72
  error: false
@@ -77,7 +77,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
77
77
  }, {
78
78
  key: "componentDidUpdate",
79
79
  value: function componentDidUpdate(prevProps) {
80
- if (fg('platform_editor_react18_elements_emoji')) {
80
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
81
81
  if (prevProps.emoji.id !== this.props.emoji.id) {
82
82
  this.setState({
83
83
  error: false
package/dist/esm/components/common/LoadingEmojiComponent.js CHANGED
@@ -44,14 +44,14 @@ var LoadingEmojiComponent = /*#__PURE__*/function (_Component) {
44
44
  }, {
45
45
  key: "UNSAFE_componentWillReceiveProps",
46
46
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
47
- if (!fg('platform_editor_react18_elements_emoji')) {
47
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
48
48
  this.loadEmojiProvider(nextProps.emojiProvider);
49
49
  }
50
50
  }
51
51
  }, {
52
52
  key: "componentDidUpdate",
53
53
  value: function componentDidUpdate(prevProps) {
54
- if (fg('platform_editor_react18_elements_emoji')) {
54
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
55
55
  if (this.props !== prevProps) {
56
56
  this.loadEmojiProvider(this.props.emojiProvider);
57
57
  }
package/dist/esm/components/compiled/common/EmojiDeletePreview.js CHANGED
@@ -68,7 +68,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
68
68
  return _createClass(EmojiDeletePreview, [{
69
69
  key: "UNSAFE_componentWillUpdate",
70
70
  value: function UNSAFE_componentWillUpdate(nextProps) {
71
- if (!fg('platform_editor_react18_elements_emoji')) {
71
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
72
72
  if (nextProps.emoji.id !== this.props.emoji.id) {
73
73
  this.setState({
74
74
  error: false
@@ -79,7 +79,7 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
79
79
  }, {
80
80
  key: "componentDidUpdate",
81
81
  value: function componentDidUpdate(prevProps) {
82
- if (fg('platform_editor_react18_elements_emoji')) {
82
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
83
83
  if (prevProps.emoji.id !== this.props.emoji.id) {
84
84
  this.setState({
85
85
  error: false
package/dist/esm/components/compiled/picker/EmojiPickerComponent.js CHANGED
@@ -114,7 +114,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
114
114
  toneEmoji = _useState28[0],
115
115
  setToneEmoji = _useState28[1];
116
116
  var emojiPickerList = useMemo(function () {
117
- return fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef();
117
+ return fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef();
118
118
  }, []);
119
119
  var openTime = useRef(0);
120
120
  var isMounting = useRef(true);
@@ -501,7 +501,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
501
501
  dynamicCategories: dynamicCategories,
502
502
  disableCategories: disableCategories,
503
503
  onCategorySelected: onCategorySelected
504
- }), fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/React.createElement(EmojiPickerListNew, {
504
+ }), fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/React.createElement(EmojiPickerListNew, {
505
505
  emojis: filteredEmojis,
506
506
  currentUser: currentUser,
507
507
  onEmojiSelected: recordUsageOnSelection,
package/dist/esm/components/picker/EmojiPickerComponent.js CHANGED
@@ -99,7 +99,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
99
99
  toneEmoji = _useState28[0],
100
100
  setToneEmoji = _useState28[1];
101
101
  var emojiPickerList = useMemo(function () {
102
- return fg('platform_editor_react18_elements_emoji') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef();
102
+ return fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef();
103
103
  }, []);
104
104
  var openTime = useRef(0);
105
105
  var isMounting = useRef(true);
@@ -484,7 +484,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
484
484
  dynamicCategories: dynamicCategories,
485
485
  disableCategories: disableCategories,
486
486
  onCategorySelected: onCategorySelected
487
- }), fg('platform_editor_react18_elements_emoji') ? jsx(EmojiPickerListNew, {
487
+ }), fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? jsx(EmojiPickerListNew, {
488
488
  emojis: filteredEmojis,
489
489
  currentUser: currentUser,
490
490
  onEmojiSelected: recordUsageOnSelection,
package/dist/esm/components/typeahead/EmojiTypeAheadComponent.js CHANGED
@@ -185,7 +185,7 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
185
185
  }, {
186
186
  key: "UNSAFE_componentWillReceiveProps",
187
187
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
188
- if (!fg('platform_editor_react18_elements_emoji')) {
188
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
189
189
  var prevEmojiProvider = this.props.emojiProvider;
190
190
  var nextEmojiProvider = nextProps.emojiProvider;
191
191
  if (prevEmojiProvider !== nextEmojiProvider) {
@@ -200,7 +200,7 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
200
200
  }, {
201
201
  key: "componentDidUpdate",
202
202
  value: function componentDidUpdate(prevProps) {
203
- if (fg('platform_editor_react18_elements_emoji')) {
203
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
204
204
  if (prevProps !== this.props) {
205
205
  var prevEmojiProvider = prevProps.emojiProvider;
206
206
  var nextEmojiProvider = this.props.emojiProvider;
package/dist/esm/components/typeahead/EmojiTypeAheadList.js CHANGED
@@ -92,7 +92,7 @@ var EmojiTypeAheadList = /*#__PURE__*/function (_PureComponent) {
92
92
  return _createClass(EmojiTypeAheadList, [{
93
93
  key: "UNSAFE_componentWillReceiveProps",
94
94
  value: function UNSAFE_componentWillReceiveProps(nextProps) {
95
- if (!fg('platform_editor_react18_elements_emoji')) {
95
+ if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
96
96
  // adjust selection
97
97
  var emojis = nextProps.emojis;
98
98
  var selectedKey = this.state.selectedKey;
@@ -123,7 +123,7 @@ var EmojiTypeAheadList = /*#__PURE__*/function (_PureComponent) {
123
123
  var selectedEmoji = emojis[selectedIndex];
124
124
  this.revealItem(selectedEmoji.id || selectedEmoji.shortName);
125
125
  }
126
- if (fg('platform_editor_react18_elements_emoji')) {
126
+ if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
127
127
  if (prevProps !== this.props) {
128
128
  // adjust selection
129
129
  if (!selectedKey) {
package/dist/esm/util/analytics/analytics.js CHANGED
@@ -13,7 +13,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
13
13
  actionSubjectId: actionSubjectId,
14
14
  attributes: _objectSpread({
15
15
  packageName: "@atlaskit/emoji",
16
- packageVersion: "69.0.6"
16
+ packageVersion: "69.0.7"
17
17
  }, attributes)
18
18
  };
19
19
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/emoji",
3
- "version": "69.0.6",
3
+ "version": "69.0.7",
4
4
  "description": "Fabric emoji React components",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -36,10 +36,10 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@atlaskit/analytics-next": "^11.0.0",
39
- "@atlaskit/button": "^22.0.0",
39
+ "@atlaskit/button": "^23.0.0",
40
40
  "@atlaskit/css": "^0.10.0",
41
41
  "@atlaskit/heading": "^5.1.0",
42
- "@atlaskit/icon": "^25.3.0",
42
+ "@atlaskit/icon": "^25.4.0",
43
43
  "@atlaskit/media-client": "^32.0.0",
44
44
  "@atlaskit/media-client-react": "^4.0.0",
45
45
  "@atlaskit/platform-feature-flags": "^1.1.0",
@@ -138,6 +138,9 @@
138
138
  },
139
139
  "platform_editor_css_migrate_emoji": {
140
140
  "type": "boolean"
141
+ },
142
+ "platform_editor_react18_elements_emoji_jira_bb": {
143
+ "type": "boolean"
141
144
  }
142
145
  },
143
146
  "scripts": {