@atlaskit/button 17.5.0 → 17.6.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/button
 
+## 17.6.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 17.6.0
+
+### Minor Changes
+
+- [#58240](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58240) [`75b2ade8b254`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/75b2ade8b254) - New buttons no longer directly emit analytics tracking events to prevent duplicate events, as the underlying primitive components already have tracking. Any analytics context set on new buttons are retained through forwarding to the primitives
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 17.5.0
 
 ### Minor Changes

package/dist/cjs/new-button/variants/default/button.js

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _pressable = _interopRequireDefault(require("@atlaskit/primitives/pressable"));
 var _useDefaultButton = _interopRequireDefault(require("./use-default-button"));
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconAfter_size", "iconAfter", "UNSAFE_iconBefore_size", "children", "shouldFitContainer", "interactionName", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "type", "testId"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconAfter_size", "iconAfter", "UNSAFE_iconBefore_size", "children", "shouldFitContainer", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "type", "testId"];
 /**
  * __Button__
  *
@@ -22,6 +22,7 @@ var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDi
  */
 var Button = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef(function Button(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
@@ -33,7 +34,6 @@ var Button = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
     UNSAFE_iconBefore_size = _ref.UNSAFE_iconBefore_size,
     children = _ref.children,
     shouldFitContainer = _ref.shouldFitContainer,
-    interactionName = _ref.interactionName,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
@@ -94,7 +94,10 @@ var Button = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwa
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "Button"
   }), baseProps.children);
 }));
 Button.displayName = 'Button';

package/dist/cjs/new-button/variants/default/link.js

@@ -9,13 +9,14 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _link = _interopRequireDefault(require("@atlaskit/primitives/link"));
+var _anchor = _interopRequireDefault(require("@atlaskit/primitives/anchor"));
 var _useDefaultButton = _interopRequireDefault(require("./use-default-button"));
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconBefore_size", "iconAfter", "UNSAFE_iconAfter_size", "children", "shouldFitContainer", "interactionName", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "testId", "href"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconBefore_size", "iconAfter", "UNSAFE_iconAfter_size", "children", "shouldFitContainer", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "testId", "href"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var LinkButtonBase = function LinkButtonBase(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
@@ -27,7 +28,6 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     UNSAFE_iconAfter_size = _ref.UNSAFE_iconAfter_size,
     children = _ref.children,
     shouldFitContainer = _ref.shouldFitContainer,
-    interactionName = _ref.interactionName,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
@@ -70,7 +70,7 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     shouldFitContainer: shouldFitContainer,
     spacing: spacing
   });
-  return /*#__PURE__*/_react.default.createElement(_link.default
+  return /*#__PURE__*/_react.default.createElement(_anchor.default
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , (0, _extends2.default)({}, rest, {
     ref: baseProps.ref,
@@ -94,7 +94,10 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "LinkButton"
   }), baseProps.children);
 };
 

package/dist/cjs/new-button/variants/icon/button.js

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _pressable = _interopRequireDefault(require("@atlaskit/primitives/pressable"));
 var _useIconButton = _interopRequireDefault(require("./use-icon-button"));
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "interactionName", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "type", "testId", "UNSAFE_size", "aria-label"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "type", "testId", "UNSAFE_size", "aria-label"];
 /**
  * __Icon Button__
  *
@@ -22,13 +22,13 @@ var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDi
  */
 var IconButton = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef(function Button(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
     isDisabled = _ref.isDisabled,
     isSelected = _ref.isSelected,
     icon = _ref.icon,
-    interactionName = _ref.interactionName,
     label = _ref.label,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
@@ -93,7 +93,10 @@ var IconButton = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.f
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    componentName: "IconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 }));
 IconButton.displayName = 'IconButton';

package/dist/cjs/new-button/variants/icon/link.js

@@ -9,20 +9,20 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _link = _interopRequireDefault(require("@atlaskit/primitives/link"));
+var _anchor = _interopRequireDefault(require("@atlaskit/primitives/anchor"));
 var _useIconButton = _interopRequireDefault(require("./use-icon-button"));
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "interactionName", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "testId", "UNSAFE_size", "href", "aria-label"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "testId", "UNSAFE_size", "href", "aria-label"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
     isDisabled = _ref.isDisabled,
     isSelected = _ref.isSelected,
     icon = _ref.icon,
-    interactionName = _ref.interactionName,
     label = _ref.label,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
@@ -67,7 +67,7 @@ var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
     spacing: spacing,
     UNSAFE_size: UNSAFE_size
   });
