@atlaskit/emoji 67.11.0 → 67.11.1
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 +9 -0
- package/afm-cc/tsconfig.json +3 -0
- package/afm-post-office/tsconfig.json +3 -0
- package/dist/cjs/components/common/Emoji.js +1 -1
- package/dist/cjs/components/common/EmojiDeletePreview.js +3 -2
- package/dist/cjs/components/common/EmojiUploadPicker.js +6 -5
- package/dist/cjs/components/common/EmojiUploadPreview.js +4 -1
- package/dist/cjs/components/common/styles.js +1 -6
- package/dist/cjs/util/analytics/analytics.js +1 -1
- package/dist/es2019/components/common/Emoji.js +1 -1
- package/dist/es2019/components/common/EmojiDeletePreview.js +4 -3
- package/dist/es2019/components/common/EmojiUploadPicker.js +7 -6
- package/dist/es2019/components/common/EmojiUploadPreview.js +4 -1
- package/dist/es2019/components/common/styles.js +0 -5
- package/dist/es2019/util/analytics/analytics.js +1 -1
- package/dist/esm/components/common/Emoji.js +1 -1
- package/dist/esm/components/common/EmojiDeletePreview.js +4 -3
- package/dist/esm/components/common/EmojiUploadPicker.js +7 -6
- package/dist/esm/components/common/EmojiUploadPreview.js +4 -1
- package/dist/esm/components/common/styles.js +0 -5
- package/dist/esm/util/analytics/analytics.js +1 -1
- package/dist/types/components/common/styles.d.ts +0 -1
- package/dist/types-ts4.5/components/common/styles.d.ts +0 -1
- package/docs/0-intro.tsx +3 -2
- package/docs/4-emoji-provider.tsx +2 -1
- package/package.json +4 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/emoji
|
|
2
2
|
|
|
3
|
+
## 67.11.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#165681](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165681)
|
|
8
|
+
[`57716f58fccef`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/57716f58fccef) -
|
|
9
|
+
[ux] typography changes to text and heading
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 67.11.0
|
|
4
13
|
|
|
5
14
|
### Minor Changes
|
package/afm-cc/tsconfig.json
CHANGED
|
@@ -18,6 +18,7 @@ var _react = require("react");
|
|
|
18
18
|
var _react2 = require("@emotion/react");
|
|
19
19
|
var _reactIntlNext = require("react-intl-next");
|
|
20
20
|
var _new = _interopRequireDefault(require("@atlaskit/button/new"));
|
|
21
|
+
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
21
22
|
var _reactFocusLock = _interopRequireDefault(require("react-focus-lock"));
|
|
22
23
|
var _i18n = require("../i18n");
|
|
23
24
|
var _CachingEmoji = _interopRequireDefault(require("./CachingEmoji"));
|
|
@@ -111,8 +112,8 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
|
111
112
|
"data-testid": emojiDeletePreviewTestId
|
|
112
113
|
}, (0, _react2.jsx)("div", {
|
|
113
114
|
css: _styles.deleteText
|
|
114
|
-
}, (0, _react2.jsx)(
|
|
115
|
-
|
|
115
|
+
}, (0, _react2.jsx)(_heading.default, {
|
|
116
|
+
size: "xxsmall"
|
|
116
117
|
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.deleteEmojiTitle)), (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.deleteEmojiDescription, {
|
|
117
118
|
values: {
|
|
118
119
|
emojiShortName: emoji.shortName
|
|
@@ -15,6 +15,7 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
15
15
|
var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
|
|
16
16
|
var _closeCross = _interopRequireDefault(require("@atlaskit/icon/core/migration/close--cross"));
|
|
17
17
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
18
|
+
var _primitives = require("@atlaskit/primitives");
|
|
18
19
|
var _reactFocusLock = _interopRequireDefault(require("react-focus-lock"));
|
|
19
20
|
var ImageUtil = _interopRequireWildcard(require("../../util/image"));
|
|
20
21
|
var _logger = _interopRequireDefault(require("../../util/logger"));
|
|
@@ -117,9 +118,7 @@ var ChooseEmojiFile = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
|
117
118
|
ref: inputRef,
|
|
118
119
|
id: "new-emoji-name-input",
|
|
119
120
|
"aria-required": true
|
|
120
|
-
})), (0, _react2.jsx)(
|
|
121
|
-
css: _styles.uploadChooseFileBrowse
|
|
122
|
-
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.emojiChooseFileScreenReaderDescription, function () {
|
|
121
|
+
})), (0, _react2.jsx)(_primitives.Text, null, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.emojiChooseFileScreenReaderDescription, function () {
|
|
123
122
|
return (0, _react2.jsx)(_FileChooser.default, {
|
|
124
123
|
label: emojiChooseFileTitle,
|
|
125
124
|
onChange: onChooseFile,
|
|
@@ -129,9 +128,11 @@ var ChooseEmojiFile = /*#__PURE__*/(0, _react.memo)(function (props) {
|
|
|
129
128
|
isDisabled: disableChooser
|
|
130
129
|
});
|
|
131
130
|
}))), (0, _react2.jsx)("div", {
|
|
132
|
-
css: _styles.emojiUploadBottom,
|
|
133
131
|
id: fileChooserButtonDescriptionId
|
|
134
|
-
}, !errorMessage ? (0, _react2.jsx)(
|
|
132
|
+
}, !errorMessage ? (0, _react2.jsx)(_primitives.Text, {
|
|
133
|
+
as: "p",
|
|
134
|
+
size: "small"
|
|
135
|
+
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.emojiImageRequirements)) : (0, _react2.jsx)(_EmojiErrorMessage.default, {
|
|
135
136
|
messageStyles: _styles.emojiChooseFileErrorMessage,
|
|
136
137
|
message: errorMessage
|
|
137
138
|
})))
|
|
@@ -14,6 +14,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
14
14
|
var _react = require("react");
|
|
15
15
|
var _react2 = require("@emotion/react");
|
|
16
16
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
17
|
+
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
17
18
|
var _reactIntlNext = require("react-intl-next");
|
|
18
19
|
var _constants = require("../../util/constants");
|
|
19
20
|
var _i18n = require("../i18n");
|
|
@@ -77,7 +78,9 @@ var EmojiUploadPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
77
78
|
"data-testid": uploadPreviewTestId
|
|
78
79
|
}, (0, _react2.jsx)("div", {
|
|
79
80
|
css: _styles.uploadPreviewText
|
|
80
|
-
}, (0, _react2.jsx)(
|
|
81
|
+
}, (0, _react2.jsx)(_heading.default, {
|
|
82
|
+
size: "xsmall"
|
|
83
|
+
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.emojiPreviewTitle)), (0, _react2.jsx)("div", {
|
|
81
84
|
id: addEmojiPreviewDescriptionId
|
|
82
85
|
}, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.emojiPreview, {
|
|
83
86
|
values: {
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.uploadPreviewText = exports.uploadPreviewFooter = exports.uploadPreview = exports.uploadChooseFileRow = exports.uploadChooseFileMessage = exports.uploadChooseFileEmojiName = exports.
|
|
7
|
+
exports.uploadPreviewText = exports.uploadPreviewFooter = exports.uploadPreview = exports.uploadChooseFileRow = exports.uploadChooseFileMessage = exports.uploadChooseFileEmojiName = exports.uploadAddRow = exports.tooltipShortcutStyle = exports.submitDelete = exports.selectOnHoverStyles = exports.requiredSymbol = exports.previewText = exports.previewImg = exports.previewButtonGroup = exports.preview = exports.placeholderContainerAnimated = exports.placeholderContainer = exports.placeholder = exports.hidden = exports.headingH5 = exports.emojiUploadTop = exports.emojiUploadBottom = exports.emojiUpload = exports.emojiToneSelectorContainer = exports.emojiSpriteContainer = exports.emojiSprite = exports.emojiShortName = exports.emojiScrollable = exports.emojiRadio = exports.emojiPreviewErrorMessage = exports.emojiPickerAddEmoji = exports.emojiNodeStyles = exports.emojiName = exports.emojiMainStyle = exports.emojiImageContainer = exports.emojiImage = exports.emojiDeleteErrorMessage = exports.emojiDeleteButton = exports.emojiChooseFileErrorMessage = exports.emojiButton = exports.emojiActionsWrapper = exports.deleteText = exports.deletePreview = exports.deleteFooter = exports.deleteButton = exports.deletableEmoji = exports.commonSelectedStyles = exports.closeEmojiUploadButton = exports.buttonSpinner = exports.bigEmojiPreview = exports.addCustomEmojiButton = exports.addCustomEmoji = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _constants = require("../../util/constants");
|
|
@@ -337,11 +337,6 @@ var uploadChooseFileEmojiName = exports.uploadChooseFileEmojiName = (0, _react.c
|
|
|
337
337
|
}), _input)
|
|
338
338
|
});
|
|
339
339
|
|
|
340
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
341
|
-
var uploadChooseFileBrowse = exports.uploadChooseFileBrowse = (0, _react.css)({
|
|
342
|
-
flex: '0 0 auto'
|
|
343
|
-
});
|
|
344
|
-
|
|
345
340
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
346
341
|
var uploadPreviewFooter = exports.uploadPreviewFooter = (0, _react.css)({
|
|
347
342
|
display: 'flex',
|
|
@@ -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: "67.11.
|
|
23
|
+
packageVersion: "67.11.1"
|
|
24
24
|
}, attributes)
|
|
25
25
|
};
|
|
26
26
|
};
|
|
@@ -9,12 +9,13 @@ import { Component } from 'react';
|
|
|
9
9
|
import { jsx } from '@emotion/react';
|
|
10
10
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
11
11
|
import AkButton from '@atlaskit/button/new';
|
|
12
|
+
import Heading from '@atlaskit/heading';
|
|
12
13
|
import FocusLock from 'react-focus-lock';
|
|
13
14
|
import { messages } from '../i18n';
|
|
14
15
|
import CachingEmoji from './CachingEmoji';
|
|
15
16
|
import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
|
|
16
17
|
import RetryableButton from './RetryableButton';
|
|
17
|
-
import { deleteFooter, deletePreview, deleteText, emojiDeleteErrorMessage,
|
|
18
|
+
import { deleteFooter, deletePreview, deleteText, emojiDeleteErrorMessage, previewButtonGroup } from './styles';
|
|
18
19
|
import VisuallyHidden from '@atlaskit/visually-hidden';
|
|
19
20
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
21
|
export const emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
@@ -89,8 +90,8 @@ class EmojiDeletePreview extends Component {
|
|
|
89
90
|
"data-testid": emojiDeletePreviewTestId
|
|
90
91
|
}, jsx("div", {
|
|
91
92
|
css: deleteText
|
|
92
|
-
}, jsx(
|
|
93
|
-
|
|
93
|
+
}, jsx(Heading, {
|
|
94
|
+
size: "xxsmall"
|
|
94
95
|
}, jsx(FormattedMessage, messages.deleteEmojiTitle)), jsx(FormattedMessage, _extends({}, messages.deleteEmojiDescription, {
|
|
95
96
|
values: {
|
|
96
97
|
emojiShortName: emoji.shortName
|
|
@@ -9,6 +9,7 @@ import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
|
9
9
|
import TextField from '@atlaskit/textfield';
|
|
10
10
|
import CrossIcon from '@atlaskit/icon/core/migration/close--cross';
|
|
11
11
|
import AkButton from '@atlaskit/button/standard-button';
|
|
12
|
+
import { Text } from '@atlaskit/primitives';
|
|
12
13
|
import FocusLock from 'react-focus-lock';
|
|
13
14
|
import * as ImageUtil from '../../util/image';
|
|
14
15
|
import debug from '../../util/logger';
|
|
@@ -17,7 +18,7 @@ import EmojiErrorMessage from './EmojiErrorMessage';
|
|
|
17
18
|
import EmojiUploadPreview from './EmojiUploadPreview';
|
|
18
19
|
import FileChooser from './FileChooser';
|
|
19
20
|
import { UploadStatus } from './internal-types';
|
|
20
|
-
import { closeEmojiUploadButton, emojiChooseFileErrorMessage, emojiUpload,
|
|
21
|
+
import { closeEmojiUploadButton, emojiChooseFileErrorMessage, emojiUpload, emojiUploadTop, headingH5, uploadChooseFileEmojiName, uploadChooseFileMessage, uploadChooseFileRow } from './styles';
|
|
21
22
|
export const uploadEmojiNameInputTestId = 'upload-emoji-name-input';
|
|
22
23
|
export const uploadEmojiComponentTestId = 'upload-emoji-component';
|
|
23
24
|
export const cancelEmojiUploadPickerTestId = 'cancel-emoji-upload-picker';
|
|
@@ -105,9 +106,7 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
|
|
|
105
106
|
ref: inputRef,
|
|
106
107
|
id: "new-emoji-name-input",
|
|
107
108
|
"aria-required": true
|
|
108
|
-
})), jsx(
|
|
109
|
-
css: uploadChooseFileBrowse
|
|
110
|
-
}, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, () => jsx(FileChooser, {
|
|
109
|
+
})), jsx(Text, null, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, () => jsx(FileChooser, {
|
|
111
110
|
label: emojiChooseFileTitle,
|
|
112
111
|
onChange: onChooseFile,
|
|
113
112
|
onClick: onClick,
|
|
@@ -115,9 +114,11 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
|
|
|
115
114
|
ariaDescribedBy: fileChooserButtonDescriptionId,
|
|
116
115
|
isDisabled: disableChooser
|
|
117
116
|
})))), jsx("div", {
|
|
118
|
-
css: emojiUploadBottom,
|
|
119
117
|
id: fileChooserButtonDescriptionId
|
|
120
|
-
}, !errorMessage ? jsx(
|
|
118
|
+
}, !errorMessage ? jsx(Text, {
|
|
119
|
+
as: "p",
|
|
120
|
+
size: "small"
|
|
121
|
+
}, jsx(FormattedMessage, messages.emojiImageRequirements)) : jsx(EmojiErrorMessage, {
|
|
121
122
|
messageStyles: emojiChooseFileErrorMessage,
|
|
122
123
|
message: errorMessage
|
|
123
124
|
})))
|
|
@@ -7,6 +7,7 @@ import { PureComponent } from 'react';
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { jsx } from '@emotion/react';
|
|
9
9
|
import AkButton from '@atlaskit/button/standard-button';
|
|
10
|
+
import Heading from '@atlaskit/heading';
|
|
10
11
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
11
12
|
import { customCategory } from '../../util/constants';
|
|
12
13
|
import { messages } from '../i18n';
|
|
@@ -60,7 +61,9 @@ class EmojiUploadPreview extends PureComponent {
|
|
|
60
61
|
"data-testid": uploadPreviewTestId
|
|
61
62
|
}, jsx("div", {
|
|
62
63
|
css: uploadPreviewText
|
|
63
|
-
}, jsx(
|
|
64
|
+
}, jsx(Heading, {
|
|
65
|
+
size: "xsmall"
|
|
66
|
+
}, jsx(FormattedMessage, messages.emojiPreviewTitle)), jsx("div", {
|
|
64
67
|
id: addEmojiPreviewDescriptionId
|
|
65
68
|
}, jsx(FormattedMessage, _extends({}, messages.emojiPreview, {
|
|
66
69
|
values: {
|
|
@@ -368,11 +368,6 @@ export const uploadChooseFileEmojiName = css({
|
|
|
368
368
|
}
|
|
369
369
|
});
|
|
370
370
|
|
|
371
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
372
|
-
export const uploadChooseFileBrowse = css({
|
|
373
|
-
flex: '0 0 auto'
|
|
374
|
-
});
|
|
375
|
-
|
|
376
371
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
377
372
|
export const uploadPreviewFooter = css({
|
|
378
373
|
display: 'flex',
|
|
@@ -17,12 +17,13 @@ import { Component } from 'react';
|
|
|
17
17
|
import { jsx } from '@emotion/react';
|
|
18
18
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
19
19
|
import AkButton from '@atlaskit/button/new';
|
|
20
|
+
import Heading from '@atlaskit/heading';
|
|
20
21
|
import FocusLock from 'react-focus-lock';
|
|
21
22
|
import { messages } from '../i18n';
|
|
22
23
|
import CachingEmoji from './CachingEmoji';
|
|
23
24
|
import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
|
|
24
25
|
import RetryableButton from './RetryableButton';
|
|
25
|
-
import { deleteFooter, deletePreview, deleteText, emojiDeleteErrorMessage,
|
|
26
|
+
import { deleteFooter, deletePreview, deleteText, emojiDeleteErrorMessage, previewButtonGroup } from './styles';
|
|
26
27
|
import VisuallyHidden from '@atlaskit/visually-hidden';
|
|
27
28
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
28
29
|
export var emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
@@ -103,8 +104,8 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
|
|
|
103
104
|
"data-testid": emojiDeletePreviewTestId
|
|
104
105
|
}, jsx("div", {
|
|
105
106
|
css: deleteText
|
|
106
|
-
}, jsx(
|
|
107
|
-
|
|
107
|
+
}, jsx(Heading, {
|
|
108
|
+
size: "xxsmall"
|
|
108
109
|
}, jsx(FormattedMessage, messages.deleteEmojiTitle)), jsx(FormattedMessage, _extends({}, messages.deleteEmojiDescription, {
|
|
109
110
|
values: {
|
|
110
111
|
emojiShortName: emoji.shortName
|
|
@@ -12,6 +12,7 @@ import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
|
12
12
|
import TextField from '@atlaskit/textfield';
|
|
13
13
|
import CrossIcon from '@atlaskit/icon/core/migration/close--cross';
|
|
14
14
|
import AkButton from '@atlaskit/button/standard-button';
|
|
15
|
+
import { Text } from '@atlaskit/primitives';
|
|
15
16
|
import FocusLock from 'react-focus-lock';
|
|
16
17
|
import * as ImageUtil from '../../util/image';
|
|
17
18
|
import debug from '../../util/logger';
|
|
@@ -20,7 +21,7 @@ import EmojiErrorMessage from './EmojiErrorMessage';
|
|
|
20
21
|
import EmojiUploadPreview from './EmojiUploadPreview';
|
|
21
22
|
import FileChooser from './FileChooser';
|
|
22
23
|
import { UploadStatus } from './internal-types';
|
|
23
|
-
import { closeEmojiUploadButton, emojiChooseFileErrorMessage, emojiUpload,
|
|
24
|
+
import { closeEmojiUploadButton, emojiChooseFileErrorMessage, emojiUpload, emojiUploadTop, headingH5, uploadChooseFileEmojiName, uploadChooseFileMessage, uploadChooseFileRow } from './styles';
|
|
24
25
|
export var uploadEmojiNameInputTestId = 'upload-emoji-name-input';
|
|
25
26
|
export var uploadEmojiComponentTestId = 'upload-emoji-component';
|
|
26
27
|
export var cancelEmojiUploadPickerTestId = 'cancel-emoji-upload-picker';
|
|
@@ -105,9 +106,7 @@ var ChooseEmojiFile = /*#__PURE__*/memo(function (props) {
|
|
|
105
106
|
ref: inputRef,
|
|
106
107
|
id: "new-emoji-name-input",
|
|
107
108
|
"aria-required": true
|
|
108
|
-
})), jsx(
|
|
109
|
-
css: uploadChooseFileBrowse
|
|
110
|
-
}, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, function () {
|
|
109
|
+
})), jsx(Text, null, jsx(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, function () {
|
|
111
110
|
return jsx(FileChooser, {
|
|
112
111
|
label: emojiChooseFileTitle,
|
|
113
112
|
onChange: onChooseFile,
|
|
@@ -117,9 +116,11 @@ var ChooseEmojiFile = /*#__PURE__*/memo(function (props) {
|
|
|
117
116
|
isDisabled: disableChooser
|
|
118
117
|
});
|
|
119
118
|
}))), jsx("div", {
|
|
120
|
-
css: emojiUploadBottom,
|
|
121
119
|
id: fileChooserButtonDescriptionId
|
|
122
|
-
}, !errorMessage ? jsx(
|
|
120
|
+
}, !errorMessage ? jsx(Text, {
|
|
121
|
+
as: "p",
|
|
122
|
+
size: "small"
|
|
123
|
+
}, jsx(FormattedMessage, messages.emojiImageRequirements)) : jsx(EmojiErrorMessage, {
|
|
123
124
|
messageStyles: emojiChooseFileErrorMessage,
|
|
124
125
|
message: errorMessage
|
|
125
126
|
})))
|
|
@@ -14,6 +14,7 @@ import { PureComponent } from 'react';
|
|
|
14
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
15
15
|
import { jsx } from '@emotion/react';
|
|
16
16
|
import AkButton from '@atlaskit/button/standard-button';
|
|
17
|
+
import Heading from '@atlaskit/heading';
|
|
17
18
|
import { FormattedMessage, injectIntl } from 'react-intl-next';
|
|
18
19
|
import { customCategory } from '../../util/constants';
|
|
19
20
|
import { messages } from '../i18n';
|
|
@@ -72,7 +73,9 @@ var EmojiUploadPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
72
73
|
"data-testid": uploadPreviewTestId
|
|
73
74
|
}, jsx("div", {
|
|
74
75
|
css: uploadPreviewText
|
|
75
|
-
}, jsx(
|
|
76
|
+
}, jsx(Heading, {
|
|
77
|
+
size: "xsmall"
|
|
78
|
+
}, jsx(FormattedMessage, messages.emojiPreviewTitle)), jsx("div", {
|
|
76
79
|
id: addEmojiPreviewDescriptionId
|
|
77
80
|
}, jsx(FormattedMessage, _extends({}, messages.emojiPreview, {
|
|
78
81
|
values: {
|
|
@@ -331,11 +331,6 @@ export var uploadChooseFileEmojiName = css({
|
|
|
331
331
|
}), _input)
|
|
332
332
|
});
|
|
333
333
|
|
|
334
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
335
|
-
export var uploadChooseFileBrowse = css({
|
|
336
|
-
flex: '0 0 auto'
|
|
337
|
-
});
|
|
338
|
-
|
|
339
334
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
340
335
|
export var uploadPreviewFooter = css({
|
|
341
336
|
display: 'flex',
|
|
@@ -13,7 +13,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
|
|
|
13
13
|
actionSubjectId: actionSubjectId,
|
|
14
14
|
attributes: _objectSpread({
|
|
15
15
|
packageName: "@atlaskit/emoji",
|
|
16
|
-
packageVersion: "67.11.
|
|
16
|
+
packageVersion: "67.11.1"
|
|
17
17
|
}, attributes)
|
|
18
18
|
};
|
|
19
19
|
};
|
|
@@ -30,7 +30,6 @@ export declare const closeEmojiUploadButton: import("@emotion/react").Serialized
|
|
|
30
30
|
export declare const emojiUploadBottom: import("@emotion/react").SerializedStyles;
|
|
31
31
|
export declare const uploadChooseFileRow: import("@emotion/react").SerializedStyles;
|
|
32
32
|
export declare const uploadChooseFileEmojiName: import("@emotion/react").SerializedStyles;
|
|
33
|
-
export declare const uploadChooseFileBrowse: import("@emotion/react").SerializedStyles;
|
|
34
33
|
export declare const uploadPreviewFooter: import("@emotion/react").SerializedStyles;
|
|
35
34
|
export declare const uploadPreview: import("@emotion/react").SerializedStyles;
|
|
36
35
|
export declare const uploadPreviewText: import("@emotion/react").SerializedStyles;
|
|
@@ -30,7 +30,6 @@ export declare const closeEmojiUploadButton: import("@emotion/react").Serialized
|
|
|
30
30
|
export declare const emojiUploadBottom: import("@emotion/react").SerializedStyles;
|
|
31
31
|
export declare const uploadChooseFileRow: import("@emotion/react").SerializedStyles;
|
|
32
32
|
export declare const uploadChooseFileEmojiName: import("@emotion/react").SerializedStyles;
|
|
33
|
-
export declare const uploadChooseFileBrowse: import("@emotion/react").SerializedStyles;
|
|
34
33
|
export declare const uploadPreviewFooter: import("@emotion/react").SerializedStyles;
|
|
35
34
|
export declare const uploadPreview: import("@emotion/react").SerializedStyles;
|
|
36
35
|
export declare const uploadPreviewText: import("@emotion/react").SerializedStyles;
|
package/docs/0-intro.tsx
CHANGED
|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { md, Example, code, AtlassianInternalWarning, Props } from '@atlaskit/docs';
|
|
3
3
|
import SectionMessage from '@atlaskit/section-message';
|
|
4
4
|
import SimpleEmojiExample from '../examples/00-simple-emoji';
|
|
5
|
+
import { Text } from '@atlaskit/primitives';
|
|
5
6
|
|
|
6
7
|
const SimpleEmojiSource = require('!!raw-loader!../examples/00-simple-emoji');
|
|
7
8
|
const EmojiProps = require('!!extract-react-types-loader!../src/components/common/Emoji');
|
|
@@ -59,10 +60,10 @@ export default md`
|
|
|
59
60
|
appearance="warning"
|
|
60
61
|
title="Emoji provider is required to be configured in order to use components from this package."
|
|
61
62
|
>
|
|
62
|
-
<p>
|
|
63
|
+
<Text as="p">
|
|
63
64
|
Please refer to `Emoji picker` section for more information on how to configure emoji
|
|
64
65
|
provider.
|
|
65
|
-
</
|
|
66
|
+
</Text>
|
|
66
67
|
</SectionMessage>
|
|
67
68
|
</>
|
|
68
69
|
)}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { md, code } from '@atlaskit/docs';
|
|
3
3
|
import SectionMessage from '@atlaskit/section-message';
|
|
4
|
+
import { Text } from '@atlaskit/primitives';
|
|
4
5
|
|
|
5
6
|
export default md`
|
|
6
7
|
Emoji provider mainly controls what type of emojis you want to support, how to resolve emojis, and how to upload custom emojis if enabled.
|
|
@@ -32,7 +33,7 @@ ${code`
|
|
|
32
33
|
appearance="warning"
|
|
33
34
|
title="There should be only one instance of EmojiResource in your application"
|
|
34
35
|
>
|
|
35
|
-
<p>Make sure EmojiResource is initialised only once.</
|
|
36
|
+
<Text as="p">Make sure EmojiResource is initialised only once.</Text>
|
|
36
37
|
</SectionMessage>
|
|
37
38
|
</>
|
|
38
39
|
)}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/emoji",
|
|
3
|
-
"version": "67.11.
|
|
3
|
+
"version": "67.11.1",
|
|
4
4
|
"description": "Fabric emoji React components",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -35,7 +35,8 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@atlaskit/analytics-next": "^10.1.0",
|
|
37
37
|
"@atlaskit/button": "^20.3.0",
|
|
38
|
-
"@atlaskit/
|
|
38
|
+
"@atlaskit/heading": "^3.1.0",
|
|
39
|
+
"@atlaskit/icon": "^22.26.0",
|
|
39
40
|
"@atlaskit/media-client": "^28.3.0",
|
|
40
41
|
"@atlaskit/media-client-react": "^2.3.0",
|
|
41
42
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
@@ -43,7 +44,7 @@
|
|
|
43
44
|
"@atlaskit/spinner": "^16.3.0",
|
|
44
45
|
"@atlaskit/textfield": "^6.5.0",
|
|
45
46
|
"@atlaskit/theme": "^14.0.0",
|
|
46
|
-
"@atlaskit/tokens": "^2.
|
|
47
|
+
"@atlaskit/tokens": "^2.3.0",
|
|
47
48
|
"@atlaskit/tooltip": "^18.9.0",
|
|
48
49
|
"@atlaskit/ufo": "^0.3.0",
|
|
49
50
|
"@atlaskit/util-service-support": "^6.2.0",
|