@atlaskit/editor-common 107.0.3 → 107.0.5
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 +18 -0
- package/dist/cjs/link/utils.js +2 -3
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/react-node-view/getInlineNodeViewProducer.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/cjs/ui/Mention/mention-with-profilecard.js +6 -3
- package/dist/cjs/ui/Mention/mention-with-providers.js +4 -1
- package/dist/es2019/link/utils.js +2 -3
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/react-node-view/getInlineNodeViewProducer.js +1 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/es2019/ui/Mention/mention-with-profilecard.js +6 -3
- package/dist/es2019/ui/Mention/mention-with-providers.js +4 -1
- package/dist/esm/link/utils.js +2 -3
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/react-node-view/getInlineNodeViewProducer.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/esm/ui/Mention/mention-with-profilecard.js +6 -3
- package/dist/esm/ui/Mention/mention-with-providers.js +4 -1
- package/dist/types/ui/Mention/mention-with-profilecard.d.ts +2 -1
- package/dist/types-ts4.5/ui/Mention/mention-with-profilecard.d.ts +2 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 107.0.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#173379](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173379)
|
|
8
|
+
[`99e2b882f5cf0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/99e2b882f5cf0) -
|
|
9
|
+
Clean up platform_editor_controls_patch_3
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 107.0.4
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#173636](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173636)
|
|
17
|
+
[`22b85a186fb8a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/22b85a186fb8a) -
|
|
18
|
+
SSR placeholder for mention profile card trigger
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 107.0.3
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/dist/cjs/link/utils.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.getLinkPreferencesURLFromENV = exports.getActiveLinkMark = void 0;
|
|
|
7
7
|
exports.isLinkAtPos = isLinkAtPos;
|
|
8
8
|
exports.isTextAtPos = isTextAtPos;
|
|
9
9
|
var _atlassianContext = require("@atlaskit/atlassian-context");
|
|
10
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
10
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
12
11
|
var _constants = require("./constants");
|
|
13
12
|
function isTextAtPos(pos) {
|
|
@@ -60,7 +59,7 @@ var getActiveLinkMark = exports.getActiveLinkMark = function getActiveLinkMark(s
|
|
|
60
59
|
pos: pos
|
|
61
60
|
} : undefined;
|
|
62
61
|
}
|
|
63
|
-
if (isEmptySelectionBeforeLink(state) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')
|
|
62
|
+
if (isEmptySelectionBeforeLink(state) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
64
63
|
// if user clicks right before the link, we want to show the toolbar for the link
|
|
65
64
|
// but only if the link is a single character
|
|
66
65
|
var _node = state.doc.nodeAt($from.pos);
|
|
@@ -69,7 +68,7 @@ var getActiveLinkMark = exports.getActiveLinkMark = function getActiveLinkMark(s
|
|
|
69
68
|
pos: $from.pos
|
|
70
69
|
} : undefined;
|
|
71
70
|
}
|
|
72
|
-
if (isEmptySelectionAfterLink(state) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')
|
|
71
|
+
if (isEmptySelectionAfterLink(state) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
73
72
|
// if user clicks right after the link, we want to show the toolbar for the link
|
|
74
73
|
// but only if the link is a single character
|
|
75
74
|
// and we return the position of the link
|
|
@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
16
16
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
17
17
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
18
18
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
19
|
-
var packageVersion = "107.0.
|
|
19
|
+
var packageVersion = "107.0.4";
|
|
20
20
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
21
21
|
// Remove URL as it has UGC
|
|
22
22
|
// Ignored via go/ees007
|
|
@@ -31,7 +31,7 @@ var canRenderFallback = function canRenderFallback(node) {
|
|
|
31
31
|
|
|
32
32
|
// list of inline nodes with toDOM fallback implementations that can be virtualized. As
|
|
33
33
|
// additional nodes are converted they should be added here
|
|
34
|
-
var virtualizedNodeAllowlist = ['status', 'mention', 'emoji', '
|
|
34
|
+
var virtualizedNodeAllowlist = ['status', 'mention', 'emoji', 'inlineCard'];
|
|
35
35
|
function createNodeView(_ref) {
|
|
36
36
|
var nodeViewParams = _ref.nodeViewParams,
|
|
37
37
|
pmPluginFactoryParams = _ref.pmPluginFactoryParams,
|
|
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
23
23
|
* @jsx jsx
|
|
24
24
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
25
25
|
var packageName = "@atlaskit/editor-common";
|
|
26
|
-
var packageVersion = "107.0.
|
|
26
|
+
var packageVersion = "107.0.4";
|
|
27
27
|
var halfFocusRing = 1;
|
|
28
28
|
var dropOffset = '0, 8';
|
|
29
29
|
// Ignored via go/ees005
|
|
@@ -20,7 +20,8 @@ function MentionWithProfileCard(_ref) {
|
|
|
20
20
|
onClick = _ref.onClick,
|
|
21
21
|
onMouseEnter = _ref.onMouseEnter,
|
|
22
22
|
onMouseLeave = _ref.onMouseLeave,
|
|
23
|
-
localId = _ref.localId
|
|
23
|
+
localId = _ref.localId,
|
|
24
|
+
ssrPlaceholderId = _ref.ssrPlaceholderId;
|
|
24
25
|
var cloudId = profilecardProvider.cloudId,
|
|
25
26
|
resourceClient = profilecardProvider.resourceClient;
|
|
26
27
|
var actions = (0, _react.useMemo)(function () {
|
|
@@ -38,7 +39,8 @@ function MentionWithProfileCard(_ref) {
|
|
|
38
39
|
// Ignored via go/ees005
|
|
39
40
|
// eslint-disable-next-line require-unicode-regexp
|
|
40
41
|
,
|
|
41
|
-
ariaLabel: text.replace(/^@/, '')
|
|
42
|
+
ariaLabel: text.replace(/^@/, ''),
|
|
43
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
42
44
|
}, /*#__PURE__*/_react.default.createElement(_mention.ResourcedMention, {
|
|
43
45
|
id: id,
|
|
44
46
|
text: text,
|
|
@@ -47,6 +49,7 @@ function MentionWithProfileCard(_ref) {
|
|
|
47
49
|
mentionProvider: mentionProvider,
|
|
48
50
|
onClick: onClick,
|
|
49
51
|
onMouseEnter: onMouseEnter,
|
|
50
|
-
onMouseLeave: onMouseLeave
|
|
52
|
+
onMouseLeave: onMouseLeave,
|
|
53
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
51
54
|
}));
|
|
52
55
|
}
|
|
@@ -16,6 +16,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
16
16
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
17
17
|
var _react = _interopRequireWildcard(require("react"));
|
|
18
18
|
var _element = require("@atlaskit/mention/element");
|
|
19
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
19
20
|
var _mentionWithProfilecard = _interopRequireDefault(require("./mention-with-profilecard"));
|
|
20
21
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
21
22
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
@@ -57,6 +58,7 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
|
|
|
57
58
|
});
|
|
58
59
|
}, [profilecardProviderResolver]);
|
|
59
60
|
var MentionComponent = profilecardProvider && profilecardProviderResolver && GENERIC_USER_IDS.indexOf(id) === -1 ? _mentionWithProfilecard.default : _element.ResourcedMention;
|
|
61
|
+
var ssrPlaceholderId = (0, _platformFeatureFlags.fg)('cc_mention_ssr_placeholder') ? "mention-".concat(id) : undefined;
|
|
60
62
|
return /*#__PURE__*/_react.default.createElement(MentionComponent, {
|
|
61
63
|
id: id,
|
|
62
64
|
text: text,
|
|
@@ -69,7 +71,8 @@ var MentionWithProviders = exports.MentionWithProviders = /*#__PURE__*/_react.de
|
|
|
69
71
|
profilecardProvider: profilecardProvider,
|
|
70
72
|
onClick: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onClick,
|
|
71
73
|
onMouseEnter: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseEnter,
|
|
72
|
-
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave
|
|
74
|
+
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave,
|
|
75
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
73
76
|
});
|
|
74
77
|
});
|
|
75
78
|
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getATLContextUrl } from '@atlaskit/atlassian-context';
|
|
2
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
2
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
4
3
|
import { linkPreferencesPath } from './constants';
|
|
5
4
|
export function isTextAtPos(pos) {
|
|
@@ -58,7 +57,7 @@ export const getActiveLinkMark = state => {
|
|
|
58
57
|
pos
|
|
59
58
|
} : undefined;
|
|
60
59
|
}
|
|
61
|
-
if (isEmptySelectionBeforeLink(state) && editorExperiment('platform_editor_controls', 'variant1')
|
|
60
|
+
if (isEmptySelectionBeforeLink(state) && editorExperiment('platform_editor_controls', 'variant1')) {
|
|
62
61
|
// if user clicks right before the link, we want to show the toolbar for the link
|
|
63
62
|
// but only if the link is a single character
|
|
64
63
|
const node = state.doc.nodeAt($from.pos);
|
|
@@ -67,7 +66,7 @@ export const getActiveLinkMark = state => {
|
|
|
67
66
|
pos: $from.pos
|
|
68
67
|
} : undefined;
|
|
69
68
|
}
|
|
70
|
-
if (isEmptySelectionAfterLink(state) && editorExperiment('platform_editor_controls', 'variant1')
|
|
69
|
+
if (isEmptySelectionAfterLink(state) && editorExperiment('platform_editor_controls', 'variant1')) {
|
|
71
70
|
// if user clicks right after the link, we want to show the toolbar for the link
|
|
72
71
|
// but only if the link is a single character
|
|
73
72
|
// and we return the position of the link
|
|
@@ -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 = "107.0.
|
|
4
|
+
const packageVersion = "107.0.4";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// Ignored via go/ees007
|
|
@@ -23,7 +23,7 @@ const canRenderFallback = node => {
|
|
|
23
23
|
|
|
24
24
|
// list of inline nodes with toDOM fallback implementations that can be virtualized. As
|
|
25
25
|
// additional nodes are converted they should be added here
|
|
26
|
-
const virtualizedNodeAllowlist = ['status', 'mention', 'emoji', '
|
|
26
|
+
const virtualizedNodeAllowlist = ['status', 'mention', 'emoji', 'inlineCard'];
|
|
27
27
|
function createNodeView({
|
|
28
28
|
nodeViewParams,
|
|
29
29
|
pmPluginFactoryParams,
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "107.0.
|
|
16
|
+
const packageVersion = "107.0.4";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
// Ignored via go/ees005
|
|
@@ -11,7 +11,8 @@ export default function MentionWithProfileCard({
|
|
|
11
11
|
onClick,
|
|
12
12
|
onMouseEnter,
|
|
13
13
|
onMouseLeave,
|
|
14
|
-
localId
|
|
14
|
+
localId,
|
|
15
|
+
ssrPlaceholderId
|
|
15
16
|
}) {
|
|
16
17
|
const {
|
|
17
18
|
cloudId,
|
|
@@ -30,7 +31,8 @@ export default function MentionWithProfileCard({
|
|
|
30
31
|
// Ignored via go/ees005
|
|
31
32
|
// eslint-disable-next-line require-unicode-regexp
|
|
32
33
|
,
|
|
33
|
-
ariaLabel: text.replace(/^@/, '')
|
|
34
|
+
ariaLabel: text.replace(/^@/, ''),
|
|
35
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
34
36
|
}, /*#__PURE__*/React.createElement(ResourcedMention, {
|
|
35
37
|
id: id,
|
|
36
38
|
text: text,
|
|
@@ -39,6 +41,7 @@ export default function MentionWithProfileCard({
|
|
|
39
41
|
mentionProvider: mentionProvider,
|
|
40
42
|
onClick: onClick,
|
|
41
43
|
onMouseEnter: onMouseEnter,
|
|
42
|
-
onMouseLeave: onMouseLeave
|
|
44
|
+
onMouseLeave: onMouseLeave,
|
|
45
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
43
46
|
}));
|
|
44
47
|
}
|
|
@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
3
|
import React, { PureComponent, useLayoutEffect, useRef, useState } from 'react';
|
|
4
4
|
import { ResourcedMention } from '@atlaskit/mention/element';
|
|
5
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
6
|
import ResourcedMentionWithProfilecard from './mention-with-profilecard';
|
|
6
7
|
const GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
|
|
7
8
|
const noop = () => {};
|
|
@@ -38,6 +39,7 @@ export const MentionWithProviders = /*#__PURE__*/React.memo(({
|
|
|
38
39
|
});
|
|
39
40
|
}, [profilecardProviderResolver]);
|
|
40
41
|
const MentionComponent = profilecardProvider && profilecardProviderResolver && GENERIC_USER_IDS.indexOf(id) === -1 ? ResourcedMentionWithProfilecard : ResourcedMention;
|
|
42
|
+
const ssrPlaceholderId = fg('cc_mention_ssr_placeholder') ? `mention-${id}` : undefined;
|
|
41
43
|
return /*#__PURE__*/React.createElement(MentionComponent, {
|
|
42
44
|
id: id,
|
|
43
45
|
text: text,
|
|
@@ -50,7 +52,8 @@ export const MentionWithProviders = /*#__PURE__*/React.memo(({
|
|
|
50
52
|
profilecardProvider: profilecardProvider,
|
|
51
53
|
onClick: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onClick,
|
|
52
54
|
onMouseEnter: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseEnter,
|
|
53
|
-
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave
|
|
55
|
+
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave,
|
|
56
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
54
57
|
});
|
|
55
58
|
});
|
|
56
59
|
|
package/dist/esm/link/utils.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getATLContextUrl } from '@atlaskit/atlassian-context';
|
|
2
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
2
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
4
3
|
import { linkPreferencesPath } from './constants';
|
|
5
4
|
export function isTextAtPos(pos) {
|
|
@@ -52,7 +51,7 @@ export var getActiveLinkMark = function getActiveLinkMark(state) {
|
|
|
52
51
|
pos: pos
|
|
53
52
|
} : undefined;
|
|
54
53
|
}
|
|
55
|
-
if (isEmptySelectionBeforeLink(state) && editorExperiment('platform_editor_controls', 'variant1')
|
|
54
|
+
if (isEmptySelectionBeforeLink(state) && editorExperiment('platform_editor_controls', 'variant1')) {
|
|
56
55
|
// if user clicks right before the link, we want to show the toolbar for the link
|
|
57
56
|
// but only if the link is a single character
|
|
58
57
|
var _node = state.doc.nodeAt($from.pos);
|
|
@@ -61,7 +60,7 @@ export var getActiveLinkMark = function getActiveLinkMark(state) {
|
|
|
61
60
|
pos: $from.pos
|
|
62
61
|
} : undefined;
|
|
63
62
|
}
|
|
64
|
-
if (isEmptySelectionAfterLink(state) && editorExperiment('platform_editor_controls', 'variant1')
|
|
63
|
+
if (isEmptySelectionAfterLink(state) && editorExperiment('platform_editor_controls', 'variant1')) {
|
|
65
64
|
// if user clicks right after the link, we want to show the toolbar for the link
|
|
66
65
|
// but only if the link is a single character
|
|
67
66
|
// and we return the position of the link
|
|
@@ -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 = "107.0.
|
|
10
|
+
var packageVersion = "107.0.4";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// Ignored via go/ees007
|
|
@@ -26,7 +26,7 @@ var canRenderFallback = function canRenderFallback(node) {
|
|
|
26
26
|
|
|
27
27
|
// list of inline nodes with toDOM fallback implementations that can be virtualized. As
|
|
28
28
|
// additional nodes are converted they should be added here
|
|
29
|
-
var virtualizedNodeAllowlist = ['status', 'mention', 'emoji', '
|
|
29
|
+
var virtualizedNodeAllowlist = ['status', 'mention', 'emoji', 'inlineCard'];
|
|
30
30
|
function createNodeView(_ref) {
|
|
31
31
|
var nodeViewParams = _ref.nodeViewParams,
|
|
32
32
|
pmPluginFactoryParams = _ref.pmPluginFactoryParams,
|
|
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
20
20
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
21
21
|
import Layer from '../Layer';
|
|
22
22
|
var packageName = "@atlaskit/editor-common";
|
|
23
|
-
var packageVersion = "107.0.
|
|
23
|
+
var packageVersion = "107.0.4";
|
|
24
24
|
var halfFocusRing = 1;
|
|
25
25
|
var dropOffset = '0, 8';
|
|
26
26
|
// Ignored via go/ees005
|
|
@@ -11,7 +11,8 @@ export default function MentionWithProfileCard(_ref) {
|
|
|
11
11
|
onClick = _ref.onClick,
|
|
12
12
|
onMouseEnter = _ref.onMouseEnter,
|
|
13
13
|
onMouseLeave = _ref.onMouseLeave,
|
|
14
|
-
localId = _ref.localId
|
|
14
|
+
localId = _ref.localId,
|
|
15
|
+
ssrPlaceholderId = _ref.ssrPlaceholderId;
|
|
15
16
|
var cloudId = profilecardProvider.cloudId,
|
|
16
17
|
resourceClient = profilecardProvider.resourceClient;
|
|
17
18
|
var actions = useMemo(function () {
|
|
@@ -29,7 +30,8 @@ export default function MentionWithProfileCard(_ref) {
|
|
|
29
30
|
// Ignored via go/ees005
|
|
30
31
|
// eslint-disable-next-line require-unicode-regexp
|
|
31
32
|
,
|
|
32
|
-
ariaLabel: text.replace(/^@/, '')
|
|
33
|
+
ariaLabel: text.replace(/^@/, ''),
|
|
34
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
33
35
|
}, /*#__PURE__*/React.createElement(ResourcedMention, {
|
|
34
36
|
id: id,
|
|
35
37
|
text: text,
|
|
@@ -38,6 +40,7 @@ export default function MentionWithProfileCard(_ref) {
|
|
|
38
40
|
mentionProvider: mentionProvider,
|
|
39
41
|
onClick: onClick,
|
|
40
42
|
onMouseEnter: onMouseEnter,
|
|
41
|
-
onMouseLeave: onMouseLeave
|
|
43
|
+
onMouseLeave: onMouseLeave,
|
|
44
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
42
45
|
}));
|
|
43
46
|
}
|
|
@@ -10,6 +10,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
|
|
|
10
10
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
11
11
|
import React, { PureComponent, useLayoutEffect, useRef, useState } from 'react';
|
|
12
12
|
import { ResourcedMention } from '@atlaskit/mention/element';
|
|
13
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
14
|
import ResourcedMentionWithProfilecard from './mention-with-profilecard';
|
|
14
15
|
var GENERIC_USER_IDS = ['HipChat', 'all', 'here'];
|
|
15
16
|
var noop = function noop() {};
|
|
@@ -48,6 +49,7 @@ export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
48
49
|
});
|
|
49
50
|
}, [profilecardProviderResolver]);
|
|
50
51
|
var MentionComponent = profilecardProvider && profilecardProviderResolver && GENERIC_USER_IDS.indexOf(id) === -1 ? ResourcedMentionWithProfilecard : ResourcedMention;
|
|
52
|
+
var ssrPlaceholderId = fg('cc_mention_ssr_placeholder') ? "mention-".concat(id) : undefined;
|
|
51
53
|
return /*#__PURE__*/React.createElement(MentionComponent, {
|
|
52
54
|
id: id,
|
|
53
55
|
text: text,
|
|
@@ -60,7 +62,8 @@ export var MentionWithProviders = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
60
62
|
profilecardProvider: profilecardProvider,
|
|
61
63
|
onClick: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onClick,
|
|
62
64
|
onMouseEnter: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseEnter,
|
|
63
|
-
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave
|
|
65
|
+
onMouseLeave: eventHandlers === null || eventHandlers === void 0 ? void 0 : eventHandlers.onMouseLeave,
|
|
66
|
+
ssrPlaceholderId: ssrPlaceholderId
|
|
64
67
|
});
|
|
65
68
|
});
|
|
66
69
|
|
|
@@ -13,5 +13,6 @@ export interface Props {
|
|
|
13
13
|
onMouseEnter?: MentionEventHandler;
|
|
14
14
|
onMouseLeave?: MentionEventHandler;
|
|
15
15
|
localId?: string;
|
|
16
|
+
ssrPlaceholderId?: string;
|
|
16
17
|
}
|
|
17
|
-
export default function MentionWithProfileCard({ autoFocus, id, text, accessLevel, mentionProvider, profilecardProvider, onClick, onMouseEnter, onMouseLeave, localId, }: Props): React.JSX.Element;
|
|
18
|
+
export default function MentionWithProfileCard({ autoFocus, id, text, accessLevel, mentionProvider, profilecardProvider, onClick, onMouseEnter, onMouseLeave, localId, ssrPlaceholderId, }: Props): React.JSX.Element;
|
|
@@ -13,5 +13,6 @@ export interface Props {
|
|
|
13
13
|
onMouseEnter?: MentionEventHandler;
|
|
14
14
|
onMouseLeave?: MentionEventHandler;
|
|
15
15
|
localId?: string;
|
|
16
|
+
ssrPlaceholderId?: string;
|
|
16
17
|
}
|
|
17
|
-
export default function MentionWithProfileCard({ autoFocus, id, text, accessLevel, mentionProvider, profilecardProvider, onClick, onMouseEnter, onMouseLeave, localId, }: Props): React.JSX.Element;
|
|
18
|
+
export default function MentionWithProfileCard({ autoFocus, id, text, accessLevel, mentionProvider, profilecardProvider, onClick, onMouseEnter, onMouseLeave, localId, ssrPlaceholderId, }: Props): React.JSX.Element;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "107.0.
|
|
3
|
+
"version": "107.0.5",
|
|
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/"
|
|
@@ -161,7 +161,7 @@
|
|
|
161
161
|
"@atlaskit/platform-feature-flags-react": "^0.2.0",
|
|
162
162
|
"@atlaskit/popper": "^7.0.0",
|
|
163
163
|
"@atlaskit/primitives": "^14.9.0",
|
|
164
|
-
"@atlaskit/profilecard": "^23.
|
|
164
|
+
"@atlaskit/profilecard": "^23.20.0",
|
|
165
165
|
"@atlaskit/react-ufo": "^3.13.0",
|
|
166
166
|
"@atlaskit/section-message": "^8.2.0",
|
|
167
167
|
"@atlaskit/smart-card": "^38.12.0",
|
|
@@ -314,9 +314,6 @@
|
|
|
314
314
|
"platform_editor_nested_dnd_styles_changes": {
|
|
315
315
|
"type": "boolean"
|
|
316
316
|
},
|
|
317
|
-
"platform_editor_controls_patch_3": {
|
|
318
|
-
"type": "boolean"
|
|
319
|
-
},
|
|
320
317
|
"platform_editor_lcm_nested_panel_icon_fix": {
|
|
321
318
|
"type": "boolean"
|
|
322
319
|
},
|
|
@@ -383,6 +380,9 @@
|
|
|
383
380
|
"confluence_connect_macro_preset_height": {
|
|
384
381
|
"type": "boolean"
|
|
385
382
|
},
|
|
383
|
+
"cc_mention_ssr_placeholder": {
|
|
384
|
+
"type": "boolean"
|
|
385
|
+
},
|
|
386
386
|
"platform_editor_breakout_resizing_hello_release": {
|
|
387
387
|
"type": "boolean"
|
|
388
388
|
},
|