@atlaskit/editor-common 134.1.2 → 134.2.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 (28) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/dist/cjs/extensions/default-extension-provider.js +16 -3
  3. package/dist/cjs/monitoring/error.js +1 -1
  4. package/dist/cjs/registered-menu/RegisteredMenuList.js +9 -4
  5. package/dist/cjs/registered-menu/useRegisteredMenu.js +6 -3
  6. package/dist/cjs/registered-menu/useRegisteredMenuSelection.js +23 -6
  7. package/dist/cjs/ui/DropList/index.js +1 -1
  8. package/dist/cjs/ui/Layer/index.js +14 -1
  9. package/dist/es2019/extensions/default-extension-provider.js +13 -1
  10. package/dist/es2019/monitoring/error.js +1 -1
  11. package/dist/es2019/registered-menu/RegisteredMenuList.js +8 -4
  12. package/dist/es2019/registered-menu/useRegisteredMenu.js +6 -3
  13. package/dist/es2019/registered-menu/useRegisteredMenuSelection.js +20 -6
  14. package/dist/es2019/ui/DropList/index.js +1 -1
  15. package/dist/es2019/ui/Layer/index.js +13 -0
  16. package/dist/esm/extensions/default-extension-provider.js +16 -3
  17. package/dist/esm/monitoring/error.js +1 -1
  18. package/dist/esm/registered-menu/RegisteredMenuList.js +9 -4
  19. package/dist/esm/registered-menu/useRegisteredMenu.js +6 -3
  20. package/dist/esm/registered-menu/useRegisteredMenuSelection.js +23 -6
  21. package/dist/esm/ui/DropList/index.js +1 -1
  22. package/dist/esm/ui/Layer/index.js +14 -1
  23. package/dist/types/extensions/default-extension-provider.d.ts +5 -0
  24. package/dist/types/registered-menu/RegisteredMenuList.d.ts +4 -2
  25. package/dist/types/registered-menu/types.d.ts +3 -1
  26. package/dist/types/registered-menu/useRegisteredMenu.d.ts +4 -2
  27. package/dist/types/registered-menu/useRegisteredMenuSelection.d.ts +6 -1
  28. package/package.json +9 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,35 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 134.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`b199ccfabf69b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b199ccfabf69b) -
8
+ EDITOR-9784: Under the platform_editor_slash_command experiment, hovering a registered menu item,
9
+ such as in the slash command menu, no longer scrolls a partially clipped item into view.
10
+ useRegisteredMenu now returns selectionSource ('keyboard' or 'pointer', exported as
11
+ RegisteredMenuSelectionSource from @atlaskit/editor-common/registered-menu), and
12
+ RegisteredMenuList accepts a selectionSource prop and only scrolls keyboard selections into view.
13
+ - [`6dfebc2196fe9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6dfebc2196fe9) -
14
+ Update i18n NPM package versions for editor,editor-extensions,activity-platform,media,elements
15
+ (Group 3)
16
+ - [`4fad2b7cfe580`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4fad2b7cfe580) -
17
+ Behind platform_editor_preloaded_extension_not_found,
18
+ DefaultExtensionProvider.getPreloadedExtension returns undefined for extensions that are not
19
+ preloaded instead of throwing during render
20
+
21
+ ### Patch Changes
22
+
23
+ - Updated dependencies
24
+
25
+ ## 134.1.3
26
+
27
+ ### Patch Changes
28
+
29
+ - [`96fcf7d06fe72`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/96fcf7d06fe72) -
30
+ Fixed `Layer` not calling `onPositioned` when the top layer is on.
31
+ - Updated dependencies
32
+
3
33
  ## 134.1.2
4
34
 
5
35
  ### Patch Changes
@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
12
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
13
14
  var _getAutoConvertPatternsFromModule = require("./getAutoConvertPatternsFromModule");
14
15
  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; } } }; }
15
16
  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; } }
@@ -76,9 +77,16 @@ var DefaultExtensionProvider = exports.default = /*#__PURE__*/function () {
76
77
  }
77
78
  return preload;
78
79
  }()
