@atlaskit/editor-common 131.0.0 → 131.1.0

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 (46) hide show
  1. package/CHANGELOG.md +35 -0
  2. package/dist/cjs/extensibility/Extension/Extension/index.js +23 -2
  3. package/dist/cjs/monitoring/error.js +1 -1
  4. package/dist/cjs/portal/PortalBucket.js +51 -11
  5. package/dist/cjs/portal/PortalManager.js +6 -3
  6. package/dist/cjs/preset/core-plugin/index.js +4 -20
  7. package/dist/cjs/quick-insert/CompactQuickInsertMenuItem.js +6 -6
  8. package/dist/cjs/quick-insert/QuickInsertSearchResultsSection.js +19 -0
  9. package/dist/cjs/quick-insert/get-quick-insert-menu-model.js +20 -31
  10. package/dist/cjs/quick-insert/getQuickInsertMenuRows.js +2 -2
  11. package/dist/cjs/quick-insert/keys.js +10 -1
  12. package/dist/cjs/quick-insert/messages.js +5 -0
  13. package/dist/cjs/ui/DropList/index.js +1 -1
  14. package/dist/cjs/ui/OverflowShadow/index.js +14 -2
  15. package/dist/es2019/extensibility/Extension/Extension/index.js +21 -2
  16. package/dist/es2019/monitoring/error.js +1 -1
  17. package/dist/es2019/portal/PortalBucket.js +48 -12
  18. package/dist/es2019/portal/PortalManager.js +6 -3
  19. package/dist/es2019/preset/core-plugin/index.js +4 -20
  20. package/dist/es2019/quick-insert/CompactQuickInsertMenuItem.js +6 -6
  21. package/dist/es2019/quick-insert/QuickInsertSearchResultsSection.js +14 -0
  22. package/dist/es2019/quick-insert/get-quick-insert-menu-model.js +15 -17
  23. package/dist/es2019/quick-insert/getQuickInsertMenuRows.js +2 -2
  24. package/dist/es2019/quick-insert/keys.js +9 -0
  25. package/dist/es2019/quick-insert/messages.js +5 -0
  26. package/dist/es2019/ui/DropList/index.js +1 -1
  27. package/dist/es2019/ui/OverflowShadow/index.js +12 -2
  28. package/dist/esm/extensibility/Extension/Extension/index.js +23 -2
  29. package/dist/esm/monitoring/error.js +1 -1
  30. package/dist/esm/portal/PortalBucket.js +52 -12
  31. package/dist/esm/portal/PortalManager.js +6 -3
  32. package/dist/esm/preset/core-plugin/index.js +4 -20
  33. package/dist/esm/quick-insert/CompactQuickInsertMenuItem.js +6 -6
  34. package/dist/esm/quick-insert/QuickInsertSearchResultsSection.js +12 -0
  35. package/dist/esm/quick-insert/get-quick-insert-menu-model.js +21 -32
  36. package/dist/esm/quick-insert/getQuickInsertMenuRows.js +2 -2
  37. package/dist/esm/quick-insert/keys.js +9 -0
  38. package/dist/esm/quick-insert/messages.js +5 -0
  39. package/dist/esm/ui/DropList/index.js +1 -1
  40. package/dist/esm/ui/OverflowShadow/index.js +14 -2
  41. package/dist/types/quick-insert/QuickInsertSearchResultsSection.d.ts +2 -0
  42. package/dist/types/quick-insert/get-quick-insert-menu-model.d.ts +4 -1
  43. package/dist/types/quick-insert/keys.d.ts +8 -0
  44. package/dist/types/quick-insert/messages.d.ts +1 -1
  45. package/dist/types/ui/OverflowShadow/index.d.ts +5 -0
  46. package/package.json +2 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,40 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 131.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`2e5bca15bacb0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e5bca15bacb0) -
8
+ [ux] Replace the JavaScript driven extension overflow shadows with a CSS scroll driven
9
+ implementation when the `platform_editor_reduce_forced_layout_2` experiment is enabled. Extensions
10
+ now paint their inline start and end shadows from the overflow wrapper's scroll timeline instead
11
+ of scroll listeners that read `scrollLeft`, `offsetWidth` and `scrollWidth`, removing the forced
12
+ synchronous layout those reads caused. The `overflowShadow` higher order component gains an
13
+ `isDisabled` option so consumers can opt out of the JavaScript shadows without affecting other
14
+ call sites.
15
+ - [`62ee40fadb62f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/62ee40fadb62f) -
16
+ Add a Search results heading to the registered Quick Insert search model (new
17
+ SEARCH_RESULTS_SECTION key and searchResults message). A search with matches now returns a single
18
+ Search results section of ranked matches in `sections`, and the `searchResults` field is removed
19
+ from QuickInsertMenuModel. Compact Quick Insert menu items are 44px tall to match the slash
20
+ command design. Affects the registered slash command menu and toolbar Insert menu behind
21
+ platform_editor_slash_command.
22
+
23
+ ### Patch Changes
24
+
25
+ - [`9fa655f27db03`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9fa655f27db03) -
26
+ Stop PortalBucket retaining removed portals in stale React fibers and fix PortalManager capacity
27
+ drift on portal re-register, behind the `platform_editor_reduce_memory_leaks` experiment.
28
+ - [`b5bdee7e6b998`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5bdee7e6b998) -
29
+ Clean up feature gate `platform_editor_fix_scroll_to_pos`
30
+ - Updated dependencies
31
+
32
+ ## 131.0.1
33
+
34
+ ### Patch Changes
35
+
36
+ - Updated dependencies
37
+
3
38
  ## 131.0.0
