@atlaskit/editor-common 134.10.0 → 134.11.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 (55) hide show
  1. package/CHANGELOG.md +37 -0
  2. package/credit-guard/package.json +10 -0
  3. package/dist/cjs/credit-guard/CreditCheckedPopup.compiled.css +3 -0
  4. package/dist/cjs/credit-guard/CreditCheckedPopup.js +182 -0
  5. package/dist/cjs/credit-guard/checkAICreditStatus.js +25 -0
  6. package/dist/cjs/credit-guard/index.js +26 -0
  7. package/dist/cjs/credit-guard/types.js +5 -0
  8. package/dist/cjs/credit-guard/useAICreditGuard.js +45 -0
  9. package/dist/cjs/element-browser/components/ElementList/ElementList.js +80 -28
  10. package/dist/cjs/element-browser/components/StatelessElementBrowser.js +17 -5
  11. package/dist/cjs/link/ConfigureLinkOverlay/Dropdown.js +6 -6
  12. package/dist/cjs/mark/getHadMarkAttributes.js +0 -5
  13. package/dist/cjs/monitoring/error.js +1 -1
  14. package/dist/cjs/quick-insert/getQuickInsertSearchPriority.js +1 -1
  15. package/dist/cjs/quick-insert/insert-menu-check.js +11 -0
  16. package/dist/cjs/ui/DropList/index.js +1 -1
  17. package/dist/es2019/credit-guard/CreditCheckedPopup.compiled.css +3 -0
  18. package/dist/es2019/credit-guard/CreditCheckedPopup.js +161 -0
  19. package/dist/es2019/credit-guard/checkAICreditStatus.js +19 -0
  20. package/dist/es2019/credit-guard/index.js +5 -0
  21. package/dist/es2019/credit-guard/types.js +1 -0
  22. package/dist/es2019/credit-guard/useAICreditGuard.js +27 -0
  23. package/dist/es2019/element-browser/components/ElementList/ElementList.js +71 -20
  24. package/dist/es2019/element-browser/components/StatelessElementBrowser.js +13 -5
  25. package/dist/es2019/link/ConfigureLinkOverlay/Dropdown.js +3 -3
  26. package/dist/es2019/mark/getHadMarkAttributes.js +0 -5
  27. package/dist/es2019/monitoring/error.js +1 -1
  28. package/dist/es2019/quick-insert/getQuickInsertSearchPriority.js +1 -1
  29. package/dist/es2019/quick-insert/insert-menu-check.js +5 -0
  30. package/dist/es2019/ui/DropList/index.js +1 -1
  31. package/dist/esm/credit-guard/CreditCheckedPopup.compiled.css +3 -0
  32. package/dist/esm/credit-guard/CreditCheckedPopup.js +173 -0
  33. package/dist/esm/credit-guard/checkAICreditStatus.js +19 -0
  34. package/dist/esm/credit-guard/index.js +5 -0
  35. package/dist/esm/credit-guard/types.js +1 -0
  36. package/dist/esm/credit-guard/useAICreditGuard.js +38 -0
  37. package/dist/esm/element-browser/components/ElementList/ElementList.js +80 -28
  38. package/dist/esm/element-browser/components/StatelessElementBrowser.js +17 -5
  39. package/dist/esm/link/ConfigureLinkOverlay/Dropdown.js +3 -3
  40. package/dist/esm/mark/getHadMarkAttributes.js +0 -5
  41. package/dist/esm/monitoring/error.js +1 -1
  42. package/dist/esm/quick-insert/getQuickInsertSearchPriority.js +1 -1
  43. package/dist/esm/quick-insert/insert-menu-check.js +5 -0
  44. package/dist/esm/ui/DropList/index.js +1 -1
  45. package/dist/types/credit-guard/CreditCheckedPopup.d.ts +34 -0
  46. package/dist/types/credit-guard/checkAICreditStatus.d.ts +3 -0
  47. package/dist/types/credit-guard/index.d.ts +6 -0
  48. package/dist/types/credit-guard/types.d.ts +13 -0
  49. package/dist/types/credit-guard/useAICreditGuard.d.ts +16 -0
  50. package/dist/types/element-browser/components/ElementList/ElementList.d.ts +1 -0
  51. package/dist/types/mark/getHadMarkAttributes.d.ts +0 -1
  52. package/dist/types/provider-factory/quick-insert-provider.d.ts +26 -0
  53. package/dist/types/quick-insert/insert-menu-check.d.ts +3 -0
  54. package/package.json +3 -5
  55. package/quick-insert/insert-menu-check/package.json +10 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,42 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 134.11.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`fba2967936dfd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fba2967936dfd) -
8
+ Add optional insert-item rendering and pre-selection hooks for toolbar and element-browser menus.
9
+ Selection appearance can be overridden independently of activation. Existing behavior is preserved
10
+ for items without these hooks.
11
+
12
+ Expose the shared CreditCheckedPopup toolbar action interface and useAICreditGuard through the
13
+ credit-guard entrypoint. Reuse the popup across block and legacy insert menus, including
14
+ nested-menu focus behavior. Rollout remains controlled by rovo_credits_degradation_ui and
15
+ product-owned UBP experiments.
16
+
17
+ Portal nested credit feedback outside virtualized insert-menu scroll containers, using the
18
+ existing Editor dialog layer to avoid clipping.
19
+
20
+ ### Patch Changes
21
+
22
+ - [`fba2967936dfd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fba2967936dfd) -
23
+ Consume cached AI credit decisions synchronously in Editor, removing deferred action and selection
24
+ handling. Legacy Promise callbacks fail open immediately until they migrate. Confluence credit
25
+ enforcement remains controlled by rovo_credits_degradation_ui and the existing UBP feature
26
+ experiments.
27
+
28
+ ## 134.10.1
29
+
30
+ ### Patch Changes
31
+
32
+ - [`4ff087c29f9e4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4ff087c29f9e4) -
33
+ Prioritize Remix slash commands for remix and chart searches under cc_remix_slash_commands
34
+ - [`c17aea7934635`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c17aea7934635) -
35
+ Use named dropdown-menu imports.
36
+ - [`8092be2405d78`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8092be2405d78) -
37
+ Remove the retired text colour tracking kill switch while preserving mark analytics attributes.
38
+ - Updated dependencies
39
+
3
40
  ## 134.10.0
4
41
 
5
42
  ### Minor Changes
@@ -0,0 +1,10 @@
1
+ {
2
+ "name": "@atlaskit/editor-common/credit-guard",
3
+ "main": "../dist/cjs/credit-guard/index.js",
4
+ "module": "../dist/esm/credit-guard/index.js",
5
+ "module:es2019": "../dist/es2019/credit-guard/index.js",
6
+ "sideEffects": [
7
+ "**/*.compiled.css"
8
+ ],
9
+ "types": "../dist/types/credit-guard/index.d.ts"
10
+ }
@@ -0,0 +1,3 @@
1
+ ._1bsb5jys{width:11pc}
2
+ ._p12f1osq{max-width:100%}
3
+ ._vchhusvi{box-sizing:border-box}
@@ -0,0 +1,182 @@
1
+ /* CreditCheckedPopup.tsx generated by @compiled/babel-plugin v3.0.2 */
2
+ "use strict";
3
+
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+ Object.defineProperty(exports, "__esModule", {
7
+ value: true
8
+ });
9
+ exports.CreditCheckedPopup = void 0;
10
+ require("./CreditCheckedPopup.compiled.css");
11
+ var _runtime = require("@compiled/react/runtime");
12
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
+ var _react = _interopRequireWildcard(require("react"));
15
+ var _bindEventListener = require("bind-event-listener");
16
+ var _constants = require("@atlaskit/editor-shared-styles/constants");
17
+ var _popup = require("@atlaskit/popup/popup");
18
+ var _box = require("@atlaskit/primitives/compiled/box");
19
+ var _useAICreditGuard = require("./useAICreditGuard");
20
+ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
21
+ 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; }
22
+ 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; }
23
+ var CreditPopupTrigger = function CreditPopupTrigger(_ref) {
24
+ var props = _ref.props,
25
+ id = _ref.id,
26
+ renderTrigger = _ref.renderTrigger,
27
+ onElement = _ref.onElement;
28
+ var popupRef = props.ref;
29
+ var ref = (0, _react.useCallback)(function (element) {
30
+ onElement(element);
31
+ if (typeof popupRef === 'function') popupRef(element);else if (popupRef) Object.assign(popupRef, {
32
+ current: element
33
+ });
34
+ }, [onElement, popupRef]);
35
+ return renderTrigger(_objectSpread(_objectSpread({}, props), {}, {
36
+ ref: ref,
37
+ id: id
38
+ }));
39
+ };
40
+ var styles = {
41
+ content: "_1bsb5jys _p12f1osq _vchhusvi"
42
+ };
43
+ var stopPropagation = function stopPropagation(event) {
44
+ return event.stopPropagation();
45
+ };
46
+
47
+ /** Editor owns popup behavior; products supply content through getAICreditStatus. */
48
+ var CreditPopup = function CreditPopup(_ref2) {
49
+ var _ref2$guard = _ref2.guard,
50
+ feedback = _ref2$guard.feedback,
51
+ close = _ref2$guard.close,
52
+ renderTrigger = _ref2.renderTrigger,
53
+ _ref2$placement = _ref2.placement,
54
+ placement = _ref2$placement === void 0 ? 'right-start' : _ref2$placement,
55
+ _ref2$isNestedMenu = _ref2.isNestedMenu,
56
+ isNestedMenu = _ref2$isNestedMenu === void 0 ? false : _ref2$isNestedMenu,
57
+ shouldRenderToParent = _ref2.shouldRenderToParent;
58
+ var id = (0, _react.useId)();
59
+ var _useState = (0, _react.useState)(null),
60
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
61
+ contentElement = _useState2[0],
62
+ setContentElement = _useState2[1];
63
+ var _useState3 = (0, _react.useState)(null),
64
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
65
+ triggerElement = _useState4[0],
66
+ setTriggerElement = _useState4[1];
67
+ var returnFocus = (0, _react.useRef)(null);
68
+ var wasOpen = (0, _react.useRef)(false);
69
+ (0, _react.useEffect)(function () {
70
+ if (feedback && !wasOpen.current) {
71
+ var active = triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.ownerDocument.activeElement;
72
+ returnFocus.current = active instanceof HTMLElement ? active : null;
73
+ }
74
+ wasOpen.current = feedback !== null;
75
+ }, [feedback, triggerElement]);
76
+ (0, _react.useEffect)(function () {
77
+ if (!feedback || !contentElement || !isNestedMenu) return;
78
+ return (0, _bindEventListener.bind)(contentElement.ownerDocument, {
79
+ type: 'scroll',
80
+ options: {
81
+ capture: true
82
+ },
83
+ listener: function listener(event) {
84
+ if (event.target instanceof Node && contentElement.contains(event.target)) return;
85
+ close();
86
+ }
87
+ });
88
+ }, [feedback, contentElement, isNestedMenu, close]);
89
+ var onKeyDown = (0, _react.useCallback)(function (event) {
90
+ event.stopPropagation();
91
+ if (event.key === 'Escape') {
92
+ var _returnFocus$current;
93
+ event.preventDefault();
94
+ close();
95
+ if (isNestedMenu) (_returnFocus$current = returnFocus.current) === null || _returnFocus$current === void 0 || _returnFocus$current.focus();
96
+ }
97
+ }, [close, isNestedMenu]);
98
+ var content = (0, _react.useCallback)(function () {
99
+ return /*#__PURE__*/_react.default.createElement(_box.Box, {
100
+ ref: setContentElement,
101
+ padding: "space.200",
102
+ xcss: styles.content,
103
+ role: "none",
104
+ onClick: stopPropagation,
105
+ onKeyDown: onKeyDown
106
+ }, feedback === null || feedback === void 0 ? void 0 : feedback.renderCustomContent());
107
+ }, [feedback, onKeyDown]);
108
+ var trigger = (0, _react.useCallback)(function (props) {
109
+ return /*#__PURE__*/_react.default.createElement(CreditPopupTrigger, {
110
+ props: props,
111
+ id: id,
112
+ renderTrigger: renderTrigger,
113
+ onElement: setTriggerElement
114
+ });
115
+ }, [renderTrigger, id]);
116
+ return /*#__PURE__*/_react.default.createElement(_popup.Popup, {
117
+ isOpen: feedback !== null,
118
+ onClose: close,
119
+ role: "dialog",
120
+ titleId: (triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.id) || id,
121
+ placement: placement,
122
+ shouldFitViewport: true,
123
+ shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false,
124
+ zIndex: isNestedMenu ? _constants.akEditorFloatingDialogZIndex : undefined,
125
+ strategy: isNestedMenu ? 'fixed' : undefined,
126
+ shouldReturnFocus: !isNestedMenu,
127
+ shouldUseCaptureOnOutsideClick: true,
128
+ content: content,
129
+ trigger: trigger
130
+ });
131
+ };
132
+
133
+ /** Props the trigger applies to anchor the popup and guard its native action. */
134
+
135
+ var CreditCheckedActionPopup = function CreditCheckedActionPopup(_ref3) {
136
+ var creditCheck = _ref3.creditCheck,
137
+ getAICreditStatus = _ref3.getAICreditStatus,
138
+ onAllowed = _ref3.onAllowed,
139
+ placement = _ref3.placement,
140
+ renderTrigger = _ref3.renderTrigger;
141
+ var guard = (0, _useAICreditGuard.useAICreditGuard)(getAICreditStatus);
142
+ var check = guard.check,
143
+ close = guard.close,
144
+ feedback = guard.feedback;
145
+ var activate = (0, _react.useCallback)(function (event) {
146
+ if (feedback) {
147
+ close();
148
+ return;
149
+ }
150
+ if (check(creditCheck)) onAllowed(event);
151
+ }, [feedback, close, check, creditCheck, onAllowed]);
152
+ var trigger = (0, _react.useCallback)(function (props) {
153
+ return renderTrigger(_objectSpread(_objectSpread({}, props), {}, {
154
+ 'aria-haspopup': 'dialog',
155
+ isSelected: feedback !== null,
156
+ onClick: activate
157
+ }));
158
+ }, [renderTrigger, feedback, activate]);
159
+ return /*#__PURE__*/_react.default.createElement(CreditPopup, {
160
+ guard: guard,
161
+ placement: placement,
162
+ renderTrigger: trigger
163
+ });
164
+ };
165
+
166
+ /** Reuses the toolbar action contract; insert-menu adapters can supply an externally triggered guard. */
167
+ var CreditCheckedPopup = exports.CreditCheckedPopup = function CreditCheckedPopup(props) {
168
+ if ('guard' in props) return /*#__PURE__*/_react.default.createElement(CreditPopup, {
169
+ guard: props.guard,
170
+ placement: props.placement,
171
+ renderTrigger: props.renderTrigger,
172
+ isNestedMenu: props.isNestedMenu,
173
+ shouldRenderToParent: props.shouldRenderToParent
174
+ });
175
+ return /*#__PURE__*/_react.default.createElement(CreditCheckedActionPopup, {
176
+ creditCheck: props.creditCheck,
177
+ getAICreditStatus: props.getAICreditStatus,
178
+ onAllowed: props.onAllowed,
179
+ placement: props.placement,
180
+ renderTrigger: props.renderTrigger
181
+ });
182
+ };
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.checkAICreditStatus = void 0;
7
+ /** Editor consumes cached decisions synchronously; legacy async providers fail open. */
8
+ var checkAICreditStatus = exports.checkAICreditStatus = function checkAICreditStatus(getAICreditStatus, creditCheck) {
9
+ try {
10
+ var result = getAICreditStatus(creditCheck);
11
+ if ('then' in result) {
12
+ // Temporary compatibility: never defer an Editor action or apply a late decision.
13
+ void result.catch(function () {});
14
+ return {
15
+ isBlocked: false
16
+ };
17
+ }
18
+ return result;
19
+ } catch (_unused) {
20
+ // Advisory checks fail open; action backends remain authoritative.
21
+ return {
22
+ isBlocked: false
23
+ };
24
+ }
25
+ };
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ Object.defineProperty(exports, "CreditCheckedPopup", {
7
+ enumerable: true,
8
+ get: function get() {
9
+ return _CreditCheckedPopup.CreditCheckedPopup;
10
+ }
11
+ });
12
+ Object.defineProperty(exports, "checkAICreditStatus", {
13
+ enumerable: true,
14
+ get: function get() {
15
+ return _checkAICreditStatus.checkAICreditStatus;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "useAICreditGuard", {
19
+ enumerable: true,
20
+ get: function get() {
21
+ return _useAICreditGuard.useAICreditGuard;
22
+ }
23
+ });
24
+ var _CreditCheckedPopup = require("./CreditCheckedPopup");
25
+ var _useAICreditGuard = require("./useAICreditGuard");
26
+ var _checkAICreditStatus = require("./checkAICreditStatus");
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
@@ -0,0 +1,45 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.useAICreditGuard = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _react = require("react");
10
+ var _checkAICreditStatus = require("./checkAICreditStatus");
11
+ /** Shares advisory checks and feedback state without owning action execution or selection. */
12
+ var useAICreditGuard = exports.useAICreditGuard = function useAICreditGuard(getAICreditStatus) {
13
+ var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
14
+ var _useState = (0, _react.useState)(null),
15
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
16
+ feedback = _useState2[0],
17
+ setFeedback = _useState2[1];
18
+ var _useState3 = (0, _react.useState)(false),
19
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
20
+ isBlocked = _useState4[0],
21
+ setIsBlocked = _useState4[1];
22
+ var close = (0, _react.useCallback)(function () {
23
+ return setFeedback(null);
24
+ }, []);
25
+ (0, _react.useLayoutEffect)(function () {
26
+ close();
27
+ setIsBlocked(false);
28
+ }, [isActive, close, getAICreditStatus]);
29
+ var check = (0, _react.useCallback)(function (creditCheck) {
30
+ var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
31
+ _ref$showFeedback = _ref.showFeedback,
32
+ showFeedback = _ref$showFeedback === void 0 ? true : _ref$showFeedback;
33
+ if (!isActive) return false;
34
+ var result = (0, _checkAICreditStatus.checkAICreditStatus)(getAICreditStatus, creditCheck);
35
+ setIsBlocked(result.isBlocked);
36
+ if (showFeedback) setFeedback(result.isBlocked ? result : null);
37
+ return !result.isBlocked;
38
+ }, [getAICreditStatus, isActive]);
39
+ return {
40
+ check: check,
41
+ close: close,
42
+ feedback: feedback,
43
+ isBlocked: isBlocked
44
+ };
45
+ };
@@ -25,6 +25,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
25
25
  var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
26
26
  var _analytics = require("../../../analytics");
27
27
  var _quickInsert = require("../../../quick-insert");
28
+ var _insertMenuCheck = require("../../../quick-insert/insert-menu-check");
28
29
  var _constants = require("../../constants");
29
30
  var _useContainerWidth2 = _interopRequireDefault(require("../../hooks/use-container-width"));
30
31
  var _useFocus = _interopRequireDefault(require("../../hooks/use-focus"));
@@ -374,6 +375,7 @@ var ElementListMultipleColumns = function ElementListMultipleColumns(props) {
374
375
  var MemoizedElementItem = /*#__PURE__*/(0, _react.memo)(ElementItem);
375
376
  MemoizedElementItem.displayName = 'MemoizedElementItem';
376
377
 
378
+ /** Render an insert item, optionally wrapped by its interaction policy. */
377
379
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
378
380
  function ElementItem(_ref6) {
379
381
  var inlineMode = _ref6.inlineMode,
@@ -385,6 +387,7 @@ function ElementItem(_ref6) {
385
387
  setFocusedItemIndex = _ref6.setFocusedItemIndex,
386
388
  role = _ref6.role;
387
389
  var ref = (0, _useFocus.default)(focus);
390
+ var surface = inlineMode ? 'toolbar' : 'element-browser';
388
391
 
389
392
  /**
390
393
  * Note: props.onSelectItem(item) is not called here as the StatelessElementBrowser's
@@ -395,24 +398,70 @@ function ElementItem(_ref6) {
395
398
  e.preventDefault();
396
399
  e.stopPropagation();
397
400
  setFocusedItemIndex(index);
398
- switch (e.nativeEvent.detail) {
399
- case 0:
400
- onInsertItem(item);
401
- break;
402
- case 1:
403
- if (inlineMode) {
401
+ var detail = e.nativeEvent.detail;
402
+ (0, _insertMenuCheck.runInsertMenuItemCheck)(item, {
403
+ surface: surface
404
+ }, function () {
405
+ switch (detail) {
406
+ case 0:
404
407
  onInsertItem(item);
405
- }
406
- break;
407
- case 2:
408
- if (!inlineMode) {
409
- onInsertItem(item);
410
- }
411
- break;
412
- default:
413
- return;
408
+ break;
409
+ case 1:
410
+ if (inlineMode) {
411
+ onInsertItem(item);
412
+ }
413
+ break;
414
+ case 2:
415
+ if (!inlineMode) {
416
+ onInsertItem(item);
417
+ }
418
+ break;
419
+ default:
420
+ return;
421
+ }
422
+ });
423
+ }, [index, inlineMode, item, onInsertItem, setFocusedItemIndex, surface]);
424
+ var renderItem = (0, _react.useCallback)(function (triggerProps) {
425
+ return (0, _react2.jsx)(ElementItemButton, {
426
+ item: item,
427
+ index: index,
428
+ inlineMode: inlineMode,
429
+ selected: selected,
430
+ role: role,
431
+ onClick: onClick,
432
+ focusRef: ref,
433
+ triggerProps: triggerProps
434
+ });
435
+ }, [item, index, inlineMode, selected, role, onClick, ref]);
436
+ return item.renderMenuItemWrapper ? item.renderMenuItemWrapper({
437
+ isActive: focus || selected,
438
+ surface: surface,
439
+ renderItem: renderItem
440
+ }) : renderItem();
441
+ }
442
+ var ElementItemButton = function ElementItemButton(_ref7) {
443
+ var _triggerProps$isSelec;
444
+ var item = _ref7.item,
445
+ index = _ref7.index,
446
+ inlineMode = _ref7.inlineMode,
447
+ selected = _ref7.selected,
448
+ role = _ref7.role,
449
+ onClick = _ref7.onClick,
450
+ focusRef = _ref7.focusRef,
451
+ triggerProps = _ref7.triggerProps;
452
+ var popupRef = triggerProps === null || triggerProps === void 0 ? void 0 : triggerProps.ref;
453
+ var setTriggerRef = (0, _react.useCallback)(function (element) {
454
+ Object.assign(focusRef, {
455
+ current: element
456
+ });
457
+ if (typeof popupRef === 'function') {
458
+ popupRef(element);
459
+ } else if (popupRef) {
460
+ Object.assign(popupRef, {
461
+ current: element
462
+ });
414
463
  }
415
- }, [index, inlineMode, item, onInsertItem, setFocusedItemIndex]);
464
+ }, [focusRef, popupRef]);
416
465
  var icon = item.icon,
417
466
  title = item.title,
418
467
  description = item.description,
@@ -428,10 +477,13 @@ function ElementItem(_ref6) {
428
477
  icon: icon,
429
478
  title: title
430
479
  }),
431
- isSelected: selected,
480
+ isSelected: (_triggerProps$isSelec = triggerProps === null || triggerProps === void 0 ? void 0 : triggerProps.isSelected) !== null && _triggerProps$isSelec !== void 0 ? _triggerProps$isSelec : selected,
481
+ "aria-controls": triggerProps === null || triggerProps === void 0 ? void 0 : triggerProps['aria-controls'],
432
482
  "aria-label": title,
433
- ref: ref,
434
- testId: "element-item-".concat(index),
483
+ ref: setTriggerRef,
484
+ testId: "element-item-".concat(index)
485
+ // Keep the search combobox's aria-activedescendant target stable.
486
+ ,
435
487
  id: "searched-item-".concat(index),
436
488
  isDisabled: isDisabled,
437
489
  role: role
@@ -448,7 +500,7 @@ function ElementItem(_ref6) {
448
500
  isDisabled: isDisabled,
449
501
  lozenge: lozenge
450
502
  })));
451
- }
503
+ };
452
504
 
453
505
  /**
454
506
  * Inline mode should use the existing Align-items:center value.
@@ -456,18 +508,18 @@ function ElementItem(_ref6) {
456
508
  var itemStyleOverrides = {
457
509
  alignItems: 'flex-start'
458
510
  };
459
- var ElementBefore = /*#__PURE__*/(0, _react.memo)(function (_ref7) {
460
- var icon = _ref7.icon;
511
+ var ElementBefore = /*#__PURE__*/(0, _react.memo)(function (_ref8) {
512
+ var icon = _ref8.icon;
461
513
  return (0, _react2.jsx)("div", {
462
514
  css: [itemIcon, itemIconStyle]
463
515
  }, icon ? icon() : (0, _react2.jsx)(_quickInsert.IconFallback, null));
464
516
  });
465
- var ItemContent = /*#__PURE__*/(0, _react.memo)(function (_ref8) {
466
- var title = _ref8.title,
467
- description = _ref8.description,
468
- keyshortcut = _ref8.keyshortcut,
469
- lozenge = _ref8.lozenge,
470
- isDisabled = _ref8.isDisabled;
517
+ var ItemContent = /*#__PURE__*/(0, _react.memo)(function (_ref9) {
518
+ var title = _ref9.title,
519
+ description = _ref9.description,
520
+ keyshortcut = _ref9.keyshortcut,
521
+ lozenge = _ref9.lozenge,
522
+ isDisabled = _ref9.isDisabled;
471
523
  return (
472
524
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
473
525
  (0, _react2.jsx)("div", {
@@ -15,6 +15,7 @@ var _withAnalyticsContext = _interopRequireDefault(require("@atlaskit/analytics-
15
15
  var _withAnalyticsEvents = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsEvents"));
16
16
  var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
17
17
  var _analytics = require("../../analytics");
18
+ var _insertMenuCheck = require("../../quick-insert/insert-menu-check");
18
19
  var _getEditorUgcToken = _interopRequireDefault(require("../../ugc-tokens/get-editor-ugc-token"));
19
20
  var _ViewMore = require("../components/ViewMore");
20
21
  var _constants = require("../constants");
@@ -206,6 +207,7 @@ function StatelessElementBrowser(props) {
206
207
  /* Only for hitting enter to select item when focused on search bar,
207
208
  * The actual enter key press is handled on individual items level.
208
209
  */
210
+ var surface = props.mode === 'inline' ? 'toolbar' : 'element-browser';
209
211
  var selectedItem = selectedItemIndex !== undefined ? items[selectedItemIndex] : null;
210
212
  var onItemsEnterTabKeyPress = (0, _react.useCallback)(function (e) {
211
213
  var _selectedItem$isDisab;
@@ -218,11 +220,15 @@ function StatelessElementBrowser(props) {
218
220
  e.preventDefault();
219
221
  return;
220
222
  }
223
+ e.preventDefault();
221
224
  if (onInsertItem && selectedItem != null && !((_selectedItem$isDisab = selectedItem.isDisabled) !== null && _selectedItem$isDisab !== void 0 ? _selectedItem$isDisab : false)) {
222
- onInsertItem(selectedItem);
225
+ (0, _insertMenuCheck.runInsertMenuItemCheck)(selectedItem, {
226
+ surface: surface
227
+ }, function () {
228
+ return onInsertItem(selectedItem);
229
+ });
223
230
  }
224
- e.preventDefault();
225
- }, [onInsertItem, selectedItem, setFocusedCategoryIndex, showCategories, selectedCategoryIndex]);
231
+ }, [onInsertItem, selectedItem, setFocusedCategoryIndex, showCategories, selectedCategoryIndex, surface]);
226
232
 
227
233
  /**
228
234
  * On arrow key selection and clicks the selectedItemIndex will change.
@@ -230,9 +236,15 @@ function StatelessElementBrowser(props) {
230
236
  */
231
237
  (0, _react.useEffect)(function () {
232
238
  if (onSelectItem && selectedItem != null) {
233
- onSelectItem(selectedItem);
239
+ // Highlighting is eligibility-only: arrows must never open a popup or take focus.
240
+ (0, _insertMenuCheck.runInsertMenuItemCheck)(selectedItem, {
241
+ surface: surface,
242
+ showFeedback: false
243
+ }, function () {
244
+ return onSelectItem(selectedItem);
245
+ });
234
246
  }
235
- }, [onSelectItem, selectedItem]);
247
+ }, [onSelectItem, selectedItem, surface, focusedItemIndex, selectedItemIndex]);
236
248
  var onSelectCategoryCB = (0, _react.useCallback)(function (category) {
237
249
  onSelectCategory(category);
238
250
  categoryBeenChosen.current = true;
@@ -11,9 +11,9 @@ var _react = require("react");
11
11
  var _react2 = require("@emotion/react");
12
12
  var _reactIntl = require("react-intl");
13
13
  var _withAnalyticsContext = _interopRequireDefault(require("@atlaskit/analytics-next/withAnalyticsContext"));
14
- var _dropdownMenu = _interopRequireDefault(require("@atlaskit/dropdown-menu/dropdown-menu"));
15
- var _dropdownMenuItem = _interopRequireDefault(require("@atlaskit/dropdown-menu/dropdown-menu-item"));
16
- var _dropdownMenuItemGroup = _interopRequireDefault(require("@atlaskit/dropdown-menu/dropdown-menu-item-group"));
14
+ var _dropdownMenu = require("@atlaskit/dropdown-menu/dropdown-menu");
15
+ var _dropdownMenuItem = require("@atlaskit/dropdown-menu/dropdown-menu-item");
16
+ var _dropdownMenuItemGroup = require("@atlaskit/dropdown-menu/dropdown-menu-item-group");
17
17
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
18
18
  var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize"));
19
19
  var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
@@ -93,7 +93,7 @@ var Dropdown = function Dropdown(_ref) {
93
93
  }
94
94
  }));
95
95
  }, [configureLinkLabel, fireLinkClickEvent]);
96
- return (0, _react2.jsx)(_dropdownMenu.default, {
96
+ return (0, _react2.jsx)(_dropdownMenu.DropdownMenu, {
97
97
  trigger: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_perf_lint_cleanup') ? memoizedTrigger : function (_ref4) {
98
98
  var _onClick2 = _ref4.onClick,
99
99
  triggerRef = _ref4.triggerRef,
@@ -117,13 +117,13 @@ var Dropdown = function Dropdown(_ref) {
117
117
  },
118
118
  testId: "".concat(testId, "-dropdown"),
119
119
  onOpenChange: onOpenChange
120
- }, (0, _react2.jsx)(_dropdownMenuItemGroup.default, null, (0, _react2.jsx)(_dropdownMenuItem.default, {
120
+ }, (0, _react2.jsx)(_dropdownMenuItemGroup.DropdownItemGroup, null, (0, _react2.jsx)(_dropdownMenuItem.DropdownItem, {
121
121
  elemBefore: (0, _react2.jsx)(_linkExternal.default, {
122
122
  label: goToLinkLabel
123
123
  }),
124
124
  testId: "".concat(testId, "-dropdown-item-open-link"),
125
125
  onClick: onGoToLinkClick
126
- }, goToLinkLabel), (0, _react2.jsx)(_dropdownMenuItem.default, {
126
+ }, goToLinkLabel), (0, _react2.jsx)(_dropdownMenuItem.DropdownItem, {
127
127
  elemBefore: (0, _react2.jsx)(_customize.default, {
128
128
  label: configureLinkLabel
129
129
  }),
@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.getHadMarkAttributes = void 0;
7
- var _fg = require("@atlaskit/platform-feature-flags/fg");
8
7
  var _anyMarksActiveFromTr = require("./anyMarksActiveFromTr");
9
8
  var HAD_ATTRIBUTE = {
10
9
  backgroundColor: 'hadBackgroundColor',
@@ -17,12 +16,8 @@ var isMarkName = function isMarkName(name) {
17
16
 
18
17
  /**
19
18
  * `had*` flags for color / highlight / link apply events.
20
- * Kill switch `platform_editor_add_text_color_tracking`: gate on, new attributes off.
21
19
  */
22
20
  var getHadMarkAttributes = exports.getHadMarkAttributes = function getHadMarkAttributes(tr, markTypes) {
23
- if ((0, _fg.fg)('platform_editor_add_text_color_tracking')) {
24
- return {};
25
- }
26
21
  var definedMarkTypes = markTypes.filter(function (markType) {
27
22
  return !!markType;
28
23
  });
@@ -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.9.3";
30
+ var packageVersion = "134.10.1";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007