From 3dba4b6f172dccebb5ad28c17d49d0fea3b5cdd7 Mon Sep 17 00:00:00 2001 From: Alican Erdurmaz Date: Mon, 25 Nov 2024 10:06:22 +0300 Subject: [PATCH] fix: disabled not work on all navigation buttons --- .../src/components/buttons/clone/index.tsx | 9 ++-- .../src/components/buttons/create/index.tsx | 11 +++-- .../src/components/buttons/delete/index.tsx | 11 ++--- .../src/components/buttons/edit/index.tsx | 9 ++-- .../src/components/buttons/list/index.tsx | 11 +++-- .../src/components/buttons/show/index.tsx | 9 ++-- .../src/components/buttons/clone/index.tsx | 9 ++-- .../src/components/buttons/create/index.tsx | 13 +++--- .../src/components/buttons/delete/index.tsx | 11 +++-- .../src/components/buttons/edit/index.tsx | 12 ++--- .../src/components/buttons/list/index.tsx | 11 +++-- .../src/components/buttons/show/index.tsx | 12 ++--- .../src/components/buttons/clone/index.tsx | 11 +++-- .../src/components/buttons/create/index.tsx | 11 +++-- .../src/components/buttons/delete/index.tsx | 13 +++--- .../src/components/buttons/edit/index.tsx | 11 +++-- .../src/components/buttons/list/index.tsx | 8 ++-- .../src/components/buttons/show/index.tsx | 11 +++-- .../mantine/src/components/buttons/types.ts | 44 +++++++------------ .../src/components/buttons/clone/index.tsx | 9 ++-- .../src/components/buttons/create/index.tsx | 12 ++--- .../src/components/buttons/delete/index.tsx | 4 +- .../mui/src/components/buttons/edit/index.tsx | 9 ++-- .../mui/src/components/buttons/list/index.tsx | 9 ++-- .../mui/src/components/buttons/show/index.tsx | 9 ++-- packages/mui/tsup.config.ts | 2 +- packages/ui-tests/src/tests/buttons/clone.tsx | 24 ++++++++++ .../ui-tests/src/tests/buttons/create.tsx | 24 ++++++++++ .../ui-tests/src/tests/buttons/delete.tsx | 24 ++++++++++ packages/ui-tests/src/tests/buttons/edit.tsx | 24 ++++++++++ packages/ui-tests/src/tests/buttons/list.tsx | 31 +++++++++++++ packages/ui-tests/src/tests/buttons/show.tsx | 24 ++++++++++ 32 files changed, 321 insertions(+), 121 deletions(-) diff --git a/packages/antd/src/components/buttons/clone/index.tsx b/packages/antd/src/components/buttons/clone/index.tsx index fbb9aeb30780a..e0f10bcb16883 100644 --- a/packages/antd/src/components/buttons/clone/index.tsx +++ b/packages/antd/src/components/buttons/clone/index.tsx @@ -34,14 +34,17 @@ export const CloneButton: React.FC = ({ meta, }); - if (hidden) return null; + const isDisabled = disabled || rest.disabled; + const isHidden = hidden || rest.hidden; + + if (isHidden) return null; return ( ) => { - if (disabled) { + if (isDisabled) { e.preventDefault(); return; } @@ -53,7 +56,7 @@ export const CloneButton: React.FC = ({ >