Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Button and ButtonTab component issue with onclick #109

Merged
merged 9 commits into from
Aug 16, 2022
5 changes: 0 additions & 5 deletions .changeset/gorgeous-weeks-learn.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/large-beans-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@appsmithorg/design-system": patch
---

fix: Button and ButtonTab component issue in onclick functions
5 changes: 0 additions & 5 deletions .changeset/yellow-wasps-work.md

This file was deleted.

12 changes: 12 additions & 0 deletions packages/design-system/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @appsmithorg/design-system

## 1.0.12

### Patch Changes

- [#105](https://github.com/appsmithorg/design-system/pull/105) [`444cee2`](https://github.com/appsmithorg/design-system/commit/444cee2ace642335988ebab974f02ff17a775f9c) Thanks [@tanvibhakta](https://github.com/tanvibhakta)! - update DropdownOption to TableDropdownOption and export for typechecking ease

## 1.0.11

### Patch Changes

- [#100](https://github.com/appsmithorg/design-system/pull/100) [`cedb54d`](https://github.com/appsmithorg/design-system/commit/cedb54d0f357389f5db571fdb5a20ad3c675885d) Thanks [@albinAppsmith](https://github.com/albinAppsmith)! - feat: Added button test

## 1.0.10

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appsmithorg/design-system",
"version": "1.0.10",
"version": "1.0.12",
"description": "This is the package for the Appsmith design system components",
"module": "build/index.js",
"types": "build/index.d.ts",
Expand Down
18 changes: 9 additions & 9 deletions packages/design-system/src/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -557,14 +557,15 @@ const getButtonContent = (props: ButtonProps) => {
};

function ButtonComponent(props: ButtonProps) {
const { className, cypressSelector, isLoading, onClick } = props;
const omitProps = ["fill"];
return (
<StyledButton
className={props.className}
data-cy={props.cypressSelector}
className={className}
data-cy={cypressSelector}
{..._.omit(props, omitProps)}
onClick={(e: React.MouseEvent<HTMLElement>) =>
props.onClick && !props.isLoading && props.onClick(e)
onClick && !isLoading && onClick(e)
}
>
{getButtonContent(props)}
Expand All @@ -573,15 +574,14 @@ function ButtonComponent(props: ButtonProps) {
}

function LinkButtonComponent(props: ButtonProps) {
const { className, cypressSelector, href, onClick } = props;
return (
<StyledLinkButton
className={props.className}
data-cy={props.cypressSelector}
href={props.href}
className={className}
data-cy={cypressSelector}
href={href}
{...props}
onClick={(e: React.MouseEvent<HTMLElement>) =>
props.onClick && props.onClick(e)
}
onClick={(e: React.MouseEvent<HTMLElement>) => onClick && onClick(e)}
>
{getButtonContent(props)}
</StyledLinkButton>
Expand Down
15 changes: 8 additions & 7 deletions packages/design-system/src/ButtonTab/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ interface ButtonTabComponentProps {
// eslint-disable-next-line react/display-name
const ButtonTabComponent = React.forwardRef(
(props: ButtonTabComponentProps, ref: any) => {
const valueSet = new Set(props.values);
const { options, selectButton, values } = props;
const valueSet = new Set(values);
let firstValueIndex = 0;
for (const [i, x] of props.options.entries()) {
for (const [i, x] of options.entries()) {
if (valueSet.has(x.value)) {
firstValueIndex = i;
break;
Expand Down Expand Up @@ -93,20 +94,20 @@ const ButtonTabComponent = React.forwardRef(
case "Right":
emitKeyPressEvent(e.key);
setFocusedIndex((prev) =>
prev === props.options.length - 1 ? 0 : prev + 1,
prev === options.length - 1 ? 0 : prev + 1,
);
break;
case "ArrowLeft":
case "Left":
emitKeyPressEvent(e.key);
setFocusedIndex((prev) =>
prev === 0 ? props.options.length - 1 : prev - 1,
prev === 0 ? options.length - 1 : prev - 1,
);
break;
case "Enter":
case " ":
emitKeyPressEvent(e.key);
props.selectButton(props.options[focusedIndex].value, true);
selectButton(options[focusedIndex].value, true);
e.preventDefault();
break;
case "Tab":
Expand All @@ -124,7 +125,7 @@ const ButtonTabComponent = React.forwardRef(
role="tablist"
tabIndex={0}
>
{props.options.map(
{options.map(
({ icon, value, width = 24 }: ButtonTabOption, index: number) => {
let ControlIcon;
if (_.isString(icon)) {
Expand All @@ -142,7 +143,7 @@ const ButtonTabComponent = React.forwardRef(
}`}
key={index}
onClick={() => {
props.selectButton(value, false);
selectButton(value, false);
setFocusedIndex(index);
}}
role="tab"
Expand Down