4
39
 
5
40
  ### Major Changes
@@ -13,6 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _react2 = require("@emotion/react");
15
15
  var _classnames2 = _interopRequireDefault(require("classnames"));
16
+ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
16
17
  var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
17
18
  var _fg = require("@atlaskit/platform-feature-flags/fg");
18
19
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -43,6 +44,12 @@ var hoverStyles = (0, _react2.css)({
43
44
  var containerStyle = (0, _react2.css)({
44
45
  containerType: 'inline-size'
45
46
  });
47
+ var isCssScrollTimelineSupported = (0, _memoizeOne.default)(function (css) {
48
+ if (!css || typeof css.supports !== 'function') {
49
+ return false;
50
+ }
51
+ return css.supports('animation-timeline', '--test-timeline') && css.supports('scroll-timeline-name', '--test-timeline') && css.supports('timeline-scope', '--test-timeline') && css.supports('animation-range', '0% 101%');
52
+ });
46
53
  function ExtensionWithPluginState(props) {
47
54
  var _node$attrs;
48
55
  var node = props.node,
@@ -113,6 +120,7 @@ function ExtensionWithPluginState(props) {
113
120
  'without-frame': removeBorder
114
121
  }, _styles2.widerLayoutClassName, shouldBreakout));
115
122
  var overflowClassNames = (0, _classnames2.default)('extension-overflow-wrapper', {
123
+ 'extension-scroll-inline-shadow': (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2'),
116
124
  'with-body': hasBody,
117
125
  'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
118
126
  // Adding extra padding for renderer view so users can have a touch target to click on the extension
@@ -232,7 +240,17 @@ function ExtensionWithPluginState(props) {
232
240
  className: contentClassNames
233
241
  }, (0, _react2.jsx)(_NodeViewContentHole.NodeViewContentHole, {
234
242
  ref: handleContentDOMRef
235
- })))), (0, _fg.fg)('cc_maui_annotations_on_extensions') && node.type.name === 'extension' && container && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.annotation) && (0, _react2.jsx)(_ExtensionCommentBadge.ExtensionCommentBadge, {
243
+ })))), (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)("div", {
244
+ contentEditable: false,
245
+ "aria-hidden": "true",
246
+ "data-vc-nvs": "true",
247
+ "data-extension-overflow-shadow": "start"
248
+ }), (0, _react2.jsx)("div", {
249
+ contentEditable: false,
250
+ "aria-hidden": "true",
251
+ "data-vc-nvs": "true",
252
+ "data-extension-overflow-shadow": "end"
253
+ })), (0, _fg.fg)('cc_maui_annotations_on_extensions') && node.type.name === 'extension' && container && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.annotation) && (0, _react2.jsx)(_ExtensionCommentBadge.ExtensionCommentBadge, {
236
254
  api: pluginInjectionApi,
237
255
  node: node,
238
256
  getPos: getPos,
@@ -269,6 +287,9 @@ var Extension = function Extension(props) {
269
287
  }, props));
270
288
  };
271
289
  var _default_1 = (0, _ui.overflowShadow)(Extension, {
272
- overflowSelector: '.extension-overflow-wrapper'
290
+ overflowSelector: '.extension-overflow-wrapper',
291
+ isDisabled: function isDisabled() {
292
+ return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_forced_layout_2') && isCssScrollTimelineSupported(globalThis.CSS);
293
+ }
273
294
  });
274
295
  var _default = exports.default = _default_1;
@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
27
27
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
28
28
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
29
29
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
30
- var packageVersion = "131.0.0";
30
+ var packageVersion = "131.0.1";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -8,18 +8,9 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.PortalBucket = PortalBucket;
9
9
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
10
10
  var _react = _interopRequireWildcard(require("react"));
11
+ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
11
12
  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); }
