@atlaskit/emoji 71.7.2 → 71.7.4
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.
- package/CHANGELOG.md +15 -0
- package/dist/cjs/components/common/EmojiActions.compiled.css +7 -1
- package/dist/cjs/components/common/EmojiActions.js +16 -15
- package/dist/cjs/components/picker/EmojiPickerComponent.js +3 -3
- package/dist/cjs/util/analytics/analytics.js +1 -1
- package/dist/es2019/components/common/EmojiActions.compiled.css +7 -1
- package/dist/es2019/components/common/EmojiActions.js +16 -15
- package/dist/es2019/components/picker/EmojiPickerComponent.js +3 -3
- package/dist/es2019/util/analytics/analytics.js +1 -1
- package/dist/esm/components/common/EmojiActions.compiled.css +7 -1
- package/dist/esm/components/common/EmojiActions.js +16 -15
- package/dist/esm/components/picker/EmojiPickerComponent.js +3 -3
- package/dist/esm/util/analytics/analytics.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/emoji
|
|
2
2
|
|
|
3
|
+
## 71.7.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`eaa674ef4c640`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eaa674ef4c640) -
|
|
8
|
+
The popup for productivity color picker should render relative to, and move with picker
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
11
|
+
## 71.7.3
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [`f294eca9448a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f294eca9448a6) -
|
|
16
|
+
If emoji upload is disabled, retain previously selected emoji in preview
|
|
17
|
+
|
|
3
18
|
## 71.7.2
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
|
|
2
2
|
._19itia51{border:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
|
|
3
3
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
|
-
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}.
|
|
4
|
+
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}._154i15iq{top:calc(100% + var(--ds-space-050, 4px))}
|
|
5
|
+
._16jlidpf{flex-grow:0}
|
|
5
6
|
._16jlkb7n{flex-grow:1}
|
|
6
7
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
7
8
|
._16qsjgpa{box-shadow:0 1px 1px 0 var(--ds-border,#0b120e24)}
|
|
@@ -10,10 +11,13 @@
|
|
|
10
11
|
._19bv12x7{padding-left:var(--ds-space-075,6px)}
|
|
11
12
|
._19bvidpf{padding-left:0}
|
|
12
13
|
._1bahesu3{justify-content:flex-end}
|
|
14
|
+
._1e0c116y{display:inline-flex}
|
|
13
15
|
._1e0c1txw{display:flex}
|
|
14
16
|
._1o9zidpf{flex-shrink:0}
|
|
15
17
|
._1o9zkb7n{flex-shrink:1}
|
|
18
|
+
._1pbydx66{z-index:9999}
|
|
16
19
|
._1wpz1h6o{align-self:center}
|
|
20
|
+
._1xi2idpf{right:0}
|
|
17
21
|
._2hwx1i6y{margin-right:var(--ds-space-negative-025,-2px)}
|
|
18
22
|
._4cvr1h6o{align-items:center}
|
|
19
23
|
._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
|
|
@@ -21,6 +25,8 @@
|
|
|
21
25
|
._ca0q1skh{padding-top:11px}
|
|
22
26
|
._i0dl1wug{flex-basis:auto}
|
|
23
27
|
._i0dlf1ug{flex-basis:0%}
|
|
28
|
+
._kqswh2mm{position:relative}
|
|
29
|
+
._kqswstnw{position:absolute}
|
|
24
30
|
._n3td12x7{padding-bottom:var(--ds-space-075,6px)}
|
|
25
31
|
._n3td1crf{padding-bottom:9pt}
|
|
26
32
|
._otyr19bv{margin-bottom:10px}
|
|
@@ -21,7 +21,6 @@ var _EmojiUploadPicker = _interopRequireDefault(require("./EmojiUploadPicker"));
|
|
|
21
21
|
var _TonePreviewButton = _interopRequireDefault(require("./TonePreviewButton"));
|
|
22
22
|
var _ToneSelector = _interopRequireDefault(require("./ToneSelector"));
|
|
23
23
|
var _ProductivityColorSelector = _interopRequireWildcard(require("./ProductivityColorSelector"));
|
|
24
|
-
var _Popup = _interopRequireDefault(require("./Popup"));
|
|
25
24
|
var _EmojiPickerListSearch = require("../picker/EmojiPickerListSearch");
|
|
26
25
|
var _i18n = require("../i18n");
|
|
27
26
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
@@ -30,7 +29,6 @@ var _setSkinToneAriaLabelText = require("./setSkinToneAriaLabelText");
|
|
|
30
29
|
var _styles = require("./styles");
|
|
31
30
|
var _constants = require("../../util/constants");
|
|
32
31
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
33
|
-
var _constants2 = require("@atlaskit/theme/constants");
|
|
34
32
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
35
33
|
var isRefreshEmojiPickerEnabled = function isRefreshEmojiPickerEnabled() {
|
|
36
34
|
if (!_featureGateJsClient.default.initializeCompleted()) {
|
|
@@ -49,6 +47,11 @@ var addCustomEmojiButton = null;
|
|
|
49
47
|
var emojiActionsWrapper = null;
|
|
50
48
|
var emojiToneSelectorContainer = null;
|
|
51
49
|
var productivityColorPopup = null;
|
|
50
|
+
var productivityColorPopupAnchor = null;
|
|
51
|
+
|
|
52
|
+
// Matches the ADS tooltip layer so the selector sits above picker content.
|
|
53
|
+
var productivityColorPopupZIndex = 9999;
|
|
54
|
+
var productivityColorPopupPosition = null;
|
|
52
55
|
var previewFooter = null;
|
|
53
56
|
var previewFooterNew = null;
|
|
54
57
|
var atlassianSubcategoriesWithProductivityColorSelector = ['Objects', 'Productivity', 'Logos'];
|
|
@@ -210,18 +213,9 @@ var TonesWrapper = function TonesWrapper(props) {
|
|
|
210
213
|
}
|
|
211
214
|
return /*#__PURE__*/React.createElement("div", {
|
|
212
215
|
className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dlf1ug _ca0q1skh _u5f319bv _n3td1crf _19bvidpf _1e0c1txw _1bahesu3"])
|
|
213
|
-
},
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
horizontalAlign: "end-to-start",
|
|
217
|
-
offsetY: 4,
|
|
218
|
-
zIndex: _constants2.layers.tooltip()
|
|
219
|
-
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
220
|
-
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
221
|
-
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
222
|
-
selectedColor: selectedProductivityColor,
|
|
223
|
-
onColorSelected: onProductivityColorSelectedHandler
|
|
224
|
-
})), /*#__PURE__*/React.createElement(_TonePreviewButton.default, {
|
|
216
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
217
|
+
className: (0, _runtime.ax)(["_kqswh2mm _1e0c116y"])
|
|
218
|
+
}, /*#__PURE__*/React.createElement(_TonePreviewButton.default, {
|
|
225
219
|
ref: tonePreviewButtonRef,
|
|
226
220
|
ariaControls: _ProductivityColorSelector.productivityColorSelectorId,
|
|
227
221
|
ariaExpanded: showToneSelector,
|
|
@@ -230,7 +224,14 @@ var TonesWrapper = function TonesWrapper(props) {
|
|
|
230
224
|
onKeyDown: onProductivityColorPreviewKeyDown,
|
|
231
225
|
onSelected: onProductivityColorToggle,
|
|
232
226
|
ariaLabelText: formatMessage(_i18n.messages.emojiSelectColorButtonAriaLabelText)
|
|
233
|
-
})
|
|
227
|
+
}), showToneSelector && /*#__PURE__*/React.createElement("div", {
|
|
228
|
+
className: (0, _runtime.ax)(["_kqswstnw _154i15iq _1xi2idpf _1pbydx66"])
|
|
229
|
+
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
230
|
+
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
231
|
+
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
232
|
+
selectedColor: selectedProductivityColor,
|
|
233
|
+
onColorSelected: onProductivityColorSelectedHandler
|
|
234
|
+
}))));
|
|
234
235
|
}
|
|
235
236
|
if (!toneEmoji) {
|
|
236
237
|
return null;
|
|
@@ -208,11 +208,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
208
208
|
setSelectedEmoji(emoji);
|
|
209
209
|
}
|
|
210
210
|
}, [selectedEmoji]);
|
|
211
|
+
var uploadEnabled = isUploadSupported && !uploading;
|
|
211
212
|
var onEmojiLeave = (0, _react.useCallback)(function () {
|
|
212
|
-
if (isRefreshEmojiPickerEnabled()) {
|
|
213
|
+
if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
|
|
213
214
|
setSelectedEmoji(undefined);
|
|
214
215
|
}
|
|
215
|
-
}, []);
|
|
216
|
+
}, [uploadEnabled]);
|
|
216
217
|
var onCategoryActivated = (0, _react.useCallback)(function (category) {
|
|
217
218
|
// Ignore scroll-driven category changes while a programmatic reveal()
|
|
218
219
|
// scroll is in progress — they would flicker the indicator through
|
|
@@ -678,7 +679,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
678
679
|
emojiProvider.unsubscribe(onProviderChange);
|
|
679
680
|
};
|
|
680
681
|
}, [emojiProvider, onProviderChange]);
|
|
681
|
-
var uploadEnabled = isUploadSupported && !uploading;
|
|
682
682
|
var showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
|
|
683
683
|
var shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
|
|
684
684
|
var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
|
|
@@ -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: "71.7.
|
|
23
|
+
packageVersion: "71.7.3"
|
|
24
24
|
}, attributes)
|
|
25
25
|
};
|
|
26
26
|
};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
|
|
2
2
|
._19itia51{border:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
|
|
3
3
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
|
-
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}.
|
|
4
|
+
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}._154i15iq{top:calc(100% + var(--ds-space-050, 4px))}
|
|
5
|
+
._16jlidpf{flex-grow:0}
|
|
5
6
|
._16jlkb7n{flex-grow:1}
|
|
6
7
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
7
8
|
._16qsjgpa{box-shadow:0 1px 1px 0 var(--ds-border,#0b120e24)}
|
|
@@ -10,10 +11,13 @@
|
|
|
10
11
|
._19bv12x7{padding-left:var(--ds-space-075,6px)}
|
|
11
12
|
._19bvidpf{padding-left:0}
|
|
12
13
|
._1bahesu3{justify-content:flex-end}
|
|
14
|
+
._1e0c116y{display:inline-flex}
|
|
13
15
|
._1e0c1txw{display:flex}
|
|
14
16
|
._1o9zidpf{flex-shrink:0}
|
|
15
17
|
._1o9zkb7n{flex-shrink:1}
|
|
18
|
+
._1pbydx66{z-index:9999}
|
|
16
19
|
._1wpz1h6o{align-self:center}
|
|
20
|
+
._1xi2idpf{right:0}
|
|
17
21
|
._2hwx1i6y{margin-right:var(--ds-space-negative-025,-2px)}
|
|
18
22
|
._4cvr1h6o{align-items:center}
|
|
19
23
|
._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
|
|
@@ -21,6 +25,8 @@
|
|
|
21
25
|
._ca0q1skh{padding-top:11px}
|
|
22
26
|
._i0dl1wug{flex-basis:auto}
|
|
23
27
|
._i0dlf1ug{flex-basis:0%}
|
|
28
|
+
._kqswh2mm{position:relative}
|
|
29
|
+
._kqswstnw{position:absolute}
|
|
24
30
|
._n3td12x7{padding-bottom:var(--ds-space-075,6px)}
|
|
25
31
|
._n3td1crf{padding-bottom:9pt}
|
|
26
32
|
._otyr19bv{margin-bottom:10px}
|
|
@@ -12,7 +12,6 @@ import EmojiUploadPicker from './EmojiUploadPicker';
|
|
|
12
12
|
import TonePreviewButton from './TonePreviewButton';
|
|
13
13
|
import ToneSelector from './ToneSelector';
|
|
14
14
|
import ProductivityColorSelector, { productivityColorSelectorId } from './ProductivityColorSelector';
|
|
15
|
-
import Popup from './Popup';
|
|
16
15
|
import { EmojiPickerListSearch } from '../picker/EmojiPickerListSearch';
|
|
17
16
|
import { messages } from '../i18n';
|
|
18
17
|
import AkButton from '@atlaskit/button/standard-button';
|
|
@@ -21,7 +20,6 @@ import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
|
|
|
21
20
|
import { emojiPickerAddEmoji } from './styles';
|
|
22
21
|
import { DEFAULT_TONE } from '../../util/constants';
|
|
23
22
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
24
|
-
import { layers } from '@atlaskit/theme/constants';
|
|
25
23
|
const isRefreshEmojiPickerEnabled = () => {
|
|
26
24
|
if (!FeatureGates.initializeCompleted()) {
|
|
27
25
|
return false;
|
|
@@ -39,6 +37,11 @@ const addCustomEmojiButton = null;
|
|
|
39
37
|
const emojiActionsWrapper = null;
|
|
40
38
|
const emojiToneSelectorContainer = null;
|
|
41
39
|
const productivityColorPopup = null;
|
|
40
|
+
const productivityColorPopupAnchor = null;
|
|
41
|
+
|
|
42
|
+
// Matches the ADS tooltip layer so the selector sits above picker content.
|
|
43
|
+
const productivityColorPopupZIndex = 9999;
|
|
44
|
+
const productivityColorPopupPosition = null;
|
|
42
45
|
const previewFooter = null;
|
|
43
46
|
const previewFooterNew = null;
|
|
44
47
|
const atlassianSubcategoriesWithProductivityColorSelector = ['Objects', 'Productivity', 'Logos'];
|
|
@@ -200,18 +203,9 @@ const TonesWrapper = props => {
|
|
|
200
203
|
}
|
|
201
204
|
return /*#__PURE__*/React.createElement("div", {
|
|
202
205
|
className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _ca0q1skh _u5f319bv _n3td1crf _19bvidpf _1e0c1txw _1bahesu3"])
|
|
203
|
-
},
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
horizontalAlign: "end-to-start",
|
|
207
|
-
offsetY: 4,
|
|
208
|
-
zIndex: layers.tooltip()
|
|
209
|
-
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
210
|
-
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
211
|
-
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
212
|
-
selectedColor: selectedProductivityColor,
|
|
213
|
-
onColorSelected: onProductivityColorSelectedHandler
|
|
214
|
-
})), /*#__PURE__*/React.createElement(TonePreviewButton, {
|
|
206
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
207
|
+
className: ax(["_kqswh2mm _1e0c116y"])
|
|
208
|
+
}, /*#__PURE__*/React.createElement(TonePreviewButton, {
|
|
215
209
|
ref: tonePreviewButtonRef,
|
|
216
210
|
ariaControls: productivityColorSelectorId,
|
|
217
211
|
ariaExpanded: showToneSelector,
|
|
@@ -220,7 +214,14 @@ const TonesWrapper = props => {
|
|
|
220
214
|
onKeyDown: onProductivityColorPreviewKeyDown,
|
|
221
215
|
onSelected: onProductivityColorToggle,
|
|
222
216
|
ariaLabelText: formatMessage(messages.emojiSelectColorButtonAriaLabelText)
|
|
223
|
-
})
|
|
217
|
+
}), showToneSelector && /*#__PURE__*/React.createElement("div", {
|
|
218
|
+
className: ax(["_kqswstnw _154i15iq _1xi2idpf _1pbydx66"])
|
|
219
|
+
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
220
|
+
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
221
|
+
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
222
|
+
selectedColor: selectedProductivityColor,
|
|
223
|
+
onColorSelected: onProductivityColorSelectedHandler
|
|
224
|
+
}))));
|
|
224
225
|
}
|
|
225
226
|
if (!toneEmoji) {
|
|
226
227
|
return null;
|
|
@@ -145,11 +145,12 @@ const EmojiPickerComponent = ({
|
|
|
145
145
|
setSelectedEmoji(emoji);
|
|
146
146
|
}
|
|
147
147
|
}, [selectedEmoji]);
|
|
148
|
+
const uploadEnabled = isUploadSupported && !uploading;
|
|
148
149
|
const onEmojiLeave = useCallback(() => {
|
|
149
|
-
if (isRefreshEmojiPickerEnabled()) {
|
|
150
|
+
if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
|
|
150
151
|
setSelectedEmoji(undefined);
|
|
151
152
|
}
|
|
152
|
-
}, []);
|
|
153
|
+
}, [uploadEnabled]);
|
|
153
154
|
const onCategoryActivated = useCallback(category => {
|
|
154
155
|
// Ignore scroll-driven category changes while a programmatic reveal()
|
|
155
156
|
// scroll is in progress — they would flicker the indicator through
|
|
@@ -583,7 +584,6 @@ const EmojiPickerComponent = ({
|
|
|
583
584
|
emojiProvider.unsubscribe(onProviderChange);
|
|
584
585
|
};
|
|
585
586
|
}, [emojiProvider, onProviderChange]);
|
|
586
|
-
const uploadEnabled = isUploadSupported && !uploading;
|
|
587
587
|
const showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
|
|
588
588
|
const shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
|
|
589
589
|
const useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
|
|
2
2
|
._19itia51{border:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
|
|
3
3
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
|
-
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}.
|
|
4
|
+
._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}._154i15iq{top:calc(100% + var(--ds-space-050, 4px))}
|
|
5
|
+
._16jlidpf{flex-grow:0}
|
|
5
6
|
._16jlkb7n{flex-grow:1}
|
|
6
7
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
7
8
|
._16qsjgpa{box-shadow:0 1px 1px 0 var(--ds-border,#0b120e24)}
|
|
@@ -10,10 +11,13 @@
|
|
|
10
11
|
._19bv12x7{padding-left:var(--ds-space-075,6px)}
|
|
11
12
|
._19bvidpf{padding-left:0}
|
|
12
13
|
._1bahesu3{justify-content:flex-end}
|
|
14
|
+
._1e0c116y{display:inline-flex}
|
|
13
15
|
._1e0c1txw{display:flex}
|
|
14
16
|
._1o9zidpf{flex-shrink:0}
|
|
15
17
|
._1o9zkb7n{flex-shrink:1}
|
|
18
|
+
._1pbydx66{z-index:9999}
|
|
16
19
|
._1wpz1h6o{align-self:center}
|
|
20
|
+
._1xi2idpf{right:0}
|
|
17
21
|
._2hwx1i6y{margin-right:var(--ds-space-negative-025,-2px)}
|
|
18
22
|
._4cvr1h6o{align-items:center}
|
|
19
23
|
._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
|
|
@@ -21,6 +25,8 @@
|
|
|
21
25
|
._ca0q1skh{padding-top:11px}
|
|
22
26
|
._i0dl1wug{flex-basis:auto}
|
|
23
27
|
._i0dlf1ug{flex-basis:0%}
|
|
28
|
+
._kqswh2mm{position:relative}
|
|
29
|
+
._kqswstnw{position:absolute}
|
|
24
30
|
._n3td12x7{padding-bottom:var(--ds-space-075,6px)}
|
|
25
31
|
._n3td1crf{padding-bottom:9pt}
|
|
26
32
|
._otyr19bv{margin-bottom:10px}
|
|
@@ -13,7 +13,6 @@ import EmojiUploadPicker from './EmojiUploadPicker';
|
|
|
13
13
|
import TonePreviewButton from './TonePreviewButton';
|
|
14
14
|
import ToneSelector from './ToneSelector';
|
|
15
15
|
import ProductivityColorSelector, { productivityColorSelectorId } from './ProductivityColorSelector';
|
|
16
|
-
import Popup from './Popup';
|
|
17
16
|
import { EmojiPickerListSearch } from '../picker/EmojiPickerListSearch';
|
|
18
17
|
import { messages } from '../i18n';
|
|
19
18
|
import AkButton from '@atlaskit/button/standard-button';
|
|
@@ -22,7 +21,6 @@ import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
|
|
|
22
21
|
import { emojiPickerAddEmoji } from './styles';
|
|
23
22
|
import { DEFAULT_TONE } from '../../util/constants';
|
|
24
23
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
25
|
-
import { layers } from '@atlaskit/theme/constants';
|
|
26
24
|
var isRefreshEmojiPickerEnabled = function isRefreshEmojiPickerEnabled() {
|
|
27
25
|
if (!FeatureGates.initializeCompleted()) {
|
|
28
26
|
return false;
|
|
@@ -40,6 +38,11 @@ var addCustomEmojiButton = null;
|
|
|
40
38
|
var emojiActionsWrapper = null;
|
|
41
39
|
var emojiToneSelectorContainer = null;
|
|
42
40
|
var productivityColorPopup = null;
|
|
41
|
+
var productivityColorPopupAnchor = null;
|
|
42
|
+
|
|
43
|
+
// Matches the ADS tooltip layer so the selector sits above picker content.
|
|
44
|
+
var productivityColorPopupZIndex = 9999;
|
|
45
|
+
var productivityColorPopupPosition = null;
|
|
43
46
|
var previewFooter = null;
|
|
44
47
|
var previewFooterNew = null;
|
|
45
48
|
var atlassianSubcategoriesWithProductivityColorSelector = ['Objects', 'Productivity', 'Logos'];
|
|
@@ -201,18 +204,9 @@ var TonesWrapper = function TonesWrapper(props) {
|
|
|
201
204
|
}
|
|
202
205
|
return /*#__PURE__*/React.createElement("div", {
|
|
203
206
|
className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _ca0q1skh _u5f319bv _n3td1crf _19bvidpf _1e0c1txw _1bahesu3"])
|
|
204
|
-
},
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
horizontalAlign: "end-to-start",
|
|
208
|
-
offsetY: 4,
|
|
209
|
-
zIndex: layers.tooltip()
|
|
210
|
-
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
211
|
-
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
212
|
-
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
213
|
-
selectedColor: selectedProductivityColor,
|
|
214
|
-
onColorSelected: onProductivityColorSelectedHandler
|
|
215
|
-
})), /*#__PURE__*/React.createElement(TonePreviewButton, {
|
|
207
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
208
|
+
className: ax(["_kqswh2mm _1e0c116y"])
|
|
209
|
+
}, /*#__PURE__*/React.createElement(TonePreviewButton, {
|
|
216
210
|
ref: tonePreviewButtonRef,
|
|
217
211
|
ariaControls: productivityColorSelectorId,
|
|
218
212
|
ariaExpanded: showToneSelector,
|
|
@@ -221,7 +215,14 @@ var TonesWrapper = function TonesWrapper(props) {
|
|
|
221
215
|
onKeyDown: onProductivityColorPreviewKeyDown,
|
|
222
216
|
onSelected: onProductivityColorToggle,
|
|
223
217
|
ariaLabelText: formatMessage(messages.emojiSelectColorButtonAriaLabelText)
|
|
224
|
-
})
|
|
218
|
+
}), showToneSelector && /*#__PURE__*/React.createElement("div", {
|
|
219
|
+
className: ax(["_kqswstnw _154i15iq _1xi2idpf _1pbydx66"])
|
|
220
|
+
}, /*#__PURE__*/React.createElement(ProductivityColorPopupContent, {
|
|
221
|
+
colorPreviewEmojis: productivityColorPreviewEmojis,
|
|
222
|
+
focusSelectedColorOnMount: focusSelectedProductivityColorOnMount,
|
|
223
|
+
selectedColor: selectedProductivityColor,
|
|
224
|
+
onColorSelected: onProductivityColorSelectedHandler
|
|
225
|
+
}))));
|
|
225
226
|
}
|
|
226
227
|
if (!toneEmoji) {
|
|
227
228
|
return null;
|
|
@@ -199,11 +199,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
199
199
|
setSelectedEmoji(emoji);
|
|
200
200
|
}
|
|
201
201
|
}, [selectedEmoji]);
|
|
202
|
+
var uploadEnabled = isUploadSupported && !uploading;
|
|
202
203
|
var onEmojiLeave = useCallback(function () {
|
|
203
|
-
if (isRefreshEmojiPickerEnabled()) {
|
|
204
|
+
if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
|
|
204
205
|
setSelectedEmoji(undefined);
|
|
205
206
|
}
|
|
206
|
-
}, []);
|
|
207
|
+
}, [uploadEnabled]);
|
|
207
208
|
var onCategoryActivated = useCallback(function (category) {
|
|
208
209
|
// Ignore scroll-driven category changes while a programmatic reveal()
|
|
209
210
|
// scroll is in progress — they would flicker the indicator through
|
|
@@ -669,7 +670,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
669
670
|
emojiProvider.unsubscribe(onProviderChange);
|
|
670
671
|
};
|
|
671
672
|
}, [emojiProvider, onProviderChange]);
|
|
672
|
-
var uploadEnabled = isUploadSupported && !uploading;
|
|
673
673
|
var showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
|
|
674
674
|
var shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
|
|
675
675
|
var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
|
|
@@ -14,7 +14,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
|
|
|
14
14
|
actionSubjectId: actionSubjectId,
|
|
15
15
|
attributes: _objectSpread({
|
|
16
16
|
packageName: "@atlaskit/emoji",
|
|
17
|
-
packageVersion: "71.7.
|
|
17
|
+
packageVersion: "71.7.3"
|
|
18
18
|
}, attributes)
|
|
19
19
|
};
|
|
20
20
|
};
|