Merge pull request #4683 from GeekyAnts/fix/button-isloadingtext

fix: isloadingtext not showing option

Author: surajahmed

src/components/primitives/Button/Button.tsx

@@ -96,14 +96,16 @@ const Button = (
     );
   }
 
-  const boxChildren = isLoading && isLoadingText ? isLoadingText : children;
-
   const spinnerElement = spinner ? (
     spinner
   ) : (
     <Spinner color={_text?.color} {..._spinner} />
   );
 
+  const boxChildren = (child: any) => {
+    return <Box _text={_text}>{child}</Box>;
+  };
+
   return (
     <Pressable
       disabled={isDisabled || isLoading}
@@ -127,14 +129,15 @@ const Button = (
       {...resolvedProps}
       accessibilityRole={props.accessibilityRole ?? 'button'}
     >
-      <HStack {..._stack}>
+      <HStack {..._stack} test={true}>
         {startIcon && !isLoading ? startIcon : null}
         {isLoading && spinnerPlacement === 'start' ? spinnerElement : null}
-        {boxChildren ? (
-          <Box _text={_text}>
-            {isLoading && isLoadingText ? isLoadingText : children}
-          </Box>
-        ) : null}
+        {isLoading
+          ? isLoadingText
+            ? boxChildren(isLoadingText)
+            : null
+          : boxChildren(children)}
+
         {endIcon && !isLoading ? endIcon : null}
         {isLoading && spinnerPlacement === 'end' ? spinnerElement : null}
       </HStack>

src/theme/components/button.ts

@@ -17,12 +17,15 @@ const baseStyle = (props: any) => {
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
+
     _web: {
-      cursor: props.isDisabled
-        ? 'not-allowed'
-        : props.isLoading
-        ? 'default'
-        : 'pointer',
+      _disabled: {
+        cursor: 'not-allowed',
+      },
+      _loading: {
+        cursor: 'not-allowed',
+      },
+      cursor: 'pointer',
     },
     _text: {
       fontWeight: 'medium',