12
- /**
13
- * A component for rendering portals managed by a `PortalManager`.
14
- * It subscribes to a `PortalManager` instance to listen for changes in the portal content
15
- * and renders the content of its assigned portal bucket.
16
- *
17
- * @param {PortalBucketProps} props The component props.
18
- * @param {number} props.id The ID for the portal bucket. This ID is used by the `PortalManager` to manage the content of this bucket.
19
- * @param {PortalManager} props.portalManager An instance of `PortalManager` which manages the registration and unregistration of portal buckets and their content.
20
- * @returns {React.ReactElement} The React element(s) that are currently registered to this portal bucket.
21
- */
22
- function PortalBucket(_ref) {
13
+ function LegacyPortalBucket(_ref) {
23
14
  var id = _ref.id,
24
15
  portalManager = _ref.portalManager;
25
16
  // State to hold the current portals for this bucket
@@ -41,4 +32,53 @@ function PortalBucket(_ref) {
41
32
  // Render the current portal elements
42
33
  // @ts-ignore - TS2322 TypeScript 5.9.2 upgrade
43
34
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, portalElements);
35
+ }
36
+
37
+ /**
38
+ * Portals stay in the manager; state is only a render tick. React keeps
39
+ * hook state on both the current and alternate fiber, so storing portals
40
+ * in state would retain removed portals until the next render.
41
+ */
42
+ function TickPortalBucket(_ref2) {
43
+ var _portalManager$getBuc, _portalManager$getBuc2;
44
+ var id = _ref2.id,
45
+ portalManager = _ref2.portalManager;
46
+ var _useReducer = (0, _react.useReducer)(function (tick) {
47
+ return tick + 1;
48
+ }, 0),
49
+ _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
50
+ forceRender = _useReducer2[1];
51
+ var updater = (0, _react.useCallback)(function () {
52
+ return forceRender();
53
+ }, []);
54
+ (0, _react.useLayoutEffect)(function () {
55
+ portalManager.registerBucket(id, updater);
56
+ return function () {
57
+ portalManager.unregisterBucket(id);
58
+ };
59
+ }, [id, portalManager, updater]);
60
+ // @ts-ignore - TS2322 TypeScript 5.9.2 upgrade
61
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Object.values((_portalManager$getBuc = (_portalManager$getBuc2 = portalManager.getBuckets()[id]) === null || _portalManager$getBuc2 === void 0 ? void 0 : _portalManager$getBuc2.portals) !== null && _portalManager$getBuc !== void 0 ? _portalManager$getBuc : {}));
62
+ }
63
+
64
+ /**
65
+ * A component for rendering portals managed by a `PortalManager`.
66
+ * It subscribes to a `PortalManager` instance to listen for changes in the portal content
67
+ * and renders the content of its assigned portal bucket.
68
+ *
69
+ * @param {PortalBucketProps} props The component props.
70
+ * @param {number} props.id The ID for the portal bucket. This ID is used by the `PortalManager` to manage the content of this bucket.
71
+ * @param {PortalManager} props.portalManager An instance of `PortalManager` which manages the registration and unregistration of portal buckets and their content.
72
+ * @returns {React.ReactElement} The React element(s) that are currently registered to this portal bucket.
73
+ */
74
+ function PortalBucket(_ref3) {
75
+ var id = _ref3.id,
76
+ portalManager = _ref3.portalManager;
77
+ return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks') ? /*#__PURE__*/_react.default.createElement(TickPortalBucket, {
78
+ id: id,
79
+ portalManager: portalManager
80
+ }) : /*#__PURE__*/_react.default.createElement(LegacyPortalBucket, {
81
+ id: id,
82
+ portalManager: portalManager
83
+ });
44
84
  }
@@ -10,6 +10,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
10
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
12
12
  var _throttle = _interopRequireDefault(require("lodash/throttle"));
13
+ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
13
14
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
14
15
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
15
16
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -206,9 +207,11 @@ var PortalManager = exports.PortalManager = /*#__PURE__*/function () {
206
207
  var _this$portalToBucketM,
207
208
  _this4 = this;
208
209
  var immediate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
209
- this.createBucket();
210
- // @ts-ignore - TS2538 TypeScript 5.9.2 upgrade
211
- this.buckets[this.getCurrentBucket()].capacity -= 1;
210
+ if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks') || !this.portalToBucketMap.has(key)) {
211
+ this.createBucket();
212
+ // @ts-ignore - TS2538 TypeScript 5.9.2 upgrade
213
+ this.buckets[this.getCurrentBucket()].capacity -= 1;
214
+ }
212
215
  var id = (_this$portalToBucketM = this.portalToBucketMap.get(key)) !== null && _this$portalToBucketM !== void 0 ? _this$portalToBucketM : this.getCurrentBucket();
213
216
  // @ts-ignore - TS2345 TypeScript 5.9.2 upgrade
214
217
  this.portalToBucketMap.set(key, id);
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.corePlugin = void 0;
7
7
  var _model = require("@atlaskit/editor-prosemirror/model");
8
- var _fg = require("@atlaskit/platform-feature-flags/fg");
9
8
  var _nodeAnchorProvider = require("../../node-anchor/node-anchor-provider");
10
9
  var _processRawFragmentValue = require("../../utils/processRawFragmentValue");
11
10
  var _processRawValue = require("../../utils/processRawValue");
@@ -74,6 +73,7 @@ var corePlugin = exports.corePlugin = function corePlugin(_ref) {
74
73
  return true;
75
74
  },