80
+ /**
81
+ * Synchronously returns an extension from the manifests loaded by `preload`. Returns undefined when
82
+ * the extension is not preloaded, so callers can fall back to the asynchronous `getExtension`.
83
+ */
79
84
  }, {
80
85
  key: "getPreloadedExtension",
81
86
  value: function getPreloadedExtension(type, key) {
87
+ if ((0, _fg.fg)('platform_editor_preloaded_extension_not_found')) {
88
+ return this.findExtensionInManifests(this.manifestsCache, type, key);
89
+ }
82
90
  if (!this.manifestsCache) {
83
91
  return;
84
92
  }
@@ -109,11 +117,16 @@ var DefaultExtensionProvider = exports.default = /*#__PURE__*/function () {
109
117
  return getExtension;
110
118
  }()
111
119
  }, {
112
- key: "getExtensionFromManifest",
113
- value: function getExtensionFromManifest(manifests, type, key) {
114
- var extension = manifests.find(function (manifest) {
120
+ key: "findExtensionInManifests",
121
+ value: function findExtensionInManifests(manifests, type, key) {
122
+ return manifests.find(function (manifest) {
115
123
  return manifest.type === type && manifest.key === key;
116
124
  });
125
+ }
126
+ }, {
127
+ key: "getExtensionFromManifest",
128
+ value: function getExtensionFromManifest(manifests, type, key) {
129
+ var extension = this.findExtensionInManifests(manifests, type, key);
117
130
  if (!extension) {
118
131
  throw new Error("Extension with type \"".concat(type, "\" and key \"").concat(key, "\" not found!"));
119
132
  }
@@ -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 = "134.1.1";
30
+ var packageVersion = "134.1.3";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -47,7 +47,9 @@ var RegisteredMenuList = exports.RegisteredMenuList = function RegisteredMenuLis
47
47
  _ref$lastRowPadding = _ref.lastRowPadding,
48
48
  lastRowPadding = _ref$lastRowPadding === void 0 ? 'none' : _ref$lastRowPadding,
49
49
  _ref$scrollTo = _ref.scrollTo,
50
- scrollTo = _ref$scrollTo === void 0 ? 'selected' : _ref$scrollTo;
50
+ scrollTo = _ref$scrollTo === void 0 ? 'selected' : _ref$scrollTo,
51
+ _ref$selectionSource = _ref.selectionSource,
52
+ selectionSource = _ref$selectionSource === void 0 ? 'keyboard' : _ref$selectionSource;
51
53
  var listRef = (0, _react.useRef)(null);
52
54
  var cache = (0, _react.useMemo)(function () {
53
55
  return new _CellMeasurer.CellMeasurerCache({
@@ -101,6 +103,9 @@ var RegisteredMenuList = exports.RegisteredMenuList = function RegisteredMenuLis
101
103
  cache.clearAll();
102
104
  (_listRef$current = listRef.current) === null || _listRef$current === void 0 || _listRef$current.recomputeRowHeights();
103
105
  }, [cache, rowKeySignature]);
106
+
107
+ // Only keyboard selections scroll into view; pointer selections leave the scroll position alone.
108
+ var scrollToSelectedItem = selectionSource === 'keyboard';
104
109
  var previousResetKeyRef = (0, _react.useRef)(scrollResetKey);
105
110
  (0, _react.useLayoutEffect)(function () {
106
111
  if (scrollTo === 'top-on-reset' && previousResetKeyRef.current !== scrollResetKey) {
@@ -110,11 +115,11 @@ var RegisteredMenuList = exports.RegisteredMenuList = function RegisteredMenuLis
110
115
  return;
111
116
  }
112
117
  previousResetKeyRef.current = scrollResetKey;
113
- if (selectedRowIndex >= 0) {
118
+ if (scrollToSelectedItem && selectedRowIndex >= 0) {
114
119
  var _listRef$current3;
115
120
  (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 || _listRef$current3.scrollToRow(selectedRowIndex);
116
121
  }
117
- }, [scrollResetKey, rowKeySignature, scrollTo, selectedRowIndex]);
122
+ }, [scrollResetKey, rowKeySignature, scrollTo, scrollToSelectedItem, selectedRowIndex]);
118
123
  var handleRowsRendered = (0, _react.useCallback)(function (_ref3) {
119
124
  var _indexes$, _indexes;
120
125
  var overscanStartIndex = _ref3.overscanStartIndex,
@@ -217,7 +222,7 @@ var RegisteredMenuList = exports.RegisteredMenuList = function RegisteredMenuLis
217
222
  rowHeight: cache.rowHeight,
218
223
  rowRenderer: renderRow,
219
224
  scrollToAlignment: "auto",
220
- scrollToIndex: scrollTo === 'selected' ? selectedRowIndex : undefined,
225
+ scrollToIndex: scrollTo === 'selected' && scrollToSelectedItem ? selectedRowIndex : undefined,
221
226
  tabIndex: tabIndex,
222
227
  width: width
223
228
  }));
@@ -70,6 +70,7 @@ var useRegisteredMenu = exports.useRegisteredMenu = function useRegisteredMenu(_
70
70
  resetKey: resetKey
71
71
  });
72
72
  var selectedItemIndex = selection.selectedIndex,
73
+ selectionSource = selection.selectionSource,
73
74
  select = selection.select;
74
75
  var _useState = (0, _react.useState)(),
75
76
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -95,7 +96,7 @@ var useRegisteredMenu = exports.useRegisteredMenu = function useRegisteredMenu(_
95
96
  activateKeyboardItem(selection.selectPrevious());
96
97
  }, [selection.selectPrevious, activateKeyboardItem]);
97
98
  var onItemHover = (0, _react.useCallback)(function (index, itemKey) {
98
- select(index);
99
+ select(index, 'pointer');
99
100
  setItemActivation(function (current) {
100
101
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey && current.source === 'pointer') {
101
102
  return current;
@@ -109,7 +110,8 @@ var useRegisteredMenu = exports.useRegisteredMenu = function useRegisteredMenu(_
109
110
  });
110
111
  }, [model, resetKey, select]);
111
112
  var onItemFocus = (0, _react.useCallback)(function (index, itemKey) {
112
- select(index);
113
+ // A press focuses the item the pointer already selected. Scrolling it then would move it before the click lands.
114
+ select(index, index === selectedItemIndex && selectionSource === 'pointer' ? 'pointer' : 'keyboard');
113
115
  setItemActivation(function (current) {
114
116
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey) {
115
117
  return current;
@@ -121,7 +123,7 @@ var useRegisteredMenu = exports.useRegisteredMenu = function useRegisteredMenu(_
121
123
  source: 'keyboard'
122
124
  } : undefined;
123
125
  });
124
- }, [model, resetKey, select]);
126
+ }, [model, resetKey, select, selectedItemIndex, selectionSource]);
125
127
  var onItemLeave = (0, _react.useCallback)(function (itemKey) {
126
128
  setItemActivation(function (current) {
127
129
  return (current === null || current === void 0 ? void 0 : current.source) === 'pointer' && current.itemKey === itemKey ? undefined : current;
@@ -143,6 +145,7 @@ var useRegisteredMenu = exports.useRegisteredMenu = function useRegisteredMenu(_
143
145
  rows: rows,
144
146
  selectableItems: selectableItems,
145
147
  selectedItemIndex: selectedItemIndex,
148
+ selectionSource: selectionSource,
146
149
  select: select,
147
150
  selectNext: selectNext,
148
151
  selectPrevious: selectPrevious,
@@ -12,6 +12,9 @@ var _reconcileRegisteredMenuSelection = require("./reconcileRegisteredMenuSelect
12
12
  * Keeps selection on the same item as items reorder. If that item disappears,
13
13
  * keeps the previous index within the remaining items. A changed reset key
14
14
  * selects the first item instead.
15
+ * Tracks whether the keyboard or the pointer made the current selection, so callers
16
+ * can scroll only keyboard selections into view. Reconciling a reorder keeps the
17
+ * current source; a reset counts as a keyboard selection.
15
18
  */
16
19
  var useRegisteredMenuSelection = exports.useRegisteredMenuSelection = function useRegisteredMenuSelection(_ref) {
17
20
  var identities = _ref.identities,
@@ -22,15 +25,20 @@ var useRegisteredMenuSelection = exports.useRegisteredMenuSelection = function u
22
25
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
23
26
  selectedIndex = _useState2[0],
24
27
  setSelectedIndex = _useState2[1];
28
+ var _useState3 = (0, _react.useState)('keyboard'),
29
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
30
+ selectionSource = _useState4[0],
31
+ setSelectionSource = _useState4[1];
25
32
  var selectedIndexRef = (0, _react.useRef)(selectedIndex);
26
33
  var previousRef = (0, _react.useRef)({
27
34
  identities: identities,
28
35
  resetKey: resetKey
29
36
  });
30
37
  var itemCount = identities.length;
31
- var select = (0, _react.useCallback)(function (index) {
38
+ var select = (0, _react.useCallback)(function (index, source) {
32
39
  selectedIndexRef.current = index;
33
40
  setSelectedIndex(index);
41
+ setSelectionSource(source);
34
42
  }, []);
35
43
  (0, _react.useLayoutEffect)(function () {
36
44
  var previous = previousRef.current;
@@ -38,27 +46,36 @@ var useRegisteredMenuSelection = exports.useRegisteredMenuSelection = function u
38
46
  identities: identities,
39
47
  resetKey: resetKey
40
48
  };
41
- select((0, _reconcileRegisteredMenuSelection.reconcileRegisteredMenuSelection)({
49
+ var reset = previous.resetKey !== resetKey;
50
+ var index = (0, _reconcileRegisteredMenuSelection.reconcileRegisteredMenuSelection)({
42
51
  nextIdentities: identities,
43
52
  previousIdentities: previous.identities,
44
53
  previousIndex: selectedIndexRef.current,
45
- reset: previous.resetKey !== resetKey
46
- }));
54
+ reset: reset
55
+ });
56
+ if (reset) {
57
+ select(index, 'keyboard');
58
+ return;
59
+ }
60
+ // The same item stays selected, so keep its source: a reorder under the pointer must not scroll.
61
+ selectedIndexRef.current = index;
62
+ setSelectedIndex(index);
47
63
  }, [identities, resetKey, select]);
48
64
  var selectNext = (0, _react.useCallback)(function () {
49
65
  var currentIndex = selectedIndexRef.current;
50
66
  var nextIndex = itemCount === 0 ? -1 : currentIndex < 0 ? 0 : (currentIndex + 1) % itemCount;
51
- select(nextIndex);
67
+ select(nextIndex, 'keyboard');
52
68
  return nextIndex;
53
69
  }, [itemCount, select]);
54
70
  var selectPrevious = (0, _react.useCallback)(function () {
55
71
  var currentIndex = selectedIndexRef.current;
56
72
  var previousIndex = itemCount === 0 ? -1 : currentIndex <= 0 ? itemCount - 1 : currentIndex - 1;
57
- select(previousIndex);
73
+ select(previousIndex, 'keyboard');
58
74
  return previousIndex;
59
75
  }, [itemCount, select]);
60
76
  return {
61
77
  selectedIndex: selectedIndex,
78
+ selectionSource: selectionSource,
62
79
  select: select,
63
80
  selectNext: selectNext,
64
81
  selectPrevious: selectPrevious
@@ -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 = "134.1.1";
26
+ var packageVersion = "134.1.3";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  // Ignored via go/ees005
@@ -236,12 +236,23 @@ var popperInteropModifiers = [{
236
236
  enabled: false
237
237
  }];
238
238
  function usePopperInteropModifiers(_ref2) {
239
- var onPositioned = _ref2.onPositioned;
239
+ var isContentShown = _ref2.isContentShown,
240
+ onPositioned = _ref2.onPositioned;
240
241
  var onPositionedRef = (0, _react.useRef)(onPositioned);
241
242
  var hasPositionedRef = (0, _react.useRef)(false);
242
243
  (0, _react.useLayoutEffect)(function () {
243
244
  onPositionedRef.current = onPositioned;
244
245
  }, [onPositioned]);
246
+
247
+ // On the top-layer path `@atlaskit/popper` ignores `modifiers`: CSS Anchor Positioning places
248
+ // the content when it mounts. So report the first position once the content is shown.
249
+ (0, _react.useLayoutEffect)(function () {
250
+ if (!(0, _fg.fg)('platform-dst-top-layer') || !isContentShown || hasPositionedRef.current) {
251
+ return;
252
+ }
253
+ hasPositionedRef.current = true;
254
+ onPositionedRef.current();
255
+ }, [isContentShown]);
245
256
  return (0, _react.useMemo)(function () {
246
257
  return [].concat(popperInteropModifiers, [{
247
258
  name: 'editorLayerFirstPositioned',
@@ -270,7 +281,9 @@ function PopperInterop(_ref3) {
270
281
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
271
282
  referenceElement = _useState2[0],
272
283
  setReferenceElement = _useState2[1];
284
+ var isContentShown = Boolean(content && referenceElement);
273
285
  var modifiers = usePopperInteropModifiers({
286
+ isContentShown: isContentShown,
274
287
  onPositioned: onPositioned
275
288
  });
276
289
  // Popper v2 compares the offset prop by reference, so memoise to avoid re-running positioning every render.
@@ -1,4 +1,5 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
2
3
  import { getAutoConvertPatternsFromModule } from './getAutoConvertPatternsFromModule';
3
4
  export default class DefaultExtensionProvider {
4
5
  constructor(manifests,
@@ -31,7 +32,15 @@ export default class DefaultExtensionProvider {
31
32
  }
32
33
  await Promise.allSettled(preloadCalls);
33
34
  }
35
+
36
+ /**
37
+ * Synchronously returns an extension from the manifests loaded by `preload`. Returns undefined when
38
+ * the extension is not preloaded, so callers can fall back to the asynchronous `getExtension`.
39
+ */
34
40
  getPreloadedExtension(type, key) {
41
+ if (fg('platform_editor_preloaded_extension_not_found')) {
42
+ return this.findExtensionInManifests(this.manifestsCache, type, key);
43
+ }
35
44
  if (!this.manifestsCache) {
36
45
  return;
37
46
  }
@@ -40,8 +49,11 @@ export default class DefaultExtensionProvider {
40
49
  async getExtension(type, key) {
41
50
  return this.getExtensionFromManifest(await this.manifestsPromise, type, key);
42
51
  }
52
+ findExtensionInManifests(manifests, type, key) {
53
+ return manifests.find(manifest => manifest.type === type && manifest.key === key);
54
+ }
43
55
  getExtensionFromManifest(manifests, type, key) {
44
- const extension = manifests.find(manifest => manifest.type === type && manifest.key === key);
56
+ const extension = this.findExtensionInManifests(manifests, type, key);
45
57
  if (!extension) {
46
58
  throw new Error(`Extension with type "${type}" and key "${key}" not found!`);
47
59
  }
@@ -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 = "134.1.1";
16
+ const packageVersion = "134.1.3";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007
@@ -27,7 +27,8 @@ export const RegisteredMenuList = ({
27
27
  omitAriaReadonly = false,
28
28
  hasScrollPadding = false,
29
29
  lastRowPadding = 'none',
30
- scrollTo = 'selected'
30
+ scrollTo = 'selected',
31
+ selectionSource = 'keyboard'
31
32
  }) => {
32
33
  const listRef = useRef(null);
33
34
  const cache = useMemo(() => new CellMeasurerCache({
@@ -67,6 +68,9 @@ export const RegisteredMenuList = ({
67
68
  cache.clearAll();
68
69
  (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : _listRef$current.recomputeRowHeights();
69
70
  }, [cache, rowKeySignature]);
71
+
72
+ // Only keyboard selections scroll into view; pointer selections leave the scroll position alone.
73
+ const scrollToSelectedItem = selectionSource === 'keyboard';
70
74
  const previousResetKeyRef = useRef(scrollResetKey);
71
75
  useLayoutEffect(() => {
72
76
  if (scrollTo === 'top-on-reset' && previousResetKeyRef.current !== scrollResetKey) {
@@ -76,11 +80,11 @@ export const RegisteredMenuList = ({
76
80
  return;
77
81
  }
78
82
  previousResetKeyRef.current = scrollResetKey;
79
- if (selectedRowIndex >= 0) {
83
+ if (scrollToSelectedItem && selectedRowIndex >= 0) {
80
84
  var _listRef$current3;
81
85
  (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : _listRef$current3.scrollToRow(selectedRowIndex);
82
86
  }
83
- }, [scrollResetKey, rowKeySignature, scrollTo, selectedRowIndex]);
87
+ }, [scrollResetKey, rowKeySignature, scrollTo, scrollToSelectedItem, selectedRowIndex]);
84
88
  const handleRowsRendered = useCallback(({
85
89
  overscanStartIndex,
86
90
  overscanStopIndex,
@@ -170,7 +174,7 @@ export const RegisteredMenuList = ({
170
174
  rowHeight: cache.rowHeight,
171
175
  rowRenderer: renderRow,
172
176
  scrollToAlignment: "auto",
173
- scrollToIndex: scrollTo === 'selected' ? selectedRowIndex : undefined,
177
+ scrollToIndex: scrollTo === 'selected' && scrollToSelectedItem ? selectedRowIndex : undefined,
174
178
  tabIndex: tabIndex,
175
179
  width: width
176
180
  }));
@@ -54,6 +54,7 @@ export const useRegisteredMenu = ({
54
54
  });
55
55
  const {
56
56
  selectedIndex: selectedItemIndex,
57
+ selectionSource,
57
58
  select
58
59
  } = selection;
59
60
  const [activation, setItemActivation] = useState();
@@ -77,7 +78,7 @@ export const useRegisteredMenu = ({
77
78
  activateKeyboardItem(selection.selectPrevious());
78
79
  }, [selection.selectPrevious, activateKeyboardItem]);
79
80
  const onItemHover = useCallback((index, itemKey) => {
80
- select(index);
81
+ select(index, 'pointer');
81
82
  setItemActivation(current => {
82
83
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey && current.source === 'pointer') {
83
84
  return current;
@@ -91,7 +92,8 @@ export const useRegisteredMenu = ({
91
92
  });
92
93
  }, [model, resetKey, select]);
93
94
  const onItemFocus = useCallback((index, itemKey) => {
94
- select(index);
95
+ // A press focuses the item the pointer already selected. Scrolling it then would move it before the click lands.
96
+ select(index, index === selectedItemIndex && selectionSource === 'pointer' ? 'pointer' : 'keyboard');
95
97
  setItemActivation(current => {
96
98
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey) {
97
99
  return current;
@@ -103,7 +105,7 @@ export const useRegisteredMenu = ({
103
105
  source: 'keyboard'
104
106
  } : undefined;
105
107
  });
106
- }, [model, resetKey, select]);
108
+ }, [model, resetKey, select, selectedItemIndex, selectionSource]);
107
109
  const onItemLeave = useCallback(itemKey => {
108
110
  setItemActivation(current => (current === null || current === void 0 ? void 0 : current.source) === 'pointer' && current.itemKey === itemKey ? undefined : current);
109
111
  }, []);
@@ -119,6 +121,7 @@ export const useRegisteredMenu = ({
119
121
  rows,
120
122
  selectableItems,
121
123
  selectedItemIndex,
124
+ selectionSource,
122
125
  select,
123
126
  selectNext,
124
127
  selectPrevious,
@@ -4,21 +4,26 @@ import { reconcileRegisteredMenuSelection } from './reconcileRegisteredMenuSelec
4
4
  * Keeps selection on the same item as items reorder. If that item disappears,
5
5
  * keeps the previous index within the remaining items. A changed reset key
6
6
  * selects the first item instead.
7
+ * Tracks whether the keyboard or the pointer made the current selection, so callers
8
+ * can scroll only keyboard selections into view. Reconciling a reorder keeps the
9
+ * current source; a reset counts as a keyboard selection.
7
10
  */
8
11
  export const useRegisteredMenuSelection = ({
9
12
  identities,
10
13
  resetKey
11
14
  }) => {
12
15
  const [selectedIndex, setSelectedIndex] = useState(() => identities.length > 0 ? 0 : -1);
16
+ const [selectionSource, setSelectionSource] = useState('keyboard');
13
17
  const selectedIndexRef = useRef(selectedIndex);
14
18
  const previousRef = useRef({
15
19
  identities,
16
20
  resetKey
17
21
  });
18
22
  const itemCount = identities.length;
19
- const select = useCallback(index => {
23
+ const select = useCallback((index, source) => {
20
24
  selectedIndexRef.current = index;
21
25
  setSelectedIndex(index);
26
+ setSelectionSource(source);
22
27
  }, []);
23
28
  useLayoutEffect(() => {
24
29
  const previous = previousRef.current;
@@ -26,27 +31,36 @@ export const useRegisteredMenuSelection = ({
26
31
  identities,
27
32
  resetKey
28
33
  };
29
- select(reconcileRegisteredMenuSelection({
34
+ const reset = previous.resetKey !== resetKey;
35
+ const index = reconcileRegisteredMenuSelection({
30
36
  nextIdentities: identities,
31
37
  previousIdentities: previous.identities,
32
38
  previousIndex: selectedIndexRef.current,
33
- reset: previous.resetKey !== resetKey
34
- }));
39
+ reset
40
+ });
41
+ if (reset) {
42
+ select(index, 'keyboard');
43
+ return;
44
+ }
45
+ // The same item stays selected, so keep its source: a reorder under the pointer must not scroll.
46
+ selectedIndexRef.current = index;
47
+ setSelectedIndex(index);
35
48
  }, [identities, resetKey, select]);
36
49
  const selectNext = useCallback(() => {
37
50
  const currentIndex = selectedIndexRef.current;
38
51
  const nextIndex = itemCount === 0 ? -1 : currentIndex < 0 ? 0 : (currentIndex + 1) % itemCount;
39
- select(nextIndex);
52
+ select(nextIndex, 'keyboard');
40
53
  return nextIndex;
41
54
  }, [itemCount, select]);
42
55
  const selectPrevious = useCallback(() => {
43
56
  const currentIndex = selectedIndexRef.current;
44
57
  const previousIndex = itemCount === 0 ? -1 : currentIndex <= 0 ? itemCount - 1 : currentIndex - 1;
45
- select(previousIndex);
58
+ select(previousIndex, 'keyboard');
46
59
  return previousIndex;
47
60
  }, [itemCount, select]);
48
61
  return {
49
62
  selectedIndex,
63
+ selectionSource,
50
64
  select,
51
65
  selectNext,
52
66
  selectPrevious
@@ -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 = "134.1.1";
16
+ const packageVersion = "134.1.3";
17
17
  const halfFocusRing = 1;
18
18
  const dropOffset = '0, 8';
19
19
  // Ignored via go/ees005
@@ -206,6 +206,7 @@ const popperInteropModifiers = [{
206
206
  enabled: false
207
207
  }];
208
208
  function usePopperInteropModifiers({
209
+ isContentShown,
209
210
  onPositioned
210
211
  }) {
211
212
  const onPositionedRef = useRef(onPositioned);
@@ -213,6 +214,16 @@ function usePopperInteropModifiers({
213
214
  useLayoutEffect(() => {
214
215
  onPositionedRef.current = onPositioned;
215
216
  }, [onPositioned]);
217
+
218
+ // On the top-layer path `@atlaskit/popper` ignores `modifiers`: CSS Anchor Positioning places
219
+ // the content when it mounts. So report the first position once the content is shown.
220
+ useLayoutEffect(() => {
221
+ if (!fg('platform-dst-top-layer') || !isContentShown || hasPositionedRef.current) {
222
+ return;
223
+ }
224
+ hasPositionedRef.current = true;
225
+ onPositionedRef.current();
226
+ }, [isContentShown]);
216
227
  return useMemo(() => [...popperInteropModifiers, {
217
228
  name: 'editorLayerFirstPositioned',
218
229
  enabled: true,
@@ -237,7 +248,9 @@ function PopperInterop({
237
248
  }) {
238
249
  const targetRef = useRef(null);
239
250
  const [referenceElement, setReferenceElement] = useState(null);
251
+ const isContentShown = Boolean(content && referenceElement);
240
252
  const modifiers = usePopperInteropModifiers({
253
+ isContentShown,
241
254
  onPositioned
242
255
  });
243
256
  // Popper v2 compares the offset prop by reference, so memoise to avoid re-running positioning every render.
@@ -6,6 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
6
6
  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; } } }; }
7
7
  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; } }
8
8
  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; }
9
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
9
10
  import { getAutoConvertPatternsFromModule } from './getAutoConvertPatternsFromModule';
10
11
  var DefaultExtensionProvider = /*#__PURE__*/function () {
11
12
  function DefaultExtensionProvider(manifests,
@@ -69,9 +70,16 @@ var DefaultExtensionProvider = /*#__PURE__*/function () {
69
70
  }
70
71
  return preload;
71
72
  }()
73
+ /**
74
+ * Synchronously returns an extension from the manifests loaded by `preload`. Returns undefined when
75
+ * the extension is not preloaded, so callers can fall back to the asynchronous `getExtension`.
76
+ */
72
77
  }, {
73
78
  key: "getPreloadedExtension",
74
79
  value: function getPreloadedExtension(type, key) {
80
+ if (fg('platform_editor_preloaded_extension_not_found')) {
81
+ return this.findExtensionInManifests(this.manifestsCache, type, key);
82
+ }
75
83
  if (!this.manifestsCache) {
76
84
  return;
77
85
  }
@@ -102,11 +110,16 @@ var DefaultExtensionProvider = /*#__PURE__*/function () {
102
110
  return getExtension;
103
111
  }()
104
112
  }, {
105
- key: "getExtensionFromManifest",
106
- value: function getExtensionFromManifest(manifests, type, key) {
107
- var extension = manifests.find(function (manifest) {
113
+ key: "findExtensionInManifests",
114
+ value: function findExtensionInManifests(manifests, type, key) {
115
+ return manifests.find(function (manifest) {
108
116
  return manifest.type === type && manifest.key === key;
109
117
  });
118
+ }
119
+ }, {
120
+ key: "getExtensionFromManifest",
121
+ value: function getExtensionFromManifest(manifests, type, key) {
122
+ var extension = this.findExtensionInManifests(manifests, type, key);
110
123
  if (!extension) {
111
124
  throw new Error("Extension with type \"".concat(type, "\" and key \"").concat(key, "\" not found!"));
112
125
  }
@@ -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 = "134.1.1";
22
+ var packageVersion = "134.1.3";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -38,7 +38,9 @@ export var RegisteredMenuList = function RegisteredMenuList(_ref) {
38
38
  _ref$lastRowPadding = _ref.lastRowPadding,
39
39
  lastRowPadding = _ref$lastRowPadding === void 0 ? 'none' : _ref$lastRowPadding,
40
40
  _ref$scrollTo = _ref.scrollTo,
41
- scrollTo = _ref$scrollTo === void 0 ? 'selected' : _ref$scrollTo;
41
+ scrollTo = _ref$scrollTo === void 0 ? 'selected' : _ref$scrollTo,
42
+ _ref$selectionSource = _ref.selectionSource,
43
+ selectionSource = _ref$selectionSource === void 0 ? 'keyboard' : _ref$selectionSource;
42
44
  var listRef = useRef(null);
43
45
  var cache = useMemo(function () {
44
46
  return new CellMeasurerCache({
@@ -92,6 +94,9 @@ export var RegisteredMenuList = function RegisteredMenuList(_ref) {
92
94
  cache.clearAll();
93
95
  (_listRef$current = listRef.current) === null || _listRef$current === void 0 || _listRef$current.recomputeRowHeights();
94
96
  }, [cache, rowKeySignature]);
97
+
98
+ // Only keyboard selections scroll into view; pointer selections leave the scroll position alone.
99
+ var scrollToSelectedItem = selectionSource === 'keyboard';
95
100
  var previousResetKeyRef = useRef(scrollResetKey);
96
101
  useLayoutEffect(function () {
97
102
  if (scrollTo === 'top-on-reset' && previousResetKeyRef.current !== scrollResetKey) {
@@ -101,11 +106,11 @@ export var RegisteredMenuList = function RegisteredMenuList(_ref) {
101
106
  return;
102
107
  }
103
108
  previousResetKeyRef.current = scrollResetKey;
104
- if (selectedRowIndex >= 0) {
109
+ if (scrollToSelectedItem && selectedRowIndex >= 0) {
105
110
  var _listRef$current3;
106
111
  (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 || _listRef$current3.scrollToRow(selectedRowIndex);
107
112
  }
108
- }, [scrollResetKey, rowKeySignature, scrollTo, selectedRowIndex]);
113
+ }, [scrollResetKey, rowKeySignature, scrollTo, scrollToSelectedItem, selectedRowIndex]);
109
114
  var handleRowsRendered = useCallback(function (_ref3) {
110
115
  var _indexes$, _indexes;
111
116
  var overscanStartIndex = _ref3.overscanStartIndex,
@@ -208,7 +213,7 @@ export var RegisteredMenuList = function RegisteredMenuList(_ref) {
208
213
  rowHeight: cache.rowHeight,
209
214
  rowRenderer: renderRow,
210
215
  scrollToAlignment: "auto",
211
- scrollToIndex: scrollTo === 'selected' ? selectedRowIndex : undefined,
216
+ scrollToIndex: scrollTo === 'selected' && scrollToSelectedItem ? selectedRowIndex : undefined,
212
217
  tabIndex: tabIndex,
213
218
  width: width
214
219
  }));
@@ -63,6 +63,7 @@ export var useRegisteredMenu = function useRegisteredMenu(_ref) {
63
63
  resetKey: resetKey
64
64
  });
65
65
  var selectedItemIndex = selection.selectedIndex,
66
+ selectionSource = selection.selectionSource,
66
67
  select = selection.select;
67
68
  var _useState = useState(),
68
69
  _useState2 = _slicedToArray(_useState, 2),
@@ -88,7 +89,7 @@ export var useRegisteredMenu = function useRegisteredMenu(_ref) {
88
89
  activateKeyboardItem(selection.selectPrevious());
89
90
  }, [selection.selectPrevious, activateKeyboardItem]);
90
91
  var onItemHover = useCallback(function (index, itemKey) {
91
- select(index);
92
+ select(index, 'pointer');
92
93
  setItemActivation(function (current) {
93
94
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey && current.source === 'pointer') {
94
95
  return current;
@@ -102,7 +103,8 @@ export var useRegisteredMenu = function useRegisteredMenu(_ref) {
102
103
  });
103
104
  }, [model, resetKey, select]);
104
105
  var onItemFocus = useCallback(function (index, itemKey) {
105
- select(index);
106
+ // A press focuses the item the pointer already selected. Scrolling it then would move it before the click lands.
107
+ select(index, index === selectedItemIndex && selectionSource === 'pointer' ? 'pointer' : 'keyboard');
106
108
  setItemActivation(function (current) {
107
109
  if (itemKey && (current === null || current === void 0 ? void 0 : current.itemKey) === itemKey && current.model === model && current.resetKey === resetKey) {
108
110
  return current;
@@ -114,7 +116,7 @@ export var useRegisteredMenu = function useRegisteredMenu(_ref) {
114
116
  source: 'keyboard'
115
117
  } : undefined;
116
118
  });
117
- }, [model, resetKey, select]);
119
+ }, [model, resetKey, select, selectedItemIndex, selectionSource]);
118
120
  var onItemLeave = useCallback(function (itemKey) {
119
121
  setItemActivation(function (current) {
120
122
  return (current === null || current === void 0 ? void 0 : current.source) === 'pointer' && current.itemKey === itemKey ? undefined : current;
@@ -136,6 +138,7 @@ export var useRegisteredMenu = function useRegisteredMenu(_ref) {
136
138
  rows: rows,
137
139
  selectableItems: selectableItems,
138
140
  selectedItemIndex: selectedItemIndex,
141
+ selectionSource: selectionSource,
139
142
  select: select,
140
143
  selectNext: selectNext,
141
144
  selectPrevious: selectPrevious,
@@ -5,6 +5,9 @@ import { reconcileRegisteredMenuSelection } from './reconcileRegisteredMenuSelec
5
5
  * Keeps selection on the same item as items reorder. If that item disappears,
6
6
  * keeps the previous index within the remaining items. A changed reset key
7
7
  * selects the first item instead.
8
+ * Tracks whether the keyboard or the pointer made the current selection, so callers
9
+ * can scroll only keyboard selections into view. Reconciling a reorder keeps the
10
+ * current source; a reset counts as a keyboard selection.
8
11
  */
9
12
  export var useRegisteredMenuSelection = function useRegisteredMenuSelection(_ref) {
10
13
  var identities = _ref.identities,
@@ -15,15 +18,20 @@ export var useRegisteredMenuSelection = function useRegisteredMenuSelection(_ref
15
18
  _useState2 = _slicedToArray(_useState, 2),
16
19
  selectedIndex = _useState2[0],
17
20
  setSelectedIndex = _useState2[1];
21
+ var _useState3 = useState('keyboard'),
22
+ _useState4 = _slicedToArray(_useState3, 2),
23
+ selectionSource = _useState4[0],
24
+ setSelectionSource = _useState4[1];
18
25
  var selectedIndexRef = useRef(selectedIndex);
19
26
  var previousRef = useRef({
20
27
  identities: identities,
21
28
  resetKey: resetKey
22
29
  });
23
30
  var itemCount = identities.length;
24
- var select = useCallback(function (index) {
31
+ var select = useCallback(function (index, source) {
25
32
  selectedIndexRef.current = index;
26
33
  setSelectedIndex(index);
34
+ setSelectionSource(source);
27
35
  }, []);
28
36
  useLayoutEffect(function () {
29
37
  var previous = previousRef.current;
@@ -31,27 +39,36 @@ export var useRegisteredMenuSelection = function useRegisteredMenuSelection(_ref
31
39
  identities: identities,
32
40
  resetKey: resetKey
33
41
  };
34
- select(reconcileRegisteredMenuSelection({
42
+ var reset = previous.resetKey !== resetKey;
43
+ var index = reconcileRegisteredMenuSelection({
35
44
  nextIdentities: identities,
36
45
  previousIdentities: previous.identities,
37
46
  previousIndex: selectedIndexRef.current,
38
- reset: previous.resetKey !== resetKey
39
- }));
47
+ reset: reset
48
+ });
49
+ if (reset) {
50
+ select(index, 'keyboard');
51
+ return;
52
+ }
53
+ // The same item stays selected, so keep its source: a reorder under the pointer must not scroll.
54
+ selectedIndexRef.current = index;
55
+ setSelectedIndex(index);
40
56
  }, [identities, resetKey, select]);
41
57
  var selectNext = useCallback(function () {
42
58
  var currentIndex = selectedIndexRef.current;
43
59
  var nextIndex = itemCount === 0 ? -1 : currentIndex < 0 ? 0 : (currentIndex + 1) % itemCount;
44
- select(nextIndex);
60
+ select(nextIndex, 'keyboard');
45
61
  return nextIndex;
46
62
  }, [itemCount, select]);
47
63
  var selectPrevious = useCallback(function () {
48
64
  var currentIndex = selectedIndexRef.current;
49
65
  var previousIndex = itemCount === 0 ? -1 : currentIndex <= 0 ? itemCount - 1 : currentIndex - 1;
50
- select(previousIndex);
66
+ select(previousIndex, 'keyboard');
51
67
  return previousIndex;
52
68
  }, [itemCount, select]);
53
69
  return {
54
70
  selectedIndex: selectedIndex,
71
+ selectionSource: selectionSource,
55
72
  select: select,
56
73
  selectNext: selectNext,
57
74
  selectPrevious: selectPrevious
@@ -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 = "134.1.1";
23
+ var packageVersion = "134.1.3";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  // Ignored via go/ees005
@@ -228,12 +228,23 @@ var popperInteropModifiers = [{
228
228
  enabled: false
229
229
  }];
230
230
  function usePopperInteropModifiers(_ref2) {
231
- var onPositioned = _ref2.onPositioned;
231
+ var isContentShown = _ref2.isContentShown,
232
+ onPositioned = _ref2.onPositioned;
232
233
  var onPositionedRef = useRef(onPositioned);
233
234
  var hasPositionedRef = useRef(false);
234
235
  useLayoutEffect(function () {
235
236
  onPositionedRef.current = onPositioned;
236
237
  }, [onPositioned]);
238
+
239
+ // On the top-layer path `@atlaskit/popper` ignores `modifiers`: CSS Anchor Positioning places
240
+ // the content when it mounts. So report the first position once the content is shown.
241
+ useLayoutEffect(function () {
242
+ if (!fg('platform-dst-top-layer') || !isContentShown || hasPositionedRef.current) {
243
+ return;
244
+ }
245
+ hasPositionedRef.current = true;
246
+ onPositionedRef.current();
247
+ }, [isContentShown]);
237
248
  return useMemo(function () {
238
249
  return [].concat(popperInteropModifiers, [{
239
250
  name: 'editorLayerFirstPositioned',
@@ -262,7 +273,9 @@ function PopperInterop(_ref3) {
262
273
  _useState2 = _slicedToArray(_useState, 2),
263
274
  referenceElement = _useState2[0],
264
275
  setReferenceElement = _useState2[1];
276
+ var isContentShown = Boolean(content && referenceElement);
265
277
  var modifiers = usePopperInteropModifiers({
278
+ isContentShown: isContentShown,
266
279
  onPositioned: onPositioned
267
280
  });
268
281
  // Popper v2 compares the offset prop by reference, so memoise to avoid re-running positioning every render.
@@ -15,8 +15,13 @@ export default class DefaultExtensionProvider<T extends Parameters> implements E
15
15
  autoConvertHandlers?: ExtensionAutoConvertHandler[]);
16
16
  getExtensions(): Promise<ExtensionManifest<T>[]>;
17
17
  preload(): Promise<void>;
18
+ /**
19
+ * Synchronously returns an extension from the manifests loaded by `preload`. Returns undefined when
20
+ * the extension is not preloaded, so callers can fall back to the asynchronous `getExtension`.
21
+ */
18
22
  getPreloadedExtension(type: ExtensionType, key: ExtensionKey): ExtensionManifest<T> | undefined;
19
23
  getExtension(type: ExtensionType, key: ExtensionKey): Promise<ExtensionManifest<T>>;
24
+ private findExtensionInManifests;
20
25
  private getExtensionFromManifest;
21
26
  search(keyword: string): Promise<ExtensionManifest<T>[]>;
22
27
  getAutoConverter(): Promise<ExtensionAutoConvertHandler[]>;
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import type { RegisterMenuItem, RegisterMenuSection } from '@atlaskit/editor-ui-control-model/types';
3
3
  import type { RegisteredMenuListItemIdParams } from './RegisteredMenuListItemRow';
4
- import type { RegisteredMenuItemProps } from './types';
4
+ import type { RegisteredMenuItemProps, RegisteredMenuSelectionSource } from './types';
5
5
  export type RegisteredMenuListProps = {
6
6
  activeItemKey?: string;
7
7
  containerRole?: 'presentation';
@@ -25,7 +25,9 @@ export type RegisteredMenuListProps = {
25
25
  scrollResetKey?: string | number | symbol;
26
26
  scrollTo?: 'selected' | 'top-on-reset';
27
27
  selectedItemIndex: number;
28
+ /** Whether the keyboard or the pointer made the current selection. */
29
+ selectionSource?: RegisteredMenuSelectionSource;
28
30
  tabIndex?: number | null;
29
31
  width: number;
30
32
  };
31
- export declare const RegisteredMenuList: ({ rows, Item, selectedItemIndex, activeItemKey, maxHeight, width, getItemId, onItemHover, onItemFocus, onItemLeave, onItemBlur, onItemVisibilityChange, onRenderedItemsChange, scrollResetKey, role, containerRole, tabIndex, omitAriaReadonly, hasScrollPadding, lastRowPadding, scrollTo, }: RegisteredMenuListProps) => React.JSX.Element | null;
33
+ export declare const RegisteredMenuList: ({ rows, Item, selectedItemIndex, activeItemKey, maxHeight, width, getItemId, onItemHover, onItemFocus, onItemLeave, onItemBlur, onItemVisibilityChange, onRenderedItemsChange, scrollResetKey, role, containerRole, tabIndex, omitAriaReadonly, hasScrollPadding, lastRowPadding, scrollTo, selectionSource, }: RegisteredMenuListProps) => React.JSX.Element | null;
@@ -5,6 +5,8 @@ import type { RegisterComponent, RegisterMenuItem, RegisterMenuSection, SurfaceC
5
5
  import type { InsertContentCallback } from '../insert';
6
6
  import type { RegisteredItemRankResolver } from './item-rank';
7
7
  export type RegisteredMenuSection = [RegisterMenuSection, ...RegisterMenuItem[]];
8
+ /** Whether the keyboard or the pointer made the current menu selection. */
9
+ export type RegisteredMenuSelectionSource = 'keyboard' | 'pointer';
8
10
  export type RegisteredMenuModel = {
9
11
  fallbackItems: RegisterMenuItem[];
10
12
  footer: RegisterMenuItem | undefined;
@@ -47,8 +49,8 @@ export type RegisteredMenuContextValue = {
47
49
  onClose: () => void;
48
50
  /** Mount point for auxiliary portals such as item previews. The host owns the menu popup. */
49
51
  portalMountPoint?: HTMLElement;
50
- registerInteraction: (interaction: RegisteredMenuInteraction) => () => void;
51
52
  query?: string;
53
+ registerInteraction: (interaction: RegisteredMenuInteraction) => () => void;
52
54
  rootComponent: SurfaceIdentifier;
53
55
  select?: (selection: RegisteredMenuSelection) => void;
54
56
  surfaceContext: SurfaceContext;
@@ -1,5 +1,5 @@
1
1
  import type { RegisterMenuItem, RegisterMenuSection } from '@atlaskit/editor-ui-control-model/types';
2
- import type { RegisteredMenuModel } from './types';
2
+ import type { RegisteredMenuModel, RegisteredMenuSelectionSource } from './types';
3
3
  type Options = {
4
4
  model: RegisteredMenuModel;
5
5
  resetKey?: string | number | symbol;
@@ -12,9 +12,11 @@ export type RegisteredMenuState = {
12
12
  onItemLeave: (itemKey: string) => void;
13
13
  onItemVisibilityChange: (itemKey: string, isVisible: boolean) => void;
14
14
  rows: Array<RegisterMenuItem | RegisterMenuSection>;
15
- select: (index: number) => void;
15
+ select: (index: number, source: RegisteredMenuSelectionSource) => void;
16
16
  selectableItems: RegisterMenuItem[];
17
17
  selectedItemIndex: number;
18
+ /** Whether the keyboard or the pointer made the current selection. */
19
+ selectionSource: RegisteredMenuSelectionSource;
18
20
  selectNext: () => void;
19
21
  selectPrevious: () => void;
20
22
  };
@@ -1,10 +1,12 @@
1
+ import type { RegisteredMenuSelectionSource } from './types';
1
2
  type Options = {
2
3
  identities: readonly string[];
3
4
  resetKey?: string | number | symbol;
4
5
  };
5
6
  type RegisteredMenuSelectionState = {
6
- select: (index: number) => void;
7
+ select: (index: number, source: RegisteredMenuSelectionSource) => void;
7
8
  selectedIndex: number;
9
+ selectionSource: RegisteredMenuSelectionSource;
8
10
  selectNext: () => number;
9
11
  selectPrevious: () => number;
10
12
  };
@@ -12,6 +14,9 @@ type RegisteredMenuSelectionState = {
12
14
  * Keeps selection on the same item as items reorder. If that item disappears,
13
15
  * keeps the previous index within the remaining items. A changed reset key
14
16
  * selects the first item instead.
17
+ * Tracks whether the keyboard or the pointer made the current selection, so callers
18
+ * can scroll only keyboard selections into view. Reconciling a reorder keeps the
19
+ * current source; a reset counts as a keyboard selection.
15
20
  */
16
21
  export declare const useRegisteredMenuSelection: ({ identities, resetKey, }: Options) => RegisteredMenuSelectionState;
17
22
  export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "134.1.2",
3
+ "version": "134.2.0",
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/"
@@ -31,7 +31,7 @@
31
31
  "@atlaskit/activity-provider": "^3.1.0",
32
32
  "@atlaskit/adf-schema": "^57.7.0",
33
33
  "@atlaskit/adf-utils": "^20.9.0",
34
- "@atlaskit/afm-i18n-platform-editor-editor-common": "2.287.0",
34
+ "@atlaskit/afm-i18n-platform-editor-editor-common": "2.294.0",
35
35
  "@atlaskit/analytics-listeners": "^11.4.0",
36
36
  "@atlaskit/analytics-namespaced-context": "^8.2.0",
37
37
  "@atlaskit/analytics-next": "^12.6.0",
@@ -50,7 +50,7 @@
50
50
  "@atlaskit/editor-toolbar": "^2.8.0",
51
51
  "@atlaskit/editor-toolbar-model": "^1.2.0",
52
52
  "@atlaskit/editor-ui-control-model": "^3.0.0",
53
- "@atlaskit/emoji": "^73.1.0",
53
+ "@atlaskit/emoji": "^73.2.0",
54
54
  "@atlaskit/feature-gate-js-client": "^7.0.0",
55
55
  "@atlaskit/icon": "^38.0.0",
56
56
  "@atlaskit/link": "^5.1.0",
@@ -63,9 +63,9 @@
63
63
  "@atlaskit/media-common": "^14.7.0",
64
64
  "@atlaskit/media-file-preview": "^2.0.0",
65
65
  "@atlaskit/media-picker": "^73.2.0",
66
- "@atlaskit/media-ui": "^31.5.0",
66
+ "@atlaskit/media-ui": "^31.6.0",
67
67
  "@atlaskit/media-viewer": "^54.12.0",
68
- "@atlaskit/mention": "^30.5.0",
68
+ "@atlaskit/mention": "^30.6.0",
69
69
  "@atlaskit/menu": "^11.0.0",
70
70
  "@atlaskit/object": "^2.3.0",
71
71
  "@atlaskit/onboarding": "^15.4.0",
@@ -82,7 +82,7 @@
82
82
  "@atlaskit/smart-card": "^46.10.0",
83
83
  "@atlaskit/smart-user-picker": "^12.8.0",
84
84
  "@atlaskit/spinner": "^20.4.0",
85
- "@atlaskit/task-decision": "^21.13.0",
85
+ "@atlaskit/task-decision": "^21.14.0",
86
86
  "@atlaskit/teams-app-config": "^3.1.0",
87
87
  "@atlaskit/textfield": "^10.3.0",
88
88
  "@atlaskit/tmp-editor-statsig": "^248.0.0",
@@ -180,6 +180,9 @@
180
180
  "type": "boolean",
181
181
  "referenceOnly": true
182
182
  },
183
+ "platform-dst-top-layer": {
184
+ "type": "boolean"
185
+ },
183
186
  "platform-dst-tokens-finesse": {
184
187
  "type": "boolean",
185
188
  "referenceOnly": true