AP-919 Stop propagation of clicks when disabled using input as

src/Button/Button.spec.tsx

@@ -64,6 +64,29 @@ test("when disabled, button does not call click handlers", () => {
  expect(rootElementOnClick).not.toHaveBeenCalled();
 });
 
+test("when disabled, button with 'as=' set to not a button element does not call click handlers", () => {
+ const rootElementOnClick = jest.fn();
+ const asElementOnClick = jest.fn();
+
+ const { getByTestId } = render(
+ <Button
+ as={<div onClick={asElementOnClick} />}
+ data-testid="button"
+ disabled
+ onClick={rootElementOnClick}
+ >
+ submit
+ </Button>
+ );
+
+ // act
+ getByTestId("button").click();
+
+ // assert
+ expect(asElementOnClick).not.toHaveBeenCalled();
+ expect(rootElementOnClick).not.toHaveBeenCalled();
+});
+
 test("when loading, button does not call click handlers", () => {
  const rootElementOnClick = jest.fn();
  const asElementOnClick = jest.fn();

src/Button/Button.tsx

@@ -464,7 +464,7 @@ export const Button: React.FC<Props> = ({
  ),
  disabled,
  onClick: (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
- // if (disabled) return event.preventDefault();
+ if (disabled) return event.preventDefault();
 
  if (otherProps.onClick) {
  otherProps.onClick(event);