@atlaskit/editor-toolbar 2.8.50 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/editor-toolbar
 
+## 2.9.0
+
+### Minor Changes
+
+- [`2d08872dfd3da`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2d08872dfd3da) -
+  Add an optional product-supplied async AI credit decision accepting a typed Editor feature-name
+  context object and returning a content renderer, with the editor block menu as the first consumer.
+  Menu actions declare optional credit-check configuration. Editor owns popup activation and
+  lifecycle; Confluence owns credit state and experiment eligibility. Export the shared credit
+  content for host-owned popups.
+
+  Blocked decisions require product-supplied content. If the advisory check rejects, Editor allows
+  the action to proceed; its backend remains authoritative for enforcement.
+
+  Confluence selects the guard with `confluence_ubp_edit_with_rovo_afm` behind the
+  `rovo_credits_degradation_ui` prerequisite, recording both cohorts at registration.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.8.51
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.8.50
 
 ### Patch Changes

package/dist/cjs/ui/ToolbarDropdownItem.js

@@ -19,8 +19,9 @@ var _anchor = require("@atlaskit/primitives/compiled/anchor");
 var _box = require("@atlaskit/primitives/compiled/box");
 var _pressable = require("@atlaskit/primitives/compiled/pressable");
 var _ToolbarDropdownMenuContext = require("./ToolbarDropdownMenuContext");
-var _excluded = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "href", "target", "rel", "title", "itemRole"],
-  _excluded2 = ["onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "elemBefore", "elemAfter", "elemAfterText", "isSelected", "children", "isDisabled", "hasNestedDropdownMenu", "triggerRef", "title", "shouldTitleWrap", "testId", "ariaKeyshortcuts", "href", "target", "rel", "role"];
+var _excluded = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "title", "data-extension-item-key", "itemRole"],
+  _excluded2 = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "href", "target", "rel", "title", "itemRole"],
+  _excluded3 = ["aria-haspopup", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "elemBefore", "elemAfter", "elemAfterText", "isSelected", "children", "isDisabled", "hasNestedDropdownMenu", "triggerRef", "title", "shouldTitleWrap", "testId", "ariaKeyshortcuts", "href", "target", "rel", "role"];
 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); }
 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; }
 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; }
