Skip to content

fix: disabled not work on all navigation buttons #7518

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.

Sign up for GitHub

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

Closed
deepshekhardas wants to merge 1 commit into from
Closed

fix: disabled not work on all navigation buttons #7518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/antd/src/components/buttons/clone/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,17 @@ export const CloneButton: React.FC<CloneButtonProps> = ({
meta,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -53,7 +56,7 @@ export const CloneButton: React.FC<CloneButtonProps> = ({
>
<Button
icon={<PlusSquareOutlined />}
disabled={disabled}
disabled={isDisabled}
title={title}
data-testid={RefineButtonTestIds.CloneButton}
className={RefineButtonClassNames.CloneButton}
Expand Down
11 changes: 7 additions & 4 deletions packages/antd/src/components/buttons/create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,22 @@ export const CreateButton: React.FC<CreateButtonProps> = ({
const { hidden, disabled, label, title, LinkComponent, to } = useCreateButton(
{
resource: resourceNameFromProps ?? propResourceNameOrRouteName,
accessControl,
meta,
accessControl,
},
);

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -53,7 +56,7 @@ export const CreateButton: React.FC<CreateButtonProps> = ({
>
<Button
icon={<PlusSquareOutlined />}
disabled={disabled}
disabled={isDisabled}
title={title}
data-testid={RefineButtonTestIds.CreateButton}
className={RefineButtonClassNames.CreateButton}
Expand Down
11 changes: 6 additions & 5 deletions packages/antd/src/components/buttons/delete/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({
accessControl,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<Popconfirm
Expand All @@ -69,16 +72,14 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({
title={confirmTitle ?? defaultConfirmTitle}
okButtonProps={{ disabled: loading }}
onConfirm={onConfirm}
disabled={
typeof rest?.disabled !== "undefined" ? rest.disabled : disabled
}
disabled={isDisabled}
>
<Button
danger
loading={loading}
icon={<DeleteOutlined />}
title={title}
disabled={disabled}
disabled={isDisabled}
data-testid={RefineButtonTestIds.DeleteButton}
className={RefineButtonClassNames.DeleteButton}
{...rest}
Expand Down
9 changes: 6 additions & 3 deletions packages/antd/src/components/buttons/edit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,17 @@ export const EditButton: React.FC<EditButtonProps> = ({
accessControl,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -53,7 +56,7 @@ export const EditButton: React.FC<EditButtonProps> = ({
>
<Button
icon={<EditOutlined />}
disabled={disabled}
disabled={isDisabled}
title={title}
data-testid={RefineButtonTestIds.EditButton}
className={RefineButtonClassNames.EditButton}
Expand Down
11 changes: 7 additions & 4 deletions packages/antd/src/components/buttons/list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,21 @@ export const ListButton: React.FC<ListButtonProps> = ({
}) => {
const { to, label, title, hidden, disabled, LinkComponent } = useListButton({
resource: resourceNameFromProps ?? propResourceNameOrRouteName,
accessControl,
meta,
accessControl,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -51,7 +54,7 @@ export const ListButton: React.FC<ListButtonProps> = ({
>
<Button
icon={<BarsOutlined />}
disabled={disabled}
disabled={isDisabled}
title={title}
data-testid={RefineButtonTestIds.ListButton}
className={RefineButtonClassNames.ListButton}
Expand Down
9 changes: 6 additions & 3 deletions packages/antd/src/components/buttons/show/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,17 @@ export const ShowButton: React.FC<ShowButtonProps> = ({
meta,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -52,8 +55,8 @@ export const ShowButton: React.FC<ShowButtonProps> = ({
}}
>
<Button
disabled={isDisabled}
icon={<EyeOutlined />}
disabled={disabled}
title={title}
data-testid={RefineButtonTestIds.ShowButton}
className={RefineButtonClassNames.ShowButton}
Expand Down
9 changes: 6 additions & 3 deletions packages/chakra-ui/src/components/buttons/clone/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,17 @@ export const CloneButton: React.FC<CloneButtonProps> = ({
meta,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -56,7 +59,7 @@ export const CloneButton: React.FC<CloneButtonProps> = ({
{hideText ? (
<IconButton
variant="outline"
isDisabled={disabled}
isDisabled={isDisabled}
aria-label={label}
title={title}
data-testid={RefineButtonTestIds.CloneButton}
Expand Down
13 changes: 8 additions & 5 deletions packages/chakra-ui/src/components/buttons/create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,22 @@ export const CreateButton: React.FC<CreateButtonProps> = ({
const { to, label, title, hidden, disabled, LinkComponent } = useCreateButton(
{
resource: resourceNameFromProps ?? resourceNameOrRouteName,
accessControl,
meta,
accessControl,
},
);

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -49,9 +52,9 @@ export const CreateButton: React.FC<CreateButtonProps> = ({
<IconButton
colorScheme="brand"
variant="outline"
isDisabled={isDisabled}
aria-label={label}
title={title}
isDisabled={disabled}
data-testid={RefineButtonTestIds.CreateButton}
className={RefineButtonClassNames.CreateButton}
{...rest}
Expand All @@ -61,7 +64,7 @@ export const CreateButton: React.FC<CreateButtonProps> = ({
) : (
<Button
colorScheme="brand"
isDisabled={disabled}
isDisabled={isDisabled}
leftIcon={<IconSquarePlus size={20} />}
title={title}
data-testid={RefineButtonTestIds.CreateButton}
Expand Down
11 changes: 7 additions & 4 deletions packages/chakra-ui/src/components/buttons/delete/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({

const [opened, setOpened] = useState(false);

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<Popover isOpen={opened} isLazy>
Expand All @@ -83,7 +86,7 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({
variant="outline"
aria-label={title}
onClick={() => setOpened((o) => !o)}
isDisabled={loading || disabled}
isDisabled={loading || isDisabled}
isLoading={loading}
data-testid={RefineButtonTestIds.DeleteButton}
className={RefineButtonClassNames.DeleteButton}
Expand All @@ -96,9 +99,9 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({
colorScheme="red"
variant="outline"
onClick={() => setOpened((o) => !o)}
isDisabled={loading || disabled}
isDisabled={loading || isDisabled}
isLoading={loading}
leftIcon={<IconTrash size={20} {...svgIconProps} />}
leftIcon={<IconTrash size={20} />}
title={title}
data-testid={RefineButtonTestIds.DeleteButton}
className={RefineButtonClassNames.DeleteButton}
Expand Down
12 changes: 7 additions & 5 deletions packages/chakra-ui/src/components/buttons/edit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ export const EditButton: React.FC<EditButtonProps> = ({
resource: resourceNameFromProps ?? resourceNameOrRouteName,
id: recordItemId,
accessControl,
meta,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -57,7 +59,7 @@ export const EditButton: React.FC<EditButtonProps> = ({
variant="outline"
aria-label={label}
title={title}
isDisabled={disabled}
isDisabled={isDisabled}
data-testid={RefineButtonTestIds.EditButton}
className={RefineButtonClassNames.EditButton}
{...rest}
Expand All @@ -67,7 +69,7 @@ export const EditButton: React.FC<EditButtonProps> = ({
) : (
<Button
variant="outline"
isDisabled={disabled}
isDisabled={isDisabled}
leftIcon={<IconPencil size={20} {...svgIconProps} />}
title={title}
data-testid={RefineButtonTestIds.EditButton}
Expand Down
11 changes: 7 additions & 4 deletions packages/chakra-ui/src/components/buttons/list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,17 @@ export const ListButton: React.FC<ListButtonProps> = ({
meta,
});

if (hidden) return null;
const isDisabled = disabled || rest.disabled;
const isHidden = hidden || rest.hidden;

if (isHidden) return null;

return (
<LinkComponent
to={to}
replace={false}
onClick={(e: React.PointerEvent<HTMLButtonElement>) => {
if (disabled) {
if (isDisabled) {
e.preventDefault();
return;
}
Expand All @@ -54,7 +57,7 @@ export const ListButton: React.FC<ListButtonProps> = ({
<IconButton
variant="outline"
aria-label={label}
isDisabled={disabled}
isDisabled={isDisabled}
title={title}
data-testid={RefineButtonTestIds.ListButton}
className={RefineButtonClassNames.ListButton}
Expand All @@ -65,7 +68,7 @@ export const ListButton: React.FC<ListButtonProps> = ({
) : (
<Button
variant="outline"
isDisabled={disabled}
isDisabled={isDisabled}
leftIcon={<IconList size={20} {...svgIconProps} />}
title={title}
data-testid={RefineButtonTestIds.ListButton}
Expand Down
Loading