@atlaskit/editor-common 91.2.2 → 91.2.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 +9 -0
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/cjs/ui/Emoji/index.js +4 -96
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/es2019/ui/Emoji/index.js +4 -75
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/esm/ui/Emoji/index.js +4 -93
- package/dist/types/ui/Emoji/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/Emoji/index.d.ts +1 -1
- package/package.json +2 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 91.2.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#146966](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146966)
|
|
8
|
+
[`ee4562a10804e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ee4562a10804e) -
|
|
9
|
+
cleaned up platform_editor_get_emoji_provider_from_config feature flag
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 91.2.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
19
19
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
20
|
-
var packageVersion = "91.2.
|
|
20
|
+
var packageVersion = "91.2.3";
|
|
21
21
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
22
22
|
// Remove URL as it has UGC
|
|
23
23
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -25,7 +25,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
25
25
|
* @jsx jsx
|
|
26
26
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
27
27
|
var packageName = "@atlaskit/editor-common";
|
|
28
|
-
var packageVersion = "91.2.
|
|
28
|
+
var packageVersion = "91.2.3";
|
|
29
29
|
var halfFocusRing = 1;
|
|
30
30
|
var dropOffset = '0, 8';
|
|
31
31
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -1,101 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = void 0;
|
|
9
|
-
var
|
|
10
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
-
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
12
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
13
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
14
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
15
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
16
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
8
|
+
var _react = _interopRequireDefault(require("react"));
|
|
17
9
|
var _element = require("@atlaskit/emoji/element");
|
|
18
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
|
-
var _providerFactory = require("../../provider-factory");
|
|
20
|
-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
21
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
22
|
-
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
|
|
23
|
-
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
24
|
-
var EmojiNodeClass = /*#__PURE__*/function (_PureComponent) {
|
|
25
|
-
(0, _inherits2.default)(EmojiNodeClass, _PureComponent);
|
|
26
|
-
var _super = _createSuper(EmojiNodeClass);
|
|
27
|
-
function EmojiNodeClass(props) {
|
|
28
|
-
var _this;
|
|
29
|
-
(0, _classCallCheck2.default)(this, EmojiNodeClass);
|
|
30
|
-
_this = _super.call(this, props);
|
|
31
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderWithProvider", function (providers) {
|
|
32
|
-
var _resourceConfig$optim;
|
|
33
|
-
var _this$props = _this.props,
|
|
34
|
-
allowTextFallback = _this$props.allowTextFallback,
|
|
35
|
-
shortName = _this$props.shortName,
|
|
36
|
-
id = _this$props.id,
|
|
37
|
-
fallback = _this$props.fallback,
|
|
38
|
-
fitToHeight = _this$props.fitToHeight,
|
|
39
|
-
showTooltip = _this$props.showTooltip,
|
|
40
|
-
resourceConfig = _this$props.resourceConfig;
|
|
41
|
-
if (allowTextFallback && !providers.emojiProvider) {
|
|
42
|
-
return /*#__PURE__*/_react.default.createElement("span", {
|
|
43
|
-
"data-emoji-id": id,
|
|
44
|
-
"data-emoji-short-name": shortName,
|
|
45
|
-
"data-emoji-text": fallback || shortName
|
|
46
|
-
}, fallback || shortName);
|
|
47
|
-
}
|
|
48
|
-
if (!providers.emojiProvider) {
|
|
49
|
-
return null;
|
|
50
|
-
}
|
|
51
|
-
return /*#__PURE__*/_react.default.createElement(_element.ResourcedEmoji, {
|
|
52
|
-
emojiId: {
|
|
53
|
-
id: id,
|
|
54
|
-
fallback: fallback,
|
|
55
|
-
shortName: shortName
|
|
56
|
-
},
|
|
57
|
-
emojiProvider: providers.emojiProvider,
|
|
58
|
-
showTooltip: showTooltip,
|
|
59
|
-
fitToHeight: fitToHeight,
|
|
60
|
-
optimistic: true,
|
|
61
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
62
|
-
id: id,
|
|
63
|
-
fallback: fallback,
|
|
64
|
-
shortName: shortName
|
|
65
|
-
}),
|
|
66
|
-
editorEmoji: true
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
_this.providerFactory = props.providers || new _providerFactory.ProviderFactory();
|
|
70
|
-
return _this;
|
|
71
|
-
}
|
|
72
|
-
(0, _createClass2.default)(EmojiNodeClass, [{
|
|
73
|
-
key: "componentWillUnmount",
|
|
74
|
-
value: function componentWillUnmount() {
|
|
75
|
-
if (!this.props.providers) {
|
|
76
|
-
// new ProviderFactory is created if no `providers` has been set
|
|
77
|
-
// in this case when component is unmounted it's safe to destroy this providerFactory
|
|
78
|
-
this.providerFactory.destroy();
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
}, {
|
|
82
|
-
key: "render",
|
|
83
|
-
value: function render() {
|
|
84
|
-
return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
|
|
85
|
-
providers: ['emojiProvider'],
|
|
86
|
-
providerFactory: this.providerFactory,
|
|
87
|
-
renderNode: this.renderWithProvider
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
}]);
|
|
91
|
-
return EmojiNodeClass;
|
|
92
|
-
}(_react.PureComponent);
|
|
93
|
-
(0, _defineProperty2.default)(EmojiNodeClass, "displayName", 'EmojiNode');
|
|
94
|
-
(0, _defineProperty2.default)(EmojiNodeClass, "defaultProps", {
|
|
95
|
-
showTooltip: true
|
|
96
|
-
});
|
|
97
10
|
var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
98
|
-
var _resourceConfig$
|
|
11
|
+
var _resourceConfig$optim;
|
|
99
12
|
var allowTextFallback = props.allowTextFallback,
|
|
100
13
|
shortName = props.shortName,
|
|
101
14
|
id = props.id,
|
|
@@ -124,7 +37,7 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
|
124
37
|
showTooltip: showTooltip,
|
|
125
38
|
fitToHeight: fitToHeight,
|
|
126
39
|
optimistic: true,
|
|
127
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$
|
|
40
|
+
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
128
41
|
id: id,
|
|
129
42
|
fallback: fallback,
|
|
130
43
|
shortName: shortName
|
|
@@ -133,11 +46,6 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
|
133
46
|
});
|
|
134
47
|
};
|
|
135
48
|
var EmojiNode = function EmojiNode(props) {
|
|
136
|
-
|
|
137
|
-
if (props.emojiProvider) {
|
|
138
|
-
return /*#__PURE__*/_react.default.createElement(EmojiNodeFunctional, props);
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
return /*#__PURE__*/_react.default.createElement(EmojiNodeClass, props);
|
|
49
|
+
return /*#__PURE__*/_react.default.createElement(EmojiNodeFunctional, props);
|
|
142
50
|
};
|
|
143
51
|
var _default = exports.default = EmojiNode;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFedRamp } from './environment';
|
|
2
2
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
3
3
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
4
|
-
const packageVersion = "91.2.
|
|
4
|
+
const packageVersion = "91.2.3";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
14
14
|
import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
|
|
15
15
|
import Layer from '../Layer';
|
|
16
16
|
const packageName = "@atlaskit/editor-common";
|
|
17
|
-
const packageVersion = "91.2.
|
|
17
|
+
const packageVersion = "91.2.3";
|
|
18
18
|
const halfFocusRing = 1;
|
|
19
19
|
const dropOffset = '0, 8';
|
|
20
20
|
class DropList extends Component {
|
|
@@ -1,73 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import React, { PureComponent } from 'react';
|
|
1
|
+
import React from 'react';
|
|
3
2
|
import { ResourcedEmoji } from '@atlaskit/emoji/element';
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
|
-
import { ProviderFactory, WithProviders } from '../../provider-factory';
|
|
6
|
-
class EmojiNodeClass extends PureComponent {
|
|
7
|
-
constructor(props) {
|
|
8
|
-
super(props);
|
|
9
|
-
_defineProperty(this, "renderWithProvider", providers => {
|
|
10
|
-
var _resourceConfig$optim;
|
|
11
|
-
const {
|
|
12
|
-
allowTextFallback,
|
|
13
|
-
shortName,
|
|
14
|
-
id,
|
|
15
|
-
fallback,
|
|
16
|
-
fitToHeight,
|
|
17
|
-
showTooltip,
|
|
18
|
-
resourceConfig
|
|
19
|
-
} = this.props;
|
|
20
|
-
if (allowTextFallback && !providers.emojiProvider) {
|
|
21
|
-
return /*#__PURE__*/React.createElement("span", {
|
|
22
|
-
"data-emoji-id": id,
|
|
23
|
-
"data-emoji-short-name": shortName,
|
|
24
|
-
"data-emoji-text": fallback || shortName
|
|
25
|
-
}, fallback || shortName);
|
|
26
|
-
}
|
|
27
|
-
if (!providers.emojiProvider) {
|
|
28
|
-
return null;
|
|
29
|
-
}
|
|
30
|
-
return /*#__PURE__*/React.createElement(ResourcedEmoji, {
|
|
31
|
-
emojiId: {
|
|
32
|
-
id,
|
|
33
|
-
fallback,
|
|
34
|
-
shortName
|
|
35
|
-
},
|
|
36
|
-
emojiProvider: providers.emojiProvider,
|
|
37
|
-
showTooltip: showTooltip,
|
|
38
|
-
fitToHeight: fitToHeight,
|
|
39
|
-
optimistic: true,
|
|
40
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 ? void 0 : (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
41
|
-
id,
|
|
42
|
-
fallback,
|
|
43
|
-
shortName
|
|
44
|
-
}),
|
|
45
|
-
editorEmoji: true
|
|
46
|
-
});
|
|
47
|
-
});
|
|
48
|
-
this.providerFactory = props.providers || new ProviderFactory();
|
|
49
|
-
}
|
|
50
|
-
componentWillUnmount() {
|
|
51
|
-
if (!this.props.providers) {
|
|
52
|
-
// new ProviderFactory is created if no `providers` has been set
|
|
53
|
-
// in this case when component is unmounted it's safe to destroy this providerFactory
|
|
54
|
-
this.providerFactory.destroy();
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
render() {
|
|
58
|
-
return /*#__PURE__*/React.createElement(WithProviders, {
|
|
59
|
-
providers: ['emojiProvider'],
|
|
60
|
-
providerFactory: this.providerFactory,
|
|
61
|
-
renderNode: this.renderWithProvider
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
_defineProperty(EmojiNodeClass, "displayName", 'EmojiNode');
|
|
66
|
-
_defineProperty(EmojiNodeClass, "defaultProps", {
|
|
67
|
-
showTooltip: true
|
|
68
|
-
});
|
|
69
3
|
const EmojiNodeFunctional = props => {
|
|
70
|
-
var _resourceConfig$
|
|
4
|
+
var _resourceConfig$optim;
|
|
71
5
|
const {
|
|
72
6
|
allowTextFallback,
|
|
73
7
|
shortName,
|
|
@@ -98,7 +32,7 @@ const EmojiNodeFunctional = props => {
|
|
|
98
32
|
showTooltip: showTooltip,
|
|
99
33
|
fitToHeight: fitToHeight,
|
|
100
34
|
optimistic: true,
|
|
101
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 ? void 0 : (_resourceConfig$
|
|
35
|
+
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 ? void 0 : (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
102
36
|
id,
|
|
103
37
|
fallback,
|
|
104
38
|
shortName
|
|
@@ -107,11 +41,6 @@ const EmojiNodeFunctional = props => {
|
|
|
107
41
|
});
|
|
108
42
|
};
|
|
109
43
|
const EmojiNode = props => {
|
|
110
|
-
|
|
111
|
-
if (props.emojiProvider) {
|
|
112
|
-
return /*#__PURE__*/React.createElement(EmojiNodeFunctional, props);
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
return /*#__PURE__*/React.createElement(EmojiNodeClass, props);
|
|
44
|
+
return /*#__PURE__*/React.createElement(EmojiNodeFunctional, props);
|
|
116
45
|
};
|
|
117
46
|
export default EmojiNode;
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { isFedRamp } from './environment';
|
|
8
8
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
9
9
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
10
|
-
var packageVersion = "91.2.
|
|
10
|
+
var packageVersion = "91.2.3";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -22,7 +22,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
|
22
22
|
import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
|
|
23
23
|
import Layer from '../Layer';
|
|
24
24
|
var packageName = "@atlaskit/editor-common";
|
|
25
|
-
var packageVersion = "91.2.
|
|
25
|
+
var packageVersion = "91.2.3";
|
|
26
26
|
var halfFocusRing = 1;
|
|
27
27
|
var dropOffset = '0, 8';
|
|
28
28
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -1,91 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import _createClass from "@babel/runtime/helpers/createClass";
|
|
3
|
-
import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
|
|
4
|
-
import _inherits from "@babel/runtime/helpers/inherits";
|
|
5
|
-
import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
|
|
6
|
-
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
7
|
-
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
8
|
-
function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
|
|
9
|
-
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
10
|
-
import React, { PureComponent } from 'react';
|
|
1
|
+
import React from 'react';
|
|
11
2
|
import { ResourcedEmoji } from '@atlaskit/emoji/element';
|
|
12
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
|
-
import { ProviderFactory, WithProviders } from '../../provider-factory';
|
|
14
|
-
var EmojiNodeClass = /*#__PURE__*/function (_PureComponent) {
|
|
15
|
-
_inherits(EmojiNodeClass, _PureComponent);
|
|
16
|
-
var _super = _createSuper(EmojiNodeClass);
|
|
17
|
-
function EmojiNodeClass(props) {
|
|
18
|
-
var _this;
|
|
19
|
-
_classCallCheck(this, EmojiNodeClass);
|
|
20
|
-
_this = _super.call(this, props);
|
|
21
|
-
_defineProperty(_assertThisInitialized(_this), "renderWithProvider", function (providers) {
|
|
22
|
-
var _resourceConfig$optim;
|
|
23
|
-
var _this$props = _this.props,
|
|
24
|
-
allowTextFallback = _this$props.allowTextFallback,
|
|
25
|
-
shortName = _this$props.shortName,
|
|
26
|
-
id = _this$props.id,
|
|
27
|
-
fallback = _this$props.fallback,
|
|
28
|
-
fitToHeight = _this$props.fitToHeight,
|
|
29
|
-
showTooltip = _this$props.showTooltip,
|
|
30
|
-
resourceConfig = _this$props.resourceConfig;
|
|
31
|
-
if (allowTextFallback && !providers.emojiProvider) {
|
|
32
|
-
return /*#__PURE__*/React.createElement("span", {
|
|
33
|
-
"data-emoji-id": id,
|
|
34
|
-
"data-emoji-short-name": shortName,
|
|
35
|
-
"data-emoji-text": fallback || shortName
|
|
36
|
-
}, fallback || shortName);
|
|
37
|
-
}
|
|
38
|
-
if (!providers.emojiProvider) {
|
|
39
|
-
return null;
|
|
40
|
-
}
|
|
41
|
-
return /*#__PURE__*/React.createElement(ResourcedEmoji, {
|
|
42
|
-
emojiId: {
|
|
43
|
-
id: id,
|
|
44
|
-
fallback: fallback,
|
|
45
|
-
shortName: shortName
|
|
46
|
-
},
|
|
47
|
-
emojiProvider: providers.emojiProvider,
|
|
48
|
-
showTooltip: showTooltip,
|
|
49
|
-
fitToHeight: fitToHeight,
|
|
50
|
-
optimistic: true,
|
|
51
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
52
|
-
id: id,
|
|
53
|
-
fallback: fallback,
|
|
54
|
-
shortName: shortName
|
|
55
|
-
}),
|
|
56
|
-
editorEmoji: true
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
_this.providerFactory = props.providers || new ProviderFactory();
|
|
60
|
-
return _this;
|
|
61
|
-
}
|
|
62
|
-
_createClass(EmojiNodeClass, [{
|
|
63
|
-
key: "componentWillUnmount",
|
|
64
|
-
value: function componentWillUnmount() {
|
|
65
|
-
if (!this.props.providers) {
|
|
66
|
-
// new ProviderFactory is created if no `providers` has been set
|
|
67
|
-
// in this case when component is unmounted it's safe to destroy this providerFactory
|
|
68
|
-
this.providerFactory.destroy();
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}, {
|
|
72
|
-
key: "render",
|
|
73
|
-
value: function render() {
|
|
74
|
-
return /*#__PURE__*/React.createElement(WithProviders, {
|
|
75
|
-
providers: ['emojiProvider'],
|
|
76
|
-
providerFactory: this.providerFactory,
|
|
77
|
-
renderNode: this.renderWithProvider
|
|
78
|
-
});
|
|
79
|
-
}
|
|
80
|
-
}]);
|
|
81
|
-
return EmojiNodeClass;
|
|
82
|
-
}(PureComponent);
|
|
83
|
-
_defineProperty(EmojiNodeClass, "displayName", 'EmojiNode');
|
|
84
|
-
_defineProperty(EmojiNodeClass, "defaultProps", {
|
|
85
|
-
showTooltip: true
|
|
86
|
-
});
|
|
87
3
|
var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
88
|
-
var _resourceConfig$
|
|
4
|
+
var _resourceConfig$optim;
|
|
89
5
|
var allowTextFallback = props.allowTextFallback,
|
|
90
6
|
shortName = props.shortName,
|
|
91
7
|
id = props.id,
|
|
@@ -114,7 +30,7 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
|
114
30
|
showTooltip: showTooltip,
|
|
115
31
|
fitToHeight: fitToHeight,
|
|
116
32
|
optimistic: true,
|
|
117
|
-
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$
|
|
33
|
+
optimisticImageURL: resourceConfig === null || resourceConfig === void 0 || (_resourceConfig$optim = resourceConfig.optimisticImageApi) === null || _resourceConfig$optim === void 0 ? void 0 : _resourceConfig$optim.getUrl({
|
|
118
34
|
id: id,
|
|
119
35
|
fallback: fallback,
|
|
120
36
|
shortName: shortName
|
|
@@ -123,11 +39,6 @@ var EmojiNodeFunctional = function EmojiNodeFunctional(props) {
|
|
|
123
39
|
});
|
|
124
40
|
};
|
|
125
41
|
var EmojiNode = function EmojiNode(props) {
|
|
126
|
-
|
|
127
|
-
if (props.emojiProvider) {
|
|
128
|
-
return /*#__PURE__*/React.createElement(EmojiNodeFunctional, props);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return /*#__PURE__*/React.createElement(EmojiNodeClass, props);
|
|
42
|
+
return /*#__PURE__*/React.createElement(EmojiNodeFunctional, props);
|
|
132
43
|
};
|
|
133
44
|
export default EmojiNode;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { EmojiProvider, EmojiResourceConfig } from '@atlaskit/emoji/resource';
|
|
3
3
|
import type { EmojiId } from '@atlaskit/emoji/types';
|
|
4
|
-
import { ProviderFactory } from '../../provider-factory';
|
|
4
|
+
import { type ProviderFactory } from '../../provider-factory';
|
|
5
5
|
export interface EmojiProps extends EmojiId {
|
|
6
6
|
allowTextFallback?: boolean;
|
|
7
7
|
providers?: ProviderFactory;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { EmojiProvider, EmojiResourceConfig } from '@atlaskit/emoji/resource';
|
|
3
3
|
import type { EmojiId } from '@atlaskit/emoji/types';
|
|
4
|
-
import { ProviderFactory } from '../../provider-factory';
|
|
4
|
+
import { type ProviderFactory } from '../../provider-factory';
|
|
5
5
|
export interface EmojiProps extends EmojiId {
|
|
6
6
|
allowTextFallback?: boolean;
|
|
7
7
|
providers?: ProviderFactory;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "91.2.
|
|
3
|
+
"version": "91.2.3",
|
|
4
4
|
"description": "A package that contains common classes and components for editor and renderer",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
"@atlaskit/primitives": "^12.2.0",
|
|
144
144
|
"@atlaskit/profilecard": "^20.2.0",
|
|
145
145
|
"@atlaskit/section-message": "^6.6.0",
|
|
146
|
-
"@atlaskit/smart-card": "^28.
|
|
146
|
+
"@atlaskit/smart-card": "^28.4.0",
|
|
147
147
|
"@atlaskit/smart-user-picker": "^6.10.0",
|
|
148
148
|
"@atlaskit/spinner": "^16.3.0",
|
|
149
149
|
"@atlaskit/task-decision": "^17.11.0",
|
|
@@ -281,9 +281,6 @@
|
|
|
281
281
|
},
|
|
282
282
|
"platform_editor_allow_annotation_triple_click": {
|
|
283
283
|
"type": "boolean"
|
|
284
|
-
},
|
|
285
|
-
"platform_editor_get_emoji_provider_from_config": {
|
|
286
|
-
"type": "boolean"
|
|
287
284
|
}
|
|
288
285
|
}
|
|
289
286
|
}
|