@atlaskit/editor-common 107.0.2 → 107.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (30) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/extensibility/ExtensionNodeWrapper.js +8 -17
  3. package/dist/cjs/extensibility/extensionNodeView.js +3 -4
  4. package/dist/cjs/link/ConfigureLinkOverlay/Dropdown.js +1 -3
  5. package/dist/cjs/monitoring/error.js +1 -1
  6. package/dist/cjs/react-node-view/getInlineNodeViewProducer.js +1 -1
  7. package/dist/cjs/ui/DropList/index.js +1 -1
  8. package/dist/cjs/ui/Mention/mention-with-profilecard.js +6 -3
  9. package/dist/cjs/ui/Mention/mention-with-providers.js +4 -1
  10. package/dist/es2019/extensibility/ExtensionNodeWrapper.js +8 -17
  11. package/dist/es2019/extensibility/extensionNodeView.js +3 -4
  12. package/dist/es2019/link/ConfigureLinkOverlay/Dropdown.js +1 -3
  13. package/dist/es2019/monitoring/error.js +1 -1
  14. package/dist/es2019/react-node-view/getInlineNodeViewProducer.js +1 -1
  15. package/dist/es2019/ui/DropList/index.js +1 -1
  16. package/dist/es2019/ui/Mention/mention-with-profilecard.js +6 -3
  17. package/dist/es2019/ui/Mention/mention-with-providers.js +4 -1
  18. package/dist/esm/extensibility/ExtensionNodeWrapper.js +8 -17
  19. package/dist/esm/extensibility/extensionNodeView.js +3 -4
  20. package/dist/esm/link/ConfigureLinkOverlay/Dropdown.js +1 -3
  21. package/dist/esm/monitoring/error.js +1 -1
  22. package/dist/esm/react-node-view/getInlineNodeViewProducer.js +1 -1
  23. package/dist/esm/ui/DropList/index.js +1 -1
  24. package/dist/esm/ui/Mention/mention-with-profilecard.js +6 -3
  25. package/dist/esm/ui/Mention/mention-with-providers.js +4 -1
  26. package/dist/types/extensibility/ExtensionNodeWrapper.d.ts +1 -2
  27. package/dist/types/ui/Mention/mention-with-profilecard.d.ts +2 -1
  28. package/dist/types-ts4.5/extensibility/ExtensionNodeWrapper.d.ts +1 -2
  29. package/dist/types-ts4.5/ui/Mention/mention-with-profilecard.d.ts +2 -1
  30. package/package.json +5 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 107.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [#173636](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173636)
8
+ [`22b85a186fb8a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/22b85a186fb8a) -
9
+ SSR placeholder for mention profile card trigger
10
+ - Updated dependencies
11
+
12
+ ## 107.0.3
13
+
14
+ ### Patch Changes
15
+
16
+ - [#173656](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173656)
17
+ [`006a6e5d1bb9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/006a6e5d1bb9d) -
18
+ remove node wrapper extension height reservation
19
+ - Updated dependencies
20
+
3
21
  ## 107.0.2
4
22
 
5
23
  ### Patch Changes
@@ -38,27 +38,18 @@ var styles = (0, _react2.css)({
38
38
  var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
39
39
  var children = _ref.children,
40
40
  nodeType = _ref.nodeType,
41
- macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
42
- nodeHeight = _ref.nodeHeight;
41
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
43
42
  var _ref2 = macroInteractionDesignFeatureFlags || {},
44
43
  showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
45
44
  var wrapperClassNames = (0, _classnames.default)({
46
45
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
47
46
  relative: showMacroInteractionDesignUpdates
48
47
  });
49
- var content =
50
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
51
- (0, _react2.jsx)("span", {
52
- className: wrapperClassNames,
53
- css: styles
54
- }, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE);
55
- if (nodeHeight) {
56
- var extensionStyles = {
57
- minHeight: "".concat(nodeHeight, "px")
58
- };
59
- return (0, _react2.jsx)("div", {
60
- style: extensionStyles
61
- }, content);
62
- }
63
- return content;
48
+ return (
49
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
50
+ (0, _react2.jsx)("span", {
51
+ className: wrapperClassNames,
52
+ css: styles
53
+ }, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE)
54
+ );
64
55
  };
@@ -91,11 +91,10 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
91
91
  }, {
92
92
  key: "render",
93
93
  value: function render(props, forwardRef) {
94
- var _props$extensionNodeV, _props$extensionNodeV2, _props$extensionNodeV3;
94
+ var _props$extensionNodeV;
95
95
  return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
96
96
  nodeType: this.node.type.name,
97
- macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
98
- nodeHeight: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 || (_props$extensionNodeV2 = _props$extensionNodeV.getExtensionHeight) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.call(_props$extensionNodeV, this.node)
97
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
99
98
  }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
100
99
  editorView: this.view,
101
100
  node: this.node,
@@ -111,7 +110,7 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
111
110
  providerFactory: props.providerFactory,
112
111
  handleContentDOMRef: forwardRef,
113
112
  extensionHandlers: props.extensionHandlers,
114
- editorAppearance: (_props$extensionNodeV3 = props.extensionNodeViewOptions) === null || _props$extensionNodeV3 === void 0 ? void 0 : _props$extensionNodeV3.appearance,
113
+ editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
115
114
  pluginInjectionApi: props.pluginInjectionApi,
116
115
  macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
117
116
  showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
@@ -16,7 +16,6 @@ var _dropdownMenu = _interopRequireWildcard(require("@atlaskit/dropdown-menu"));
16
16
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down"));
17
17
  var _customizePreferences = _interopRequireDefault(require("@atlaskit/icon/core/migration/customize--preferences"));
18
18
  var _linkExternalShortcut = _interopRequireDefault(require("@atlaskit/icon/core/migration/link-external--shortcut"));
19
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
20
19
  var _messages = require("../../messages");
21
20
  var _StyledButton = require("./StyledButton");
22
21
  var _useLinkOverlayAnalyticsEvents = require("./useLinkOverlayAnalyticsEvents");
@@ -93,8 +92,7 @@ var Dropdown = function Dropdown(_ref) {
93
92
  }));
