From a7dbae3ae8112d6c06ff8ec75ea6347853faa3d0 Mon Sep 17 00:00:00 2001
From: aditiSoni <aditi.soni@groww.in>
Date: Wed, 6 Dec 2023 13:19:58 +0530
Subject: [PATCH] button cursor changes

---
 packages/ui-toolkit/package.json                   |  2 +-
 .../src/components/atoms/Button/Button.tsx         |  4 +++-
 .../src/components/atoms/Button/button.css         |  5 ++++-
 .../components/atoms/ToggleSwitch/ToggleSwitch.tsx | 14 ++++++++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json
index 690028e6..0a91a795 100644
--- a/packages/ui-toolkit/package.json
+++ b/packages/ui-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@groww-tech/ui-toolkit",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A lightning nature UI",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/ui-toolkit/src/components/atoms/Button/Button.tsx b/packages/ui-toolkit/src/components/atoms/Button/Button.tsx
index 5e537f04..dc462fcd 100644
--- a/packages/ui-toolkit/src/components/atoms/Button/Button.tsx
+++ b/packages/ui-toolkit/src/components/atoms/Button/Button.tsx
@@ -40,7 +40,7 @@ const Button = (props: Props) => {
     backgroundAccentSubtle: (isAccent && !isDisabled) || (isAccent && isDisabled && isLoading),
     contentDisabled: isDisabled,
     borderPrimary: !isAccent,
-    btn96ButtonDisable: isDisabled
+    btn96ButtonDisable: isDisabled && !isLoading
   });
 
   const tertiaryButtonClasses = cn({
@@ -64,6 +64,8 @@ const Button = (props: Props) => {
   });
 
   const fontClasses = cn({
+    'cur-po': !isLoading && !isDisabled,
+    btn96LoaderCursor: isLoading || isDisabled,
     bodySmallHeavy: size === BUTTON_SIZES.SMALL,
     bodyBaseHeavy: size === BUTTON_SIZES.BASE,
     bodyLargeHeavy: size === BUTTON_SIZES.LARGE,
diff --git a/packages/ui-toolkit/src/components/atoms/Button/button.css b/packages/ui-toolkit/src/components/atoms/Button/button.css
index d5a6cff2..c73fb49b 100644
--- a/packages/ui-toolkit/src/components/atoms/Button/button.css
+++ b/packages/ui-toolkit/src/components/atoms/Button/button.css
@@ -1,7 +1,6 @@
 .btn96DefaultClass {
   border-radius: 8px;
   flex-shrink: 0;
-  cursor: default;
 }
 
 
@@ -148,4 +147,8 @@
   width: 100%;
   z-index: 1000;
   bottom: 0;
+}
+
+.btn96LoaderCursor {
+  cursor: default;
 }
\ No newline at end of file
diff --git a/packages/ui-toolkit/src/components/atoms/ToggleSwitch/ToggleSwitch.tsx b/packages/ui-toolkit/src/components/atoms/ToggleSwitch/ToggleSwitch.tsx
index 130ab26a..96a32000 100644
--- a/packages/ui-toolkit/src/components/atoms/ToggleSwitch/ToggleSwitch.tsx
+++ b/packages/ui-toolkit/src/components/atoms/ToggleSwitch/ToggleSwitch.tsx
@@ -47,6 +47,16 @@ const ToggleSwitch = (props: Props) => {
     'cur-po': !isDisabled
   });
 
+
+  const onToggleSwitch = (e: React.MouseEvent<HTMLDivElement, MouseEvent> | React.ChangeEvent<HTMLInputElement>) => {
+    if (!isDisabled) {
+      onChange(e);
+
+    } else {
+      e.stopPropagation();
+    }
+  };
+
   return (
     <div className={baseClasses}>
       <div className={labelClasses}>
@@ -55,12 +65,12 @@ const ToggleSwitch = (props: Props) => {
       <div
         className='sw348reactSwitchDivision'
         data-test-id={dataTestId.length ? dataTestId : null}
-        onClick={(e) => onChange(e)}
+        onClick={(e) => onToggleSwitch(e)}
       >
         <input
           style={inputStyle}
           checked={isActive}
-          onChange={(e) => onChange(e)}
+          onChange={(e) => onToggleSwitch(e)}
           className="sw348reactSwitchCheckbox"
           id="reactSwitchId"
           type="checkbox"