From 94961deb8ac8ca8174820da922d614d0f4940760 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Fri, 21 Jul 2023 00:09:05 +0300 Subject: [PATCH] Improve UI procedures --- .../src/components/Common/Dropdown.tsx | 2 +- .../src/components/Common/DropdownButton.tsx | 22 ++++++++ .../src/components/Common/LabeledText.tsx | 2 +- rsconcept/frontend/src/components/Icons.tsx | 2 +- .../Navigation/NavigationTextItem.tsx | 19 ------- .../components/Navigation/UserDropdown.tsx | 26 +++++----- .../frontend/src/context/RSFormContext.tsx | 29 ++++++----- rsconcept/frontend/src/index.css | 4 ++ .../pages/RSFormPage/ConstituentEditor.tsx | 8 +-- .../pages/RSFormPage/ConstituentsSideList.tsx | 5 +- .../pages/RSFormPage/ConstituentsTable.tsx | 1 - .../src/pages/RSFormPage/RSFormCard.tsx | 36 ++++--------- .../src/pages/RSFormPage/RSFormTabs.tsx | 34 +++++++------ .../src/pages/RSFormPage/TablistTools.tsx | 50 ++++++++++++++++--- rsconcept/frontend/src/utils/procedures.ts | 34 +++++++++++++ 15 files changed, 172 insertions(+), 102 deletions(-) create mode 100644 rsconcept/frontend/src/components/Common/DropdownButton.tsx delete mode 100644 rsconcept/frontend/src/components/Navigation/NavigationTextItem.tsx create mode 100644 rsconcept/frontend/src/utils/procedures.ts diff --git a/rsconcept/frontend/src/components/Common/Dropdown.tsx b/rsconcept/frontend/src/components/Common/Dropdown.tsx index da455a44..05990bb6 100644 --- a/rsconcept/frontend/src/components/Common/Dropdown.tsx +++ b/rsconcept/frontend/src/components/Common/Dropdown.tsx @@ -7,7 +7,7 @@ interface DropdownProps { function Dropdown({children, widthClass='w-fit', stretchLeft}: DropdownProps) { return (
-
+
{children}
diff --git a/rsconcept/frontend/src/components/Common/DropdownButton.tsx b/rsconcept/frontend/src/components/Common/DropdownButton.tsx new file mode 100644 index 00000000..d5578e27 --- /dev/null +++ b/rsconcept/frontend/src/components/Common/DropdownButton.tsx @@ -0,0 +1,22 @@ +interface NavigationTextItemProps { + description?: string | undefined + onClick?: () => void + disabled?: boolean + children: React.ReactNode +} + +function DropdownButton({description='', onClick, disabled, children}: NavigationTextItemProps) { + const behavior = (onClick ? 'cursor-pointer clr-hover': 'cursor-default') + ' disabled:cursor-not-allowed'; + return ( + + ); +} + +export default DropdownButton; \ No newline at end of file diff --git a/rsconcept/frontend/src/components/Common/LabeledText.tsx b/rsconcept/frontend/src/components/Common/LabeledText.tsx index 9ab30a98..158ca874 100644 --- a/rsconcept/frontend/src/components/Common/LabeledText.tsx +++ b/rsconcept/frontend/src/components/Common/LabeledText.tsx @@ -7,7 +7,7 @@ interface LabeledTextProps { function LabeledText({id, label, text, tooltip}: LabeledTextProps) { return ( -
+