76
75
  scrollToPos: function scrollToPos(pos, scrollOptions) {
76
+ var _ref2, _editorView$domAtPos;
77
77
  var editorView = config === null || config === void 0 ? void 0 : config.getEditorView();
78
78
  if (!editorView) {
79
79
  return false;
@@ -83,27 +83,11 @@ var corePlugin = exports.corePlugin = function corePlugin(_ref) {
83
83
  if (!isValidPos) {
84
84
  return false;
85
85
  }
86
- if ((0, _fg.fg)('platform_editor_fix_scroll_to_pos')) {
87
- var _ref2, _editorView$domAtPos;
88
- // nodeDOM can return a Text node for inline positions
89
- var nodeDom = editorView.nodeDOM(pos);
90
- var _dom = (_ref2 = nodeDom instanceof Element ? nodeDom : null) !== null && _ref2 !== void 0 ? _ref2 : (_editorView$domAtPos = editorView.domAtPos(pos)) === null || _editorView$domAtPos === void 0 ? void 0 : _editorView$domAtPos.node;
91
- if (!(_dom instanceof Element)) {
92
- return false;
93
- }
94
- _dom.scrollIntoView(scrollOptions);
95
- return true;
96
- }
97
86
 
98
- // Legacy path — domAtPos interprets block boundaries as the parent container
99
- var dom = editorView.domAtPos(pos).node;
87
+ // nodeDOM can return a Text node for inline positions
88
+ var nodeDom = editorView.nodeDOM(pos);
89
+ var dom = (_ref2 = nodeDom instanceof Element ? nodeDom : null) !== null && _ref2 !== void 0 ? _ref2 : (_editorView$domAtPos = editorView.domAtPos(pos)) === null || _editorView$domAtPos === void 0 ? void 0 : _editorView$domAtPos.node;
100
90
  if (!(dom instanceof Element)) {
101
- // If it's not an element (e.g. #text node), we'll try the parent.
102
- // This is expected to cover most of the scenarios, if not, window.scrollTo is an alternative
103
- if (dom.parentNode instanceof Element) {
104
- dom.parentNode.scrollIntoView(scrollOptions);
105
- return true;
106
- }
107
91
  return false;
108
92
  }
109
93
  dom.scrollIntoView(scrollOptions);
@@ -45,8 +45,8 @@ var itemStyles = (0, _xcss.xcss)({
45
45
  color: 'color.text',
46
46
  display: 'flex',
47
47
  gap: 'space.150',
48
- minHeight: '40px',
49
- paddingBlock: 'space.100',
48
+ minHeight: '44px',
49
+ paddingBlock: 'space.075',
50
50
  paddingInline: 'space.200',
51
51
  textAlign: 'start',
52
52
  width: '100%',
@@ -60,8 +60,8 @@ var selectedItemStyles = (0, _xcss.xcss)({
60
60
  color: 'color.text',
61
61
  display: 'flex',
62
62
  gap: 'space.150',
63
- minHeight: '40px',
64
- paddingBlock: 'space.100',
63
+ minHeight: '44px',
64
+ paddingBlock: 'space.075',
65
65
  paddingInline: 'space.200',
66
66
  position: 'relative',
67
67
  textAlign: 'start',
@@ -86,8 +86,8 @@ var disabledItemStyles = (0, _xcss.xcss)({
86
86
  color: 'color.text.disabled',
87
87
  display: 'flex',
88
88
  gap: 'space.150',
89
- minHeight: '40px',
90
- paddingBlock: 'space.100',
89
+ minHeight: '44px',
90
+ paddingBlock: 'space.075',
91
91
  paddingInline: 'space.200',
92
92
  textAlign: 'start',
93
93
  width: '100%'
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.QuickInsertSearchResultsSection = void 0;
8
+ var _react = _interopRequireDefault(require("react"));
9
+ var _reactIntl = require("react-intl");
10
+ var _messages = require("./messages");
11
+ var _QuickInsertMenuSection = require("./QuickInsertMenuSection");
12
+ var QuickInsertSearchResultsSection = exports.QuickInsertSearchResultsSection = function QuickInsertSearchResultsSection(_ref) {
13
+ var children = _ref.children;
14
+ var _useIntl = (0, _reactIntl.useIntl)(),
15
+ formatMessage = _useIntl.formatMessage;
16
+ return /*#__PURE__*/_react.default.createElement(_QuickInsertMenuSection.QuickInsertMenuSection, {
17
+ title: formatMessage(_messages.messages.searchResults)
18
+ }, children);
19
+ };
@@ -12,12 +12,23 @@ var _isMenuFooterSectionKey = require("../type-ahead/isMenuFooterSectionKey");
12
12
  var _isSectionOverflowItemKey = require("../type-ahead/isSectionOverflowItemKey");
13
13
  var _itemRank = require("../type-ahead/item-rank");
14
14
  var _keys = require("./keys");
15
+ var _QuickInsertSearchResultsSection = require("./QuickInsertSearchResultsSection");
15
16
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
16
17
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
17
18
  function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
18
19
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
19
20
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
20
21
  var SEARCH_TOP_MATCH_LIMIT = 5;
22
+ var SEARCH_RESULTS_HEADING = {
23
+ key: _keys.SEARCH_RESULTS_SECTION.key,
24
+ type: _keys.SEARCH_RESULTS_SECTION.type,
25
+ component: _QuickInsertSearchResultsSection.QuickInsertSearchResultsSection,
26
+ parents: [{
27
+ key: _keys.MENU.key,
28
+ type: _keys.MENU.type,
29
+ rank: 0
30
+ }]
31
+ };
21
32
  var getParentRank = function getParentRank(component, parentKey) {
22
33
  var _component$parents$fi, _component$parents;
23
34
  return (_component$parents$fi = (_component$parents = component.parents) === null || _component$parents === void 0 || (_component$parents = _component$parents.find(function (parent) {
@@ -106,12 +117,12 @@ var buildSearchSections = function buildSearchSections(_ref5) {
106
117
  try {
107
118
  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
108
119
  var section = _step2.value;
109
- var _iterator4 = _createForOfIteratorHelper(getRenderedMenuItems(section, childrenMap, surfaceContext)),
110
- _step4;
120
+ var _iterator3 = _createForOfIteratorHelper(getRenderedMenuItems(section, childrenMap, surfaceContext)),
121
+ _step3;
111
122
  try {
112
- for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
123
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
113
124
  var _item$match, _match$score, _sourceIndexByCompone;
114
- var item = _step4.value;
125
+ var item = _step3.value;
115
126
  if ((0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(item.key)) {
116
127
  continue;
117
128
  }
@@ -128,7 +139,6 @@ var buildSearchSections = function buildSearchSections(_ref5) {
128
139
  itemRank: getParentRank(item, section.key),
129
140
  score: Math.min(1, Math.max(0, (_match$score = match === null || match === void 0 ? void 0 : match.score) !== null && _match$score !== void 0 ? _match$score : 0)),
130
141
  sourceIndex: (_sourceIndexByCompone = sourceIndexByComponent.get(item)) !== null && _sourceIndexByCompone !== void 0 ? _sourceIndexByCompone : Number.MAX_SAFE_INTEGER,
131
- section: section,
132
142
  sectionRank: getParentRank(section, root.key)
133
143
  };
134
144
  var existing = matches.get(candidate.identity);
@@ -137,9 +147,9 @@ var buildSearchSections = function buildSearchSections(_ref5) {
137
147
  }
138
148
  }
139
149
  } catch (err) {
140
- _iterator4.e(err);
150
+ _iterator3.e(err);
141
151
  } finally {
142
- _iterator4.f();
152
+ _iterator3.f();
143
153
  }
144
154
  }
145
155
  } catch (err) {
@@ -149,29 +159,9 @@ var buildSearchSections = function buildSearchSections(_ref5) {
149
159
  }
150
160
  var uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
151
161
  var searchResults = getSearchResults(uniqueMatches);
152
- var sectionsByKey = new Map();
153
- var _iterator3 = _createForOfIteratorHelper(uniqueMatches),
154
- _step3;
155
- try {
156
- for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
157
- var _match = _step3.value;
158
- var _existing = sectionsByKey.get(_match.section.key);
159
- if (_existing) {
160
- _existing.push(_match.item);
161
- } else {
162
- sectionsByKey.set(_match.section.key, [_match.section, _match.item]);
163
- }
164
- }
165
- } catch (err) {
166
- _iterator3.e(err);
167
- } finally {
168
- _iterator3.f();
169
- }
170
- var sections = Array.from(sectionsByKey.values());
171
- if (sections.length > 0) {
162
+ if (searchResults.length > 0) {
172
163
  return {
173
- searchResults: searchResults,
174
- sections: sections
164
+ sections: [[SEARCH_RESULTS_HEADING].concat((0, _toConsumableArray2.default)(searchResults))]
175
165
  };
176
166
  }
177
167
  var fallbackItem = contentSections.flatMap(function (section) {
@@ -182,8 +172,7 @@ var buildSearchSections = function buildSearchSections(_ref5) {
182
172
  });
183
173
  return {
184
174
  fallbackItems: fallbackItem ? [fallbackItem] : [],
185
- searchResults: searchResults,
186
- sections: sections
175
+ sections: []
187
176
  };
188
177
  };
189
178
 
@@ -7,6 +7,6 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.getQuickInsertMenuRows = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
9
  var getQuickInsertMenuRows = exports.getQuickInsertMenuRows = function getQuickInsertMenuRows(model) {
10
- var _model$searchResults, _model$fallbackItems;
11
- return [].concat((0, _toConsumableArray2.default)((_model$searchResults = model.searchResults) !== null && _model$searchResults !== void 0 ? _model$searchResults : model.sections.flat()), (0, _toConsumableArray2.default)((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
10
+ var _model$fallbackItems;
11
+ return [].concat((0, _toConsumableArray2.default)(model.sections.flat()), (0, _toConsumableArray2.default)((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
12
12
  };
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.getBlockTemplateMenuItem = exports.WHITEBOARD_MENU_ITEM = exports.WARNING_PANEL_MENU_ITEM = exports.VIEW_ALL_ELEMENTS_MENU_ITEM = exports.UNORDERED_LIST_MENU_ITEM = exports.TWO_COLUMNS_LAYOUT_MENU_ITEM = exports.THREE_COLUMNS_LAYOUT_MENU_ITEM = exports.TEXT_FORMATTING_SECTION = exports.TABS_MENU_ITEM = exports.TABLE_MENU_ITEM = exports.SYNCED_BLOCK_MENU_ITEM = exports.SUCCESS_PANEL_MENU_ITEM = exports.STRUCTURE_SECTION = exports.STATUS_MENU_ITEM = exports.RULE_MENU_ITEM = exports.ROVO_SECTION = exports.ROADMAP_MENU_ITEM = exports.RETROSPECTIVE_MENU_ITEM = exports.RECOMMENDED_SECTION = exports.PLACEHOLDER_TEXT_MENU_ITEM = exports.OTHER_SECTION = exports.ORDERED_LIST_MENU_ITEM = exports.NOTE_PANEL_MENU_ITEM = exports.MENU = exports.MENTION_MENU_ITEM = exports.MEDIA_SECTION = exports.MEDIA_INSERT_MENU_ITEM = exports.LOOM_MENU_ITEM = exports.JIRA_WORK_ITEMS_MENU_ITEM = exports.JIRA_ISSUE_MENU_ITEM = exports.INFO_PANEL_MENU_ITEM = exports.HYPERLINK_MENU_ITEM = exports.HELP_DIALOG_MENU_ITEM = exports.HEADING_6_MENU_ITEM = exports.HEADING_5_MENU_ITEM = exports.HEADING_4_MENU_ITEM = exports.HEADING_3_MENU_ITEM = exports.HEADING_2_MENU_ITEM = exports.HEADING_1_MENU_ITEM = exports.FOUR_COLUMNS_LAYOUT_MENU_ITEM = exports.FLOWCHART_MENU_ITEM = exports.FIVE_COLUMNS_LAYOUT_MENU_ITEM = exports.EXPAND_MENU_ITEM = exports.ERROR_PANEL_MENU_ITEM = exports.EMOJI_MENU_ITEM = exports.EMBED_SECTION = exports.DIAGRAM_MENU_ITEM = exports.DECISION_MENU_ITEM = exports.DATE_MENU_ITEM = exports.DATA_AND_CHARTS_SECTION = exports.DATABASE_MENU_ITEM = exports.CUSTOM_PANEL_MENU_ITEM = exports.CREATE_SECTION = exports.CONFLUENCE_PAGE_MENU_ITEM = exports.CONFLUENCE_LIST_MENU_ITEM = exports.CODE_BLOCK_MENU_ITEM = exports.BRAINSTORMING_MENU_ITEM = exports.BLOCK_TEMPLATES_SECTION = exports.BLOCKQUOTE_MENU_ITEM = exports.ASSETS_MENU_ITEM = exports.ASK_ROVO_MENU_ITEM = exports.AI_IMAGE_GENERATION_MENU_ITEM = exports.ADD_SUGGESTIONS_TO_CONTENT_SKILL_MENU_ITEM = exports.ACTION_MENU_ITEM = void 0;
6
+ exports.getBlockTemplateMenuItem = exports.WHITEBOARD_MENU_ITEM = exports.WARNING_PANEL_MENU_ITEM = exports.VIEW_ALL_ELEMENTS_MENU_ITEM = exports.UNORDERED_LIST_MENU_ITEM = exports.TWO_COLUMNS_LAYOUT_MENU_ITEM = exports.THREE_COLUMNS_LAYOUT_MENU_ITEM = exports.TEXT_FORMATTING_SECTION = exports.TABS_MENU_ITEM = exports.TABLE_MENU_ITEM = exports.SYNCED_BLOCK_MENU_ITEM = exports.SUCCESS_PANEL_MENU_ITEM = exports.STRUCTURE_SECTION = exports.STATUS_MENU_ITEM = exports.SEARCH_RESULTS_SECTION = exports.RULE_MENU_ITEM = exports.ROVO_SECTION = exports.ROADMAP_MENU_ITEM = exports.RETROSPECTIVE_MENU_ITEM = exports.RECOMMENDED_SECTION = exports.PLACEHOLDER_TEXT_MENU_ITEM = exports.OTHER_SECTION = exports.ORDERED_LIST_MENU_ITEM = exports.NOTE_PANEL_MENU_ITEM = exports.MENU = exports.MENTION_MENU_ITEM = exports.MEDIA_SECTION = exports.MEDIA_INSERT_MENU_ITEM = exports.LOOM_MENU_ITEM = exports.JIRA_WORK_ITEMS_MENU_ITEM = exports.JIRA_ISSUE_MENU_ITEM = exports.INFO_PANEL_MENU_ITEM = exports.HYPERLINK_MENU_ITEM = exports.HELP_DIALOG_MENU_ITEM = exports.HEADING_6_MENU_ITEM = exports.HEADING_5_MENU_ITEM = exports.HEADING_4_MENU_ITEM = exports.HEADING_3_MENU_ITEM = exports.HEADING_2_MENU_ITEM = exports.HEADING_1_MENU_ITEM = exports.FOUR_COLUMNS_LAYOUT_MENU_ITEM = exports.FLOWCHART_MENU_ITEM = exports.FIVE_COLUMNS_LAYOUT_MENU_ITEM = exports.EXPAND_MENU_ITEM = exports.ERROR_PANEL_MENU_ITEM = exports.EMOJI_MENU_ITEM = exports.EMBED_SECTION = exports.DIAGRAM_MENU_ITEM = exports.DECISION_MENU_ITEM = exports.DATE_MENU_ITEM = exports.DATA_AND_CHARTS_SECTION = exports.DATABASE_MENU_ITEM = exports.CUSTOM_PANEL_MENU_ITEM = exports.CREATE_SECTION = exports.CONFLUENCE_PAGE_MENU_ITEM = exports.CONFLUENCE_LIST_MENU_ITEM = exports.CODE_BLOCK_MENU_ITEM = exports.BRAINSTORMING_MENU_ITEM = exports.BLOCK_TEMPLATES_SECTION = exports.BLOCKQUOTE_MENU_ITEM = exports.ASSETS_MENU_ITEM = exports.ASK_ROVO_MENU_ITEM = exports.AI_IMAGE_GENERATION_MENU_ITEM = exports.ADD_SUGGESTIONS_TO_CONTENT_SKILL_MENU_ITEM = exports.ACTION_MENU_ITEM = void 0;
7
7
  /* eslint-disable @atlaskit/volt-strict-mode/no-multiple-exports */
8
8
 
9
9
  var MENU = exports.MENU = {
@@ -50,6 +50,15 @@ var OTHER_SECTION = exports.OTHER_SECTION = {
50
50
  key: 'quick-insert-other-section',
51
51
  type: 'menu-section'
52
52
  };
53
+
54
+ /**
55
+ * Heading shown above the matching items when the menu has a search query. It is not registered,
56
+ * so it never appears in browse mode.
57
+ */
58
+ var SEARCH_RESULTS_SECTION = exports.SEARCH_RESULTS_SECTION = {
59
+ key: 'quick-insert-search-results-section',
60
+ type: 'menu-section'
61
+ };
53
62
  var VIEW_ALL_ELEMENTS_MENU_ITEM = exports.VIEW_ALL_ELEMENTS_MENU_ITEM = {
54
63
  key: 'quick-insert-view-all-elements-menu-item',
55
64
  type: 'menu-item'
@@ -141,6 +141,11 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
141
141
  defaultMessage: 'Other elements',
142
142
  description: 'Other items in the Quick Insert menu.'
143
143
  },
144
+ searchResults: {
145
+ id: 'editor-common.quick-insert.searchResults',
146
+ defaultMessage: 'Search results',
147
+ description: 'Heading shown above the matching items when searching in the Quick Insert menu.'
148
+ },
144
149
  previewAttributionBy: {
145
150
  id: 'editor-common.quick-insert.previewAttributionBy',
146
151
  defaultMessage: 'By {name}',
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
24
24
  * @jsx jsx
25
25
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
26
26
  var packageName = "@atlaskit/editor-common";
27
- var packageVersion = "131.0.0";
27
+ var packageVersion = "131.0.1";
28
28
  var halfFocusRing = 1;
29
29
  var dropOffset = '0, 8';
30
30
  var fadeIn = (0, _react2.keyframes)({
@@ -44,7 +44,7 @@ function overflowShadow(Component, options) {
44
44
  _this.updateShadows();
45
45
  });
46
46
  (0, _defineProperty2.default)(_this, "updateShadows", function () {
47
- if (options.useShadowObserver) {
47
+ if (_this.isDisabled || options.useShadowObserver) {
48
48
  return;
49
49
  }
50
50
  _this.setState(function (prevState) {
@@ -98,6 +98,9 @@ function overflowShadow(Component, options) {
98
98
  if (!_this.overflowContainer) {
99
99
  _this.overflowContainer = container;
100
100
  }
101
+ if (_this.isDisabled) {
102
+ return;
103
+ }
101
104
  if (options.useShadowObserver) {
102
105
  _this.initShadowObserver();
103
106
  return;
@@ -111,6 +114,15 @@ function overflowShadow(Component, options) {
111
114
  }
112
115
  (0, _inherits2.default)(OverflowShadow, _React$Component);
113
116
  return (0, _createClass2.default)(OverflowShadow, [{
117
+ key: "isDisabled",
118
+ get: function get() {
119
+ if (this.disabled === undefined) {
120
+ var _options$isDisabled, _options$isDisabled2;
121
+ this.disabled = (_options$isDisabled = (_options$isDisabled2 = options.isDisabled) === null || _options$isDisabled2 === void 0 ? void 0 : _options$isDisabled2.call(options)) !== null && _options$isDisabled !== void 0 ? _options$isDisabled : false;
122
+ }
123
+ return this.disabled;
124
+ }
125
+ }, {
114
126
  key: "componentWillUnmount",
115
127
  value: function componentWillUnmount() {
116
128
  if (options.useShadowObserver) {
@@ -161,7 +173,7 @@ function overflowShadow(Component, options) {
161
173
  var _this$state = this.state,
162
174
  showLeftShadow = _this$state.showLeftShadow,
163
175
  showRightShadow = _this$state.showRightShadow;
164
- var classNames = [!((_this$props = this.props) !== null && _this$props !== void 0 && _this$props.disableTableOverflowShadow) && showRightShadow && shadowClassNames.RIGHT_SHADOW, !((_this$props2 = this.props) !== null && _this$props2 !== void 0 && _this$props2.disableTableOverflowShadow) && showLeftShadow && shadowClassNames.LEFT_SHADOW, options.useShadowObserver && _shadowObserverClassNames.shadowObserverClassNames.SHADOW_CONTAINER].filter(Boolean).join(' ');
176
+ var classNames = this.isDisabled ? '' : [!((_this$props = this.props) !== null && _this$props !== void 0 && _this$props.disableTableOverflowShadow) && showRightShadow && shadowClassNames.RIGHT_SHADOW, !((_this$props2 = this.props) !== null && _this$props2 !== void 0 && _this$props2.disableTableOverflowShadow) && showLeftShadow && shadowClassNames.LEFT_SHADOW, options.useShadowObserver && _shadowObserverClassNames.shadowObserverClassNames.SHADOW_CONTAINER].filter(Boolean).join(' ');
165
177
 
166
178
  /**
167
179
  * The widths have already been calculated to determine
@@ -9,6 +9,7 @@ import React, { Fragment, useCallback, useState } from 'react';
9
9
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
10
10
  import { css, jsx } from '@emotion/react';
11
11
  import classnames from 'classnames';
12
+ import memoizeOne from 'memoize-one';
12
13
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
13
14
  import { fg } from '@atlaskit/platform-feature-flags/fg';
14
15
  import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -30,6 +31,12 @@ const hoverStyles = css({
30
31
  const containerStyle = css({
31
32
  containerType: 'inline-size'
32
33
  });
34
+ const isCssScrollTimelineSupported = memoizeOne(css => {
35
+ if (!css || typeof css.supports !== 'function') {
36
+ return false;
37
+ }
38
+ return css.supports('animation-timeline', '--test-timeline') && css.supports('scroll-timeline-name', '--test-timeline') && css.supports('timeline-scope', '--test-timeline') && css.supports('animation-range', '0% 101%');
39
+ });
33
40
  function ExtensionWithPluginState(props) {
34
41
  var _node$attrs, _node$attrs$parameter, _node$attrs$parameter2, _node$attrs$parameter3;
35
42
  const {
@@ -103,6 +110,7 @@ function ExtensionWithPluginState(props) {
103
110
  [widerLayoutClassName]: shouldBreakout
104
111
  });
105
112
  const overflowClassNames = classnames('extension-overflow-wrapper', {
113
+ 'extension-scroll-inline-shadow': isExperimentEnabled('platform_editor_reduce_forced_layout_2'),
106
114
  'with-body': hasBody,
107
115
  'with-margin-styles': showMacroInteractionDesignUpdates && !isNodeNested && !showBodiedExtensionRendererView,
108
116
  // Adding extra padding for renderer view so users can have a touch target to click on the extension
@@ -224,7 +232,17 @@ function ExtensionWithPluginState(props) {
224
232
  className: contentClassNames
225
233
  }, jsx(NodeViewContentHole, {
226
234
  ref: handleContentDOMRef
227
- })))), fg('cc_maui_annotations_on_extensions') && node.type.name === 'extension' && container && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.annotation) && jsx(ExtensionCommentBadge, {
235
+ })))), isExperimentEnabled('platform_editor_reduce_forced_layout_2') && jsx(Fragment, null, jsx("div", {
236
+ contentEditable: false,
237
+ "aria-hidden": "true",
238
+ "data-vc-nvs": "true",
239
+ "data-extension-overflow-shadow": "start"
240
+ }), jsx("div", {
241
+ contentEditable: false,
242
+ "aria-hidden": "true",
243
+ "data-vc-nvs": "true",
244
+ "data-extension-overflow-shadow": "end"
245
+ })), fg('cc_maui_annotations_on_extensions') && node.type.name === 'extension' && container && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.annotation) && jsx(ExtensionCommentBadge, {
228
246
  api: pluginInjectionApi,
229
247
  node: node,
230
248
  getPos: getPos,
@@ -262,6 +280,7 @@ const Extension = props => {
262
280
  }, props));
263
281
  };
264
282
  const _default_1 = overflowShadow(Extension, {
265
- overflowSelector: '.extension-overflow-wrapper'
283
+ overflowSelector: '.extension-overflow-wrapper',
284
+ isDisabled: () => isExperimentEnabled('platform_editor_reduce_forced_layout_2') && isCssScrollTimelineSupported(globalThis.CSS)
266
285
  });
267
286
  export default _default_1;
@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
13
13
  const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
14
14
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
15
15
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
16
- const packageVersion = "131.0.0";
16
+ const packageVersion = "131.0.1";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007