-  return /*#__PURE__*/_react.default.createElement(_link.default
+  return /*#__PURE__*/_react.default.createElement(_anchor.default
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , (0, _extends2.default)({}, rest, {
     ref: baseProps.ref,
@@ -91,7 +91,10 @@ var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    componentName: "LinkIconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 };
 

package/dist/cjs/new-button/variants/shared/use-button-base.js

@@ -8,10 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _analyticsNext = require("@atlaskit/analytics-next");
-var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
 var _useAutoFocus = _interopRequireDefault(require("@atlaskit/ds-lib/use-auto-focus"));
-var _interactionContext = _interopRequireDefault(require("@atlaskit/interaction-context"));
 var _primitives = require("@atlaskit/primitives");
 var _splitButtonContext = require("../../containers/split-button/split-button-context");
 var _blockEvents = _interopRequireDefault(require("./block-events"));
@@ -19,9 +16,7 @@ var _xcss = require("./xcss");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; } // eslint-disable-next-line no-duplicate-imports
-// Include modified onClick with analytics
-
+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; }
 var overlayStyles = (0, _primitives.xcss)({
   position: 'absolute',
   insetInlineStart: 'space.0',
@@ -47,13 +42,11 @@ var overlayStyles = (0, _primitives.xcss)({
  * @private
  */
 var useButtonBase = function useButtonBase(_ref) {
-  var analyticsContext = _ref.analyticsContext,
-    _ref$appearance = _ref.appearance,
+  var _ref$appearance = _ref.appearance,
     propAppearance = _ref$appearance === void 0 ? 'default' : _ref$appearance,
     _ref$autoFocus = _ref.autoFocus,
     autoFocus = _ref$autoFocus === void 0 ? false : _ref$autoFocus,
     buttonType = _ref.buttonType,
-    interactionName = _ref.interactionName,
     _ref$isDisabled = _ref.isDisabled,
     propIsDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
     _ref$isSelected = _ref.isSelected,
@@ -67,8 +60,7 @@ var useButtonBase = function useButtonBase(_ref) {
     _ref$hasIconAfter = _ref.hasIconAfter,
     hasIconAfter = _ref$hasIconAfter === void 0 ? false : _ref$hasIconAfter,
     children = _ref.children,
-    _ref$onClick = _ref.onClick,
-    providedOnClick = _ref$onClick === void 0 ? _noop.default : _ref$onClick,
+    onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
     onMouseUpCapture = _ref.onMouseUpCapture,
     onKeyDownCapture = _ref.onKeyDownCapture,
@@ -107,20 +99,6 @@ var useButtonBase = function useButtonBase(_ref) {
     ref.current = node;
   }, [ourRef, ref]);
   (0, _useAutoFocus.default)(ourRef, autoFocus);
-  var interactionContext = (0, _react.useContext)(_interactionContext.default);
-  var handleClick = (0, _react.useCallback)(function (e, analyticsEvent) {
-    interactionContext && interactionContext.tracePress(interactionName, e.timeStamp);
-    providedOnClick(e, analyticsEvent);
-  }, [providedOnClick, interactionContext, interactionName]);
-  var onClick = (0, _analyticsNext.usePlatformLeafEventHandler)({
-    fn: handleClick,
-    action: 'clicked',
-    componentName: 'button',
-    packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
-    analyticsData: analyticsContext,
-    actionSubject: buttonType
-  });
   var buttonXCSS = (0, _react.useMemo)(function () {
     return (0, _xcss.getXCSS)({
       appearance: appearance,

package/dist/cjs/old-button/shared/button-base.js

@@ -117,7 +117,7 @@ var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(function
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
+    packageVersion: "0.0.0-development",
     analyticsData: analyticsContext
   });
 

package/dist/es2019/new-button/variants/default/button.js

@@ -13,6 +13,7 @@ import useDefaultButton from './use-default-button';
  */
 const Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function Button({
   analyticsContext,
+  interactionName,
   autoFocus,
   appearance,
   spacing,
@@ -24,7 +25,6 @@ const Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function B
   UNSAFE_iconBefore_size,
   children,
   shouldFitContainer,
-  interactionName,
   overlay,
   onClick,
   onMouseDownCapture,
@@ -85,7 +85,10 @@ const Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function B
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "Button"
   }), baseProps.children);
 }));
 Button.displayName = 'Button';

package/dist/es2019/new-button/variants/default/link.js

@@ -1,9 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { forwardRef, memo } from 'react';
-import UNSAFE_LINK from '@atlaskit/primitives/link';
+import UNSAFE_ANCHOR from '@atlaskit/primitives/anchor';
 import useDefaultButton from './use-default-button';
 const LinkButtonBase = ({
   analyticsContext,
+  interactionName,
   autoFocus,
   appearance,
   spacing,
@@ -15,7 +16,6 @@ const LinkButtonBase = ({
   UNSAFE_iconAfter_size,
   children,
   shouldFitContainer,
-  interactionName,
   overlay,
   onClick,
   onMouseDownCapture,
@@ -59,7 +59,7 @@ const LinkButtonBase = ({
     shouldFitContainer,
     spacing
   });
-  return /*#__PURE__*/React.createElement(UNSAFE_LINK
+  return /*#__PURE__*/React.createElement(UNSAFE_ANCHOR
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , _extends({}, rest, {
     ref: baseProps.ref,
@@ -83,7 +83,10 @@ const LinkButtonBase = ({
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "LinkButton"
   }), baseProps.children);
 };
 

package/dist/es2019/new-button/variants/icon/button.js

@@ -13,13 +13,13 @@ import useIconButton from './use-icon-button';
  */
 const IconButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function Button({
   analyticsContext,
+  interactionName,
   autoFocus,
   appearance,
   spacing,
   isDisabled,
   isSelected,
   icon,
-  interactionName,
   label,
   overlay,
   onClick,
@@ -85,7 +85,10 @@ const IconButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(functi
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    componentName: "IconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 }));
 IconButton.displayName = 'IconButton';

package/dist/es2019/new-button/variants/icon/link.js

@@ -1,16 +1,16 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { forwardRef, memo } from 'react';
-import UNSAFE_LINK from '@atlaskit/primitives/link';
+import UNSAFE_ANCHOR from '@atlaskit/primitives/anchor';
 import useIconButton from './use-icon-button';
 const LinkIconButtonBase = ({
   analyticsContext,
+  interactionName,
   autoFocus,
   appearance,
   spacing,
   isDisabled,
   isSelected,
   icon,
-  interactionName,
   label,
   overlay,
   onClick,
@@ -57,7 +57,7 @@ const LinkIconButtonBase = ({
     spacing,
     UNSAFE_size
   });
-  return /*#__PURE__*/React.createElement(UNSAFE_LINK
+  return /*#__PURE__*/React.createElement(UNSAFE_ANCHOR
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , _extends({}, rest, {
     ref: baseProps.ref,
@@ -81,7 +81,10 @@ const LinkIconButtonBase = ({
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    componentName: "LinkIconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 };
 

package/dist/es2019/new-button/variants/shared/use-button-base.js

@@ -1,16 +1,9 @@
-import React, { Fragment, useCallback, useContext, useMemo, useRef } from 'react';
-import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
-import noop from '@atlaskit/ds-lib/noop';
+import React, { Fragment, useCallback, useMemo, useRef } from 'react';
 import useAutoFocus from '@atlaskit/ds-lib/use-auto-focus';
-// eslint-disable-next-line no-duplicate-imports
-import InteractionContext from '@atlaskit/interaction-context';
 import { Box, xcss } from '@atlaskit/primitives';
 import { useSplitButtonContext } from '../../containers/split-button/split-button-context';
 import blockEvents from './block-events';
 import { getXCSS } from './xcss';
-
-// Include modified onClick with analytics
-
 const overlayStyles = xcss({
   position: 'absolute',
   insetInlineStart: 'space.0',
@@ -36,11 +29,9 @@ const overlayStyles = xcss({
  * @private
  */
 const useButtonBase = ({
-  analyticsContext,
   appearance: propAppearance = 'default',
   autoFocus = false,
   buttonType,
-  interactionName,
   isDisabled: propIsDisabled = false,
   isSelected = false,
   // TODO: Separate Icon Button styling from button base
@@ -50,7 +41,7 @@ const useButtonBase = ({
   hasIconBefore = false,
   hasIconAfter = false,
   children,
-  onClick: providedOnClick = noop,
+  onClick,
   onMouseDownCapture,
   onMouseUpCapture,
   onKeyDownCapture,
@@ -88,20 +79,6 @@ const useButtonBase = ({
     ref.current = node;
   }, [ourRef, ref]);
   useAutoFocus(ourRef, autoFocus);
-  const interactionContext = useContext(InteractionContext);
-  const handleClick = useCallback((e, analyticsEvent) => {
-    interactionContext && interactionContext.tracePress(interactionName, e.timeStamp);
-    providedOnClick(e, analyticsEvent);
-  }, [providedOnClick, interactionContext, interactionName]);
-  const onClick = usePlatformLeafEventHandler({
-    fn: handleClick,
-    action: 'clicked',
-    componentName: 'button',
-    packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
-    analyticsData: analyticsContext,
-    actionSubject: buttonType
-  });
   const buttonXCSS = useMemo(() => getXCSS({
     appearance,
     spacing,

package/dist/es2019/old-button/shared/button-base.js

@@ -102,7 +102,7 @@ export default /*#__PURE__*/React.forwardRef(function ButtonBase(props, ref) {
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
+    packageVersion: "0.0.0-development",
     analyticsData: analyticsContext
   });
 

package/dist/esm/new-button/variants/default/button.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconAfter_size", "iconAfter", "UNSAFE_iconBefore_size", "children", "shouldFitContainer", "interactionName", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "type", "testId"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconAfter_size", "iconAfter", "UNSAFE_iconBefore_size", "children", "shouldFitContainer", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "type", "testId"];
 import React from 'react';
 import UNSAFE_PRESSABLE from '@atlaskit/primitives/pressable';
 import useDefaultButton from './use-default-button';
@@ -15,6 +15,7 @@ import useDefaultButton from './use-default-button';
  */
 var Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function Button(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
@@ -26,7 +27,6 @@ var Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function But
     UNSAFE_iconBefore_size = _ref.UNSAFE_iconBefore_size,
     children = _ref.children,
     shouldFitContainer = _ref.shouldFitContainer,
-    interactionName = _ref.interactionName,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
@@ -87,7 +87,10 @@ var Button = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function But
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "Button"
   }), baseProps.children);
 }));
 Button.displayName = 'Button';

package/dist/esm/new-button/variants/default/link.js

@@ -1,11 +1,12 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconBefore_size", "iconAfter", "UNSAFE_iconAfter_size", "children", "shouldFitContainer", "interactionName", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "testId", "href"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "iconBefore", "UNSAFE_iconBefore_size", "iconAfter", "UNSAFE_iconAfter_size", "children", "shouldFitContainer", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "testId", "href"];
 import React, { forwardRef, memo } from 'react';
-import UNSAFE_LINK from '@atlaskit/primitives/link';
+import UNSAFE_ANCHOR from '@atlaskit/primitives/anchor';
 import useDefaultButton from './use-default-button';
 var LinkButtonBase = function LinkButtonBase(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
@@ -17,7 +18,6 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     UNSAFE_iconAfter_size = _ref.UNSAFE_iconAfter_size,
     children = _ref.children,
     shouldFitContainer = _ref.shouldFitContainer,
-    interactionName = _ref.interactionName,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
@@ -60,7 +60,7 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     shouldFitContainer: shouldFitContainer,
     spacing: spacing
   });
-  return /*#__PURE__*/React.createElement(UNSAFE_LINK
+  return /*#__PURE__*/React.createElement(UNSAFE_ANCHOR
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , _extends({}, rest, {
     ref: baseProps.ref,
@@ -84,7 +84,10 @@ var LinkButtonBase = function LinkButtonBase(_ref, ref) {
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    analyticsContext: analyticsContext,
+    interactionName: interactionName,
+    componentName: "LinkButton"
   }), baseProps.children);
 };
 

package/dist/esm/new-button/variants/icon/button.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "interactionName", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "type", "testId", "UNSAFE_size", "aria-label"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "type", "testId", "UNSAFE_size", "aria-label"];
 import React from 'react';
 import UNSAFE_PRESSABLE from '@atlaskit/primitives/pressable';
 import useIconButton from './use-icon-button';
@@ -15,13 +15,13 @@ import useIconButton from './use-icon-button';
  */
 var IconButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function Button(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
     isDisabled = _ref.isDisabled,
     isSelected = _ref.isSelected,
     icon = _ref.icon,
-    interactionName = _ref.interactionName,
     label = _ref.label,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
@@ -86,7 +86,10 @@ var IconButton = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function
     onPointerUpCapture: baseProps.onPointerUpCapture,
     onClickCapture: baseProps.onClickCapture,
     type: type,
-    testId: testId
+    testId: testId,
+    componentName: "IconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 }));
 IconButton.displayName = 'IconButton';

package/dist/esm/new-button/variants/icon/link.js

@@ -1,18 +1,18 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["analyticsContext", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "interactionName", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "testId", "UNSAFE_size", "href", "aria-label"];
+var _excluded = ["analyticsContext", "interactionName", "autoFocus", "appearance", "spacing", "isDisabled", "isSelected", "icon", "label", "overlay", "onClick", "onMouseDownCapture", "onMouseUpCapture", "onKeyDownCapture", "onKeyUpCapture", "onTouchStartCapture", "onTouchEndCapture", "onPointerDownCapture", "onPointerUpCapture", "onClickCapture", "shape", "testId", "UNSAFE_size", "href", "aria-label"];
 import React, { forwardRef, memo } from 'react';
-import UNSAFE_LINK from '@atlaskit/primitives/link';
+import UNSAFE_ANCHOR from '@atlaskit/primitives/anchor';
 import useIconButton from './use-icon-button';
 var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
   var analyticsContext = _ref.analyticsContext,
+    interactionName = _ref.interactionName,
     autoFocus = _ref.autoFocus,
     appearance = _ref.appearance,
     spacing = _ref.spacing,
     isDisabled = _ref.isDisabled,
     isSelected = _ref.isSelected,
     icon = _ref.icon,
-    interactionName = _ref.interactionName,
     label = _ref.label,
     overlay = _ref.overlay,
     onClick = _ref.onClick,
@@ -57,7 +57,7 @@ var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
     spacing: spacing,
     UNSAFE_size: UNSAFE_size
   });
-  return /*#__PURE__*/React.createElement(UNSAFE_LINK
+  return /*#__PURE__*/React.createElement(UNSAFE_ANCHOR
   // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
   , _extends({}, rest, {
     ref: baseProps.ref,
@@ -81,7 +81,10 @@ var LinkIconButtonBase = function LinkIconButtonBase(_ref, ref) {
     ,
     href: baseProps.isDisabled ? undefined : href,
     role: baseProps.isDisabled ? 'link' : undefined,
-    "aria-disabled": baseProps.isDisabled === true ? true : undefined
+    "aria-disabled": baseProps.isDisabled === true ? true : undefined,
+    componentName: "LinkIconButton",
+    analyticsContext: analyticsContext,
+    interactionName: interactionName
   }), baseProps.children);
 };
 

package/dist/esm/new-button/variants/shared/use-button-base.js

@@ -1,19 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import React, { Fragment, useCallback, useContext, useMemo, useRef } from 'react';
-import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
-import noop from '@atlaskit/ds-lib/noop';
+import React, { Fragment, useCallback, useMemo, useRef } from 'react';
 import useAutoFocus from '@atlaskit/ds-lib/use-auto-focus';
-// eslint-disable-next-line no-duplicate-imports
-import InteractionContext from '@atlaskit/interaction-context';
 import { Box, xcss } from '@atlaskit/primitives';
 import { useSplitButtonContext } from '../../containers/split-button/split-button-context';
 import blockEvents from './block-events';
 import { getXCSS } from './xcss';
-
-// Include modified onClick with analytics
-
 var overlayStyles = xcss({
   position: 'absolute',
   insetInlineStart: 'space.0',
@@ -39,13 +32,11 @@ var overlayStyles = xcss({
  * @private
  */
 var useButtonBase = function useButtonBase(_ref) {
-  var analyticsContext = _ref.analyticsContext,
-    _ref$appearance = _ref.appearance,
+  var _ref$appearance = _ref.appearance,
     propAppearance = _ref$appearance === void 0 ? 'default' : _ref$appearance,
     _ref$autoFocus = _ref.autoFocus,
     autoFocus = _ref$autoFocus === void 0 ? false : _ref$autoFocus,
     buttonType = _ref.buttonType,
-    interactionName = _ref.interactionName,
     _ref$isDisabled = _ref.isDisabled,
     propIsDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
     _ref$isSelected = _ref.isSelected,
@@ -59,8 +50,7 @@ var useButtonBase = function useButtonBase(_ref) {
     _ref$hasIconAfter = _ref.hasIconAfter,
     hasIconAfter = _ref$hasIconAfter === void 0 ? false : _ref$hasIconAfter,
     children = _ref.children,
-    _ref$onClick = _ref.onClick,
-    providedOnClick = _ref$onClick === void 0 ? noop : _ref$onClick,
+    onClick = _ref.onClick,
     onMouseDownCapture = _ref.onMouseDownCapture,
     onMouseUpCapture = _ref.onMouseUpCapture,
     onKeyDownCapture = _ref.onKeyDownCapture,
@@ -99,20 +89,6 @@ var useButtonBase = function useButtonBase(_ref) {
     ref.current = node;
   }, [ourRef, ref]);
   useAutoFocus(ourRef, autoFocus);
-  var interactionContext = useContext(InteractionContext);
-  var handleClick = useCallback(function (e, analyticsEvent) {
-    interactionContext && interactionContext.tracePress(interactionName, e.timeStamp);
-    providedOnClick(e, analyticsEvent);
-  }, [providedOnClick, interactionContext, interactionName]);
-  var onClick = usePlatformLeafEventHandler({
-    fn: handleClick,
-    action: 'clicked',
-    componentName: 'button',
-    packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
-    analyticsData: analyticsContext,
-    actionSubject: buttonType
-  });
   var buttonXCSS = useMemo(function () {
     return getXCSS({
       appearance: appearance,

package/dist/esm/old-button/shared/button-base.js

@@ -108,7 +108,7 @@ export default /*#__PURE__*/React.forwardRef(function ButtonBase(props, ref) {
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "17.5.0",
+    packageVersion: "0.0.0-development",
     analyticsData: analyticsContext
   });
 

package/dist/types/new-button/variants/default/link.d.ts

@@ -2,7 +2,7 @@ import React, { type Ref } from 'react';
 import { type AdditionalDefaultLinkVariantProps, type CommonLinkVariantProps } from '../types';
 import { type CommonDefaultButtonProps } from './types';
 export type LinkButtonProps<RouterLinkConfig extends Record<string, any> = never> = CommonDefaultButtonProps & CommonLinkVariantProps<RouterLinkConfig> & AdditionalDefaultLinkVariantProps;
-declare const LinkButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, autoFocus, appearance, spacing, isDisabled, isSelected, iconBefore, UNSAFE_iconBefore_size, iconAfter, UNSAFE_iconAfter_size, children, shouldFitContainer, interactionName, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, testId, href, ...rest }: LinkButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const LinkButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, interactionName, autoFocus, appearance, spacing, isDisabled, isSelected, iconBefore, UNSAFE_iconBefore_size, iconAfter, UNSAFE_iconAfter_size, children, shouldFitContainer, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, testId, href, ...rest }: LinkButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __Link Button__
  *

package/dist/types/new-button/variants/icon/link.d.ts

@@ -2,7 +2,7 @@ import React, { type Ref } from 'react';
 import { type CommonLinkVariantProps } from '../types';
 import { type CommonIconButtonProps } from './types';
 export type LinkIconButtonProps<RouterLinkConfig extends Record<string, any> = never> = CommonIconButtonProps & CommonLinkVariantProps<RouterLinkConfig>;
-declare const LinkIconButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, autoFocus, appearance, spacing, isDisabled, isSelected, icon, interactionName, label, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, shape, testId, UNSAFE_size, href, "aria-label": preventedAriaLabel, ...rest }: LinkIconButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const LinkIconButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, interactionName, autoFocus, appearance, spacing, isDisabled, isSelected, icon, label, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, shape, testId, UNSAFE_size, href, "aria-label": preventedAriaLabel, ...rest }: LinkIconButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __Link Icon Button__
  *

package/dist/types/new-button/variants/shared/use-button-base.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 import { xcss } from '@atlaskit/primitives';
 import { type Appearance, type CommonButtonProps } from '../types';
-export type ControlledEvents<TagName extends HTMLElement> = Pick<React.DOMAttributes<TagName>, 'onMouseDownCapture' | 'onMouseUpCapture' | 'onKeyDownCapture' | 'onKeyUpCapture' | 'onTouchStartCapture' | 'onTouchEndCapture' | 'onPointerDownCapture' | 'onPointerUpCapture' | 'onClickCapture' | 'onClick'>;
-export type ControlledEventsPassed<TagName extends HTMLElement> = Omit<ControlledEvents<TagName>, 'onClick'> & Pick<CommonButtonProps<TagName>, 'onClick'>;
+export type ControlledEvents<TagName extends HTMLElement> = Pick<React.DOMAttributes<TagName>, 'onMouseDownCapture' | 'onMouseUpCapture' | 'onKeyDownCapture' | 'onKeyUpCapture' | 'onTouchStartCapture' | 'onTouchEndCapture' | 'onPointerDownCapture' | 'onPointerUpCapture' | 'onClickCapture'> & Pick<CommonButtonProps<TagName>, 'onClick'>;
 export type UseButtonBaseArgs<TagName extends HTMLElement> = {
     ref: React.Ref<TagName>;
     /**
@@ -16,7 +15,7 @@ export type UseButtonBaseArgs<TagName extends HTMLElement> = {
     shouldFitContainer?: boolean;
     appearance?: Appearance;
     children: React.ReactNode;
-} & Pick<CommonButtonProps<TagName>, 'analyticsContext' | 'autoFocus' | 'interactionName' | 'isDisabled' | 'isSelected' | 'overlay' | 'spacing'> & ControlledEventsPassed<TagName>;
+} & Pick<CommonButtonProps<TagName>, 'analyticsContext' | 'autoFocus' | 'interactionName' | 'isDisabled' | 'isSelected' | 'overlay' | 'spacing'> & ControlledEvents<TagName>;
 export type UseButtonBaseReturn<TagName extends HTMLElement> = {
     xcss: ReturnType<typeof xcss>;
     ref(node: TagName | null): void;
@@ -36,5 +35,5 @@ export type UseButtonBaseReturn<TagName extends HTMLElement> = {
  *
  * @private
  */
-declare const useButtonBase: <TagName extends HTMLElement>({ analyticsContext, appearance: propAppearance, autoFocus, buttonType, interactionName, isDisabled: propIsDisabled, isSelected, isIconButton, isCircle, hasIconBefore, hasIconAfter, children, onClick: providedOnClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, overlay, ref, shouldFitContainer, spacing: propSpacing, }: UseButtonBaseArgs<TagName>) => UseButtonBaseReturn<TagName>;
+declare const useButtonBase: <TagName extends HTMLElement>({ appearance: propAppearance, autoFocus, buttonType, isDisabled: propIsDisabled, isSelected, isIconButton, isCircle, hasIconBefore, hasIconAfter, children, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, overlay, ref, shouldFitContainer, spacing: propSpacing, }: UseButtonBaseArgs<TagName>) => UseButtonBaseReturn<TagName>;
 export default useButtonBase;

package/dist/types-ts4.5/new-button/variants/default/link.d.ts

@@ -2,7 +2,7 @@ import React, { type Ref } from 'react';
 import { type AdditionalDefaultLinkVariantProps, type CommonLinkVariantProps } from '../types';
 import { type CommonDefaultButtonProps } from './types';
 export type LinkButtonProps<RouterLinkConfig extends Record<string, any> = never> = CommonDefaultButtonProps & CommonLinkVariantProps<RouterLinkConfig> & AdditionalDefaultLinkVariantProps;
-declare const LinkButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, autoFocus, appearance, spacing, isDisabled, isSelected, iconBefore, UNSAFE_iconBefore_size, iconAfter, UNSAFE_iconAfter_size, children, shouldFitContainer, interactionName, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, testId, href, ...rest }: LinkButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const LinkButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, interactionName, autoFocus, appearance, spacing, isDisabled, isSelected, iconBefore, UNSAFE_iconBefore_size, iconAfter, UNSAFE_iconAfter_size, children, shouldFitContainer, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, testId, href, ...rest }: LinkButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __Link Button__
  *

package/dist/types-ts4.5/new-button/variants/icon/link.d.ts

@@ -2,7 +2,7 @@ import React, { type Ref } from 'react';
 import { type CommonLinkVariantProps } from '../types';
 import { type CommonIconButtonProps } from './types';
 export type LinkIconButtonProps<RouterLinkConfig extends Record<string, any> = never> = CommonIconButtonProps & CommonLinkVariantProps<RouterLinkConfig>;
-declare const LinkIconButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, autoFocus, appearance, spacing, isDisabled, isSelected, icon, interactionName, label, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, shape, testId, UNSAFE_size, href, "aria-label": preventedAriaLabel, ...rest }: LinkIconButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const LinkIconButtonBase: <RouterLinkConfig extends Record<string, any> = never>({ analyticsContext, interactionName, autoFocus, appearance, spacing, isDisabled, isSelected, icon, label, overlay, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, shape, testId, UNSAFE_size, href, "aria-label": preventedAriaLabel, ...rest }: LinkIconButtonProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __Link Icon Button__
  *

package/dist/types-ts4.5/new-button/variants/shared/use-button-base.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 import { xcss } from '@atlaskit/primitives';
 import { type Appearance, type CommonButtonProps } from '../types';
-export type ControlledEvents<TagName extends HTMLElement> = Pick<React.DOMAttributes<TagName>, 'onMouseDownCapture' | 'onMouseUpCapture' | 'onKeyDownCapture' | 'onKeyUpCapture' | 'onTouchStartCapture' | 'onTouchEndCapture' | 'onPointerDownCapture' | 'onPointerUpCapture' | 'onClickCapture' | 'onClick'>;
-export type ControlledEventsPassed<TagName extends HTMLElement> = Omit<ControlledEvents<TagName>, 'onClick'> & Pick<CommonButtonProps<TagName>, 'onClick'>;
+export type ControlledEvents<TagName extends HTMLElement> = Pick<React.DOMAttributes<TagName>, 'onMouseDownCapture' | 'onMouseUpCapture' | 'onKeyDownCapture' | 'onKeyUpCapture' | 'onTouchStartCapture' | 'onTouchEndCapture' | 'onPointerDownCapture' | 'onPointerUpCapture' | 'onClickCapture'> & Pick<CommonButtonProps<TagName>, 'onClick'>;
 export type UseButtonBaseArgs<TagName extends HTMLElement> = {
     ref: React.Ref<TagName>;
     /**
@@ -16,7 +15,7 @@ export type UseButtonBaseArgs<TagName extends HTMLElement> = {
     shouldFitContainer?: boolean;
     appearance?: Appearance;
     children: React.ReactNode;
-} & Pick<CommonButtonProps<TagName>, 'analyticsContext' | 'autoFocus' | 'interactionName' | 'isDisabled' | 'isSelected' | 'overlay' | 'spacing'> & ControlledEventsPassed<TagName>;
+} & Pick<CommonButtonProps<TagName>, 'analyticsContext' | 'autoFocus' | 'interactionName' | 'isDisabled' | 'isSelected' | 'overlay' | 'spacing'> & ControlledEvents<TagName>;
 export type UseButtonBaseReturn<TagName extends HTMLElement> = {
     xcss: ReturnType<typeof xcss>;
     ref(node: TagName | null): void;
@@ -36,5 +35,5 @@ export type UseButtonBaseReturn<TagName extends HTMLElement> = {
  *
  * @private
  */
-declare const useButtonBase: <TagName extends HTMLElement>({ analyticsContext, appearance: propAppearance, autoFocus, buttonType, interactionName, isDisabled: propIsDisabled, isSelected, isIconButton, isCircle, hasIconBefore, hasIconAfter, children, onClick: providedOnClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, overlay, ref, shouldFitContainer, spacing: propSpacing, }: UseButtonBaseArgs<TagName>) => UseButtonBaseReturn<TagName>;
+declare const useButtonBase: <TagName extends HTMLElement>({ appearance: propAppearance, autoFocus, buttonType, isDisabled: propIsDisabled, isSelected, isIconButton, isCircle, hasIconBefore, hasIconAfter, children, onClick, onMouseDownCapture, onMouseUpCapture, onKeyDownCapture, onKeyUpCapture, onTouchStartCapture, onTouchEndCapture, onPointerDownCapture, onPointerUpCapture, onClickCapture, overlay, ref, shouldFitContainer, spacing: propSpacing, }: UseButtonBaseArgs<TagName>) => UseButtonBaseReturn<TagName>;
 export default useButtonBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/button",
-  "version": "17.5.0",
+  "version": "17.6.1",
   "description": "A button triggers an event or action. They let users know what will happen next.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -87,10 +87,10 @@
     "@atlaskit/focus-ring": "^1.3.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/interaction-context": "^2.1.0",
-    "@atlaskit/primitives": "^2.1.0",
+    "@atlaskit/primitives": "^4.0.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.38.0",
+    "@atlaskit/tokens": "^1.39.0",
     "@atlaskit/visually-hidden": "^1.2.4",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1"