@atlaskit/editor-common 137.4.0 → 137.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,28 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 137.5.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`144ab5d6b3422`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/144ab5d6b3422) -
8
+ Keep slash-command previews beside their results under the platform_editor_slash_command
9
+ experiment, including in side panels.
10
+
11
+ ## 137.5.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [`5d0e8f810cfd2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5d0e8f810cfd2) -
16
+ Add an optional `getItemRank` resolver to `RegistryElementBrowser`. Under
17
+ `platform_editor_slash_command`, empty-query Element Browser results use the same category ranks
18
+ and host overrides as the inline slash menu.
19
+
20
+ Export `resolveRegisteredItemRank` so both menus can resolve a parent rank using the same rule.
21
+
22
+ ### Patch Changes
23
+
24
+ - Updated dependencies
25
+
3
26
  ## 137.4.0
4
27
 
5
28
  ### Minor Changes
@@ -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 = "137.3.0";
30
+ var packageVersion = "137.5.0";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -16,6 +16,7 @@ var _inline = require("@atlaskit/primitives/compiled/inline");
16
16
  var _text = require("@atlaskit/primitives/compiled/text");
17
17
  var _pressable = require("@atlaskit/primitives/pressable");
18
18
  var _xcss = require("@atlaskit/primitives/xcss/xcss");
19
+ var _RegisteredMenuSurfaceContext = require("../registered-menu/RegisteredMenuSurfaceContext");
19
20
  var _QuickInsertHoverPreview = require("./QuickInsertHoverPreview");
20
21
  var _quickInsertMenuItemUtils = require("./quickInsertMenuItemUtils");
21
22
  var _QuickInsertShortcut = require("./QuickInsertShortcut");
@@ -93,7 +94,7 @@ var disabledItemStyles = (0, _xcss.xcss)({
93
94
  width: '100%'
94
95
  });
95
96
  var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref) {
96
- var _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
97
+ var _surfaceContext$get, _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
97
98
  var ariaLabel = _ref.ariaLabel,
98
99
  ariaControls = _ref['aria-controls'],
99
100
  description = _ref.description,
@@ -116,7 +117,9 @@ var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function C
116
117
  title = _ref.title;
117
118
  var _useQuickInsertContex = (0, _useQuickInsertContext.useQuickInsertContext)(),
118
119
  item = _useQuickInsertContex.item,
119
- popupsMountPoint = _useQuickInsertContex.popupsMountPoint;
120
+ popupsMountPoint = _useQuickInsertContex.popupsMountPoint,
121
+ surfaceContext = _useQuickInsertContex.surfaceContext;
122
+ var surface = surfaceContext === null || surfaceContext === void 0 || (_surfaceContext$get = surfaceContext.get(_RegisteredMenuSurfaceContext.REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.surface;
120
123
  var _ref2 = item !== null && item !== void 0 ? item : {
121
124
  id: undefined,
122
125
  isPreviewActive: undefined,
@@ -192,6 +195,7 @@ var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function C
192
195
  title: title,
193
196
  titleContent: titleContent,
194
197
  icon: previewIcon,
195
- shouldClampText: shouldClampPreview
198
+ shouldClampText: shouldClampPreview,
199
+ useViewportPositioning: surface === 'typeahead'
196
200
  }));
197
201
  };
@@ -58,13 +58,16 @@ var QuickInsertHoverPreview = exports.QuickInsertHoverPreview = function QuickIn
58
58
  _ref$shouldClampText = _ref.shouldClampText,
59
59
  shouldClampText = _ref$shouldClampText === void 0 ? true : _ref$shouldClampText,
60
60
  title = _ref.title,
61
- titleContent = _ref.titleContent;
61
+ titleContent = _ref.titleContent,
62
+ useViewportPositioning = _ref.useViewportPositioning;
62
63
  var hasAccessibleContent = Boolean(description || preview.attribution);
63
64
  var portalTarget = popupsMountPoint !== null && popupsMountPoint !== void 0 ? popupsMountPoint : referenceElement.ownerDocument.body;
