@hero-design/rn 8.12.1 → 8.12.2

package/src/components/Button/StyledButton.tsx

@@ -1,4 +1,4 @@
-import { TouchableOpacity, View } from 'react-native';
+import { TouchableHighlight, View } from 'react-native';
 import styled from '@emotion/native';
 import type { ReactNativeStyle } from '@emotion/native';
 import type { Theme } from '@emotion/react';
@@ -21,10 +21,11 @@ type ThemeVariant =
 const genFilledContainerStyles = (
   theme: Theme,
   intent: Intent,
-  disabled: boolean
+  disabled: boolean,
+  loading: boolean
 ): ReactNativeStyle => {
   const backgroundColorStyling = () => {
-    if (disabled) {
+    if (!loading && disabled) {
       return {
         backgroundColor: theme.__hd__.button.colors.disabledBorder,
       };
@@ -47,10 +48,11 @@ const genFilledContainerStyles = (
 const genOutlineContainerStyles = (
   theme: Theme,
   intent: Intent,
-  disabled: boolean
+  disabled: boolean,
+  loading: boolean
 ): ReactNativeStyle => {
   const borderColorStyling = () => {
-    if (disabled) {
+    if (!loading && disabled) {
       return {
         borderColor: theme.__hd__.button.colors.disabledBorder,
       };
@@ -118,32 +120,37 @@ const genTextVariantTextStyles = (
   };
 };
 
-const StyledButtonContainer = styled(TouchableOpacity)<{
+const StyledButtonContainer = styled(TouchableHighlight)<{
   disabled?: boolean;
   themeVariant: ThemeVariant;
-}>(({ disabled = false, themeVariant, theme }) => {
+  loading?: boolean;
+}>(({ disabled = false, loading = false, themeVariant, theme }) => {
   switch (themeVariant) {
     case 'filled-primary':
-      return genFilledContainerStyles(theme, 'primary', disabled);
+      return genFilledContainerStyles(theme, 'primary', disabled, loading);
     case 'filled-secondary':
-      return genFilledContainerStyles(theme, 'secondary', disabled);
+      return genFilledContainerStyles(theme, 'secondary', disabled, loading);
     case 'filled-danger':
-      return genFilledContainerStyles(theme, 'danger', disabled);
+      return genFilledContainerStyles(theme, 'danger', disabled, loading);
     case 'outlined-primary':
-      return genOutlineContainerStyles(theme, 'primary', disabled);
+      return genOutlineContainerStyles(theme, 'primary', disabled, loading);
     case 'outlined-secondary':
-      return genOutlineContainerStyles(theme, 'secondary', disabled);
+      return genOutlineContainerStyles(theme, 'secondary', disabled, loading);
     case 'outlined-danger':
-      return genOutlineContainerStyles(theme, 'danger', disabled);
+      return genOutlineContainerStyles(theme, 'danger', disabled, loading);
     case 'text-primary':
     case 'text-secondary':
     case 'text-danger':
       return {
+        borderRadius: theme.__hd__.button.radii.text,
         flexDirection: 'row',
         justifyContent: 'center',
         alignItems: 'center',
-        padding: theme.__hd__.button.space.buttonPadding,
+        padding: theme.__hd__.button.space.textButtonPadding,
         borderWidth: 0,
+        backgroundColor: loading
+          ? theme.__hd__.button.colors.textLoadingBackground
+          : 'transparent',
       };
   }
 });

package/src/components/Button/__tests__/Button.spec.tsx

@@ -46,9 +46,11 @@ describe('Button', () => {
   });
 
   it('renders loading icon', () => {
-    const { getByTestId } = renderWithTheme(
+    const { getByTestId, toJSON } = renderWithTheme(
       <Button text="A button" testID="button" onPress={jest.fn()} loading />
     );
+
+    expect(toJSON()).toMatchSnapshot();
     expect(getByTestId('button-loading-indicator')).toBeDefined();
   });
 
@@ -64,6 +66,17 @@ describe('Button', () => {
       });
     });
 
+    describe('button is loading', () => {
+      it('NOT allows to click on', () => {
+        const onPress = jest.fn();
+        const { getByTestId } = renderWithTheme(
+          <Button text="A button" testID="button" loading onPress={onPress} />
+        );
+        fireEvent.press(getByTestId('button-loading-indicator'));
+        expect(onPress).not.toHaveBeenCalled();
+      });
+    });
+
     describe('button is enabled', () => {
       it('allows to click on', () => {
         const onPress = jest.fn();
@@ -75,6 +88,38 @@ describe('Button', () => {
       });
     });
   });
+
+  it.each`
+    variant       | intent         | loading  | disabled
+    ${'filled'}   | ${'primary'}   | ${false} | ${false}
+    ${'filled'}   | ${'primary'}   | ${true}  | ${false}
+    ${'filled'}   | ${'primary'}   | ${false} | ${true}
+    ${'outlined'} | ${'primary'}   | ${false} | ${false}
+    ${'outlined'} | ${'primary'}   | ${true}  | ${false}
+    ${'outlined'} | ${'primary'}   | ${false} | ${true}
+    ${'text'}     | ${'primary'}   | ${false} | ${false}
+    ${'text'}     | ${'primary'}   | ${true}  | ${false}
+    ${'text'}     | ${'primary'}   | ${false} | ${true}
+    ${'text'}     | ${'secondary'} | ${false} | ${false}
+    ${'text'}     | ${'secondary'} | ${true}  | ${false}
+    ${'text'}     | ${'secondary'} | ${false} | ${true}
+    ${'text'}     | ${'danger'}    | ${false} | ${false}
+    ${'text'}     | ${'danger'}    | ${true}  | ${false}
+    ${'text'}     | ${'danger'}    | ${false} | ${true}
+  `('renders correctly', ({ variant, intent, loading, disabled }) => {
+    const { toJSON } = renderWithTheme(
+      <Button
+        text="A button"
+        variant={variant}
+        intent={intent}
+        loading={loading}
+        disabled={disabled}
+        onPress={jest.fn()}
+      />
+    );
+
+    expect(toJSON()).toMatchSnapshot();
+  });
 });
 
 describe('getThemeVariant', () => {