@atlaskit/primitives 2.0.3 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/primitives
 
+## 2.1.0
+
+### Minor Changes
+
+- [#74930](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/74930) [`707a8fee2aee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/707a8fee2aee) - Both the Pressable and Anchor primitives (in Alpha) now support analytics tracking in the same fashion as `@atlaskit/button`. An additional prop `componentName` allows analytics to be configured if a parent component name is desired to be tracked rather than the primitive names. For the time being this tracking is opt-in via use of the `componentName` prop. This will be made default behavior in an upcoming release once tracking is removed in the new Buttons, and `@atlaskit/button` is bumped to use the latest version of `@atlaskit/primitives`
+- [#75221](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75221) [`c15d58bff276`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c15d58bff276) - `Text` inherits color by default if `color` prop is not provided.
+  Removed auto-collapsing behaviour of `Text`
+
 ## 2.0.3
 
 ### Patch Changes

package/dist/cjs/components/link.js

@@ -12,10 +12,13 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
+var _analyticsNext = require("@atlaskit/analytics-next");
 var _appProvider = require("@atlaskit/app-provider");
+var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
+var _interactionContext = _interopRequireDefault(require("@atlaskit/interaction-context"));
 var _xcss = require("../xcss/xcss");
 var _box = _interopRequireDefault(require("./box"));
-var _excluded = ["href", "children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "testId", "xcss", "target", "rel"];
+var _excluded = ["href", "children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "testId", "xcss", "target", "rel", "onClick", "interactionName", "componentName", "analyticsContext"];
 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 || _typeof3(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; }
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -54,7 +57,26 @@ var Link = function Link(_ref, ref) {
     xcssStyles = _ref.xcss,
     target = _ref.target,
     rel = _ref.rel,
+    _ref$onClick = _ref.onClick,
+    providedOnClick = _ref$onClick === void 0 ? _noop.default : _ref$onClick,
+    interactionName = _ref.interactionName,
+    componentName = _ref.componentName,
+    analyticsContext = _ref.analyticsContext,
     htmlAttributes = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  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: componentName || 'Anchor',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'link'
+  });
   var RouterLink = (0, _appProvider.useRouterLink)();
 
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
@@ -91,6 +113,11 @@ var Link = function Link(_ref, ref) {
     paddingInline: paddingInline,
     paddingInlineStart: paddingInlineStart,
     paddingInlineEnd: paddingInlineEnd
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     ,
     xcss: styles
@@ -103,8 +130,9 @@ var Link = function Link(_ref, ref) {
  *
  * @internal Still under development. Do not use.
  *
- * A Link is a primitive component that renders an `<a>` anchor. It utilizes
- * the configured router link component in the AppProvider if set.
+ * Link is a primitive for building custom anchor links. It's a wrapper around the HTML `<a>` element that provides a consistent API for handling client-side routing and Atlassian Design System styling.
+ *
+ * This component is mostly used by other design system components, such as the [link component](/components/link/usage).
  *
  * - [Examples](https://atlassian.design/components/primitives/link/examples)
  * - [Code](https://atlassian.design/components/primitives/link/code)

package/dist/cjs/components/pressable.js

@@ -10,9 +10,12 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _analyticsNext = require("@atlaskit/analytics-next");
+var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
+var _interactionContext = _interopRequireDefault(require("@atlaskit/interaction-context"));
 var _xcss = require("../xcss/xcss");
 var _box = _interopRequireDefault(require("./box"));
-var _excluded = ["children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "isDisabled", "type", "testId", "xcss"];
+var _excluded = ["children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "isDisabled", "type", "testId", "xcss", "onClick", "interactionName", "componentName", "analyticsContext"];
 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; }
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -61,7 +64,27 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     type = _ref$type === void 0 ? 'button' : _ref$type,
     testId = _ref.testId,
     xcssStyles = _ref.xcss,
+    _ref$onClick = _ref.onClick,
+    providedOnClick = _ref$onClick === void 0 ? _noop.default : _ref$onClick,
+    interactionName = _ref.interactionName,
+    componentName = _ref.componentName,
+    analyticsContext = _ref.analyticsContext,
     htmlAttributes = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  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: componentName || 'Pressable',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'button'
+  });
+
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
   var styles = [(0, _xcss.xcss)({
     cursor: isDisabled ? 'not-allowed' : 'pointer'
@@ -71,7 +94,12 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     as: "button",
     ref: ref,
     testId: testId,
-    type: type,
+    type: type
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick,
     backgroundColor: backgroundColor,
     padding: padding,
     paddingBlock: paddingBlock,

package/dist/cjs/components/text.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
-var _react2 = require("@emotion/react");
+var _react = require("@emotion/react");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _styleMaps = require("../xcss/style-maps.partial");
 var _surfaceProvider = require("./internal/surface-provider");
@@ -19,34 +18,34 @@ var asAllowlist = ['span', 'p', 'strong', 'em'];
 // We're doing this because our CSS reset can add top margins to elements such as `p` which is totally insane.
 // Long term we should remove those instances from the reset - it should be a reset to 0.
 // For now, at least we know <Text> will be unaffected by this.
-var resetStyles = (0, _react2.css)({
+var resetStyles = (0, _react.css)({
   margin: 0
 });
 var variantStyles = _objectSpread(_objectSpread({}, _styleMaps.bodyTextStylesMap), _styleMaps.uiTextStylesMap);
-var strongStyles = (0, _react2.css)({
+var strongStyles = (0, _react.css)({
   fontWeight: 'bold'
 });
-var emStyles = (0, _react2.css)({
+var emStyles = (0, _react.css)({
   fontStyle: 'italic'
 });
 var textAlignMap = {
-  center: (0, _react2.css)({
+  center: (0, _react.css)({
     textAlign: 'center'
   }),
-  end: (0, _react2.css)({
+  end: (0, _react.css)({
     textAlign: 'end'
   }),
-  start: (0, _react2.css)({
+  start: (0, _react.css)({
     textAlign: 'start'
   })
 };
-var truncationStyles = (0, _react2.css)({
+var truncationStyles = (0, _react.css)({
   display: '-webkit-box',
   overflow: 'hidden',
   WebkitBoxOrient: 'vertical'
 });
 var wordBreakMap = {
-  breakAll: (0, _react2.css)({
+  breakAll: (0, _react.css)({
     wordBreak: 'break-all'
   })
 };
@@ -56,19 +55,14 @@ var wordBreakMap = {
  */
 var useColor = function useColor(colorProp) {
   var surface = (0, _surfaceProvider.useSurface)();
-  var inverseTextColor = _styleMaps.inverseColorMap[surface];
 
   /**
    * Where the color of the surface is inverted we override the user choice
    * as there is no valid choice that is not covered by the override.
    */
-  var color = inverseTextColor !== null && inverseTextColor !== void 0 ? inverseTextColor : colorProp;
+  var color = _styleMaps.inverseColorMap.hasOwnProperty(surface) ? _styleMaps.inverseColorMap[surface] : colorProp;
   return color;
 };
-var HasTextAncestorContext = /*#__PURE__*/(0, _react.createContext)(false);
-var useHasTextAncestor = function useHasTextAncestor() {
-  return (0, _react.useContext)(HasTextAncestorContext);
-};
 
 /**
  * __Text__
@@ -83,8 +77,7 @@ var Text = function Text(_ref) {
   var children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var asElement = props.as,
-    _props$color = props.color,
-    colorProp = _props$color === void 0 ? 'color.text' : _props$color,
+    colorProp = props.color,
     textAlign = props.textAlign,
     testId = props.testId,
     id = props.id,
@@ -103,16 +96,7 @@ var Text = function Text(_ref) {
     maxLines = props.maxLines;
   }
   var color = useColor(colorProp);
-  var isWrapped = useHasTextAncestor();
-
-  /**
-   * If the text is already wrapped and applies no props we can just
-   * render the children directly as a fragment.
-   */
-  if (isWrapped && Object.keys(props).length === 0) {
-    return (0, _react2.jsx)(_react.Fragment, null, children);
-  }
-  var component = (0, _react2.jsx)(Component, {
+  return (0, _react.jsx)(Component, {
     css: [resetStyles, variant && variantStyles[variant], color && _styleMaps.textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && _styleMaps.fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
     style: {
       WebkitLineClamp: maxLines
@@ -120,10 +104,5 @@ var Text = function Text(_ref) {
     "data-testid": testId,
     id: id
   }, children);
-  return isWrapped ?
-  // no need to re-apply context if the text is already wrapped
-  component : (0, _react2.jsx)(HasTextAncestorContext.Provider, {
-    value: true
-  }, component);
 };
 var _default = exports.default = Text;

package/dist/cjs/index.js

@@ -52,6 +52,12 @@ Object.defineProperty(exports, "UNSAFE_BREAKPOINTS_CONFIG", {
     return _responsive.UNSAFE_BREAKPOINTS_CONFIG;
   }
 });
+Object.defineProperty(exports, "UNSAFE_Pressable", {
+  enumerable: true,
+  get: function get() {
+    return _pressable.default;
+  }
+});
 Object.defineProperty(exports, "UNSAFE_media", {
   enumerable: true,
   get: function get() {
@@ -84,4 +90,5 @@ var _flex = _interopRequireDefault(require("./components/flex"));
 var _grid = _interopRequireDefault(require("./components/grid"));
 var _bleed = _interopRequireDefault(require("./components/bleed"));
 var _text = _interopRequireDefault(require("./components/text"));
+var _pressable = _interopRequireDefault(require("./components/pressable"));
 var _responsive = require("./responsive");

package/dist/es2019/components/link.js

@@ -1,7 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useCallback, useContext } from 'react';
 import invariant from 'tiny-invariant';
+import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
 import { useRouterLink } from '@atlaskit/app-provider';
+import noop from '@atlaskit/ds-lib/noop';
+import InteractionContext from '@atlaskit/interaction-context';
 import { xcss } from '../xcss/xcss';
 import Box from './box';
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -40,8 +43,26 @@ const Link = ({
   xcss: xcssStyles,
   target,
   rel,
+  onClick: providedOnClick = noop,
+  interactionName,
+  componentName,
+  analyticsContext,
   ...htmlAttributes
 }, ref) => {
+  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: componentName || 'Anchor',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'link'
+  });
   const RouterLink = useRouterLink();
 
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
@@ -78,6 +99,11 @@ const Link = ({
     paddingInline: paddingInline,
     paddingInlineStart: paddingInlineStart,
     paddingInlineEnd: paddingInlineEnd
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     ,
     xcss: styles
@@ -90,8 +116,9 @@ const Link = ({
  *
  * @internal Still under development. Do not use.
  *
- * A Link is a primitive component that renders an `<a>` anchor. It utilizes
- * the configured router link component in the AppProvider if set.
+ * Link is a primitive for building custom anchor links. It's a wrapper around the HTML `<a>` element that provides a consistent API for handling client-side routing and Atlassian Design System styling.
+ *
+ * This component is mostly used by other design system components, such as the [link component](/components/link/usage).
  *
  * - [Examples](https://atlassian.design/components/primitives/link/examples)
  * - [Code](https://atlassian.design/components/primitives/link/code)

package/dist/es2019/components/pressable.js

@@ -1,5 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useCallback, useContext } from 'react';
+import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
+import noop from '@atlaskit/ds-lib/noop';
+import InteractionContext from '@atlaskit/interaction-context';
 import { xcss } from '../xcss/xcss';
 import Box from './box';
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -47,8 +50,27 @@ const UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(({
   type = 'button',
   testId,
   xcss: xcssStyles,
+  onClick: providedOnClick = noop,
+  interactionName,
+  componentName,
+  analyticsContext,
   ...htmlAttributes
 }, ref) => {
+  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: componentName || 'Pressable',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'button'
+  });
+
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
   let styles = [xcss({
     cursor: isDisabled ? 'not-allowed' : 'pointer'
@@ -58,7 +80,12 @@ const UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(({
     as: "button",
     ref: ref,
     testId: testId,
-    type: type,
+    type: type
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick,
     backgroundColor: backgroundColor,
     padding: padding,
     paddingBlock: paddingBlock,

package/dist/es2019/components/text.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import { createContext, Fragment, useContext } from 'react';
+
 import { css, jsx } from '@emotion/react';
 import invariant from 'tiny-invariant';
 import { bodyTextStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap, uiTextStylesMap } from '../xcss/style-maps.partial';
@@ -48,17 +48,14 @@ const wordBreakMap = {
  */
 const useColor = colorProp => {
   const surface = useSurface();
-  const inverseTextColor = inverseColorMap[surface];
 
   /**
    * Where the color of the surface is inverted we override the user choice
    * as there is no valid choice that is not covered by the override.
    */
-  const color = inverseTextColor !== null && inverseTextColor !== void 0 ? inverseTextColor : colorProp;
+  const color = inverseColorMap.hasOwnProperty(surface) ? inverseColorMap[surface] : colorProp;
   return color;
 };
-const HasTextAncestorContext = /*#__PURE__*/createContext(false);
-const useHasTextAncestor = () => useContext(HasTextAncestorContext);
 
 /**
  * __Text__
@@ -75,7 +72,7 @@ const Text = ({
 }) => {
   const {
     as: asElement,
-    color: colorProp = 'color.text',
+    color: colorProp,
     textAlign,
     testId,
     id,
@@ -94,16 +91,7 @@ const Text = ({
     maxLines = props.maxLines;
   }
   const color = useColor(colorProp);
-  const isWrapped = useHasTextAncestor();
-
-  /**
-   * If the text is already wrapped and applies no props we can just
-   * render the children directly as a fragment.
-   */
-  if (isWrapped && Object.keys(props).length === 0) {
-    return jsx(Fragment, null, children);
-  }
-  const component = jsx(Component, {
+  return jsx(Component, {
     css: [resetStyles, variant && variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
     style: {
       WebkitLineClamp: maxLines
@@ -111,10 +99,5 @@ const Text = ({
     "data-testid": testId,
     id: id
   }, children);
-  return isWrapped ?
-  // no need to re-apply context if the text is already wrapped
-  component : jsx(HasTextAncestorContext.Provider, {
-    value: true
-  }, component);
 };
 export default Text;

package/dist/es2019/index.js

@@ -6,4 +6,5 @@ export { default as Flex } from './components/flex';
 export { default as Grid } from './components/grid';
 export { default as Bleed } from './components/bleed';
 export { default as Text } from './components/text';
+export { default as UNSAFE_Pressable } from './components/pressable';
 export { media, UNSAFE_media, UNSAFE_BREAKPOINTS_CONFIG } from './responsive';

package/dist/esm/components/link.js

@@ -2,10 +2,13 @@ import _extends from "@babel/runtime/helpers/extends";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["href", "children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "testId", "xcss", "target", "rel"];
-import React, { forwardRef } from 'react';
+var _excluded = ["href", "children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "testId", "xcss", "target", "rel", "onClick", "interactionName", "componentName", "analyticsContext"];
+import React, { forwardRef, useCallback, useContext } from 'react';
 import invariant from 'tiny-invariant';
+import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
 import { useRouterLink } from '@atlaskit/app-provider';
+import noop from '@atlaskit/ds-lib/noop';
+import InteractionContext from '@atlaskit/interaction-context';
 import { xcss } from '../xcss/xcss';
 import Box from './box';
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -44,7 +47,26 @@ var Link = function Link(_ref, ref) {
     xcssStyles = _ref.xcss,
     target = _ref.target,
     rel = _ref.rel,
+    _ref$onClick = _ref.onClick,
+    providedOnClick = _ref$onClick === void 0 ? noop : _ref$onClick,
+    interactionName = _ref.interactionName,
+    componentName = _ref.componentName,
+    analyticsContext = _ref.analyticsContext,
     htmlAttributes = _objectWithoutProperties(_ref, _excluded);
+  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: componentName || 'Anchor',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'link'
+  });
   var RouterLink = useRouterLink();
 
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
@@ -81,6 +103,11 @@ var Link = function Link(_ref, ref) {
     paddingInline: paddingInline,
     paddingInlineStart: paddingInlineStart,
     paddingInlineEnd: paddingInlineEnd
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     ,
     xcss: styles
@@ -93,8 +120,9 @@ var Link = function Link(_ref, ref) {
  *
  * @internal Still under development. Do not use.
  *
- * A Link is a primitive component that renders an `<a>` anchor. It utilizes
- * the configured router link component in the AppProvider if set.
+ * Link is a primitive for building custom anchor links. It's a wrapper around the HTML `<a>` element that provides a consistent API for handling client-side routing and Atlassian Design System styling.
+ *
+ * This component is mostly used by other design system components, such as the [link component](/components/link/usage).
  *
  * - [Examples](https://atlassian.design/components/primitives/link/examples)
  * - [Code](https://atlassian.design/components/primitives/link/code)

package/dist/esm/components/pressable.js

@@ -1,8 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "isDisabled", "type", "testId", "xcss"];
-import React, { forwardRef } from 'react';
+var _excluded = ["children", "backgroundColor", "padding", "paddingBlock", "paddingBlockStart", "paddingBlockEnd", "paddingInline", "paddingInlineStart", "paddingInlineEnd", "isDisabled", "type", "testId", "xcss", "onClick", "interactionName", "componentName", "analyticsContext"];
+import React, { forwardRef, useCallback, useContext } from 'react';
+import { usePlatformLeafEventHandler } from '@atlaskit/analytics-next';
+import noop from '@atlaskit/ds-lib/noop';
+import InteractionContext from '@atlaskit/interaction-context';
 import { xcss } from '../xcss/xcss';
 import Box from './box';
 // TODO: Duplicated FocusRing styles due to lack of `xcss` support
@@ -51,7 +54,27 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(function (_ref, ref) {
     type = _ref$type === void 0 ? 'button' : _ref$type,
     testId = _ref.testId,
     xcssStyles = _ref.xcss,
+    _ref$onClick = _ref.onClick,
+    providedOnClick = _ref$onClick === void 0 ? noop : _ref$onClick,
+    interactionName = _ref.interactionName,
+    componentName = _ref.componentName,
+    analyticsContext = _ref.analyticsContext,
     htmlAttributes = _objectWithoutProperties(_ref, _excluded);
+  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: componentName || 'Pressable',
+    packageName: "@atlaskit/primitives",
+    packageVersion: "2.1.0",
+    analyticsData: analyticsContext,
+    actionSubject: 'button'
+  });
+
   // Combine default styles with supplied styles. XCSS does not support deep nested arrays
   var styles = [xcss({
     cursor: isDisabled ? 'not-allowed' : 'pointer'
@@ -61,7 +84,12 @@ var UNSAFE_PRESSABLE = /*#__PURE__*/forwardRef(function (_ref, ref) {
     as: "button",
     ref: ref,
     testId: testId,
-    type: type,
+    type: type
+    // TODO: This only tracks events if componentName is supplied, which makes tracking opt-in during
+    // the transition period. This will be removed once `@atlaskit/button` is bumped to use the latest
+    // version of primitives
+    ,
+    onClick: componentName ? onClick : providedOnClick,
     backgroundColor: backgroundColor,
     padding: padding,
     paddingBlock: paddingBlock,

package/dist/esm/components/text.js

@@ -4,7 +4,7 @@ var _excluded = ["children"];
 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; }
 /** @jsx jsx */
-import { createContext, Fragment, useContext } from 'react';
+
 import { css, jsx } from '@emotion/react';
 import invariant from 'tiny-invariant';
 import { bodyTextStylesMap, fontWeightStylesMap, inverseColorMap, textColorStylesMap, uiTextStylesMap } from '../xcss/style-maps.partial';
@@ -50,19 +50,14 @@ var wordBreakMap = {
  */
 var useColor = function useColor(colorProp) {
   var surface = useSurface();
-  var inverseTextColor = inverseColorMap[surface];
 
   /**
    * Where the color of the surface is inverted we override the user choice
    * as there is no valid choice that is not covered by the override.
    */
-  var color = inverseTextColor !== null && inverseTextColor !== void 0 ? inverseTextColor : colorProp;
+  var color = inverseColorMap.hasOwnProperty(surface) ? inverseColorMap[surface] : colorProp;
   return color;
 };
-var HasTextAncestorContext = /*#__PURE__*/createContext(false);
-var useHasTextAncestor = function useHasTextAncestor() {
-  return useContext(HasTextAncestorContext);
-};
 
 /**
  * __Text__
@@ -77,8 +72,7 @@ var Text = function Text(_ref) {
   var children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var asElement = props.as,
-    _props$color = props.color,
-    colorProp = _props$color === void 0 ? 'color.text' : _props$color,
+    colorProp = props.color,
     textAlign = props.textAlign,
     testId = props.testId,
     id = props.id,
@@ -97,16 +91,7 @@ var Text = function Text(_ref) {
     maxLines = props.maxLines;
   }
   var color = useColor(colorProp);
-  var isWrapped = useHasTextAncestor();
-
-  /**
-   * If the text is already wrapped and applies no props we can just
-   * render the children directly as a fragment.
-   */
-  if (isWrapped && Object.keys(props).length === 0) {
-    return jsx(Fragment, null, children);
-  }
-  var component = jsx(Component, {
+  return jsx(Component, {
     css: [resetStyles, variant && variantStyles[variant], color && textColorStylesMap[color], maxLines && truncationStyles, maxLines === 1 && wordBreakMap.breakAll, textAlign && textAlignMap[textAlign], weight && fontWeightStylesMap[weight], asElement === 'em' && emStyles, asElement === 'strong' && strongStyles],
     style: {
       WebkitLineClamp: maxLines
@@ -114,10 +99,5 @@ var Text = function Text(_ref) {
     "data-testid": testId,
     id: id
   }, children);
-  return isWrapped ?
-  // no need to re-apply context if the text is already wrapped
-  component : jsx(HasTextAncestorContext.Provider, {
-    value: true
-  }, component);
 };
 export default Text;

package/dist/esm/index.js

@@ -6,4 +6,5 @@ export { default as Flex } from './components/flex';
 export { default as Grid } from './components/grid';
 export { default as Bleed } from './components/bleed';
 export { default as Text } from './components/text';
+export { default as UNSAFE_Pressable } from './components/pressable';
 export { media, UNSAFE_media, UNSAFE_BREAKPOINTS_CONFIG } from './responsive';

package/dist/types/components/link.d.ts

@@ -1,30 +1,68 @@
 import React, { type ReactNode, type Ref } from 'react';
+import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type RouterLinkComponentProps } from '@atlaskit/app-provider';
 import { type BoxProps } from './box';
-export type LinkProps<RouterLinkConfig extends Record<string, any> = never> = RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<'a'>, 'href' | 'as' | 'children' | 'style'> & {
+export type LinkProps<RouterLinkConfig extends Record<string, any> = never> = RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<'a'>, 'href' | 'as' | 'children' | 'style' | 'onClick'> & {
     /**
      * `children` should be defined to ensure links have text.
      */
     children: ReactNode;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: (e: React.MouseEvent<HTMLAnchorElement>, analyticsEvent?: UIAnalyticsEvent) => void;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from anchor.
+     */
+    analyticsContext?: Record<string, any>;
 };
-declare const Link: <RouterLinkConfig extends Record<string, any> = never>({ href, children, backgroundColor, padding, paddingBlock, paddingBlockStart, paddingBlockEnd, paddingInline, paddingInlineStart, paddingInlineEnd, testId, xcss: xcssStyles, target, rel, ...htmlAttributes }: LinkProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const Link: <RouterLinkConfig extends Record<string, any> = never>({ href, children, backgroundColor, padding, paddingBlock, paddingBlockStart, paddingBlockEnd, paddingInline, paddingInlineStart, paddingInlineEnd, testId, xcss: xcssStyles, target, rel, onClick: providedOnClick, interactionName, componentName, analyticsContext, ...htmlAttributes }: LinkProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __UNSAFE_LINK__
  *
  * @internal Still under development. Do not use.
  *
- * A Link is a primitive component that renders an `<a>` anchor. It utilizes
- * the configured router link component in the AppProvider if set.
+ * Link is a primitive for building custom anchor links. It's a wrapper around the HTML `<a>` element that provides a consistent API for handling client-side routing and Atlassian Design System styling.
+ *
+ * This component is mostly used by other design system components, such as the [link component](/components/link/usage).
  *
  * - [Examples](https://atlassian.design/components/primitives/link/examples)
  * - [Code](https://atlassian.design/components/primitives/link/code)
  * - [Usage](https://atlassian.design/components/primitives/link/usage)
  */
-declare const UNSAFE_LINK: <RouterLinkConfig extends Record<string, any> = never>(props: RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<"a">, "style" | "children" | "as" | "href"> & {
+declare const UNSAFE_LINK: <RouterLinkConfig extends Record<string, any> = never>(props: RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<"a">, "style" | "children" | "as" | "onClick" | "href"> & {
     /**
      * `children` should be defined to ensure links have text.
      */
     children: ReactNode;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: ((e: React.MouseEvent<HTMLAnchorElement>, analyticsEvent?: UIAnalyticsEvent) => void) | undefined;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string | undefined;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string | undefined;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from anchor.
+     */
+    analyticsContext?: Record<string, any> | undefined;
 } & {
     ref?: React.Ref<HTMLAnchorElement> | undefined;
 }) => ReturnType<typeof Link>;

package/dist/types/components/pressable.d.ts

@@ -1,14 +1,32 @@
-import { type ReactElement, type ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
+import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type BoxProps } from './box';
-export type PressableProps = Omit<BoxProps<'button'>, 'disabled' | 'as' | 'children' | 'role' | 'style'> & {
+export type PressableProps = Omit<BoxProps<'button'>, 'disabled' | 'as' | 'children' | 'role' | 'style' | 'onClick'> & {
     /**
      * `children` should be defined to ensure buttons are not empty,
      * because they should have labels.
      */
     children: ReactNode;
     isDisabled?: boolean;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: (e: React.MouseEvent<HTMLButtonElement>, analyticsEvent?: UIAnalyticsEvent) => void;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from pressable.
+     */
+    analyticsContext?: Record<string, any>;
 };
-type PressableComponent = (props: PressableProps, displayName: string) => ReactElement | null;
 /**
  * __UNSAFE_PRESSABLE__
  *
@@ -20,5 +38,30 @@ type PressableComponent = (props: PressableProps, displayName: string) => ReactE
  * - [Code](https://atlassian.design/components/primitives/pressable/code)
  * - [Usage](https://atlassian.design/components/primitives/pressable/usage)
  */
-declare const UNSAFE_PRESSABLE: PressableComponent;
+declare const UNSAFE_PRESSABLE: React.ForwardRefExoticComponent<Pick<Omit<BoxProps<"button">, "style" | "disabled" | "children" | "as" | "role" | "onClick"> & {
+    /**
+     * `children` should be defined to ensure buttons are not empty,
+     * because they should have labels.
+     */
+    children: ReactNode;
+    isDisabled?: boolean | undefined;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: ((e: React.MouseEvent<HTMLButtonElement>, analyticsEvent?: UIAnalyticsEvent) => void) | undefined;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string | undefined;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string | undefined;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from pressable.
+     */
+    analyticsContext?: Record<string, any> | undefined;
+}, "padding" | "paddingBlock" | "paddingBlockStart" | "paddingBlockEnd" | "paddingInline" | "paddingInlineStart" | "paddingInlineEnd" | "backgroundColor" | "color" | "translate" | "key" | "value" | "hidden" | "children" | "form" | "slot" | "title" | "name" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "testId" | "xcss" | "data-testid" | "isDisabled" | "interactionName" | "componentName" | "analyticsContext"> & React.RefAttributes<HTMLButtonElement>>;
 export default UNSAFE_PRESSABLE;

package/dist/types/index.d.ts

@@ -15,5 +15,7 @@ export { default as Bleed } from './components/bleed';
 export type { BleedProps } from './components/bleed';
 export { default as Text } from './components/text';
 export type { TextProps } from './components/text';
+export { default as UNSAFE_Pressable } from './components/pressable';
+export type { PressableProps as UNSAFE_PressableProps } from './components/pressable';
 export { media, UNSAFE_media, UNSAFE_BREAKPOINTS_CONFIG } from './responsive';
 export type { Breakpoint, MediaQuery } from './responsive';

package/dist/types-ts4.5/components/link.d.ts

@@ -1,30 +1,68 @@
 import React, { type ReactNode, type Ref } from 'react';
+import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type RouterLinkComponentProps } from '@atlaskit/app-provider';
 import { type BoxProps } from './box';
-export type LinkProps<RouterLinkConfig extends Record<string, any> = never> = RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<'a'>, 'href' | 'as' | 'children' | 'style'> & {
+export type LinkProps<RouterLinkConfig extends Record<string, any> = never> = RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<'a'>, 'href' | 'as' | 'children' | 'style' | 'onClick'> & {
     /**
      * `children` should be defined to ensure links have text.
      */
     children: ReactNode;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: (e: React.MouseEvent<HTMLAnchorElement>, analyticsEvent?: UIAnalyticsEvent) => void;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from anchor.
+     */
+    analyticsContext?: Record<string, any>;
 };
-declare const Link: <RouterLinkConfig extends Record<string, any> = never>({ href, children, backgroundColor, padding, paddingBlock, paddingBlockStart, paddingBlockEnd, paddingInline, paddingInlineStart, paddingInlineEnd, testId, xcss: xcssStyles, target, rel, ...htmlAttributes }: LinkProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
+declare const Link: <RouterLinkConfig extends Record<string, any> = never>({ href, children, backgroundColor, padding, paddingBlock, paddingBlockStart, paddingBlockEnd, paddingInline, paddingInlineStart, paddingInlineEnd, testId, xcss: xcssStyles, target, rel, onClick: providedOnClick, interactionName, componentName, analyticsContext, ...htmlAttributes }: LinkProps<RouterLinkConfig>, ref: Ref<HTMLAnchorElement>) => JSX.Element;
 /**
  * __UNSAFE_LINK__
  *
  * @internal Still under development. Do not use.
  *
- * A Link is a primitive component that renders an `<a>` anchor. It utilizes
- * the configured router link component in the AppProvider if set.
+ * Link is a primitive for building custom anchor links. It's a wrapper around the HTML `<a>` element that provides a consistent API for handling client-side routing and Atlassian Design System styling.
+ *
+ * This component is mostly used by other design system components, such as the [link component](/components/link/usage).
  *
  * - [Examples](https://atlassian.design/components/primitives/link/examples)
  * - [Code](https://atlassian.design/components/primitives/link/code)
  * - [Usage](https://atlassian.design/components/primitives/link/usage)
  */
-declare const UNSAFE_LINK: <RouterLinkConfig extends Record<string, any> = never>(props: RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<"a">, "style" | "children" | "as" | "href"> & {
+declare const UNSAFE_LINK: <RouterLinkConfig extends Record<string, any> = never>(props: RouterLinkComponentProps<RouterLinkConfig> & Omit<BoxProps<"a">, "style" | "children" | "as" | "onClick" | "href"> & {
     /**
      * `children` should be defined to ensure links have text.
      */
     children: ReactNode;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: ((e: React.MouseEvent<HTMLAnchorElement>, analyticsEvent?: UIAnalyticsEvent) => void) | undefined;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string | undefined;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string | undefined;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from anchor.
+     */
+    analyticsContext?: Record<string, any> | undefined;
 } & {
     ref?: React.Ref<HTMLAnchorElement> | undefined;
 }) => ReturnType<typeof Link>;

package/dist/types-ts4.5/components/pressable.d.ts

@@ -1,14 +1,32 @@
-import { type ReactElement, type ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
+import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type BoxProps } from './box';
-export type PressableProps = Omit<BoxProps<'button'>, 'disabled' | 'as' | 'children' | 'role' | 'style'> & {
+export type PressableProps = Omit<BoxProps<'button'>, 'disabled' | 'as' | 'children' | 'role' | 'style' | 'onClick'> & {
     /**
      * `children` should be defined to ensure buttons are not empty,
      * because they should have labels.
      */
     children: ReactNode;
     isDisabled?: boolean;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: (e: React.MouseEvent<HTMLButtonElement>, analyticsEvent?: UIAnalyticsEvent) => void;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from pressable.
+     */
+    analyticsContext?: Record<string, any>;
 };
-type PressableComponent = (props: PressableProps, displayName: string) => ReactElement | null;
 /**
  * __UNSAFE_PRESSABLE__
  *
@@ -20,5 +38,30 @@ type PressableComponent = (props: PressableProps, displayName: string) => ReactE
  * - [Code](https://atlassian.design/components/primitives/pressable/code)
  * - [Usage](https://atlassian.design/components/primitives/pressable/usage)
  */
-declare const UNSAFE_PRESSABLE: PressableComponent;
+declare const UNSAFE_PRESSABLE: React.ForwardRefExoticComponent<Pick<Omit<BoxProps<"button">, "style" | "disabled" | "children" | "as" | "role" | "onClick"> & {
+    /**
+     * `children` should be defined to ensure buttons are not empty,
+     * because they should have labels.
+     */
+    children: ReactNode;
+    isDisabled?: boolean | undefined;
+    /**
+     * Handler to be called on click. The second argument can be used to track analytics data. See the tutorial in the analytics-next package for details.
+     */
+    onClick?: ((e: React.MouseEvent<HTMLButtonElement>, analyticsEvent?: UIAnalyticsEvent) => void) | undefined;
+    /**
+     * An optional name used to identify the interaction type to press listeners. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    interactionName?: string | undefined;
+    /**
+     * An optional component name used to identify this component to press listeners. This can be used if a parent component's name is preferred. For example, interaction tracing. For more information,
+     * see [UFO integration into Design System components](https://go.atlassian.com/react-ufo-dst-integration).
+     */
+    componentName?: string | undefined;
+    /**
+     * Additional information to be included in the `context` of analytics events that come from pressable.
+     */
+    analyticsContext?: Record<string, any> | undefined;
+}, "padding" | "paddingBlock" | "paddingBlockStart" | "paddingBlockEnd" | "paddingInline" | "paddingInlineStart" | "paddingInlineEnd" | "backgroundColor" | "color" | "translate" | "key" | "value" | "hidden" | "children" | "form" | "slot" | "title" | "name" | "type" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "autoFocus" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "testId" | "xcss" | "data-testid" | "isDisabled" | "interactionName" | "componentName" | "analyticsContext"> & React.RefAttributes<HTMLButtonElement>>;
 export default UNSAFE_PRESSABLE;

package/dist/types-ts4.5/index.d.ts

@@ -15,5 +15,7 @@ export { default as Bleed } from './components/bleed';
 export type { BleedProps } from './components/bleed';
 export { default as Text } from './components/text';
 export type { TextProps } from './components/text';
+export { default as UNSAFE_Pressable } from './components/pressable';
+export type { PressableProps as UNSAFE_PressableProps } from './components/pressable';
 export { media, UNSAFE_media, UNSAFE_BREAKPOINTS_CONFIG } from './responsive';
 export type { Breakpoint, MediaQuery } from './responsive';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/primitives",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Primitives are token-backed low-level building blocks.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -104,7 +104,10 @@
     "codegen-styles": "ts-node -r tsconfig-paths/register ./scripts/codegen-styles.tsx"
   },
   "dependencies": {
+    "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/app-provider": "^1.0.0",
+    "@atlaskit/ds-lib": "^2.2.0",
+    "@atlaskit/interaction-context": "^2.1.0",
     "@atlaskit/tokens": "^1.38.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -117,7 +120,6 @@
   },
   "devDependencies": {
     "@af/accessibility-testing": "*",
-    "@atlaskit/ds-lib": "*",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",