button cursor changes

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",

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,

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;
 }

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"