94
93
  },
95
94
  testId: "".concat(testId, "-dropdown"),
96
- onOpenChange: onOpenChange,
97
- shouldRenderToParent: (0, _platformFeatureFlags.fg)('should-render-to-parent-should-be-true-editor')
95
+ onOpenChange: onOpenChange
98
96
  }, (0, _react2.jsx)(_dropdownMenu.DropdownItemGroup, null, (0, _react2.jsx)(_dropdownMenu.DropdownItem, {
99
97
  elemBefore: (0, _react2.jsx)(_linkExternalShortcut.default, {
100
98
  label: goToLinkLabel,
@@ -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.1";
19
+ var packageVersion = "107.0.3";
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', 'date', 'inlineCard'];
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.1";
26
+ var packageVersion = "107.0.3";
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
 
@@ -30,8 +30,7 @@ const styles = css({
30
30
  export const ExtensionNodeWrapper = ({
31
31
  children,
32
32
  nodeType,
33
- macroInteractionDesignFeatureFlags,
34
- nodeHeight
33
+ macroInteractionDesignFeatureFlags
35
34
  }) => {
36
35
  const {
37
36
  showMacroInteractionDesignUpdates
@@ -40,19 +39,11 @@ export const ExtensionNodeWrapper = ({
40
39
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
41
40
  relative: showMacroInteractionDesignUpdates
42
41
  });
43
- const content =
44
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
45
- jsx("span", {
46
- className: wrapperClassNames,
47
- css: styles
48
- }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
49
- if (nodeHeight) {
50
- const extensionStyles = {
51
- minHeight: `${nodeHeight}px`
52
- };
53
- return jsx("div", {
54
- style: extensionStyles
55
- }, content);
56
- }
57
- return content;
42
+ return (
43
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
44
+ jsx("span", {
45
+ className: wrapperClassNames,
46
+ css: styles
47
+ }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE)
48
+ );
58
49
  };
@@ -59,11 +59,10 @@ export class ExtensionNode extends ReactNodeView {
59
59
  };
60
60
  }
61
61
  render(props, forwardRef) {
62
- var _props$extensionNodeV, _props$extensionNodeV2, _props$extensionNodeV3;
62
+ var _props$extensionNodeV;
63
63
  return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
64
64
  nodeType: this.node.type.name,
65
- macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
66
- nodeHeight: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : (_props$extensionNodeV2 = _props$extensionNodeV.getExtensionHeight) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.call(_props$extensionNodeV, this.node)
65
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
67
66
  }, /*#__PURE__*/React.createElement(Extension, {
68
67
  editorView: this.view,
69
68
  node: this.node,
@@ -79,7 +78,7 @@ export class ExtensionNode extends ReactNodeView {
79
78
  providerFactory: props.providerFactory,
80
79
  handleContentDOMRef: forwardRef,
81
80
  extensionHandlers: props.extensionHandlers,
82
- editorAppearance: (_props$extensionNodeV3 = props.extensionNodeViewOptions) === null || _props$extensionNodeV3 === void 0 ? void 0 : _props$extensionNodeV3.appearance,
81
+ editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
83
82
  pluginInjectionApi: props.pluginInjectionApi,
84
83
  macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
85
84
  showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
@@ -13,7 +13,6 @@ import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdow
13
13
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
14
14
  import PreferencesIcon from '@atlaskit/icon/core/migration/customize--preferences';
15
15
  import LinkExternalIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
16
  import { cardMessages as messages } from '../../messages';
18
17
  import { StyledButton } from './StyledButton';
19
18
  import { useLinkOverlayAnalyticsEvents } from './useLinkOverlayAnalyticsEvents';
@@ -84,8 +83,7 @@ const Dropdown = ({
84
83
  }
85
84
  })),
86
85
  testId: `${testId}-dropdown`,
87
- onOpenChange: onOpenChange,
88
- shouldRenderToParent: fg('should-render-to-parent-should-be-true-editor')
86
+ onOpenChange: onOpenChange
89
87
  }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
90
88
  elemBefore: jsx(LinkExternalIcon, {
91
89
  label: goToLinkLabel,
@@ -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.1";
4
+ const packageVersion = "107.0.3";
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', 'date', 'inlineCard'];
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.1";
16
+ const packageVersion = "107.0.3";
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
 
@@ -30,27 +30,18 @@ var styles = css({
30
30
  export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
31
31
  var children = _ref.children,
32
32
  nodeType = _ref.nodeType,
33
- macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
34
- nodeHeight = _ref.nodeHeight;
33
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
35
34
  var _ref2 = macroInteractionDesignFeatureFlags || {},
36
35
  showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
37
36
  var wrapperClassNames = classnames({
38
37
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
39
38
  relative: showMacroInteractionDesignUpdates
40
39
  });
41
- var content =
42
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
43
- jsx("span", {
44
- className: wrapperClassNames,
45
- css: styles
46
- }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
47
- if (nodeHeight) {
48
- var extensionStyles = {
49
- minHeight: "".concat(nodeHeight, "px")
50
- };
51
- return jsx("div", {
52
- style: extensionStyles
53
- }, content);
54
- }
55
- return content;
40
+ return (
41
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
42
+ jsx("span", {
43
+ className: wrapperClassNames,
44
+ css: styles
45
+ }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE)
46
+ );
56
47
  };
@@ -83,11 +83,10 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
83
83
  }, {
84
84
  key: "render",
85
85
  value: function render(props, forwardRef) {
86
- var _props$extensionNodeV, _props$extensionNodeV2, _props$extensionNodeV3;
86
+ var _props$extensionNodeV;
87
87
  return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
88
88
  nodeType: this.node.type.name,
89
- macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
90
- nodeHeight: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 || (_props$extensionNodeV2 = _props$extensionNodeV.getExtensionHeight) === null || _props$extensionNodeV2 === void 0 ? void 0 : _props$extensionNodeV2.call(_props$extensionNodeV, this.node)
89
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
91
90
  }, /*#__PURE__*/React.createElement(Extension, {
92
91
  editorView: this.view,
93
92
  node: this.node,
@@ -103,7 +102,7 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
103
102
  providerFactory: props.providerFactory,
104
103
  handleContentDOMRef: forwardRef,
105
104
  extensionHandlers: props.extensionHandlers,
106
- editorAppearance: (_props$extensionNodeV3 = props.extensionNodeViewOptions) === null || _props$extensionNodeV3 === void 0 ? void 0 : _props$extensionNodeV3.appearance,
105
+ editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
107
106
  pluginInjectionApi: props.pluginInjectionApi,
108
107
  macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
109
108
  showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
@@ -15,7 +15,6 @@ import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdow
15
15
  import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
16
16
  import PreferencesIcon from '@atlaskit/icon/core/migration/customize--preferences';
17
17
  import LinkExternalIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
18
- import { fg } from '@atlaskit/platform-feature-flags';
19
18
  import { cardMessages as messages } from '../../messages';
20
19
  import { StyledButton } from './StyledButton';
21
20
  import { useLinkOverlayAnalyticsEvents } from './useLinkOverlayAnalyticsEvents';
@@ -85,8 +84,7 @@ var Dropdown = function Dropdown(_ref) {
85
84
  }));
86
85
  },
87
86
  testId: "".concat(testId, "-dropdown"),
88
- onOpenChange: onOpenChange,
89
- shouldRenderToParent: fg('should-render-to-parent-should-be-true-editor')
87
+ onOpenChange: onOpenChange
90
88
  }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
91
89
  elemBefore: jsx(LinkExternalIcon, {
92
90
  label: goToLinkLabel,
@@ -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.1";
10
+ var packageVersion = "107.0.3";
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', 'date', 'inlineCard'];
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.1";
23
+ var packageVersion = "107.0.3";
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
 
@@ -10,7 +10,6 @@ type Props = {
10
10
  children: React.ReactNode;
11
11
  nodeType: string;
12
12
  macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
13
- nodeHeight?: string;
14
13
  };
15
14
  /**
16
15
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -20,5 +19,5 @@ type Props = {
20
19
  * @param param0
21
20
  * @returns
22
21
  */
23
- export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, nodeHeight, }: Props) => jsx.JSX.Element;
22
+ export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
24
23
  export {};
@@ -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;
@@ -10,7 +10,6 @@ type Props = {
10
10
  children: React.ReactNode;
11
11
  nodeType: string;
12
12
  macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
13
- nodeHeight?: string;
14
13
  };
15
14
  /**
16
15
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -20,5 +19,5 @@ type Props = {
20
19
  * @param param0
21
20
  * @returns
22
21
  */
23
- export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, nodeHeight, }: Props) => jsx.JSX.Element;
22
+ export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
24
23
  export {};
@@ -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.2",
3
+ "version": "107.0.4",
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/"
@@ -164,7 +164,7 @@
164
164
  "@atlaskit/profilecard": "^23.19.0",
165
165
  "@atlaskit/react-ufo": "^3.13.0",
166
166
  "@atlaskit/section-message": "^8.2.0",
167
- "@atlaskit/smart-card": "^38.10.0",
167
+ "@atlaskit/smart-card": "^38.12.0",
168
168
  "@atlaskit/smart-user-picker": "^8.0.0",
169
169
  "@atlaskit/spinner": "^18.0.0",
170
170
  "@atlaskit/task-decision": "^19.2.0",
@@ -383,6 +383,9 @@
383
383
  "confluence_connect_macro_preset_height": {
384
384
  "type": "boolean"
385
385
  },
386
+ "cc_mention_ssr_placeholder": {
387
+ "type": "boolean"
388
+ },
386
389
  "platform_editor_breakout_resizing_hello_release": {
387
390
  "type": "boolean"
388
391
  },