@@ -47,8 +48,11 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/(0, _react.forwardRef)(function
     tabIndex = _ref.tabIndex,
     title = _ref.title,
     dataExtensionItemKey = _ref['data-extension-item-key'],
-    itemRole = _ref.itemRole;
-  return /*#__PURE__*/_react.default.createElement(_pressable.Pressable, {
+    itemRole = _ref.itemRole,
+    dataAttributes = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return /*#__PURE__*/_react.default.createElement(_pressable.Pressable
+  // eslint-disable-next-line react/jsx-props-no-spreading -- Forward the native trigger relationship and data attributes.
+  , (0, _extends2.default)({}, dataAttributes, {
     role: itemRole || 'menuitem',
     testId: testId,
     xcss: (0, _css.cx)(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
@@ -67,7 +71,7 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/(0, _react.forwardRef)(function
     ref: ref,
     title: title,
     "data-extension-item-key": dataExtensionItemKey
-  }, children);
+  }), children);
 });
 var CustomDropdownMenuItemAnchor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var children = _ref2.children,
@@ -87,7 +91,7 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/(0, _react.forwardRef)(function
     rel = _ref2.rel,
     title = _ref2.title,
     itemRole = _ref2.itemRole,
-    dataAttributes = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+    dataAttributes = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   return /*#__PURE__*/_react.default.createElement(_anchor.Anchor, (0, _extends2.default)({
     role: itemRole || 'menuitem',
     testId: testId,
@@ -113,7 +117,8 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/(0, _react.forwardRef)(function
   }, dataAttributes), children);
 });
 var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdownItem(_ref3) {
-  var _onClick = _ref3.onClick,
+  var ariaHasPopup = _ref3['aria-haspopup'],
+    _onClick = _ref3.onClick,
     onBlur = _ref3.onBlur,
     onFocus = _ref3.onFocus,
     onMouseEnter = _ref3.onMouseEnter,
@@ -135,7 +140,7 @@ var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdown
     target = _ref3.target,
     rel = _ref3.rel,
     role = _ref3.role,
-    dataAttributes = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
+    dataAttributes = (0, _objectWithoutProperties2.default)(_ref3, _excluded3);
   var parentContext = (0, _ToolbarDropdownMenuContext.useToolbarDropdownMenu)();
   var injectedElemAfter = function () {
     if (! /*#__PURE__*/(0, _react.isValidElement)(elemAfter)) {
@@ -166,7 +171,7 @@ var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdown
     elemAfter: injectedElemAfter,
     isSelected: isSelected,
     isDisabled: isDisabled,
-    "aria-haspopup": hasNestedDropdownMenu,
+    "aria-haspopup": ariaHasPopup !== null && ariaHasPopup !== void 0 ? ariaHasPopup : hasNestedDropdownMenu,
     "aria-pressed": isSelected,
     "aria-keyshortcuts": ariaKeyshortcuts,
     itemRole: role,

package/dist/es2019/ui/ToolbarDropdownItem.js

@@ -32,8 +32,11 @@ const CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(({
   tabIndex,
   title,
   'data-extension-item-key': dataExtensionItemKey,
-  itemRole
-}, ref) => /*#__PURE__*/React.createElement(Pressable, {
+  itemRole,
+  ...dataAttributes
+}, ref) => /*#__PURE__*/React.createElement(Pressable
+// eslint-disable-next-line react/jsx-props-no-spreading -- Forward the native trigger relationship and data attributes.
+, _extends({}, dataAttributes, {
   role: itemRole || 'menuitem',
   testId: testId,
   xcss: cx(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
@@ -52,7 +55,7 @@ const CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(({
   ref: ref,
   title: title,
   "data-extension-item-key": dataExtensionItemKey
-}, children));
+}), children));
 const CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(({
   children,
   'data-testid': testId,
@@ -96,6 +99,7 @@ const CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(({
   // eslint-disable-next-line react/jsx-props-no-spreading
 }, dataAttributes), children));
 export const ToolbarDropdownItem = ({
+  'aria-haspopup': ariaHasPopup,
   onClick,
   onBlur,
   onFocus,
@@ -150,7 +154,7 @@ export const ToolbarDropdownItem = ({
     elemAfter: injectedElemAfter,
     isSelected: isSelected,
     isDisabled: isDisabled,
-    "aria-haspopup": hasNestedDropdownMenu,
+    "aria-haspopup": ariaHasPopup !== null && ariaHasPopup !== void 0 ? ariaHasPopup : hasNestedDropdownMenu,
     "aria-pressed": isSelected,
     "aria-keyshortcuts": ariaKeyshortcuts,
     itemRole: role,

package/dist/esm/ui/ToolbarDropdownItem.js

@@ -2,8 +2,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "href", "target", "rel", "title", "itemRole"],
-  _excluded2 = ["onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "elemBefore", "elemAfter", "elemAfterText", "isSelected", "children", "isDisabled", "hasNestedDropdownMenu", "triggerRef", "title", "shouldTitleWrap", "testId", "ariaKeyshortcuts", "href", "target", "rel", "role"];
+var _excluded = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "title", "data-extension-item-key", "itemRole"],
+  _excluded2 = ["children", "data-testid", "aria-haspopup", "aria-disabled", "aria-pressed", "aria-keyshortcuts", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "tabIndex", "href", "target", "rel", "title", "itemRole"],
+  _excluded3 = ["aria-haspopup", "onClick", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "elemBefore", "elemAfter", "elemAfterText", "isSelected", "children", "isDisabled", "hasNestedDropdownMenu", "triggerRef", "title", "shouldTitleWrap", "testId", "ariaKeyshortcuts", "href", "target", "rel", "role"];
 import "./ToolbarDropdownItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 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; }
@@ -38,8 +39,11 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(function (_ref, ref)
     tabIndex = _ref.tabIndex,
     title = _ref.title,
     dataExtensionItemKey = _ref['data-extension-item-key'],
-    itemRole = _ref.itemRole;
-  return /*#__PURE__*/React.createElement(Pressable, {
+    itemRole = _ref.itemRole,
+    dataAttributes = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/React.createElement(Pressable
+  // eslint-disable-next-line react/jsx-props-no-spreading -- Forward the native trigger relationship and data attributes.
+  , _extends({}, dataAttributes, {
     role: itemRole || 'menuitem',
     testId: testId,
     xcss: cx(styles.toolbarDropdownItem, ariaDisabled ? styles.disabled : ariaPressed ? styles.selected : styles.enabled),
@@ -58,7 +62,7 @@ var CustomDropdownMenuItemButton = /*#__PURE__*/forwardRef(function (_ref, ref)
     ref: ref,
     title: title,
     "data-extension-item-key": dataExtensionItemKey
-  }, children);
+  }), children);
 });
 var CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var children = _ref2.children,
@@ -78,7 +82,7 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(function (_ref2, ref)
     rel = _ref2.rel,
     title = _ref2.title,
     itemRole = _ref2.itemRole,
-    dataAttributes = _objectWithoutProperties(_ref2, _excluded);
+    dataAttributes = _objectWithoutProperties(_ref2, _excluded2);
   return /*#__PURE__*/React.createElement(Anchor, _extends({
     role: itemRole || 'menuitem',
     testId: testId,
@@ -104,7 +108,8 @@ var CustomDropdownMenuItemAnchor = /*#__PURE__*/forwardRef(function (_ref2, ref)
   }, dataAttributes), children);
 });
 export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref3) {
-  var _onClick = _ref3.onClick,
+  var ariaHasPopup = _ref3['aria-haspopup'],
+    _onClick = _ref3.onClick,
     onBlur = _ref3.onBlur,
     onFocus = _ref3.onFocus,
     onMouseEnter = _ref3.onMouseEnter,
@@ -126,7 +131,7 @@ export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref3) {
     target = _ref3.target,
     rel = _ref3.rel,
     role = _ref3.role,
-    dataAttributes = _objectWithoutProperties(_ref3, _excluded2);
+    dataAttributes = _objectWithoutProperties(_ref3, _excluded3);
   var parentContext = useToolbarDropdownMenu();
   var injectedElemAfter = function () {
     if (! /*#__PURE__*/isValidElement(elemAfter)) {
@@ -157,7 +162,7 @@ export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref3) {
     elemAfter: injectedElemAfter,
     isSelected: isSelected,
     isDisabled: isDisabled,
-    "aria-haspopup": hasNestedDropdownMenu,
+    "aria-haspopup": ariaHasPopup !== null && ariaHasPopup !== void 0 ? ariaHasPopup : hasNestedDropdownMenu,
     "aria-pressed": isSelected,
     "aria-keyshortcuts": ariaKeyshortcuts,
     itemRole: role,

package/dist/types/ui/ToolbarDropdownItem.d.ts

@@ -11,15 +11,20 @@ export type ToolbarDropdownItemInteractionProps = {
 };
 export type ToolbarDropdownItemRole = 'menuitem' | 'menuitemcheckbox' | 'menuitemradio';
 export type CustomDropdownMenuItemButtonProps = CustomItemComponentProps & ToolbarDropdownItemInteractionProps & {
+    'aria-controls'?: string;
     'aria-disabled'?: boolean;
-    'aria-haspopup'?: boolean;
+    'aria-haspopup'?: React.AriaAttributes['aria-haspopup'];
     'aria-keyshortcuts'?: string;
     'aria-pressed'?: boolean;
     'data-extension-item-key'?: string;
+    id?: string;
     itemRole?: ToolbarDropdownItemRole;
     title?: string;
 };
 type ToolbarDropdownItemProps = ToolbarDropdownItemInteractionProps & {
+    'aria-controls'?: string;
+    /** Accessible relationship for items that open a nested popup. */
+    'aria-haspopup'?: React.AriaAttributes['aria-haspopup'];
     ariaKeyshortcuts?: string;
     children?: React.ReactNode;
     elemAfter?: ReactNode;
@@ -27,6 +32,7 @@ type ToolbarDropdownItemProps = ToolbarDropdownItemInteractionProps & {
     elemBefore?: ReactNode;
     hasNestedDropdownMenu?: boolean;
     href?: string;
+    id?: string;
     isDisabled?: boolean;
     isSelected?: boolean;
     onClick?: (e: React.MouseEvent | React.KeyboardEvent) => void;
@@ -39,5 +45,5 @@ type ToolbarDropdownItemProps = ToolbarDropdownItemInteractionProps & {
     title?: string;
     triggerRef?: Ref<HTMLButtonElement>;
 } & DataAttributes;
-export declare const ToolbarDropdownItem: ({ onClick, onBlur, onFocus, onMouseEnter, onMouseLeave, elemBefore, elemAfter, elemAfterText, isSelected, children, isDisabled, hasNestedDropdownMenu, triggerRef, title, shouldTitleWrap, testId, ariaKeyshortcuts, href, target, rel, role, ...dataAttributes }: ToolbarDropdownItemProps) => React.JSX.Element;
+export declare const ToolbarDropdownItem: ({ 'aria-haspopup': ariaHasPopup, onClick, onBlur, onFocus, onMouseEnter, onMouseLeave, elemBefore, elemAfter, elemAfterText, isSelected, children, isDisabled, hasNestedDropdownMenu, triggerRef, title, shouldTitleWrap, testId, ariaKeyshortcuts, href, target, rel, role, ...dataAttributes }: ToolbarDropdownItemProps) => React.JSX.Element;
 export {};

package/package.json

@@ -3,7 +3,7 @@
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
 	},
-	"version": "2.8.50",
+	"version": "2.9.0",
 	"description": "Common UI for Toolbars across the platform",
 	"atlassian": {
 		"website": {
@@ -45,7 +45,7 @@
 		"@atlaskit/popup": "^10.2.0",
 		"@atlaskit/primitives": "^22.6.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^253.0.0",
+		"@atlaskit/tmp-editor-statsig": "^255.0.0",
 		"@atlaskit/tokens": "^20.9.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@babel/runtime": "^7.0.0",