64
65
  return /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement(_reactPopper.Popper, {
65
66
  placement: "right-start",
66
- referenceElement: referenceElement,
67
- strategy: popupsMountPoint ? 'absolute' : 'fixed',
67
+ referenceElement: referenceElement
68
+ // A fixed slash preview can flip outside a scrolling panel while staying in its host portal.
69
+ ,
70
+ strategy: useViewportPositioning || !popupsMountPoint ? 'fixed' : 'absolute',
68
71
  modifiers: PREVIEW_MODIFIERS
69
72
  }, function (_ref2) {
70
73
  var ref = _ref2.ref,
@@ -84,7 +87,8 @@ var QuickInsertHoverPreview = exports.QuickInsertHoverPreview = function QuickIn
84
87
  shouldClampText: shouldClampText,
85
88
  title: title,
86
89
  titleContent: titleContent,
87
- update: update
90
+ update: update,
91
+ useViewportPositioning: useViewportPositioning
88
92
  }));
89
93
  }), portalTarget);
90
94
  };
@@ -98,13 +102,14 @@ var QuickInsertPreviewPanel = function QuickInsertPreviewPanel(_ref3) {
98
102
  shouldClampText = _ref3.shouldClampText,
99
103
  title = _ref3.title,
100
104
  titleContent = _ref3.titleContent,
101
- update = _ref3.update;
105
+ update = _ref3.update,
106
+ useViewportPositioning = _ref3.useViewportPositioning;
102
107
  var _useState = (0, _react.useState)(null),
103
108
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
104
109
  panelElement = _useState2[0],
105
110
  setPanelElement = _useState2[1];
106
111
  (0, _react.useLayoutEffect)(function () {
107
- var _ownerDocument$defaul;
112
+ var _ownerDocument$defaul, _ownerDocument$defaul2;
108
113
  void update();
109
114
  var ownerDocument = referenceElement.ownerDocument;
110
115
  var onScroll = function onScroll() {
@@ -115,23 +120,37 @@ var QuickInsertPreviewPanel = function QuickInsertPreviewPanel(_ref3) {
115
120
  listener: onScroll,
116
121
  options: true
117
122
  });
118
- var ResizeObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.ResizeObserver;
119
- if (!panelElement || !ResizeObserverConstructor) {
120
- return unbindScrollListener;
123
+ var MutationObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.MutationObserver;
124
+ var mountPositionObserver;
125
+ if (useViewportPositioning && popupsMountPoint && MutationObserverConstructor) {
126
+ // Panning can move a host mount without firing a scroll or resize event.
127
+ mountPositionObserver = new MutationObserverConstructor(function () {
128
+ return void update();
129
+ });
130
+ mountPositionObserver.observe(popupsMountPoint, {
131
+ attributes: true,
132
+ attributeFilter: ['class', 'style']
133
+ });
121
134
  }
122
- var observer = new ResizeObserverConstructor(function () {
123
- return void update();
124
- });
125
- observer.observe(panelElement);
126
- observer.observe(referenceElement);
127
- if (popupsMountPoint) {
128
- observer.observe(popupsMountPoint);
135
+ var ResizeObserverConstructor = (_ownerDocument$defaul2 = ownerDocument.defaultView) === null || _ownerDocument$defaul2 === void 0 ? void 0 : _ownerDocument$defaul2.ResizeObserver;
136
+ var resizeObserver;
137
+ if (panelElement && ResizeObserverConstructor) {
138
+ resizeObserver = new ResizeObserverConstructor(function () {
139
+ return void update();
140
+ });
141
+ resizeObserver.observe(panelElement);
142
+ resizeObserver.observe(referenceElement);
143
+ if (popupsMountPoint) {
144
+ resizeObserver.observe(popupsMountPoint);
145
+ }
129
146
  }
130
147
  return function () {
148
+ var _resizeObserver, _mountPositionObserve;
131
149
  unbindScrollListener();
132
- observer.disconnect();
150
+ (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || _resizeObserver.disconnect();
151
+ (_mountPositionObserve = mountPositionObserver) === null || _mountPositionObserve === void 0 || _mountPositionObserve.disconnect();
133
152
  };
134
- }, [panelElement, popupsMountPoint, referenceElement, update]);
153
+ }, [panelElement, popupsMountPoint, referenceElement, update, useViewportPositioning]);
135
154
  return /*#__PURE__*/_react.default.createElement("div", {
136
155
  ref: setPanelElement,
137
156
  id: id,
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.applyRegisteredItemRanks = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
+ var _resolveRegisteredItemRank = require("./resolve-registered-item-rank");
9
10
  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; }
10
11
  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; }
11
12
  /** Pure parent-rank override. Return undefined to preserve parent.rank; do not mutate either record. */
@@ -20,13 +21,8 @@ var applyRegisteredItemRanks = exports.applyRegisteredItemRanks = function apply
20
21
  return component;
21
22
  }
22
23
  var parents = component.parents.map(function (parent) {
23
- var _getRegisteredItemRan;
24
- var rank = (_getRegisteredItemRan = getRegisteredItemRank({
25
- component: component,
26
- parent: parent
27
- })) === null || _getRegisteredItemRan === void 0 ? void 0 : _getRegisteredItemRan.rank;
28
24
  return _objectSpread(_objectSpread({}, parent), {}, {
29
- rank: typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank
25
+ rank: (0, _resolveRegisteredItemRank.resolveRegisteredItemRank)(component, parent, getRegisteredItemRank)
30
26
  });
31
27
  });
32
28
  return Object.assign({}, component, {
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.resolveRegisteredItemRank = void 0;
7
+ var resolveRegisteredItemRank = exports.resolveRegisteredItemRank = function resolveRegisteredItemRank(component, parent, getItemRank) {
8
+ var _getItemRank;
9
+ var rank = getItemRank === null || getItemRank === void 0 || (_getItemRank = getItemRank({
10
+ component: component,
11
+ parent: parent
12
+ })) === null || _getItemRank === void 0 ? void 0 : _getItemRank.rank;
13
+ return typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank;
14
+ };
@@ -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 = "137.3.0";
26
+ var packageVersion = "137.5.0";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  // Ignored via go/ees005
@@ -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 = "137.3.0";
16
+ const packageVersion = "137.5.0";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007
@@ -9,6 +9,7 @@ import { Text } from '@atlaskit/primitives/compiled/text';
9
9
  import { Pressable } from '@atlaskit/primitives/pressable';
10
10
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- Compiled primitives do not provide Pressable.
11
11
  import { xcss } from '@atlaskit/primitives/xcss/xcss';
12
+ import { REGISTERED_MENU_SURFACE_CONTEXT } from '../registered-menu/RegisteredMenuSurfaceContext';
12
13
  import { QuickInsertHoverPreview } from './QuickInsertHoverPreview';
13
14
  import { useQuickInsertMenuItemSelection } from './quickInsertMenuItemUtils';
14
15
  import { QuickInsertShortcut } from './QuickInsertShortcut';
@@ -102,11 +103,13 @@ export const CompactQuickInsertMenuItem = ({
102
103
  shouldWrapIcon = true,
103
104
  title
104
105
  }) => {
105
- var _resolvedPreview$attr, _ref, _resolvedPreview$imag, _resolvedPreview$imag2;
106
+ var _surfaceContext$get, _resolvedPreview$attr, _ref, _resolvedPreview$imag, _resolvedPreview$imag2;
106
107
  const {
107
108
  item,
108
- popupsMountPoint
109
+ popupsMountPoint,
110
+ surfaceContext
109
111
  } = useQuickInsertContext();
112
+ const surface = surfaceContext === null || surfaceContext === void 0 ? void 0 : (_surfaceContext$get = surfaceContext.get(REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.surface;
110
113
  const {
111
114
  id,
112
115
  isPreviewActive,
@@ -178,6 +181,7 @@ export const CompactQuickInsertMenuItem = ({
178
181
  title: title,
179
182
  titleContent: titleContent,
180
183
  icon: previewIcon,
181
- shouldClampText: shouldClampPreview
184
+ shouldClampText: shouldClampPreview,
185
+ useViewportPositioning: surface === 'typeahead'
182
186
  }));
183
187
  };
@@ -50,14 +50,17 @@ export const QuickInsertHoverPreview = ({
50
50
  referenceElement,
51
51
  shouldClampText = true,
52
52
  title,
53
- titleContent
53
+ titleContent,
54
+ useViewportPositioning
54
55
  }) => {
55
56
  const hasAccessibleContent = Boolean(description || preview.attribution);
56
57
  const portalTarget = popupsMountPoint !== null && popupsMountPoint !== void 0 ? popupsMountPoint : referenceElement.ownerDocument.body;
57
58
  return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Popper, {
58
59
  placement: "right-start",
59
- referenceElement: referenceElement,
60
- strategy: popupsMountPoint ? 'absolute' : 'fixed',
60
+ referenceElement: referenceElement
61
+ // A fixed slash preview can flip outside a scrolling panel while staying in its host portal.
62
+ ,
63
+ strategy: useViewportPositioning || !popupsMountPoint ? 'fixed' : 'absolute',
61
64
  modifiers: PREVIEW_MODIFIERS
62
65
  }, ({
63
66
  ref,
@@ -77,7 +80,8 @@ export const QuickInsertHoverPreview = ({
77
80
  shouldClampText: shouldClampText,
78
81
  title: title,
79
82
  titleContent: titleContent,
80
- update: update
83
+ update: update,
84
+ useViewportPositioning: useViewportPositioning
81
85
  }))), portalTarget);
82
86
  };
83
87
  const QuickInsertPreviewPanel = ({
@@ -90,11 +94,12 @@ const QuickInsertPreviewPanel = ({
90
94
  shouldClampText,
91
95
  title,
92
96
  titleContent,
93
- update
97
+ update,
98
+ useViewportPositioning
94
99
  }) => {
95
100
  const [panelElement, setPanelElement] = useState(null);
96
101
  useLayoutEffect(() => {
97
- var _ownerDocument$defaul;
102
+ var _ownerDocument$defaul, _ownerDocument$defaul2;
98
103
  void update();
99
104
  const {
100
105
  ownerDocument
@@ -105,21 +110,33 @@ const QuickInsertPreviewPanel = ({
105
110
  listener: onScroll,
106
111
  options: true
107
112
  });
108
- const ResizeObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.ResizeObserver;
109
- if (!panelElement || !ResizeObserverConstructor) {
110
- return unbindScrollListener;
113
+ const MutationObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.MutationObserver;
114
+ let mountPositionObserver;
115
+ if (useViewportPositioning && popupsMountPoint && MutationObserverConstructor) {
116
+ // Panning can move a host mount without firing a scroll or resize event.
117
+ mountPositionObserver = new MutationObserverConstructor(() => void update());
118
+ mountPositionObserver.observe(popupsMountPoint, {
119
+ attributes: true,
120
+ attributeFilter: ['class', 'style']
121
+ });
111
122
  }
112
- const observer = new ResizeObserverConstructor(() => void update());
113
- observer.observe(panelElement);
114
- observer.observe(referenceElement);
115
- if (popupsMountPoint) {
116
- observer.observe(popupsMountPoint);
123
+ const ResizeObserverConstructor = (_ownerDocument$defaul2 = ownerDocument.defaultView) === null || _ownerDocument$defaul2 === void 0 ? void 0 : _ownerDocument$defaul2.ResizeObserver;
124
+ let resizeObserver;
125
+ if (panelElement && ResizeObserverConstructor) {
126
+ resizeObserver = new ResizeObserverConstructor(() => void update());
127
+ resizeObserver.observe(panelElement);
128
+ resizeObserver.observe(referenceElement);
129
+ if (popupsMountPoint) {
130
+ resizeObserver.observe(popupsMountPoint);
131
+ }
117
132
  }
118
133
  return () => {
134
+ var _resizeObserver, _mountPositionObserve;
119
135
  unbindScrollListener();
120
- observer.disconnect();
136
+ (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 ? void 0 : _resizeObserver.disconnect();
137
+ (_mountPositionObserve = mountPositionObserver) === null || _mountPositionObserve === void 0 ? void 0 : _mountPositionObserve.disconnect();
121
138
  };
122
- }, [panelElement, popupsMountPoint, referenceElement, update]);
139
+ }, [panelElement, popupsMountPoint, referenceElement, update, useViewportPositioning]);
123
140
  return /*#__PURE__*/React.createElement("div", {
124
141
  ref: setPanelElement,
125
142
  id: id,
@@ -1,3 +1,5 @@
1
+ import { resolveRegisteredItemRank } from './resolve-registered-item-rank';
2
+
1
3
  /** Pure parent-rank override. Return undefined to preserve parent.rank; do not mutate either record. */
2
4
 
3
5
  /** Applies per-editor parent ranks without changing shared registry records. */
@@ -9,17 +11,10 @@ export const applyRegisteredItemRanks = (components, getRegisteredItemRank) => {
9
11
  if (!component.parents) {
10
12
  return component;
11
13
  }
12
- const parents = component.parents.map(parent => {
13
- var _getRegisteredItemRan;
14
- const rank = (_getRegisteredItemRan = getRegisteredItemRank({
15
- component,
16
- parent
17
- })) === null || _getRegisteredItemRan === void 0 ? void 0 : _getRegisteredItemRan.rank;
18
- return {
19
- ...parent,
20
- rank: typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank
21
- };
22
- });
14
+ const parents = component.parents.map(parent => ({
15
+ ...parent,
16
+ rank: resolveRegisteredItemRank(component, parent, getRegisteredItemRank)
17
+ }));
23
18
  return Object.assign({}, component, {
24
19
  parents
25
20
  });
@@ -0,0 +1,8 @@
1
+ export const resolveRegisteredItemRank = (component, parent, getItemRank) => {
2
+ var _getItemRank;
3
+ const rank = getItemRank === null || getItemRank === void 0 ? void 0 : (_getItemRank = getItemRank({
4
+ component,
5
+ parent
6
+ })) === null || _getItemRank === void 0 ? void 0 : _getItemRank.rank;
7
+ return typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank;
8
+ };
@@ -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 = "137.3.0";
16
+ const packageVersion = "137.5.0";
17
17
  const halfFocusRing = 1;
18
18
  const dropOffset = '0, 8';
19
19
  // Ignored via go/ees005
@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
19
19
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
20
20
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
21
21
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
22
- var packageVersion = "137.3.0";
22
+ var packageVersion = "137.5.0";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -10,6 +10,7 @@ import { Text } from '@atlaskit/primitives/compiled/text';
10
10
  import { Pressable } from '@atlaskit/primitives/pressable';
11
11
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- Compiled primitives do not provide Pressable.
12
12
  import { xcss } from '@atlaskit/primitives/xcss/xcss';
13
+ import { REGISTERED_MENU_SURFACE_CONTEXT } from '../registered-menu/RegisteredMenuSurfaceContext';
13
14
  import { QuickInsertHoverPreview } from './QuickInsertHoverPreview';
14
15
  import { useQuickInsertMenuItemSelection } from './quickInsertMenuItemUtils';
15
16
  import { QuickInsertShortcut } from './QuickInsertShortcut';
@@ -84,7 +85,7 @@ var disabledItemStyles = xcss({
84
85
  width: '100%'
85
86
  });
86
87
  export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref) {
87
- var _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
88
+ var _surfaceContext$get, _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
88
89
  var ariaLabel = _ref.ariaLabel,
89
90
  ariaControls = _ref['aria-controls'],
90
91
  description = _ref.description,
@@ -107,7 +108,9 @@ export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref
107
108
  title = _ref.title;
108
109
  var _useQuickInsertContex = useQuickInsertContext(),
109
110
  item = _useQuickInsertContex.item,
110
- popupsMountPoint = _useQuickInsertContex.popupsMountPoint;
111
+ popupsMountPoint = _useQuickInsertContex.popupsMountPoint,
112
+ surfaceContext = _useQuickInsertContex.surfaceContext;
113
+ var surface = surfaceContext === null || surfaceContext === void 0 || (_surfaceContext$get = surfaceContext.get(REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.surface;
111
114
  var _ref2 = item !== null && item !== void 0 ? item : {
112
115
  id: undefined,
113
116
  isPreviewActive: undefined,
@@ -183,6 +186,7 @@ export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref
183
186
  title: title,
184
187
  titleContent: titleContent,
185
188
  icon: previewIcon,
186
- shouldClampText: shouldClampPreview
189
+ shouldClampText: shouldClampPreview,
190
+ useViewportPositioning: surface === 'typeahead'
187
191
  }));
188
192
  };
@@ -52,13 +52,16 @@ export var QuickInsertHoverPreview = function QuickInsertHoverPreview(_ref) {
52
52
  _ref$shouldClampText = _ref.shouldClampText,
53
53
  shouldClampText = _ref$shouldClampText === void 0 ? true : _ref$shouldClampText,
54
54
  title = _ref.title,
55
- titleContent = _ref.titleContent;
55
+ titleContent = _ref.titleContent,
56
+ useViewportPositioning = _ref.useViewportPositioning;
56
57
  var hasAccessibleContent = Boolean(description || preview.attribution);
57
58
  var portalTarget = popupsMountPoint !== null && popupsMountPoint !== void 0 ? popupsMountPoint : referenceElement.ownerDocument.body;
58
59
  return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Popper, {
59
60
  placement: "right-start",
60
- referenceElement: referenceElement,
61
- strategy: popupsMountPoint ? 'absolute' : 'fixed',
61
+ referenceElement: referenceElement
62
+ // A fixed slash preview can flip outside a scrolling panel while staying in its host portal.
63
+ ,
64
+ strategy: useViewportPositioning || !popupsMountPoint ? 'fixed' : 'absolute',
62
65
  modifiers: PREVIEW_MODIFIERS
63
66
  }, function (_ref2) {
64
67
  var ref = _ref2.ref,
@@ -78,7 +81,8 @@ export var QuickInsertHoverPreview = function QuickInsertHoverPreview(_ref) {
78
81
  shouldClampText: shouldClampText,
79
82
  title: title,
80
83
  titleContent: titleContent,
81
- update: update
84
+ update: update,
85
+ useViewportPositioning: useViewportPositioning
82
86
  }));
83
87
  }), portalTarget);
84
88
  };
@@ -92,13 +96,14 @@ var QuickInsertPreviewPanel = function QuickInsertPreviewPanel(_ref3) {
92
96
  shouldClampText = _ref3.shouldClampText,
93
97
  title = _ref3.title,
94
98
  titleContent = _ref3.titleContent,
95
- update = _ref3.update;
99
+ update = _ref3.update,
100
+ useViewportPositioning = _ref3.useViewportPositioning;
96
101
  var _useState = useState(null),
97
102
  _useState2 = _slicedToArray(_useState, 2),
98
103
  panelElement = _useState2[0],
99
104
  setPanelElement = _useState2[1];
100
105
  useLayoutEffect(function () {
101
- var _ownerDocument$defaul;
106
+ var _ownerDocument$defaul, _ownerDocument$defaul2;
102
107
  void update();
103
108
  var ownerDocument = referenceElement.ownerDocument;
104
109
  var onScroll = function onScroll() {
@@ -109,23 +114,37 @@ var QuickInsertPreviewPanel = function QuickInsertPreviewPanel(_ref3) {
109
114
  listener: onScroll,
110
115
  options: true
111
116
  });
112
- var ResizeObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.ResizeObserver;
113
- if (!panelElement || !ResizeObserverConstructor) {
114
- return unbindScrollListener;
117
+ var MutationObserverConstructor = (_ownerDocument$defaul = ownerDocument.defaultView) === null || _ownerDocument$defaul === void 0 ? void 0 : _ownerDocument$defaul.MutationObserver;
118
+ var mountPositionObserver;
119
+ if (useViewportPositioning && popupsMountPoint && MutationObserverConstructor) {
120
+ // Panning can move a host mount without firing a scroll or resize event.
121
+ mountPositionObserver = new MutationObserverConstructor(function () {
122
+ return void update();
123
+ });
124
+ mountPositionObserver.observe(popupsMountPoint, {
125
+ attributes: true,
126
+ attributeFilter: ['class', 'style']
127
+ });
115
128
  }
116
- var observer = new ResizeObserverConstructor(function () {
117
- return void update();
118
- });
119
- observer.observe(panelElement);
120
- observer.observe(referenceElement);
121
- if (popupsMountPoint) {
122
- observer.observe(popupsMountPoint);
129
+ var ResizeObserverConstructor = (_ownerDocument$defaul2 = ownerDocument.defaultView) === null || _ownerDocument$defaul2 === void 0 ? void 0 : _ownerDocument$defaul2.ResizeObserver;
130
+ var resizeObserver;
131
+ if (panelElement && ResizeObserverConstructor) {
132
+ resizeObserver = new ResizeObserverConstructor(function () {
133
+ return void update();
134
+ });
135
+ resizeObserver.observe(panelElement);
136
+ resizeObserver.observe(referenceElement);
137
+ if (popupsMountPoint) {
138
+ resizeObserver.observe(popupsMountPoint);
139
+ }
123
140
  }
124
141
  return function () {
142
+ var _resizeObserver, _mountPositionObserve;
125
143
  unbindScrollListener();
126
- observer.disconnect();
144
+ (_resizeObserver = resizeObserver) === null || _resizeObserver === void 0 || _resizeObserver.disconnect();
145
+ (_mountPositionObserve = mountPositionObserver) === null || _mountPositionObserve === void 0 || _mountPositionObserve.disconnect();
127
146
  };
128
- }, [panelElement, popupsMountPoint, referenceElement, update]);
147
+ }, [panelElement, popupsMountPoint, referenceElement, update, useViewportPositioning]);
129
148
  return /*#__PURE__*/React.createElement("div", {
130
149
  ref: setPanelElement,
131
150
  id: id,
@@ -1,6 +1,8 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  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; }
3
3
  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) { _defineProperty(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; }
4
+ import { resolveRegisteredItemRank } from './resolve-registered-item-rank';
5
+
4
6
  /** Pure parent-rank override. Return undefined to preserve parent.rank; do not mutate either record. */
5
7
 
6
8
  /** Applies per-editor parent ranks without changing shared registry records. */
@@ -13,13 +15,8 @@ export var applyRegisteredItemRanks = function applyRegisteredItemRanks(componen
13
15
  return component;
14
16
  }
15
17
  var parents = component.parents.map(function (parent) {
16
- var _getRegisteredItemRan;
17
- var rank = (_getRegisteredItemRan = getRegisteredItemRank({
18
- component: component,
19
- parent: parent
20
- })) === null || _getRegisteredItemRan === void 0 ? void 0 : _getRegisteredItemRan.rank;
21
18
  return _objectSpread(_objectSpread({}, parent), {}, {
22
- rank: typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank
19
+ rank: resolveRegisteredItemRank(component, parent, getRegisteredItemRank)
23
20
  });
24
21
  });
25
22
  return Object.assign({}, component, {
@@ -0,0 +1,8 @@
1
+ export var resolveRegisteredItemRank = function resolveRegisteredItemRank(component, parent, getItemRank) {
2
+ var _getItemRank;
3
+ var rank = getItemRank === null || getItemRank === void 0 || (_getItemRank = getItemRank({
4
+ component: component,
5
+ parent: parent
6
+ })) === null || _getItemRank === void 0 ? void 0 : _getItemRank.rank;
7
+ return typeof rank === 'number' && Number.isFinite(rank) ? rank : parent.rank;
8
+ };
@@ -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 = "137.3.0";
23
+ var packageVersion = "137.5.0";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  // Ignored via go/ees005
@@ -71,10 +71,7 @@ type SyncedBlockDeleteSuccessAttributes = SyncedBlockSuccessAttributes & {
71
71
  mechanism?: SyncedBlockDeletionMechanismAttribute;
72
72
  };
73
73
  type FetchSyncedBlockSuccessAttributes = SyncedBlockSuccessAttributes;
74
- /**
75
- * Per-request source-info success attrs. `sourceLocation` is only set for Jira sources
76
- * behind the `platform_editor_blocks_patch_12` experiment.
77
- */
74
+ /** Per-request source-info success attrs. `sourceLocation` is only set for Jira sources. */
78
75
  type SyncedBlockGetSourceInfoSuccessAttributes = SyncedBlockSuccessAttributes & {
79
76
  sourceLocation?: SyncedBlockSourceLocationAttribute;
80
77
  };
@@ -5,7 +5,7 @@
5
5
  import React, { type ReactNode } from 'react';
6
6
  import type { QuickInsertPreview } from './preview';
7
7
  /** The selected item's description and attribution are announced through its aria-describedby. */
8
- export declare const QuickInsertHoverPreview: ({ description, icon, id, preview, popupsMountPoint, referenceElement, shouldClampText, title, titleContent, }: {
8
+ export declare const QuickInsertHoverPreview: ({ description, icon, id, preview, popupsMountPoint, referenceElement, shouldClampText, title, titleContent, useViewportPositioning, }: {
9
9
  description?: string;
10
10
  icon?: ReactNode;
11
11
  id: string;
@@ -16,4 +16,5 @@ export declare const QuickInsertHoverPreview: ({ description, icon, id, preview,
16
16
  title: string;
17
17
  /** Rich content rendered in place of the title. */
18
18
  titleContent?: ReactNode;
19
+ useViewportPositioning: boolean;
19
20
  }) => React.JSX.Element;
@@ -0,0 +1,3 @@
1
+ import type { RegisterComponent, RegisterComponentParent } from '@atlaskit/editor-ui-control-model/types';
2
+ import type { RegisteredItemRankResolver } from './item-rank';
3
+ export declare const resolveRegisteredItemRank: (component: RegisterComponent, parent: RegisterComponentParent, getItemRank?: RegisteredItemRankResolver) => number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "137.4.0",
3
+ "version": "137.5.1",
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/"
@@ -52,7 +52,7 @@
52
52
  "@atlaskit/editor-ui-control-model": "^3.0.0",
53
53
  "@atlaskit/emoji": "^73.7.0",
54
54
  "@atlaskit/feature-gate-js-client": "^8.0.0",
55
- "@atlaskit/icon": "^38.1.0",
55
+ "@atlaskit/icon": "^38.2.0",
56
56
  "@atlaskit/link": "^5.1.0",
57
57
  "@atlaskit/link-datasource": "^7.15.0",
58
58
  "@atlaskit/link-picker": "^6.22.0",
@@ -132,7 +132,7 @@
132
132
  "@atlassian/experiment-test-utils": "^0.2.0",
133
133
  "@atlassian/feature-flags-test-utils": "^2.0.0",
134
134
  "@atlassian/testing-library": "^0.12.0",
135
- "@react-loosely-lazy/manifest": "^1.0.0",
135
+ "@react-loosely-lazy/manifest": "^1.2.1",
136
136
  "@testing-library/dom": "^10.1.0",
137
137
  "@testing-library/jest-dom": "^6.4.5",
138
138
  "@testing-library/react": "^16.3.0",
@@ -0,0 +1,10 @@
1
+ {
2
+ "name": "@atlaskit/editor-common/registered-menu/resolve-item-rank",
3
+ "main": "../../dist/cjs/registered-menu/resolve-registered-item-rank.js",
4
+ "module": "../../dist/esm/registered-menu/resolve-registered-item-rank.js",
5
+ "module:es2019": "../../dist/es2019/registered-menu/resolve-registered-item-rank.js",
6
+ "sideEffects": [
7
+ "**/*.compiled.css"
8
+ ],
9
+ "types": "../../dist/types/registered-menu/resolve-registered-item-rank.d.ts"
10
+ }