@atlaskit/emoji 70.10.1 → 70.10.3
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/EmojiDeletePreview.compiled.css +22 -1
- package/dist/cjs/components/common/EmojiDeletePreview.js +48 -0
- package/dist/cjs/components/common/EmojiUploadPicker.compiled.css +3 -3
- package/dist/cjs/components/common/EmojiUploadPicker.js +4 -3
- package/dist/cjs/components/picker/EmojiPicker.compiled.css +1 -0
- package/dist/cjs/components/picker/EmojiPicker.js +6 -1
- package/dist/cjs/components/picker/EmojiPickerComponent.compiled.css +4 -0
- package/dist/cjs/components/picker/EmojiPickerComponent.js +34 -15
- package/dist/cjs/util/analytics/analytics.js +1 -1
- package/dist/es2019/components/common/EmojiDeletePreview.compiled.css +22 -1
- package/dist/es2019/components/common/EmojiDeletePreview.js +49 -1
- package/dist/es2019/components/common/EmojiUploadPicker.compiled.css +3 -3
- package/dist/es2019/components/common/EmojiUploadPicker.js +4 -3
- package/dist/es2019/components/picker/EmojiPicker.compiled.css +1 -0
- package/dist/es2019/components/picker/EmojiPicker.js +6 -1
- package/dist/es2019/components/picker/EmojiPickerComponent.compiled.css +4 -0
- package/dist/es2019/components/picker/EmojiPickerComponent.js +34 -15
- package/dist/es2019/util/analytics/analytics.js +1 -1
- package/dist/esm/components/common/EmojiDeletePreview.compiled.css +22 -1
- package/dist/esm/components/common/EmojiDeletePreview.js +49 -1
- package/dist/esm/components/common/EmojiUploadPicker.compiled.css +3 -3
- package/dist/esm/components/common/EmojiUploadPicker.js +4 -3
- package/dist/esm/components/picker/EmojiPicker.compiled.css +1 -0
- package/dist/esm/components/picker/EmojiPicker.js +6 -1
- package/dist/esm/components/picker/EmojiPickerComponent.compiled.css +4 -0
- package/dist/esm/components/picker/EmojiPickerComponent.js +34 -15
- package/dist/esm/util/analytics/analytics.js +1 -1
- package/package.json +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/emoji
|
|
2
2
|
|
|
3
|
+
## 70.10.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`3bdfab536342f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3bdfab536342f) -
|
|
8
|
+
Updated the delete emoji screen to match the upload emoji screen
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
11
|
+
## 70.10.2
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [`0ad23a9827f5d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0ad23a9827f5d) -
|
|
16
|
+
Updated the delete emoji screen to match the upload emoji screen
|
|
17
|
+
|
|
3
18
|
## 70.10.1
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -1,18 +1,39 @@
|
|
|
1
1
|
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
|
+
._1sc1wadc span{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
3
|
+
._2rko1tm3{border-radius:var(--ds-radius-xxlarge,1pc)}
|
|
4
|
+
._zulp1b66{gap:var(--ds-space-050,4px)}
|
|
5
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
6
|
+
._zulputpp{gap:var(--ds-space-150,9pt)}
|
|
7
|
+
._16jlkb7n{flex-grow:1}
|
|
8
|
+
._19bvpxbi{padding-left:var(--ds-space-200,1pc)}
|
|
2
9
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
3
10
|
._19l3zwfg img{max-height:2pc}
|
|
11
|
+
._19pkutpp{margin-top:var(--ds-space-150,9pt)}
|
|
12
|
+
._1bah1h6o{justify-content:center}
|
|
4
13
|
._1bah1yb4{justify-content:space-between}
|
|
5
14
|
._1bahesu3{justify-content:flex-end}
|
|
6
15
|
._1e0c1txw{display:flex}
|
|
16
|
+
._1o9zkb7n{flex-shrink:1}
|
|
7
17
|
._1qz31b66 .emoji-submit-delete{margin-right:var(--ds-space-050,4px)}
|
|
18
|
+
._1tke1sa4{min-height:390px}
|
|
8
19
|
._1txfwu06 .emoji-submit-delete{font-weight:var(--ds-font-weight-bold,653)}
|
|
9
20
|
._2lx21bp4{flex-direction:column}
|
|
10
21
|
._4cvr1h6o{align-items:center}
|
|
22
|
+
._4cvr1y6m{align-items:flex-start}
|
|
11
23
|
._4t3i1ylp{height:40px}
|
|
12
24
|
._4t3i53f4{height:75pt}
|
|
13
25
|
._4t3ivbgk{height:4pc}
|
|
26
|
+
._bfhk1gly{background-color:var(--ds-background-danger,#ffeceb)}
|
|
27
|
+
._bna7t9kd img{height:72px}
|
|
14
28
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
29
|
+
._ca0qutpp{padding-top:var(--ds-space-150,9pt)}
|
|
30
|
+
._i0dl1wug{flex-basis:auto}
|
|
15
31
|
._m73io7ol .emoji-submit-delete{width:84px}
|
|
32
|
+
._mezjt9kd img{width:72px}
|
|
16
33
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
34
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
17
35
|
._rtyst9kd img{max-width:72px}
|
|
18
|
-
.
|
|
36
|
+
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
37
|
+
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
38
|
+
._vchhusvi{box-sizing:border-box}
|
|
39
|
+
._y3gn1e5h{text-align:left}
|
|
@@ -23,6 +23,7 @@ var _new = _interopRequireDefault(require("@atlaskit/button/new"));
|
|
|
23
23
|
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
24
24
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
25
25
|
var _reactFocusLock = _interopRequireDefault(require("react-focus-lock"));
|
|
26
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
26
27
|
var _i18n = require("../i18n");
|
|
27
28
|
var _CachingEmoji = _interopRequireDefault(require("./CachingEmoji"));
|
|
28
29
|
var _EmojiErrorMessage = _interopRequireWildcard(require("./EmojiErrorMessage"));
|
|
@@ -35,6 +36,10 @@ var deleteFooter = null;
|
|
|
35
36
|
var deletePreview = null;
|
|
36
37
|
var deleteText = null;
|
|
37
38
|
var previewButtonGroup = null;
|
|
39
|
+
var deletePreviewNew = null;
|
|
40
|
+
var deleteTextSection = null;
|
|
41
|
+
var emojiPreviewLargeBox = null;
|
|
42
|
+
var deleteButtonGroup = null;
|
|
38
43
|
var emojiDeletePreviewTestId = exports.emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
39
44
|
var deleteEmojiLabelId = 'fabric.emoji.delete.label.id';
|
|
40
45
|
var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
@@ -92,6 +97,49 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
|
92
97
|
loading = _this$state.loading,
|
|
93
98
|
error = _this$state.error;
|
|
94
99
|
var formatMessage = intl.formatMessage;
|
|
100
|
+
if ((0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
|
|
101
|
+
return /*#__PURE__*/React.createElement(_reactFocusLock.default, {
|
|
102
|
+
noFocusGuards: true
|
|
103
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
104
|
+
"data-testid": emojiDeletePreviewTestId,
|
|
105
|
+
className: (0, _runtime.ax)(["_zulputpp _1e0c1txw _2lx21bp4 _1tke1sa4 _ca0qutpp _u5f3pxbi _n3tdutpp _19bvpxbi _vchhusvi"])
|
|
106
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
107
|
+
className: (0, _runtime.ax)(["_zulp1b66 _1e0c1txw _2lx21bp4 _4cvr1y6m _y3gn1e5h"])
|
|
108
|
+
}, /*#__PURE__*/React.createElement(_compiled.Box, {
|
|
109
|
+
paddingBlockEnd: "space.100"
|
|
110
|
+
}, /*#__PURE__*/React.createElement(_heading.default, {
|
|
111
|
+
size: "small"
|
|
112
|
+
}, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.deleteEmojiTitle))), /*#__PURE__*/React.createElement(_compiled.Text, {
|
|
113
|
+
color: "color.text.subtle",
|
|
114
|
+
size: "small"
|
|
115
|
+
}, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.deleteEmojiDescription, {
|
|
116
|
+
values: {
|
|
117
|
+
emojiShortName: emoji.shortName
|
|
118
|
+
}
|
|
119
|
+
})))), /*#__PURE__*/React.createElement("div", {
|
|
120
|
+
className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dl1wug _2rko1tm3 _1e0c1txw _4cvr1h6o _1bah1h6o _bfhk1gly _1sc1wadc _mezjt9kd _bna7t9kd"])
|
|
121
|
+
}, /*#__PURE__*/React.createElement(_CachingEmoji.default, {
|
|
122
|
+
emoji: emoji
|
|
123
|
+
})), /*#__PURE__*/React.createElement("div", {
|
|
124
|
+
className: (0, _runtime.ax)(["_zulpu2gc _1e0c1txw _4cvr1h6o _1bahesu3 _19pkutpp"])
|
|
125
|
+
}, error && !loading ? /*#__PURE__*/React.createElement(_EmojiErrorMessage.default, {
|
|
126
|
+
message: formatMessage(_i18n.messages.deleteEmojiFailed),
|
|
127
|
+
errorStyle: "delete",
|
|
128
|
+
tooltip: true
|
|
129
|
+
}) : null, /*#__PURE__*/React.createElement(_visuallyHidden.default, {
|
|
130
|
+
id: deleteEmojiLabelId
|
|
131
|
+
}, formatMessage(_i18n.messages.deleteEmojiLabel)), /*#__PURE__*/React.createElement(_new.default, {
|
|
132
|
+
appearance: "subtle",
|
|
133
|
+
onClick: this.onCancel
|
|
134
|
+
}, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.cancelLabel)), /*#__PURE__*/React.createElement(_RetryableButton.default, {
|
|
135
|
+
label: formatMessage(_i18n.messages.deleteEmojiLabel),
|
|
136
|
+
onSubmit: this.onSubmit,
|
|
137
|
+
appearance: "danger",
|
|
138
|
+
loading: loading,
|
|
139
|
+
error: error,
|
|
140
|
+
ariaLabelledBy: "".concat(_EmojiErrorMessage.emojiErrorScreenreaderTestId, " ").concat(deleteEmojiLabelId)
|
|
141
|
+
}))));
|
|
142
|
+
}
|
|
95
143
|
return /*#__PURE__*/React.createElement(_reactFocusLock.default, {
|
|
96
144
|
noFocusGuards: true
|
|
97
145
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
1
2
|
._11c8wadc{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
3
|
._scffidpf input{border:0}
|
|
3
4
|
._zulp12x7{gap:var(--ds-space-075,6px)}
|
|
@@ -18,16 +19,15 @@
|
|
|
18
19
|
._4cvr1h6o{align-items:center}
|
|
19
20
|
._4cvresu3{align-items:flex-end}
|
|
20
21
|
._9bj2glyw input::-ms-clear{display:none}
|
|
21
|
-
.
|
|
22
|
+
._ca0q12x7{padding-top:var(--ds-space-075,6px)}
|
|
22
23
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
23
24
|
._coc6glyw input:invalid{box-shadow:none}
|
|
24
25
|
._gxxuglyw input{outline-style:none}
|
|
25
26
|
._gy1p12x7{column-gap:var(--ds-space-075,6px)}
|
|
26
27
|
._i0dl1wug{flex-basis:auto}
|
|
27
28
|
._k48p1pd9{font-weight:var(--ds-font-weight-semibold,600)}
|
|
28
|
-
._n3td1ejb{padding-bottom:var(--ds-space-300,24px)}
|
|
29
29
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
30
|
-
.
|
|
30
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
31
31
|
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
32
32
|
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
33
33
|
._xmji1r31 input{outline-color:currentColor}
|
|
@@ -38,6 +38,7 @@ var emojiUploadNew = null;
|
|
|
38
38
|
var emojiUploadTop = null;
|
|
39
39
|
var emojiUploadTopNew = null;
|
|
40
40
|
var labelStyles = null;
|
|
41
|
+
var labelStylesNew = null;
|
|
41
42
|
var uploadChooseFileEmojiName = null;
|
|
42
43
|
var uploadChooseFileMessage = null;
|
|
43
44
|
var uploadChooseFileRow = null;
|
|
@@ -96,10 +97,10 @@ var ChooseEmojiFile = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
|
96
97
|
"data-testid": uploadEmojiComponentTestId,
|
|
97
98
|
className: (0, _runtime.ax)(["_ca0qu2gc _u5f3pxbi _n3tdu2gc _19bvpxbi _1e0c1txw _2lx21bp4 _1bah1b1v"])
|
|
98
99
|
}, /*#__PURE__*/React.createElement("div", {
|
|
99
|
-
className: (0, _runtime.ax)(["
|
|
100
|
+
className: (0, _runtime.ax)(["_ca0q12x7 _n3tdutpp _1e0c1txw _1bah1yb4 _4cvresu3"])
|
|
100
101
|
}, /*#__PURE__*/React.createElement("label", {
|
|
101
102
|
htmlFor: "new-emoji-name-input",
|
|
102
|
-
className: (0, _runtime.ax)(["_1w90azsu", "
|
|
103
|
+
className: (0, _runtime.ax)(["_1w90azsu", "_11c8fhey _k48p1pd9"])
|
|
103
104
|
}, previewImage ? /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.emojiPreviewTitle) : /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.addCustomEmojiLabel))), /*#__PURE__*/React.createElement("div", {
|
|
104
105
|
className: (0, _runtime.ax)(["_zulp12x7 _1e0c1txw _2lx21bp4 _1tker0r7"])
|
|
105
106
|
}, /*#__PURE__*/React.createElement(_compiled.Box, null, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.emojiChooseFileScreenReaderDescription, function () {
|
|
@@ -138,7 +139,7 @@ var ChooseEmojiFile = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
|
138
139
|
errorStyle: "chooseFile",
|
|
139
140
|
message: nameErrorMessage
|
|
140
141
|
}))), /*#__PURE__*/React.createElement("div", {
|
|
141
|
-
className: (0, _runtime.ax)(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o
|
|
142
|
+
className: (0, _runtime.ax)(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o _ca0qu2gc _n3tdutpp"])
|
|
142
143
|
}, /*#__PURE__*/React.createElement(_new.default, {
|
|
143
144
|
onClick: onUploadCancelled,
|
|
144
145
|
appearance: "subtle",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
4
5
|
._1bah1yb4{justify-content:space-between}
|
|
5
6
|
._1bsb1edt{width:350px}
|
|
@@ -17,6 +17,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
17
17
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
18
18
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
19
|
var _react = _interopRequireDefault(require("react"));
|
|
20
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
20
21
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
21
22
|
var _analytics = require("../../util/analytics");
|
|
22
23
|
var _LoadingEmojiComponent = _interopRequireDefault(require("../common/LoadingEmojiComponent"));
|
|
@@ -29,6 +30,7 @@ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0,
|
|
|
29
30
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
30
31
|
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" != (0, _typeof2.default)(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); }
|
|
31
32
|
var emojiPicker = null;
|
|
33
|
+
var emojiPickerNew = null;
|
|
32
34
|
var emojiPickerModuleLoader = function emojiPickerModuleLoader() {
|
|
33
35
|
return Promise.resolve().then(function () {
|
|
34
36
|
return _interopRequireWildcard(require( /* webpackChunkName:"@atlaskit-internal_emojiPickerComponent" */'./EmojiPickerComponent'));
|
|
@@ -76,7 +78,10 @@ var EmojiPickerInternal = exports.EmojiPickerInternal = /*#__PURE__*/function (_
|
|
|
76
78
|
}
|
|
77
79
|
};
|
|
78
80
|
_analytics.ufoExperiences['emoji-picker-opened'].markFMP();
|
|
79
|
-
return /*#__PURE__*/_react.default.createElement("div", {
|
|
81
|
+
return (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? /*#__PURE__*/_react.default.createElement("div", {
|
|
82
|
+
ref: handlePickerRef,
|
|
83
|
+
className: (0, _runtime.ax)(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
84
|
+
}, item.renderItem()) : /*#__PURE__*/_react.default.createElement("div", {
|
|
80
85
|
ref: handlePickerRef,
|
|
81
86
|
className: (0, _runtime.ax)(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
82
87
|
}, item.renderItem());
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._154iidpf{top:0}
|
|
4
5
|
._16jlkb7n{flex-grow:1}
|
|
5
6
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
@@ -19,9 +20,12 @@
|
|
|
19
20
|
._1ul910mj{min-width:var(--_gsvyy7)}
|
|
20
21
|
._1xi2idpf{right:0}
|
|
21
22
|
._2lx21bp4{flex-direction:column}
|
|
23
|
+
._4t3i1784{height:470px}
|
|
22
24
|
._4t3i1ckg{height:455px}
|
|
25
|
+
._4t3i1sa4{height:390px}
|
|
23
26
|
._4t3i2300{height:429px}
|
|
24
27
|
._4t3iaq3k{height:295px}
|
|
28
|
+
._4t3ibqjm{height:310px}
|
|
25
29
|
._4t3iixjv{height:375px}
|
|
26
30
|
._4t3iuxo9{height:var(--_19dn98e)}
|
|
27
31
|
._4t3ivixp{height:349px}
|
|
@@ -35,6 +35,7 @@ var _RecordSelectionDefault = require("../common/RecordSelectionDefault");
|
|
|
35
35
|
var _CategorySelector = _interopRequireDefault(require("./CategorySelector"));
|
|
36
36
|
var _EmojiPickerFooter = _interopRequireDefault(require("./EmojiPickerFooter"));
|
|
37
37
|
var _EmojiUploadPicker = _interopRequireDefault(require("../common/EmojiUploadPicker"));
|
|
38
|
+
var _EmojiDeletePreview = _interopRequireDefault(require("../common/EmojiDeletePreview"));
|
|
38
39
|
var _EmojiPickerList = require("./EmojiPickerList");
|
|
39
40
|
var _analytics = require("../../util/analytics");
|
|
40
41
|
var _useEmoji2 = require("../../hooks/useEmoji");
|
|
@@ -46,10 +47,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
46
47
|
var emojiPickerBoxShadow = "var(--ds-shadow-overlay, 0px 8px 12px #1E1F2126, 0px 0px 1px #1E1F214f)";
|
|
47
48
|
var emojiPickerHeight = 295;
|
|
48
49
|
var emojiPickerHeightWithPreview = 349; // emojiPickerHeight + emojiPickerPreviewHeight;
|
|
50
|
+
var emojiPickerHeightWithPreviewNew = 310;
|
|
49
51
|
var emojiPickerWidth = 350;
|
|
50
52
|
var emojiPickerMinHeight = 260;
|
|
51
53
|
var heightOffset = 80;
|
|
52
54
|
var emojiPicker = null;
|
|
55
|
+
var emojiPickerNew = null;
|
|
53
56
|
var uploadOverlay = null;
|
|
54
57
|
var emojiPickerWrapper = null;
|
|
55
58
|
var withPreviewHeight = {
|
|
@@ -57,6 +60,11 @@ var withPreviewHeight = {
|
|
|
57
60
|
medium: "_4t3i2300 _1tke5x59",
|
|
58
61
|
large: "_4t3ixt2k _1tke1pna"
|
|
59
62
|
};
|
|
63
|
+
var withUploadRefreshHeight = {
|
|
64
|
+
small: "_4t3ibqjm _1tkegx0z",
|
|
65
|
+
medium: "_4t3i1sa4 _1tke5x59",
|
|
66
|
+
large: "_4t3i1784 _1tke1pna"
|
|
67
|
+
};
|
|
60
68
|
var withoutPreviewHeight = {
|
|
61
69
|
small: "_4t3iaq3k _1tkegx0z",
|
|
62
70
|
medium: "_4t3iixjv _1tke5x59",
|
|
@@ -171,14 +179,14 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
171
179
|
if (isProgrammaticScroll.current && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
|
|
172
180
|
return;
|
|
173
181
|
}
|
|
174
|
-
// Ignore scroll-driven category changes while the upload screen is open
|
|
175
|
-
if (uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
|
|
182
|
+
// Ignore scroll-driven category changes while the upload or delete screen is open
|
|
183
|
+
if ((uploading || emojiToDelete) && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
|
|
176
184
|
return;
|
|
177
185
|
}
|
|
178
186
|
if (activeCategory !== category) {
|
|
179
187
|
setActiveCategory(category);
|
|
180
188
|
}
|
|
181
|
-
}, [activeCategory, uploading]);
|
|
189
|
+
}, [activeCategory, uploading, emojiToDelete]);
|
|
182
190
|
var calculateElapsedTime = function calculateElapsedTime() {
|
|
183
191
|
return Date.now() - openTime.current;
|
|
184
192
|
};
|
|
@@ -334,10 +342,15 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
334
342
|
return;
|
|
335
343
|
}
|
|
336
344
|
|
|
337
|
-
// If the upload screen is open, close it when a category is selected
|
|
338
|
-
if (
|
|
339
|
-
|
|
340
|
-
|
|
345
|
+
// If the upload or delete screen is open, close it when a category is selected
|
|
346
|
+
if ((0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
|
|
347
|
+
if (uploading) {
|
|
348
|
+
setUploading(false);
|
|
349
|
+
setUploadErrorMessage(undefined);
|
|
350
|
+
}
|
|
351
|
+
if (emojiToDelete) {
|
|
352
|
+
setEmojiToDelete(undefined);
|
|
353
|
+
}
|
|
341
354
|
}
|
|
342
355
|
emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
|
|
343
356
|
if (!disableCategories) {
|
|
@@ -368,7 +381,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
368
381
|
}));
|
|
369
382
|
}
|
|
370
383
|
});
|
|
371
|
-
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
|
|
384
|
+
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
|
|
372
385
|
var recordUsageOnSelection = (0, _react.useMemo)(function () {
|
|
373
386
|
return (0, _RecordSelectionDefault.createRecordSelectionDefault)(emojiProvider, onSelectWrapper, function (analytic) {
|
|
374
387
|
return fireAnalytics(analytic(_types.SearchSourceTypes.PICKER));
|
|
@@ -618,7 +631,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
618
631
|
role: "dialog",
|
|
619
632
|
"aria-label": formatMessage(_i18n.messages.emojiPickerTitle),
|
|
620
633
|
"aria-modal": true,
|
|
621
|
-
className: (0, _runtime.ax)(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm",
|
|
634
|
+
className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
|
|
622
635
|
style: {
|
|
623
636
|
"--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
|
|
624
637
|
"--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
|
|
@@ -630,7 +643,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
630
643
|
onKeyDown: suppressKeyPress,
|
|
631
644
|
className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
|
|
632
645
|
}, /*#__PURE__*/React.createElement(_CategorySelector.default, {
|
|
633
|
-
activeCategoryId: uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
646
|
+
activeCategoryId: (uploading || emojiToDelete) && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
634
647
|
dynamicCategories: dynamicCategories,
|
|
635
648
|
disableCategories: disableCategories,
|
|
636
649
|
onCategorySelected: onCategorySelected
|
|
@@ -663,7 +676,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
663
676
|
onOpenUpload: onOpenUpload,
|
|
664
677
|
size: size,
|
|
665
678
|
activeCategoryId: activeCategory
|
|
666
|
-
}), showPreview && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
|
|
679
|
+
}), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
|
|
667
680
|
selectedEmoji: selectedEmoji,
|
|
668
681
|
uploadEnabled: isUploadSupported && !uploading,
|
|
669
682
|
onOpenUpload: onOpenUpload
|
|
@@ -678,13 +691,13 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
678
691
|
onKeyPress: suppressKeyPress,
|
|
679
692
|
onKeyUp: suppressKeyPress,
|
|
680
693
|
onKeyDown: suppressKeyPress,
|
|
681
|
-
className: (0, _runtime.ax)(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm",
|
|
694
|
+
className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
|
|
682
695
|
style: {
|
|
683
696
|
"--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
|
|
684
697
|
"--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
|
|
685
698
|
}
|
|
686
699
|
}, /*#__PURE__*/React.createElement(_CategorySelector.default, {
|
|
687
|
-
activeCategoryId: uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
700
|
+
activeCategoryId: (uploading || emojiToDelete) && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
688
701
|
dynamicCategories: dynamicCategories,
|
|
689
702
|
disableCategories: disableCategories,
|
|
690
703
|
onCategorySelected: onCategorySelected
|
|
@@ -717,18 +730,24 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
717
730
|
onOpenUpload: onOpenUpload,
|
|
718
731
|
size: size,
|
|
719
732
|
activeCategoryId: activeCategory
|
|
720
|
-
}), showPreview && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
|
|
733
|
+
}), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
|
|
721
734
|
selectedEmoji: selectedEmoji,
|
|
722
735
|
uploadEnabled: isUploadSupported && !uploading,
|
|
723
736
|
onOpenUpload: onOpenUpload
|
|
724
737
|
}), uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
725
|
-
className: (0, _runtime.ax)(["
|
|
738
|
+
className: (0, _runtime.ax)(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
726
739
|
}, /*#__PURE__*/React.createElement(_EmojiUploadPicker.default, {
|
|
727
740
|
onUploadEmoji: onUploadEmoji,
|
|
728
741
|
onUploadCancelled: onUploadCancelled,
|
|
729
742
|
onFileChooserClicked: onFileChooserClicked,
|
|
730
743
|
errorMessage: formattedErrorMessage,
|
|
731
744
|
initialUploadName: query
|
|
745
|
+
})), emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
746
|
+
className: (0, _runtime.ax)(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
747
|
+
}, /*#__PURE__*/React.createElement(_EmojiDeletePreview.default, {
|
|
748
|
+
emoji: emojiToDelete,
|
|
749
|
+
onDeleteEmoji: onDeleteEmoji,
|
|
750
|
+
onCloseDelete: onCloseDelete
|
|
732
751
|
})));
|
|
733
752
|
};
|
|
734
753
|
var _default_1 = /*#__PURE__*/(0, _react.memo)(EmojiPickerComponent);
|
|
@@ -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: "70.10.
|
|
23
|
+
packageVersion: "70.10.2"
|
|
24
24
|
}, attributes)
|
|
25
25
|
};
|
|
26
26
|
};
|
|
@@ -1,18 +1,39 @@
|
|
|
1
1
|
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
|
+
._1sc1wadc span{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
3
|
+
._2rko1tm3{border-radius:var(--ds-radius-xxlarge,1pc)}
|
|
4
|
+
._zulp1b66{gap:var(--ds-space-050,4px)}
|
|
5
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
6
|
+
._zulputpp{gap:var(--ds-space-150,9pt)}
|
|
7
|
+
._16jlkb7n{flex-grow:1}
|
|
8
|
+
._19bvpxbi{padding-left:var(--ds-space-200,1pc)}
|
|
2
9
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
3
10
|
._19l3zwfg img{max-height:2pc}
|
|
11
|
+
._19pkutpp{margin-top:var(--ds-space-150,9pt)}
|
|
12
|
+
._1bah1h6o{justify-content:center}
|
|
4
13
|
._1bah1yb4{justify-content:space-between}
|
|
5
14
|
._1bahesu3{justify-content:flex-end}
|
|
6
15
|
._1e0c1txw{display:flex}
|
|
16
|
+
._1o9zkb7n{flex-shrink:1}
|
|
7
17
|
._1qz31b66 .emoji-submit-delete{margin-right:var(--ds-space-050,4px)}
|
|
18
|
+
._1tke1sa4{min-height:390px}
|
|
8
19
|
._1txfwu06 .emoji-submit-delete{font-weight:var(--ds-font-weight-bold,653)}
|
|
9
20
|
._2lx21bp4{flex-direction:column}
|
|
10
21
|
._4cvr1h6o{align-items:center}
|
|
22
|
+
._4cvr1y6m{align-items:flex-start}
|
|
11
23
|
._4t3i1ylp{height:40px}
|
|
12
24
|
._4t3i53f4{height:75pt}
|
|
13
25
|
._4t3ivbgk{height:4pc}
|
|
26
|
+
._bfhk1gly{background-color:var(--ds-background-danger,#ffeceb)}
|
|
27
|
+
._bna7t9kd img{height:72px}
|
|
14
28
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
29
|
+
._ca0qutpp{padding-top:var(--ds-space-150,9pt)}
|
|
30
|
+
._i0dl1wug{flex-basis:auto}
|
|
15
31
|
._m73io7ol .emoji-submit-delete{width:84px}
|
|
32
|
+
._mezjt9kd img{width:72px}
|
|
16
33
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
34
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
17
35
|
._rtyst9kd img{max-width:72px}
|
|
18
|
-
.
|
|
36
|
+
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
37
|
+
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
38
|
+
._vchhusvi{box-sizing:border-box}
|
|
39
|
+
._y3gn1e5h{text-align:left}
|
|
@@ -8,8 +8,9 @@ import { Component } from 'react';
|
|
|
8
8
|
import { FormattedMessage, injectIntl } from 'react-intl';
|
|
9
9
|
import AkButton from '@atlaskit/button/new';
|
|
10
10
|
import Heading from '@atlaskit/heading';
|
|
11
|
-
import { Text } from '@atlaskit/primitives/compiled';
|
|
11
|
+
import { Box, Text } from '@atlaskit/primitives/compiled';
|
|
12
12
|
import FocusLock from 'react-focus-lock';
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
import { messages } from '../i18n';
|
|
14
15
|
import CachingEmoji from './CachingEmoji';
|
|
15
16
|
import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
|
|
@@ -19,6 +20,10 @@ const deleteFooter = null;
|
|
|
19
20
|
const deletePreview = null;
|
|
20
21
|
const deleteText = null;
|
|
21
22
|
const previewButtonGroup = null;
|
|
23
|
+
const deletePreviewNew = null;
|
|
24
|
+
const deleteTextSection = null;
|
|
25
|
+
const emojiPreviewLargeBox = null;
|
|
26
|
+
const deleteButtonGroup = null;
|
|
22
27
|
export const emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
23
28
|
const deleteEmojiLabelId = 'fabric.emoji.delete.label.id';
|
|
24
29
|
class EmojiDeletePreview extends Component {
|
|
@@ -73,6 +78,49 @@ class EmojiDeletePreview extends Component {
|
|
|
73
78
|
const {
|
|
74
79
|
formatMessage
|
|
75
80
|
} = intl;
|
|
81
|
+
if (fg('platform_emoji_picker_refresh')) {
|
|
82
|
+
return /*#__PURE__*/React.createElement(FocusLock, {
|
|
83
|
+
noFocusGuards: true
|
|
84
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
85
|
+
"data-testid": emojiDeletePreviewTestId,
|
|
86
|
+
className: ax(["_zulputpp _1e0c1txw _2lx21bp4 _1tke1sa4 _ca0qutpp _u5f3pxbi _n3tdutpp _19bvpxbi _vchhusvi"])
|
|
87
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
88
|
+
className: ax(["_zulp1b66 _1e0c1txw _2lx21bp4 _4cvr1y6m _y3gn1e5h"])
|
|
89
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
90
|
+
paddingBlockEnd: "space.100"
|
|
91
|
+
}, /*#__PURE__*/React.createElement(Heading, {
|
|
92
|
+
size: "small"
|
|
93
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, messages.deleteEmojiTitle))), /*#__PURE__*/React.createElement(Text, {
|
|
94
|
+
color: "color.text.subtle",
|
|
95
|
+
size: "small"
|
|
96
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.deleteEmojiDescription, {
|
|
97
|
+
values: {
|
|
98
|
+
emojiShortName: emoji.shortName
|
|
99
|
+
}
|
|
100
|
+
})))), /*#__PURE__*/React.createElement("div", {
|
|
101
|
+
className: ax(["_16jlkb7n _1o9zkb7n _i0dl1wug _2rko1tm3 _1e0c1txw _4cvr1h6o _1bah1h6o _bfhk1gly _1sc1wadc _mezjt9kd _bna7t9kd"])
|
|
102
|
+
}, /*#__PURE__*/React.createElement(CachingEmoji, {
|
|
103
|
+
emoji: emoji
|
|
104
|
+
})), /*#__PURE__*/React.createElement("div", {
|
|
105
|
+
className: ax(["_zulpu2gc _1e0c1txw _4cvr1h6o _1bahesu3 _19pkutpp"])
|
|
106
|
+
}, error && !loading ? /*#__PURE__*/React.createElement(EmojiErrorMessage, {
|
|
107
|
+
message: formatMessage(messages.deleteEmojiFailed),
|
|
108
|
+
errorStyle: "delete",
|
|
109
|
+
tooltip: true
|
|
110
|
+
}) : null, /*#__PURE__*/React.createElement(VisuallyHidden, {
|
|
111
|
+
id: deleteEmojiLabelId
|
|
112
|
+
}, formatMessage(messages.deleteEmojiLabel)), /*#__PURE__*/React.createElement(AkButton, {
|
|
113
|
+
appearance: "subtle",
|
|
114
|
+
onClick: this.onCancel
|
|
115
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelLabel)), /*#__PURE__*/React.createElement(RetryableButton, {
|
|
116
|
+
label: formatMessage(messages.deleteEmojiLabel),
|
|
117
|
+
onSubmit: this.onSubmit,
|
|
118
|
+
appearance: "danger",
|
|
119
|
+
loading: loading,
|
|
120
|
+
error: error,
|
|
121
|
+
ariaLabelledBy: `${emojiErrorScreenreaderTestId} ${deleteEmojiLabelId}`
|
|
122
|
+
}))));
|
|
123
|
+
}
|
|
76
124
|
return /*#__PURE__*/React.createElement(FocusLock, {
|
|
77
125
|
noFocusGuards: true
|
|
78
126
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
1
2
|
._11c8wadc{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
3
|
._scffidpf input{border:0}
|
|
3
4
|
._zulp12x7{gap:var(--ds-space-075,6px)}
|
|
@@ -18,16 +19,15 @@
|
|
|
18
19
|
._4cvr1h6o{align-items:center}
|
|
19
20
|
._4cvresu3{align-items:flex-end}
|
|
20
21
|
._9bj2glyw input::-ms-clear{display:none}
|
|
21
|
-
.
|
|
22
|
+
._ca0q12x7{padding-top:var(--ds-space-075,6px)}
|
|
22
23
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
23
24
|
._coc6glyw input:invalid{box-shadow:none}
|
|
24
25
|
._gxxuglyw input{outline-style:none}
|
|
25
26
|
._gy1p12x7{column-gap:var(--ds-space-075,6px)}
|
|
26
27
|
._i0dl1wug{flex-basis:auto}
|
|
27
28
|
._k48p1pd9{font-weight:var(--ds-font-weight-semibold,600)}
|
|
28
|
-
._n3td1ejb{padding-bottom:var(--ds-space-300,24px)}
|
|
29
29
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
30
|
-
.
|
|
30
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
31
31
|
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
32
32
|
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
33
33
|
._xmji1r31 input{outline-color:currentColor}
|
|
@@ -27,6 +27,7 @@ const emojiUploadNew = null;
|
|
|
27
27
|
const emojiUploadTop = null;
|
|
28
28
|
const emojiUploadTopNew = null;
|
|
29
29
|
const labelStyles = null;
|
|
30
|
+
const labelStylesNew = null;
|
|
30
31
|
const uploadChooseFileEmojiName = null;
|
|
31
32
|
const uploadChooseFileMessage = null;
|
|
32
33
|
const uploadChooseFileRow = null;
|
|
@@ -88,10 +89,10 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
|
|
|
88
89
|
"data-testid": uploadEmojiComponentTestId,
|
|
89
90
|
className: ax(["_ca0qu2gc _u5f3pxbi _n3tdu2gc _19bvpxbi _1e0c1txw _2lx21bp4 _1bah1b1v"])
|
|
90
91
|
}, /*#__PURE__*/React.createElement("div", {
|
|
91
|
-
className: ax(["
|
|
92
|
+
className: ax(["_ca0q12x7 _n3tdutpp _1e0c1txw _1bah1yb4 _4cvresu3"])
|
|
92
93
|
}, /*#__PURE__*/React.createElement("label", {
|
|
93
94
|
htmlFor: "new-emoji-name-input",
|
|
94
|
-
className: ax(["_1w90azsu", "
|
|
95
|
+
className: ax(["_1w90azsu", "_11c8fhey _k48p1pd9"])
|
|
95
96
|
}, previewImage ? /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiPreviewTitle) : /*#__PURE__*/React.createElement(FormattedMessage, messages.addCustomEmojiLabel))), /*#__PURE__*/React.createElement("div", {
|
|
96
97
|
className: ax(["_zulp12x7 _1e0c1txw _2lx21bp4 _1tker0r7"])
|
|
97
98
|
}, /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, () => /*#__PURE__*/React.createElement(FileChooser, {
|
|
@@ -128,7 +129,7 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
|
|
|
128
129
|
errorStyle: "chooseFile",
|
|
129
130
|
message: nameErrorMessage
|
|
130
131
|
}))), /*#__PURE__*/React.createElement("div", {
|
|
131
|
-
className: ax(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o
|
|
132
|
+
className: ax(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o _ca0qu2gc _n3tdutpp"])
|
|
132
133
|
}, /*#__PURE__*/React.createElement(Button, {
|
|
133
134
|
onClick: onUploadCancelled,
|
|
134
135
|
appearance: "subtle",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
4
5
|
._1bah1yb4{justify-content:space-between}
|
|
5
6
|
._1bsb1edt{width:350px}
|
|
@@ -3,6 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
3
3
|
import "./EmojiPicker.compiled.css";
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
5
|
import React from 'react';
|
|
6
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
6
7
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
7
8
|
import { ufoExperiences } from '../../util/analytics';
|
|
8
9
|
import LoadingEmojiComponent from '../common/LoadingEmojiComponent';
|
|
@@ -11,6 +12,7 @@ import { UfoErrorBoundary } from '../common/UfoErrorBoundary';
|
|
|
11
12
|
import { defaultEmojiPickerSize } from '../../util/constants';
|
|
12
13
|
import { EmojiCommonProvider } from '../../context/EmojiCommonProvider';
|
|
13
14
|
const emojiPicker = null;
|
|
15
|
+
const emojiPickerNew = null;
|
|
14
16
|
const emojiPickerModuleLoader = () => import( /* webpackChunkName:"@atlaskit-internal_emojiPickerComponent" */'./EmojiPickerComponent');
|
|
15
17
|
const emojiPickerLoader = () => emojiPickerModuleLoader().then(module => module.default);
|
|
16
18
|
export const preloadEmojiPicker = () => {
|
|
@@ -40,7 +42,10 @@ export class EmojiPickerInternal extends LoadingEmojiComponent {
|
|
|
40
42
|
}
|
|
41
43
|
};
|
|
42
44
|
ufoExperiences['emoji-picker-opened'].markFMP();
|
|
43
|
-
return /*#__PURE__*/React.createElement("div", {
|
|
45
|
+
return fg('platform_emoji_picker_refresh') ? /*#__PURE__*/React.createElement("div", {
|
|
46
|
+
ref: handlePickerRef,
|
|
47
|
+
className: ax(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
48
|
+
}, item.renderItem()) : /*#__PURE__*/React.createElement("div", {
|
|
44
49
|
ref: handlePickerRef,
|
|
45
50
|
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
46
51
|
}, item.renderItem());
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._154iidpf{top:0}
|
|
4
5
|
._16jlkb7n{flex-grow:1}
|
|
5
6
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
@@ -19,9 +20,12 @@
|
|
|
19
20
|
._1ul91edt{min-width:350px}
|
|
20
21
|
._1xi2idpf{right:0}
|
|
21
22
|
._2lx21bp4{flex-direction:column}
|
|
23
|
+
._4t3i1784{height:470px}
|
|
22
24
|
._4t3i1ckg{height:455px}
|
|
25
|
+
._4t3i1sa4{height:390px}
|
|
23
26
|
._4t3i2300{height:429px}
|
|
24
27
|
._4t3iaq3k{height:295px}
|
|
28
|
+
._4t3ibqjm{height:310px}
|
|
25
29
|
._4t3iixjv{height:375px}
|
|
26
30
|
._4t3ivixp{height:349px}
|
|
27
31
|
._4t3ixt2k{height:509px}
|
|
@@ -22,6 +22,7 @@ import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
|
|
|
22
22
|
import CategorySelector from './CategorySelector';
|
|
23
23
|
import EmojiPickerFooter from './EmojiPickerFooter';
|
|
24
24
|
import EmojiUploadPicker from '../common/EmojiUploadPicker';
|
|
25
|
+
import EmojiDeletePreviewComponent from '../common/EmojiDeletePreview';
|
|
25
26
|
import { EmojiPickerVirtualListInternal as EmojiPickerList } from './EmojiPickerList';
|
|
26
27
|
import { createAndFireEventInElementsChannel, categoryClickedEvent, closedPickerEvent, deleteBeginEvent, deleteCancelEvent, deleteConfirmEvent, openedPickerEvent, pickerClickedEvent, pickerSearchedEvent, selectedFileEvent, uploadBeginButton, uploadCancelButton, uploadConfirmButton, toneSelectorClosedEvent, ufoExperiences } from '../../util/analytics';
|
|
27
28
|
import { useEmoji } from '../../hooks/useEmoji';
|
|
@@ -30,10 +31,12 @@ import { messages } from '../i18n';
|
|
|
30
31
|
const emojiPickerBoxShadow = "var(--ds-shadow-overlay, 0px 8px 12px #1E1F2126, 0px 0px 1px #1E1F214f)";
|
|
31
32
|
const emojiPickerHeight = 295;
|
|
32
33
|
const emojiPickerHeightWithPreview = 349; // emojiPickerHeight + emojiPickerPreviewHeight;
|
|
34
|
+
const emojiPickerHeightWithPreviewNew = 310;
|
|
33
35
|
const emojiPickerWidth = 350;
|
|
34
36
|
const emojiPickerMinHeight = 260;
|
|
35
37
|
const heightOffset = 80;
|
|
36
38
|
const emojiPicker = null;
|
|
39
|
+
const emojiPickerNew = null;
|
|
37
40
|
const uploadOverlay = null;
|
|
38
41
|
const emojiPickerWrapper = null;
|
|
39
42
|
const withPreviewHeight = {
|
|
@@ -41,6 +44,11 @@ const withPreviewHeight = {
|
|
|
41
44
|
medium: "_4t3i2300 _1tke5x59",
|
|
42
45
|
large: "_4t3ixt2k _1tke1pna"
|
|
43
46
|
};
|
|
47
|
+
const withUploadRefreshHeight = {
|
|
48
|
+
small: "_4t3ibqjm _1tkegx0z",
|
|
49
|
+
medium: "_4t3i1sa4 _1tke5x59",
|
|
50
|
+
large: "_4t3i1784 _1tke1pna"
|
|
51
|
+
};
|
|
44
52
|
const withoutPreviewHeight = {
|
|
45
53
|
small: "_4t3iaq3k _1tkegx0z",
|
|
46
54
|
medium: "_4t3iixjv _1tke5x59",
|
|
@@ -113,14 +121,14 @@ const EmojiPickerComponent = ({
|
|
|
113
121
|
if (isProgrammaticScroll.current && fg('platform_emoji_picker_refresh')) {
|
|
114
122
|
return;
|
|
115
123
|
}
|
|
116
|
-
// Ignore scroll-driven category changes while the upload screen is open
|
|
117
|
-
if (uploading && fg('platform_emoji_picker_refresh')) {
|
|
124
|
+
// Ignore scroll-driven category changes while the upload or delete screen is open
|
|
125
|
+
if ((uploading || emojiToDelete) && fg('platform_emoji_picker_refresh')) {
|
|
118
126
|
return;
|
|
119
127
|
}
|
|
120
128
|
if (activeCategory !== category) {
|
|
121
129
|
setActiveCategory(category);
|
|
122
130
|
}
|
|
123
|
-
}, [activeCategory, uploading]);
|
|
131
|
+
}, [activeCategory, uploading, emojiToDelete]);
|
|
124
132
|
const calculateElapsedTime = () => {
|
|
125
133
|
return Date.now() - openTime.current;
|
|
126
134
|
};
|
|
@@ -278,10 +286,15 @@ const EmojiPickerComponent = ({
|
|
|
278
286
|
return;
|
|
279
287
|
}
|
|
280
288
|
|
|
281
|
-
// If the upload screen is open, close it when a category is selected
|
|
282
|
-
if (
|
|
283
|
-
|
|
284
|
-
|
|
289
|
+
// If the upload or delete screen is open, close it when a category is selected
|
|
290
|
+
if (fg('platform_emoji_picker_refresh')) {
|
|
291
|
+
if (uploading) {
|
|
292
|
+
setUploading(false);
|
|
293
|
+
setUploadErrorMessage(undefined);
|
|
294
|
+
}
|
|
295
|
+
if (emojiToDelete) {
|
|
296
|
+
setEmojiToDelete(undefined);
|
|
297
|
+
}
|
|
285
298
|
}
|
|
286
299
|
emojiProvider.findInCategory(categoryId).then(emojisInCategory => {
|
|
287
300
|
if (!disableCategories) {
|
|
@@ -312,7 +325,7 @@ const EmojiPickerComponent = ({
|
|
|
312
325
|
}));
|
|
313
326
|
}
|
|
314
327
|
});
|
|
315
|
-
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
|
|
328
|
+
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
|
|
316
329
|
const recordUsageOnSelection = useMemo(() => createRecordSelectionDefault(emojiProvider, onSelectWrapper, analytic => fireAnalytics(analytic(SearchSourceTypes.PICKER))), [emojiProvider, fireAnalytics, onSelectWrapper]);
|
|
317
330
|
const formattedErrorMessage = useMemo(() => uploadErrorMessage ? /*#__PURE__*/React.createElement(FormattedMessage, uploadErrorMessage) : null, [uploadErrorMessage]);
|
|
318
331
|
const onFileChooserClicked = useCallback(() => {
|
|
@@ -528,7 +541,7 @@ const EmojiPickerComponent = ({
|
|
|
528
541
|
role: "dialog",
|
|
529
542
|
"aria-label": formatMessage(messages.emojiPickerTitle),
|
|
530
543
|
"aria-modal": true,
|
|
531
|
-
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm",
|
|
544
|
+
className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
|
|
532
545
|
}, /*#__PURE__*/React.createElement("div", {
|
|
533
546
|
role: "presentation",
|
|
534
547
|
onKeyPress: suppressKeyPress,
|
|
@@ -536,7 +549,7 @@ const EmojiPickerComponent = ({
|
|
|
536
549
|
onKeyDown: suppressKeyPress,
|
|
537
550
|
className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
|
|
538
551
|
}, /*#__PURE__*/React.createElement(CategorySelector, {
|
|
539
|
-
activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
552
|
+
activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
540
553
|
dynamicCategories: dynamicCategories,
|
|
541
554
|
disableCategories: disableCategories,
|
|
542
555
|
onCategorySelected: onCategorySelected
|
|
@@ -569,7 +582,7 @@ const EmojiPickerComponent = ({
|
|
|
569
582
|
onOpenUpload: onOpenUpload,
|
|
570
583
|
size: size,
|
|
571
584
|
activeCategoryId: activeCategory
|
|
572
|
-
}), showPreview && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
585
|
+
}), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
573
586
|
selectedEmoji: selectedEmoji,
|
|
574
587
|
uploadEnabled: isUploadSupported && !uploading,
|
|
575
588
|
onOpenUpload: onOpenUpload
|
|
@@ -584,9 +597,9 @@ const EmojiPickerComponent = ({
|
|
|
584
597
|
onKeyPress: suppressKeyPress,
|
|
585
598
|
onKeyUp: suppressKeyPress,
|
|
586
599
|
onKeyDown: suppressKeyPress,
|
|
587
|
-
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm",
|
|
600
|
+
className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
|
|
588
601
|
}, /*#__PURE__*/React.createElement(CategorySelector, {
|
|
589
|
-
activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
602
|
+
activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
590
603
|
dynamicCategories: dynamicCategories,
|
|
591
604
|
disableCategories: disableCategories,
|
|
592
605
|
onCategorySelected: onCategorySelected
|
|
@@ -619,18 +632,24 @@ const EmojiPickerComponent = ({
|
|
|
619
632
|
onOpenUpload: onOpenUpload,
|
|
620
633
|
size: size,
|
|
621
634
|
activeCategoryId: activeCategory
|
|
622
|
-
}), showPreview && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
635
|
+
}), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
623
636
|
selectedEmoji: selectedEmoji,
|
|
624
637
|
uploadEnabled: isUploadSupported && !uploading,
|
|
625
638
|
onOpenUpload: onOpenUpload
|
|
626
639
|
}), uploading && fg('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
627
|
-
className: ax(["
|
|
640
|
+
className: ax(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
628
641
|
}, /*#__PURE__*/React.createElement(EmojiUploadPicker, {
|
|
629
642
|
onUploadEmoji: onUploadEmoji,
|
|
630
643
|
onUploadCancelled: onUploadCancelled,
|
|
631
644
|
onFileChooserClicked: onFileChooserClicked,
|
|
632
645
|
errorMessage: formattedErrorMessage,
|
|
633
646
|
initialUploadName: query
|
|
647
|
+
})), emojiToDelete && fg('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
648
|
+
className: ax(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
649
|
+
}, /*#__PURE__*/React.createElement(EmojiDeletePreviewComponent, {
|
|
650
|
+
emoji: emojiToDelete,
|
|
651
|
+
onDeleteEmoji: onDeleteEmoji,
|
|
652
|
+
onCloseDelete: onCloseDelete
|
|
634
653
|
})));
|
|
635
654
|
};
|
|
636
655
|
const _default_1 = /*#__PURE__*/memo(EmojiPickerComponent);
|
|
@@ -1,18 +1,39 @@
|
|
|
1
1
|
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
|
+
._1sc1wadc span{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
3
|
+
._2rko1tm3{border-radius:var(--ds-radius-xxlarge,1pc)}
|
|
4
|
+
._zulp1b66{gap:var(--ds-space-050,4px)}
|
|
5
|
+
._zulpu2gc{gap:var(--ds-space-100,8px)}
|
|
6
|
+
._zulputpp{gap:var(--ds-space-150,9pt)}
|
|
7
|
+
._16jlkb7n{flex-grow:1}
|
|
8
|
+
._19bvpxbi{padding-left:var(--ds-space-200,1pc)}
|
|
2
9
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
3
10
|
._19l3zwfg img{max-height:2pc}
|
|
11
|
+
._19pkutpp{margin-top:var(--ds-space-150,9pt)}
|
|
12
|
+
._1bah1h6o{justify-content:center}
|
|
4
13
|
._1bah1yb4{justify-content:space-between}
|
|
5
14
|
._1bahesu3{justify-content:flex-end}
|
|
6
15
|
._1e0c1txw{display:flex}
|
|
16
|
+
._1o9zkb7n{flex-shrink:1}
|
|
7
17
|
._1qz31b66 .emoji-submit-delete{margin-right:var(--ds-space-050,4px)}
|
|
18
|
+
._1tke1sa4{min-height:390px}
|
|
8
19
|
._1txfwu06 .emoji-submit-delete{font-weight:var(--ds-font-weight-bold,653)}
|
|
9
20
|
._2lx21bp4{flex-direction:column}
|
|
10
21
|
._4cvr1h6o{align-items:center}
|
|
22
|
+
._4cvr1y6m{align-items:flex-start}
|
|
11
23
|
._4t3i1ylp{height:40px}
|
|
12
24
|
._4t3i53f4{height:75pt}
|
|
13
25
|
._4t3ivbgk{height:4pc}
|
|
26
|
+
._bfhk1gly{background-color:var(--ds-background-danger,#ffeceb)}
|
|
27
|
+
._bna7t9kd img{height:72px}
|
|
14
28
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
29
|
+
._ca0qutpp{padding-top:var(--ds-space-150,9pt)}
|
|
30
|
+
._i0dl1wug{flex-basis:auto}
|
|
15
31
|
._m73io7ol .emoji-submit-delete{width:84px}
|
|
32
|
+
._mezjt9kd img{width:72px}
|
|
16
33
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
34
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
17
35
|
._rtyst9kd img{max-width:72px}
|
|
18
|
-
.
|
|
36
|
+
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
37
|
+
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
38
|
+
._vchhusvi{box-sizing:border-box}
|
|
39
|
+
._y3gn1e5h{text-align:left}
|
|
@@ -15,8 +15,9 @@ import { Component } from 'react';
|
|
|
15
15
|
import { FormattedMessage, injectIntl } from 'react-intl';
|
|
16
16
|
import AkButton from '@atlaskit/button/new';
|
|
17
17
|
import Heading from '@atlaskit/heading';
|
|
18
|
-
import { Text } from '@atlaskit/primitives/compiled';
|
|
18
|
+
import { Box, Text } from '@atlaskit/primitives/compiled';
|
|
19
19
|
import FocusLock from 'react-focus-lock';
|
|
20
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
21
|
import { messages } from '../i18n';
|
|
21
22
|
import CachingEmoji from './CachingEmoji';
|
|
22
23
|
import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
|
|
@@ -26,6 +27,10 @@ var deleteFooter = null;
|
|
|
26
27
|
var deletePreview = null;
|
|
27
28
|
var deleteText = null;
|
|
28
29
|
var previewButtonGroup = null;
|
|
30
|
+
var deletePreviewNew = null;
|
|
31
|
+
var deleteTextSection = null;
|
|
32
|
+
var emojiPreviewLargeBox = null;
|
|
33
|
+
var deleteButtonGroup = null;
|
|
29
34
|
export var emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
30
35
|
var deleteEmojiLabelId = 'fabric.emoji.delete.label.id';
|
|
31
36
|
var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
@@ -83,6 +88,49 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
|
83
88
|
loading = _this$state.loading,
|
|
84
89
|
error = _this$state.error;
|
|
85
90
|
var formatMessage = intl.formatMessage;
|
|
91
|
+
if (fg('platform_emoji_picker_refresh')) {
|
|
92
|
+
return /*#__PURE__*/React.createElement(FocusLock, {
|
|
93
|
+
noFocusGuards: true
|
|
94
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
95
|
+
"data-testid": emojiDeletePreviewTestId,
|
|
96
|
+
className: ax(["_zulputpp _1e0c1txw _2lx21bp4 _1tke1sa4 _ca0qutpp _u5f3pxbi _n3tdutpp _19bvpxbi _vchhusvi"])
|
|
97
|
+
}, /*#__PURE__*/React.createElement("div", {
|
|
98
|
+
className: ax(["_zulp1b66 _1e0c1txw _2lx21bp4 _4cvr1y6m _y3gn1e5h"])
|
|
99
|
+
}, /*#__PURE__*/React.createElement(Box, {
|
|
100
|
+
paddingBlockEnd: "space.100"
|
|
101
|
+
}, /*#__PURE__*/React.createElement(Heading, {
|
|
102
|
+
size: "small"
|
|
103
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, messages.deleteEmojiTitle))), /*#__PURE__*/React.createElement(Text, {
|
|
104
|
+
color: "color.text.subtle",
|
|
105
|
+
size: "small"
|
|
106
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.deleteEmojiDescription, {
|
|
107
|
+
values: {
|
|
108
|
+
emojiShortName: emoji.shortName
|
|
109
|
+
}
|
|
110
|
+
})))), /*#__PURE__*/React.createElement("div", {
|
|
111
|
+
className: ax(["_16jlkb7n _1o9zkb7n _i0dl1wug _2rko1tm3 _1e0c1txw _4cvr1h6o _1bah1h6o _bfhk1gly _1sc1wadc _mezjt9kd _bna7t9kd"])
|
|
112
|
+
}, /*#__PURE__*/React.createElement(CachingEmoji, {
|
|
113
|
+
emoji: emoji
|
|
114
|
+
})), /*#__PURE__*/React.createElement("div", {
|
|
115
|
+
className: ax(["_zulpu2gc _1e0c1txw _4cvr1h6o _1bahesu3 _19pkutpp"])
|
|
116
|
+
}, error && !loading ? /*#__PURE__*/React.createElement(EmojiErrorMessage, {
|
|
117
|
+
message: formatMessage(messages.deleteEmojiFailed),
|
|
118
|
+
errorStyle: "delete",
|
|
119
|
+
tooltip: true
|
|
120
|
+
}) : null, /*#__PURE__*/React.createElement(VisuallyHidden, {
|
|
121
|
+
id: deleteEmojiLabelId
|
|
122
|
+
}, formatMessage(messages.deleteEmojiLabel)), /*#__PURE__*/React.createElement(AkButton, {
|
|
123
|
+
appearance: "subtle",
|
|
124
|
+
onClick: this.onCancel
|
|
125
|
+
}, /*#__PURE__*/React.createElement(FormattedMessage, messages.cancelLabel)), /*#__PURE__*/React.createElement(RetryableButton, {
|
|
126
|
+
label: formatMessage(messages.deleteEmojiLabel),
|
|
127
|
+
onSubmit: this.onSubmit,
|
|
128
|
+
appearance: "danger",
|
|
129
|
+
loading: loading,
|
|
130
|
+
error: error,
|
|
131
|
+
ariaLabelledBy: "".concat(emojiErrorScreenreaderTestId, " ").concat(deleteEmojiLabelId)
|
|
132
|
+
}))));
|
|
133
|
+
}
|
|
86
134
|
return /*#__PURE__*/React.createElement(FocusLock, {
|
|
87
135
|
noFocusGuards: true
|
|
88
136
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
._11c8fhey{font:var(--ds-font-body,normal 400 14px/20px "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
1
2
|
._11c8wadc{font:var(--ds-font-body-small,normal 400 9pt/1pc "Atlassian Sans",ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
|
|
2
3
|
._scffidpf input{border:0}
|
|
3
4
|
._zulp12x7{gap:var(--ds-space-075,6px)}
|
|
@@ -18,16 +19,15 @@
|
|
|
18
19
|
._4cvr1h6o{align-items:center}
|
|
19
20
|
._4cvresu3{align-items:flex-end}
|
|
20
21
|
._9bj2glyw input::-ms-clear{display:none}
|
|
21
|
-
.
|
|
22
|
+
._ca0q12x7{padding-top:var(--ds-space-075,6px)}
|
|
22
23
|
._ca0qu2gc{padding-top:var(--ds-space-100,8px)}
|
|
23
24
|
._coc6glyw input:invalid{box-shadow:none}
|
|
24
25
|
._gxxuglyw input{outline-style:none}
|
|
25
26
|
._gy1p12x7{column-gap:var(--ds-space-075,6px)}
|
|
26
27
|
._i0dl1wug{flex-basis:auto}
|
|
27
28
|
._k48p1pd9{font-weight:var(--ds-font-weight-semibold,600)}
|
|
28
|
-
._n3td1ejb{padding-bottom:var(--ds-space-300,24px)}
|
|
29
29
|
._n3tdu2gc{padding-bottom:var(--ds-space-100,8px)}
|
|
30
|
-
.
|
|
30
|
+
._n3tdutpp{padding-bottom:var(--ds-space-150,9pt)}
|
|
31
31
|
._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
|
|
32
32
|
._u5f3u2gc{padding-right:var(--ds-space-100,8px)}
|
|
33
33
|
._xmji1r31 input{outline-color:currentColor}
|
|
@@ -30,6 +30,7 @@ var emojiUploadNew = null;
|
|
|
30
30
|
var emojiUploadTop = null;
|
|
31
31
|
var emojiUploadTopNew = null;
|
|
32
32
|
var labelStyles = null;
|
|
33
|
+
var labelStylesNew = null;
|
|
33
34
|
var uploadChooseFileEmojiName = null;
|
|
34
35
|
var uploadChooseFileMessage = null;
|
|
35
36
|
var uploadChooseFileRow = null;
|
|
@@ -88,10 +89,10 @@ var ChooseEmojiFile = /*#__PURE__*/memo(function (props) {
|
|
|
88
89
|
"data-testid": uploadEmojiComponentTestId,
|
|
89
90
|
className: ax(["_ca0qu2gc _u5f3pxbi _n3tdu2gc _19bvpxbi _1e0c1txw _2lx21bp4 _1bah1b1v"])
|
|
90
91
|
}, /*#__PURE__*/React.createElement("div", {
|
|
91
|
-
className: ax(["
|
|
92
|
+
className: ax(["_ca0q12x7 _n3tdutpp _1e0c1txw _1bah1yb4 _4cvresu3"])
|
|
92
93
|
}, /*#__PURE__*/React.createElement("label", {
|
|
93
94
|
htmlFor: "new-emoji-name-input",
|
|
94
|
-
className: ax(["_1w90azsu", "
|
|
95
|
+
className: ax(["_1w90azsu", "_11c8fhey _k48p1pd9"])
|
|
95
96
|
}, previewImage ? /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiPreviewTitle) : /*#__PURE__*/React.createElement(FormattedMessage, messages.addCustomEmojiLabel))), /*#__PURE__*/React.createElement("div", {
|
|
96
97
|
className: ax(["_zulp12x7 _1e0c1txw _2lx21bp4 _1tker0r7"])
|
|
97
98
|
}, /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, function () {
|
|
@@ -130,7 +131,7 @@ var ChooseEmojiFile = /*#__PURE__*/memo(function (props) {
|
|
|
130
131
|
errorStyle: "chooseFile",
|
|
131
132
|
message: nameErrorMessage
|
|
132
133
|
}))), /*#__PURE__*/React.createElement("div", {
|
|
133
|
-
className: ax(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o
|
|
134
|
+
className: ax(["_zulpu2gc _1e0c1txw _1bahesu3 _4cvr1h6o _ca0qu2gc _n3tdutpp"])
|
|
134
135
|
}, /*#__PURE__*/React.createElement(Button, {
|
|
135
136
|
onClick: onUploadCancelled,
|
|
136
137
|
appearance: "subtle",
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
4
5
|
._1bah1yb4{justify-content:space-between}
|
|
5
6
|
._1bsb1edt{width:350px}
|
|
@@ -12,6 +12,7 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
12
12
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
13
13
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
14
14
|
import React from 'react';
|
|
15
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
16
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
16
17
|
import { ufoExperiences } from '../../util/analytics';
|
|
17
18
|
import LoadingEmojiComponent from '../common/LoadingEmojiComponent';
|
|
@@ -20,6 +21,7 @@ import { UfoErrorBoundary } from '../common/UfoErrorBoundary';
|
|
|
20
21
|
import { defaultEmojiPickerSize } from '../../util/constants';
|
|
21
22
|
import { EmojiCommonProvider } from '../../context/EmojiCommonProvider';
|
|
22
23
|
var emojiPicker = null;
|
|
24
|
+
var emojiPickerNew = null;
|
|
23
25
|
var emojiPickerModuleLoader = function emojiPickerModuleLoader() {
|
|
24
26
|
return import( /* webpackChunkName:"@atlaskit-internal_emojiPickerComponent" */'./EmojiPickerComponent');
|
|
25
27
|
};
|
|
@@ -65,7 +67,10 @@ export var EmojiPickerInternal = /*#__PURE__*/function (_LoadingEmojiComponen) {
|
|
|
65
67
|
}
|
|
66
68
|
};
|
|
67
69
|
ufoExperiences['emoji-picker-opened'].markFMP();
|
|
68
|
-
return /*#__PURE__*/React.createElement("div", {
|
|
70
|
+
return fg('platform_emoji_picker_refresh') ? /*#__PURE__*/React.createElement("div", {
|
|
71
|
+
ref: handlePickerRef,
|
|
72
|
+
className: ax(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
73
|
+
}, item.renderItem()) : /*#__PURE__*/React.createElement("div", {
|
|
69
74
|
ref: handlePickerRef,
|
|
70
75
|
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
71
76
|
}, item.renderItem());
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
3
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
4
|
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._154iidpf{top:0}
|
|
4
5
|
._16jlkb7n{flex-grow:1}
|
|
5
6
|
._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
@@ -19,9 +20,12 @@
|
|
|
19
20
|
._1ul910mj{min-width:var(--_gsvyy7)}
|
|
20
21
|
._1xi2idpf{right:0}
|
|
21
22
|
._2lx21bp4{flex-direction:column}
|
|
23
|
+
._4t3i1784{height:470px}
|
|
22
24
|
._4t3i1ckg{height:455px}
|
|
25
|
+
._4t3i1sa4{height:390px}
|
|
23
26
|
._4t3i2300{height:429px}
|
|
24
27
|
._4t3iaq3k{height:295px}
|
|
28
|
+
._4t3ibqjm{height:310px}
|
|
25
29
|
._4t3iixjv{height:375px}
|
|
26
30
|
._4t3iuxo9{height:var(--_19dn98e)}
|
|
27
31
|
._4t3ivixp{height:349px}
|
|
@@ -29,6 +29,7 @@ import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
|
|
|
29
29
|
import CategorySelector from './CategorySelector';
|
|
30
30
|
import EmojiPickerFooter from './EmojiPickerFooter';
|
|
31
31
|
import EmojiUploadPicker from '../common/EmojiUploadPicker';
|
|
32
|
+
import EmojiDeletePreviewComponent from '../common/EmojiDeletePreview';
|
|
32
33
|
import { EmojiPickerVirtualListInternal as EmojiPickerList } from './EmojiPickerList';
|
|
33
34
|
import { createAndFireEventInElementsChannel, categoryClickedEvent, closedPickerEvent, deleteBeginEvent, deleteCancelEvent, deleteConfirmEvent, openedPickerEvent, pickerClickedEvent, pickerSearchedEvent, selectedFileEvent, uploadBeginButton, uploadCancelButton, uploadConfirmButton, toneSelectorClosedEvent, ufoExperiences } from '../../util/analytics';
|
|
34
35
|
import { useEmoji } from '../../hooks/useEmoji';
|
|
@@ -37,10 +38,12 @@ import { messages } from '../i18n';
|
|
|
37
38
|
var emojiPickerBoxShadow = "var(--ds-shadow-overlay, 0px 8px 12px #1E1F2126, 0px 0px 1px #1E1F214f)";
|
|
38
39
|
var emojiPickerHeight = 295;
|
|
39
40
|
var emojiPickerHeightWithPreview = 349; // emojiPickerHeight + emojiPickerPreviewHeight;
|
|
41
|
+
var emojiPickerHeightWithPreviewNew = 310;
|
|
40
42
|
var emojiPickerWidth = 350;
|
|
41
43
|
var emojiPickerMinHeight = 260;
|
|
42
44
|
var heightOffset = 80;
|
|
43
45
|
var emojiPicker = null;
|
|
46
|
+
var emojiPickerNew = null;
|
|
44
47
|
var uploadOverlay = null;
|
|
45
48
|
var emojiPickerWrapper = null;
|
|
46
49
|
var withPreviewHeight = {
|
|
@@ -48,6 +51,11 @@ var withPreviewHeight = {
|
|
|
48
51
|
medium: "_4t3i2300 _1tke5x59",
|
|
49
52
|
large: "_4t3ixt2k _1tke1pna"
|
|
50
53
|
};
|
|
54
|
+
var withUploadRefreshHeight = {
|
|
55
|
+
small: "_4t3ibqjm _1tkegx0z",
|
|
56
|
+
medium: "_4t3i1sa4 _1tke5x59",
|
|
57
|
+
large: "_4t3i1784 _1tke1pna"
|
|
58
|
+
};
|
|
51
59
|
var withoutPreviewHeight = {
|
|
52
60
|
small: "_4t3iaq3k _1tkegx0z",
|
|
53
61
|
medium: "_4t3iixjv _1tke5x59",
|
|
@@ -162,14 +170,14 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
162
170
|
if (isProgrammaticScroll.current && fg('platform_emoji_picker_refresh')) {
|
|
163
171
|
return;
|
|
164
172
|
}
|
|
165
|
-
// Ignore scroll-driven category changes while the upload screen is open
|
|
166
|
-
if (uploading && fg('platform_emoji_picker_refresh')) {
|
|
173
|
+
// Ignore scroll-driven category changes while the upload or delete screen is open
|
|
174
|
+
if ((uploading || emojiToDelete) && fg('platform_emoji_picker_refresh')) {
|
|
167
175
|
return;
|
|
168
176
|
}
|
|
169
177
|
if (activeCategory !== category) {
|
|
170
178
|
setActiveCategory(category);
|
|
171
179
|
}
|
|
172
|
-
}, [activeCategory, uploading]);
|
|
180
|
+
}, [activeCategory, uploading, emojiToDelete]);
|
|
173
181
|
var calculateElapsedTime = function calculateElapsedTime() {
|
|
174
182
|
return Date.now() - openTime.current;
|
|
175
183
|
};
|
|
@@ -325,10 +333,15 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
325
333
|
return;
|
|
326
334
|
}
|
|
327
335
|
|
|
328
|
-
// If the upload screen is open, close it when a category is selected
|
|
329
|
-
if (
|
|
330
|
-
|
|
331
|
-
|
|
336
|
+
// If the upload or delete screen is open, close it when a category is selected
|
|
337
|
+
if (fg('platform_emoji_picker_refresh')) {
|
|
338
|
+
if (uploading) {
|
|
339
|
+
setUploading(false);
|
|
340
|
+
setUploadErrorMessage(undefined);
|
|
341
|
+
}
|
|
342
|
+
if (emojiToDelete) {
|
|
343
|
+
setEmojiToDelete(undefined);
|
|
344
|
+
}
|
|
332
345
|
}
|
|
333
346
|
emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
|
|
334
347
|
if (!disableCategories) {
|
|
@@ -359,7 +372,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
359
372
|
}));
|
|
360
373
|
}
|
|
361
374
|
});
|
|
362
|
-
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
|
|
375
|
+
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
|
|
363
376
|
var recordUsageOnSelection = useMemo(function () {
|
|
364
377
|
return createRecordSelectionDefault(emojiProvider, onSelectWrapper, function (analytic) {
|
|
365
378
|
return fireAnalytics(analytic(SearchSourceTypes.PICKER));
|
|
@@ -609,7 +622,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
609
622
|
role: "dialog",
|
|
610
623
|
"aria-label": formatMessage(messages.emojiPickerTitle),
|
|
611
624
|
"aria-modal": true,
|
|
612
|
-
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm",
|
|
625
|
+
className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
|
|
613
626
|
style: {
|
|
614
627
|
"--_19dn98e": ix("".concat(emojiPickerHeight, "px")),
|
|
615
628
|
"--_gsvyy7": ix("".concat(emojiPickerWidth, "px"))
|
|
@@ -621,7 +634,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
621
634
|
onKeyDown: suppressKeyPress,
|
|
622
635
|
className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
|
|
623
636
|
}, /*#__PURE__*/React.createElement(CategorySelector, {
|
|
624
|
-
activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
637
|
+
activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
625
638
|
dynamicCategories: dynamicCategories,
|
|
626
639
|
disableCategories: disableCategories,
|
|
627
640
|
onCategorySelected: onCategorySelected
|
|
@@ -654,7 +667,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
654
667
|
onOpenUpload: onOpenUpload,
|
|
655
668
|
size: size,
|
|
656
669
|
activeCategoryId: activeCategory
|
|
657
|
-
}), showPreview && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
670
|
+
}), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
658
671
|
selectedEmoji: selectedEmoji,
|
|
659
672
|
uploadEnabled: isUploadSupported && !uploading,
|
|
660
673
|
onOpenUpload: onOpenUpload
|
|
@@ -669,13 +682,13 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
669
682
|
onKeyPress: suppressKeyPress,
|
|
670
683
|
onKeyUp: suppressKeyPress,
|
|
671
684
|
onKeyDown: suppressKeyPress,
|
|
672
|
-
className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm",
|
|
685
|
+
className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", (uploading || !!emojiToDelete) && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
|
|
673
686
|
style: {
|
|
674
687
|
"--_19dn98e": ix("".concat(emojiPickerHeight, "px")),
|
|
675
688
|
"--_gsvyy7": ix("".concat(emojiPickerWidth, "px"))
|
|
676
689
|
}
|
|
677
690
|
}, /*#__PURE__*/React.createElement(CategorySelector, {
|
|
678
|
-
activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
691
|
+
activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
|
|
679
692
|
dynamicCategories: dynamicCategories,
|
|
680
693
|
disableCategories: disableCategories,
|
|
681
694
|
onCategorySelected: onCategorySelected
|
|
@@ -708,18 +721,24 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
708
721
|
onOpenUpload: onOpenUpload,
|
|
709
722
|
size: size,
|
|
710
723
|
activeCategoryId: activeCategory
|
|
711
|
-
}), showPreview && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
724
|
+
}), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
|
|
712
725
|
selectedEmoji: selectedEmoji,
|
|
713
726
|
uploadEnabled: isUploadSupported && !uploading,
|
|
714
727
|
onOpenUpload: onOpenUpload
|
|
715
728
|
}), uploading && fg('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
716
|
-
className: ax(["
|
|
729
|
+
className: ax(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
717
730
|
}, /*#__PURE__*/React.createElement(EmojiUploadPicker, {
|
|
718
731
|
onUploadEmoji: onUploadEmoji,
|
|
719
732
|
onUploadCancelled: onUploadCancelled,
|
|
720
733
|
onFileChooserClicked: onFileChooserClicked,
|
|
721
734
|
errorMessage: formattedErrorMessage,
|
|
722
735
|
initialUploadName: query
|
|
736
|
+
})), emojiToDelete && fg('platform_emoji_picker_refresh') && /*#__PURE__*/React.createElement("div", {
|
|
737
|
+
className: ax(["_2rko1mok _kqswstnw _154iidpf _1ltvidpf _1xi2idpf _94n5idpf _bfhk1bhr _1pbykb7n _18m91wug"])
|
|
738
|
+
}, /*#__PURE__*/React.createElement(EmojiDeletePreviewComponent, {
|
|
739
|
+
emoji: emojiToDelete,
|
|
740
|
+
onDeleteEmoji: onDeleteEmoji,
|
|
741
|
+
onCloseDelete: onCloseDelete
|
|
723
742
|
})));
|
|
724
743
|
};
|
|
725
744
|
var _default_1 = /*#__PURE__*/memo(EmojiPickerComponent);
|
|
@@ -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: "70.10.
|
|
17
|
+
packageVersion: "70.10.2"
|
|
18
18
|
}, attributes)
|
|
19
19
|
};
|
|
20
20
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/emoji",
|
|
3
|
-
"version": "70.10.
|
|
3
|
+
"version": "70.10.3",
|
|
4
4
|
"description": "Fabric emoji React components",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@atlaskit/primitives": "^19.0.0",
|
|
53
53
|
"@atlaskit/spinner": "^19.1.0",
|
|
54
54
|
"@atlaskit/textfield": "^8.3.0",
|
|
55
|
-
"@atlaskit/tmp-editor-statsig": "^82.
|
|
55
|
+
"@atlaskit/tmp-editor-statsig": "^82.3.0",
|
|
56
56
|
"@atlaskit/tokens": "^13.0.0",
|
|
57
57
|
"@atlaskit/tooltip": "^22.2.0",
|
|
58
58
|
"@atlaskit/ufo": "^0.5.0",
|
|
@@ -97,6 +97,7 @@
|
|
|
97
97
|
"p-wait-for": "^3.2.0",
|
|
98
98
|
"react": "^18.2.0",
|
|
99
99
|
"react-addons-perf": "^15.3.2",
|
|
100
|
+
"react-dom": "^18.2.0",
|
|
100
101
|
"react-intl": "^6.6.2",
|
|
101
102
|
"react-test-renderer": "^18.2.0",
|
|
102
103
|
"rxjs": "^5.5.0",
|