@atlaskit/button 20.3.10 → 20.3.11

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/button
 
+## 20.3.11
+
+### Patch Changes
+
+- [#105924](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105924)
+  [`b5716d4ae35de`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b5716d4ae35de) -
+  Unsets internal `SplitButton` context to fix an edge-case where appearances of deeply nested
+  Button components were being overridden.
+
 ## 20.3.10
 
 ### Patch Changes

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

@@ -492,7 +492,9 @@ var useButtonBase = function useButtonBase(_ref) {
     // TODO: remove me once we kill color fallbacks
     isSelected && appearance === 'discovery' && selectedDiscoveryStyles, isDisabled && disabledStyles, isCircle && !isSplitButton && circleStyles, spacing === 'compact' && spacingCompactStyles, hasIconBefore && buttonIconBeforeStyles, hasIconAfter && buttonIconAfterStyles, isIconButton && iconButtonStyles, isIconButton && spacing === 'compact' && iconButtonCompactStyles, shouldFitContainer && fullWidthStyles, isLoading && loadingStyles, isSplitButton && splitButtonStyles, isNavigationSplitButton && navigationSplitButtonStyles],
     isDisabled: isEffectivelyDisabled,
-    children: /*#__PURE__*/_react.default.createElement(_react.Fragment, null, children, isLoading ? /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    children: /*#__PURE__*/_react.default.createElement(_splitButtonContext.SplitButtonContext.Provider, {
+      value: undefined
+    }, children, isLoading ? /*#__PURE__*/_react.default.createElement(_primitives.Box, {
       as: "span",
       xcss: loadingOverlayStyles
     }, (0, _loadingOverlay.default)({

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

@@ -133,7 +133,7 @@ var ButtonBase = /*#__PURE__*/_react.default.forwardRef(function ButtonBase(prop
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "20.3.10",
+    packageVersion: "20.3.11",
     analyticsData: analyticsContext
   });
 

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

@@ -1,4 +1,4 @@
-import React, { Fragment, useRef } from 'react';
+import React, { useRef } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useAutoFocus from '@atlaskit/ds-lib/use-auto-focus';
 import { useId } from '@atlaskit/ds-lib/use-id';
@@ -6,7 +6,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import * as colors from '@atlaskit/theme/colors';
 import VisuallyHidden from '@atlaskit/visually-hidden';
-import { useSplitButtonContext } from '../../containers/split-button/split-button-context';
+import { SplitButtonContext, useSplitButtonContext } from '../../containers/split-button/split-button-context';
 import blockEvents from './block-events';
 import { LOADING_LABEL } from './constants';
 import renderLoadingOverlay from './loading-overlay';
@@ -471,7 +471,9 @@ const useButtonBase = ({
     // TODO: remove me once we kill color fallbacks
     isSelected && appearance === 'discovery' && selectedDiscoveryStyles, isDisabled && disabledStyles, isCircle && !isSplitButton && circleStyles, spacing === 'compact' && spacingCompactStyles, hasIconBefore && buttonIconBeforeStyles, hasIconAfter && buttonIconAfterStyles, isIconButton && iconButtonStyles, isIconButton && spacing === 'compact' && iconButtonCompactStyles, shouldFitContainer && fullWidthStyles, isLoading && loadingStyles, isSplitButton && splitButtonStyles, isNavigationSplitButton && navigationSplitButtonStyles],
     isDisabled: isEffectivelyDisabled,
-    children: /*#__PURE__*/React.createElement(Fragment, null, children, isLoading ? /*#__PURE__*/React.createElement(Box, {
+    children: /*#__PURE__*/React.createElement(SplitButtonContext.Provider, {
+      value: undefined
+    }, children, isLoading ? /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: loadingOverlayStyles
     }, renderLoadingOverlay({

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

@@ -119,7 +119,7 @@ const ButtonBase = /*#__PURE__*/React.forwardRef(function ButtonBase(props, ref)
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "20.3.10",
+    packageVersion: "20.3.11",
     analyticsData: analyticsContext
   });
 

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

@@ -1,7 +1,7 @@
 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, useRef } from 'react';
+import React, { useRef } from 'react';
 import mergeRefs from '@atlaskit/ds-lib/merge-refs';
 import useAutoFocus from '@atlaskit/ds-lib/use-auto-focus';
 import { useId } from '@atlaskit/ds-lib/use-id';
@@ -9,7 +9,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import * as colors from '@atlaskit/theme/colors';
 import VisuallyHidden from '@atlaskit/visually-hidden';
-import { useSplitButtonContext } from '../../containers/split-button/split-button-context';
+import { SplitButtonContext, useSplitButtonContext } from '../../containers/split-button/split-button-context';
 import blockEvents from './block-events';
 import { LOADING_LABEL } from './constants';
 import renderLoadingOverlay from './loading-overlay';
@@ -482,7 +482,9 @@ var useButtonBase = function useButtonBase(_ref) {
     // TODO: remove me once we kill color fallbacks
     isSelected && appearance === 'discovery' && selectedDiscoveryStyles, isDisabled && disabledStyles, isCircle && !isSplitButton && circleStyles, spacing === 'compact' && spacingCompactStyles, hasIconBefore && buttonIconBeforeStyles, hasIconAfter && buttonIconAfterStyles, isIconButton && iconButtonStyles, isIconButton && spacing === 'compact' && iconButtonCompactStyles, shouldFitContainer && fullWidthStyles, isLoading && loadingStyles, isSplitButton && splitButtonStyles, isNavigationSplitButton && navigationSplitButtonStyles],
     isDisabled: isEffectivelyDisabled,
-    children: /*#__PURE__*/React.createElement(Fragment, null, children, isLoading ? /*#__PURE__*/React.createElement(Box, {
+    children: /*#__PURE__*/React.createElement(SplitButtonContext.Provider, {
+      value: undefined
+    }, children, isLoading ? /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: loadingOverlayStyles
     }, renderLoadingOverlay({

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

@@ -125,7 +125,7 @@ var ButtonBase = /*#__PURE__*/React.forwardRef(function ButtonBase(props, ref) {
     action: 'clicked',
     componentName: 'button',
     packageName: "@atlaskit/button",
-    packageVersion: "20.3.10",
+    packageVersion: "20.3.11",
     analyticsData: analyticsContext
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/button",
-	"version": "20.3.10",
+	"version": "20.3.11",
 	"description": "A button triggers an event or action. They let users know what will happen next.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -88,12 +88,12 @@
 		"@atlaskit/ds-lib": "^3.3.0",
 		"@atlaskit/focus-ring": "^2.0.0",
 		"@atlaskit/icon": "^23.4.0",
-		"@atlaskit/interaction-context": "^2.4.0",
+		"@atlaskit/interaction-context": "^2.5.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^3.1.0",
+		"@atlaskit/tokens": "^3.2.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@atlaskit/visually-hidden": "^1.5.0",
 		"@babel/runtime": "^7.0.0",
@@ -109,7 +109,7 @@
 		"@atlaskit/app-provider": "^1.6.0",
 		"@atlaskit/checkbox": "^15.2.0",
 		"@atlaskit/docs": "*",
-		"@atlaskit/dropdown-menu": "^12.24.0",
+		"@atlaskit/dropdown-menu": "^12.25.0",
 		"@atlaskit/form": "^11.0.1",
 		"@atlaskit/heading": "*",
 		"@atlaskit/link": "*",

package/__perf__/button.tsx

@@ -1,19 +0,0 @@
-import React from 'react';
-
-import Button from '../src';
-
-import Example from './utils/example-runner';
-import { interactionTasks } from './utils/interaction-tasks';
-
-const button = () => <Example Component={Button} />;
-
-button.story = {
-	name: 'Button',
-	parameters: {
-		performance: {
-			interactions: interactionTasks,
-		},
-	},
-};
-
-export default button;

package/__perf__/custom.tsx

@@ -1,19 +0,0 @@
-import React from 'react';
-
-import { CustomThemeButton } from '../src';
-
-import Example from './utils/example-runner';
-import { interactionTasks } from './utils/interaction-tasks';
-
-const customThemeButton = () => <Example Component={CustomThemeButton} />;
-
-customThemeButton.story = {
-	name: 'CustomThemeButton',
-	parameters: {
-		performance: {
-			interactions: interactionTasks,
-		},
-	},
-};
-
-export default customThemeButton;

package/__perf__/customised.tsx

@@ -1,10 +0,0 @@
-/* eslint-disable @atlaskit/design-system/no-legacy-icons -- TODO - https://product-fabric.atlassian.net/browse/DSP-20398 */
-import React from 'react';
-
-import AddIcon from '@atlaskit/icon/glyph/editor/add';
-
-import { CustomThemeButton } from '../src';
-
-export default () => (
-	<CustomThemeButton iconBefore={<AddIcon label="" />}>Button</CustomThemeButton>
-);

package/__perf__/default.tsx

@@ -1,5 +0,0 @@
-import React from 'react';
-
-import Button from '../src';
-
-export default () => <Button>Default button</Button>;

package/__perf__/loading.tsx

@@ -1,5 +0,0 @@
-import React from 'react';
-
-import { LoadingButton } from '../src';
-
-export default () => <LoadingButton isLoading>Loading button</LoadingButton>;

package/__perf__/utils/example-runner.tsx

@@ -1,43 +0,0 @@
-import React, { useLayoutEffect, useRef, useState } from 'react';
-
-import { bindAll } from 'bind-event-listener';
-
-import type { ButtonProps } from '../../src';
-
-export default function Example({ Component }: { Component: ButtonProps['component'] }) {
-	const [isSelected, setIsSelected] = useState<boolean>(false);
-	const [isDisabled, setIsDisabled] = useState<boolean>(false);
-	const ref = useRef<HTMLElement>(null);
-
-	useLayoutEffect(() => {
-		function toggleSelect() {
-			setIsSelected((value) => !value);
-		}
-		function toggleDisabled() {
-			setIsDisabled((value) => !value);
-		}
-
-		const el: HTMLElement | null = ref.current;
-		if (!el) {
-			throw new Error('Could not find button ref');
-		}
-
-		return bindAll(el, [
-			{ type: 'toggle-select', listener: toggleSelect },
-			{ type: 'toggle-disabled', listener: toggleDisabled },
-		]);
-	}, []);
-
-	return (
-		// @ts-ignore
-		<Component
-			ref={ref}
-			testId="my-button"
-			isSelected={isSelected}
-			isDisabled={isDisabled}
-			data-is-selected={isSelected}
-		>
-			Hello world
-		</Component>
-	);
-}

package/__perf__/utils/interaction-tasks.tsx

@@ -1,77 +0,0 @@
-import { fireEvent } from '@testing-library/react';
-import { type InteractionTaskArgs, type PublicInteractionTask } from 'storybook-addon-performance';
-
-export const interactionTasks: PublicInteractionTask[] = [
-	{
-		name: 'Click a button',
-		description: 'Recording how long a mousedown + click event take to be processed',
-		run: async ({ container }: InteractionTaskArgs): Promise<void> => {
-			const button: HTMLElement | null = container.querySelector('[data-testid="my-button"]');
-			if (button == null) {
-				throw new Error('Could not find button element');
-			}
-
-			fireEvent.mouseDown(button);
-			fireEvent.click(button);
-		},
-	},
-	{
-		name: 'Focus on button',
-		description: 'Focus on a button and wait for layout and paint to finish',
-		run: async ({ container, controls }: InteractionTaskArgs): Promise<void> => {
-			const button: HTMLElement | null = container.querySelector('[data-testid="my-button"]');
-			if (button == null) {
-				throw new Error('Could not find button element');
-			}
-
-			await controls.time(async () => {
-				fireEvent.focus(button);
-				fireEvent.blur(button);
-			});
-		},
-	},
-	{
-		name: 'Select button',
-		description: 'Trigger the selection of a button',
-		run: async ({ container, controls }: InteractionTaskArgs): Promise<void> => {
-			const button: HTMLElement | null = container.querySelector('[data-testid="my-button"]');
-			if (button == null) {
-				throw new Error('Could not find button element');
-			}
-
-			if (button.getAttribute('data-is-selected') !== 'false') {
-				throw new Error('Should not start selected');
-			}
-
-			await controls.time(async () => {
-				fireEvent(button, new Event('toggle-select'));
-			});
-
-			if (button.getAttribute('data-is-selected') !== 'true') {
-				throw new Error('Should now be selected');
-			}
-		},
-	},
-	{
-		name: 'Disable button',
-		description: 'Trigger the disabling of a button',
-		run: async ({ container, controls }: InteractionTaskArgs): Promise<void> => {
-			const button: HTMLElement | null = container.querySelector('[data-testid="my-button"]');
-			if (button == null) {
-				throw new Error('Could not find button element');
-			}
-
-			if (button.hasAttribute('disabled')) {
-				throw new Error('Should not start disabled');
-			}
-
-			await controls.time(async () => {
-				fireEvent(button, new Event('toggle-disabled'));
-			});
-
-			if (!button.hasAttribute('disabled')) {
-				throw new Error('Should now be disabled');
-			}
-		},
-	},
-];