@hero-design/rn 9.0.0-0 → 9.0.0-alpha.0

package/src/components/Button/StyledButton.tsx

@@ -4,6 +4,7 @@ import type { ReactNativeStyle } from '@emotion/native';
 import type { Theme } from '@emotion/react';
 import Icon from '../Icon';
 import Typography from '../Typography';
+import { scale } from '../../utils/scale';
 
 type Intent = 'primary' | 'secondary' | 'danger';
 
@@ -35,6 +36,7 @@ const genFilledContainerStyles = (
   };
 
   return {
+    height: scale(60),
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
@@ -62,6 +64,7 @@ const genOutlineContainerStyles = (
   };
 
   return {
+    height: scale(60),
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
@@ -76,54 +79,26 @@ const genOutlineContainerStyles = (
   };
 };
 
-const genOutlineTextStyles = (
+const genTextStyles = (
   theme: Theme,
   intent: Intent,
   disabled?: boolean
 ): ReactNativeStyle => {
-  const textColorStyling = () => {
-    if (disabled) {
-      return {
-        color: theme.__hd__.button.colors.disabledText,
-      };
-    }
-
-    return { color: theme.__hd__.button.colors[intent] };
-  };
-
-  return {
-    fontSize: theme.__hd__.button.fontSize.default,
-    ...textColorStyling(),
-  };
-};
-
-const genTextVariantTextStyles = (
-  theme: Theme,
-  intent: Intent,
-  disabled?: boolean
-): ReactNativeStyle => {
-  const textColorStyling = () => {
-    if (disabled) {
-      return {
-        color: theme.__hd__.button.colors.disabledText,
-      };
-    }
-
-    return { color: theme.__hd__.button.colors[intent] };
-  };
+  if (disabled) {
+    return {
+      color: theme.__hd__.button.colors.disabledText,
+    };
+  }
 
-  return {
-    fontSize: theme.__hd__.button.fontSize.textVariant,
-    ...textColorStyling(),
-  };
+  return { color: theme.__hd__.button.colors[intent] };
 };
 
 const StyledButtonContainer = styled(TouchableHighlight)<{
   disabled?: boolean;
-  themeVariant: ThemeVariant;
+  themeButtonVariant: ThemeVariant;
   loading?: boolean;
-}>(({ disabled = false, loading = false, themeVariant, theme }) => {
-  switch (themeVariant) {
+}>(({ disabled = false, loading = false, themeButtonVariant, theme }) => {
+  switch (themeButtonVariant) {
     case 'filled-primary':
       return genFilledContainerStyles(theme, 'primary', disabled, loading);
     case 'filled-secondary':
@@ -140,6 +115,7 @@ const StyledButtonContainer = styled(TouchableHighlight)<{
     case 'text-secondary':
     case 'text-danger':
       return {
+        height: scale(60),
         borderRadius: theme.__hd__.button.radii.text,
         flexDirection: 'row',
         justifyContent: 'center',
@@ -153,37 +129,57 @@ const StyledButtonContainer = styled(TouchableHighlight)<{
   }
 });
 
-const StyledButtonText = styled(Typography.Text)<{
+const StyledButtonText = styled(Typography.Title)<{
   disabled?: boolean;
-  themeVariant: ThemeVariant;
-}>(({ disabled, themeVariant, theme }) => {
+  themeButtonVariant: ThemeVariant;
+}>(({ disabled, themeButtonVariant, theme }) => {
   const themeStyling = () => {
-    switch (themeVariant) {
+    switch (themeButtonVariant) {
       case 'filled-primary':
       case 'filled-secondary':
       case 'filled-danger':
         return {
-          fontSize: theme.__hd__.button.fontSize.default,
           color: theme.__hd__.button.colors.invertedText,
         };
       case 'outlined-primary':
-        return genOutlineTextStyles(theme, 'primary', disabled);
+        return genTextStyles(theme, 'primary', disabled);
       case 'outlined-secondary':
-        return genOutlineTextStyles(theme, 'secondary', disabled);
+        return genTextStyles(theme, 'secondary', disabled);
       case 'outlined-danger':
-        return genOutlineTextStyles(theme, 'danger', disabled);
+        return genTextStyles(theme, 'danger', disabled);
+      case 'text-primary':
+        return genTextStyles(theme, 'primary', disabled);
+      case 'text-secondary':
+        return genTextStyles(theme, 'secondary', disabled);
+      case 'text-danger':
+        return genTextStyles(theme, 'danger', disabled);
+    }
+  };
+  return {
+    flexShrink: 1,
+    textAlign: 'center',
+    ...themeStyling(),
+  };
+});
+
+const StyledButtonTitleOfVariantText = styled(Typography.Body)<{
+  disabled?: boolean;
+  themeButtonVariant: 'text-primary' | 'text-secondary' | 'text-danger';
+}>(({ disabled, themeButtonVariant, theme }) => {
+  const themeStyling = () => {
+    switch (themeButtonVariant) {
       case 'text-primary':
-        return genTextVariantTextStyles(theme, 'primary', disabled);
+        return genTextStyles(theme, 'primary', disabled);
       case 'text-secondary':
-        return genTextVariantTextStyles(theme, 'secondary', disabled);
+        return genTextStyles(theme, 'secondary', disabled);
       case 'text-danger':
-        return genTextVariantTextStyles(theme, 'danger', disabled);
+        return genTextStyles(theme, 'danger', disabled);
     }
   };
   return {
     flexShrink: 1,
+    lineHeight: theme.__hd__.button.lineHeights.titleOfTextVariant, // align text on Android
     textAlign: 'center',
-    fontFamily: theme.__hd__.button.fonts.default,
     ...themeStyling(),
   };
 });
@@ -201,26 +197,26 @@ const StyledButtonIconWrapper = styled(View)<{
 
 const StyledButtonIcon = styled(Icon)<{
   disabled?: boolean;
-  themeVariant: ThemeVariant;
-}>(({ disabled, themeVariant, theme }) => {
+  themeButtonVariant: ThemeVariant;
+}>(({ disabled, themeButtonVariant, theme }) => {
   const themeStyling = () => {
-    switch (themeVariant) {
+    switch (themeButtonVariant) {
       case 'filled-primary':
       case 'filled-secondary':
       case 'filled-danger':
         return { color: theme.__hd__.button.colors.invertedText };
       case 'outlined-primary':
-        return genOutlineTextStyles(theme, 'primary', disabled);
+        return genTextStyles(theme, 'primary', disabled);
       case 'outlined-secondary':
-        return genOutlineTextStyles(theme, 'secondary', disabled);
+        return genTextStyles(theme, 'secondary', disabled);
       case 'outlined-danger':
-        return genOutlineTextStyles(theme, 'danger', disabled);
+        return genTextStyles(theme, 'danger', disabled);
       case 'text-primary':
-        return genTextVariantTextStyles(theme, 'primary', disabled);
+        return genTextStyles(theme, 'primary', disabled);
       case 'text-secondary':
-        return genTextVariantTextStyles(theme, 'secondary', disabled);
+        return genTextStyles(theme, 'secondary', disabled);
       case 'text-danger':
-        return genTextVariantTextStyles(theme, 'danger', disabled);
+        return genTextStyles(theme, 'danger', disabled);
     }
   };
 
@@ -235,5 +231,6 @@ export {
   StyledButtonText,
   StyledButtonIconWrapper,
   StyledButtonIcon,
+  StyledButtonTitleOfVariantText,
 };
 export type { Intent, ThemeVariant };

package/src/components/Button/UtilityButton/StyledUtilityButton.tsx

@@ -17,9 +17,7 @@ export const IconWrapper = styled(View)(({ theme }) => ({
   paddingRight: theme.__hd__.button.space.iconPadding,
 }));
 
-export const ButtonText = styled(Typography.Text)(({ theme }) => ({
+export const ButtonText = styled(Typography.Body)({
   flexShrink: 1,
   textAlign: 'center',
-  fontSize: theme.__hd__.button.fontSize.utility,
-  fontFamily: theme.__hd__.button.fonts.utility,
-}));
+});

package/src/components/Button/UtilityButton/__tests__/__snapshots__/index.spec.tsx.snap

@@ -2,168 +2,252 @@
 
 exports[`UtilityButton snapshot has intent primary style 1`] = `
 <View
-  accessible={true}
-  collapsable={false}
-  focusable={true}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
   style={
-    Object {
-      "alignItems": "center",
-      "backgroundColor": "#f6f6f7",
-      "borderRadius": 8,
-      "flexDirection": "row",
-      "justifyContent": "center",
-      "opacity": 1,
-      "padding": 8,
-      "width": "100%",
+    {
+      "flex": 1,
     }
   }
-  testID="settings-btn"
 >
   <View
+    accessibilityState={
+      {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
     style={
-      Array [
-        Object {
-          "paddingRight": 12,
-        },
-        undefined,
-      ]
+      {
+        "alignItems": "center",
+        "backgroundColor": "#ffffff",
+        "borderRadius": 8,
+        "flexDirection": "row",
+        "justifyContent": "center",
+        "opacity": 1,
+        "padding": 8,
+        "width": "100%",
+      }
     }
+    testID="settings-btn"
   >
-    <HeroIcon
-      name="cog-outlined"
+    <View
       style={
-        Array [
-          Object {
-            "color": "#001f23",
-            "fontSize": 24,
+        [
+          {
+            "paddingRight": 12,
           },
           undefined,
         ]
       }
-      testID="settings-btn-icon"
-      themeIntent="text"
-      themeSize="medium"
-    />
-  </View>
-  <Text
-    allowFontScaling={false}
-    style={
-      Array [
-        Object {
-          "color": "#001f23",
-          "fontFamily": "BeVietnamPro-Regular",
-          "fontSize": 14,
-          "letterSpacing": 0.42,
-          "lineHeight": 22,
-        },
-        Array [
-          Object {
-            "flexShrink": 1,
+    >
+      <HeroIcon
+        name="cog-outlined"
+        style={
+          [
+            {
+              "color": "#001f23",
+              "fontSize": 24,
+            },
+            undefined,
+          ]
+        }
+        testID="settings-btn-icon"
+        themeIntent="text"
+        themeSize="medium"
+      />
+    </View>
+    <Text
+      allowFontScaling={false}
+      style={
+        [
+          {
+            "color": "#001f23",
             "fontFamily": "BeVietnamPro-Regular",
             "fontSize": 16,
-            "textAlign": "center",
+            "letterSpacing": 0.48,
+            "lineHeight": 24,
           },
-          undefined,
-        ],
+          [
+            {
+              "flexShrink": 1,
+              "textAlign": "center",
+            },
+            undefined,
+          ],
+        ]
+      }
+      themeIntent="body"
+      themeTypeface="neutral"
+      themeVariant="regular"
+    >
+      Settings
+    </Text>
+  </View>
+  <View
+    pointerEvents="box-none"
+    position="bottom"
+    style={
+      [
+        {
+          "bottom": 0,
+          "elevation": 9999,
+          "flexDirection": "column-reverse",
+          "left": 0,
+          "paddingHorizontal": 24,
+          "paddingVertical": 16,
+          "position": "absolute",
+          "right": 0,
+          "top": 0,
+        },
+        undefined,
       ]
     }
-    themeFontSize="medium"
-    themeFontWeight="regular"
-    themeIntent="body"
-    themeTypeface="neutral"
-  >
-    Settings
-  </Text>
+  />
 </View>
 `;
 
 exports[`UtilityButton snapshot has intent text style 1`] = `
 <View
-  accessible={true}
-  collapsable={false}
-  focusable={true}
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
   style={
-    Object {
-      "alignItems": "center",
-      "backgroundColor": "#f6f6f7",
-      "borderRadius": 8,
-      "flexDirection": "row",
-      "justifyContent": "center",
-      "opacity": 1,
-      "padding": 8,
-      "width": "100%",
+    {
+      "flex": 1,
     }
   }
-  testID="settings-btn"
 >
   <View
+    accessibilityState={
+      {
+        "busy": undefined,
+        "checked": undefined,
+        "disabled": undefined,
+        "expanded": undefined,
+        "selected": undefined,
+      }
+    }
+    accessibilityValue={
+      {
+        "max": undefined,
+        "min": undefined,
+        "now": undefined,
+        "text": undefined,
+      }
+    }
+    accessible={true}
+    collapsable={false}
+    focusable={true}
+    onClick={[Function]}
+    onResponderGrant={[Function]}
+    onResponderMove={[Function]}
+    onResponderRelease={[Function]}
+    onResponderTerminate={[Function]}
+    onResponderTerminationRequest={[Function]}
+    onStartShouldSetResponder={[Function]}
     style={
-      Array [
-        Object {
-          "paddingRight": 12,
-        },
-        undefined,
-      ]
+      {
+        "alignItems": "center",
+        "backgroundColor": "#ffffff",
+        "borderRadius": 8,
+        "flexDirection": "row",
+        "justifyContent": "center",
+        "opacity": 1,
+        "padding": 8,
+        "width": "100%",
+      }
     }
+    testID="settings-btn"
   >
-    <HeroIcon
-      name="cog-outlined"
+    <View
       style={
-        Array [
-          Object {
-            "color": "#001f23",
-            "fontSize": 24,
+        [
+          {
+            "paddingRight": 12,
           },
           undefined,
         ]
       }
-      testID="settings-btn-icon"
-      themeIntent="text"
-      themeSize="medium"
-    />
-  </View>
-  <Text
-    allowFontScaling={false}
-    style={
-      Array [
-        Object {
-          "color": "#001f23",
-          "fontFamily": "BeVietnamPro-Regular",
-          "fontSize": 14,
-          "letterSpacing": 0.42,
-          "lineHeight": 22,
-        },
-        Array [
-          Object {
-            "flexShrink": 1,
+    >
+      <HeroIcon
+        name="cog-outlined"
+        style={
+          [
+            {
+              "color": "#001f23",
+              "fontSize": 24,
+            },
+            undefined,
+          ]
+        }
+        testID="settings-btn-icon"
+        themeIntent="text"
+        themeSize="medium"
+      />
+    </View>
+    <Text
+      allowFontScaling={false}
+      style={
+        [
+          {
+            "color": "#001f23",
             "fontFamily": "BeVietnamPro-Regular",
             "fontSize": 16,
-            "textAlign": "center",
+            "letterSpacing": 0.48,
+            "lineHeight": 24,
           },
-          undefined,
-        ],
+          [
+            {
+              "flexShrink": 1,
+              "textAlign": "center",
+            },
+            undefined,
+          ],
+        ]
+      }
+      themeIntent="body"
+      themeTypeface="neutral"
+      themeVariant="regular"
+    >
+      Settings
+    </Text>
+  </View>
+  <View
+    pointerEvents="box-none"
+    position="bottom"
+    style={
+      [
+        {
+          "bottom": 0,
+          "elevation": 9999,
+          "flexDirection": "column-reverse",
+          "left": 0,
+          "paddingHorizontal": 24,
+          "paddingVertical": 16,
+          "position": "absolute",
+          "right": 0,
+          "top": 0,
+        },
+        undefined,
       ]
     }
-    themeFontSize="medium"
-    themeFontWeight="regular"
-    themeIntent="body"
-    themeTypeface="neutral"
-  >
-    Settings
-  </Text>
+  />
 </View>
 `;

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

@@ -5,6 +5,7 @@ import renderWithTheme from '../../../testHelpers/renderWithTheme';
 
 import Button from '..';
 import { getThemeVariant } from '../Button';
+import Icon from '../../Icon';
 
 describe('Button', () => {
   it('renders button text', () => {
@@ -45,6 +46,23 @@ describe('Button', () => {
     expect(getByTestId('button-right-icon')).toBeDefined();
   });
 
+  it('allows render custom icon', () => {
+    const { toJSON, getByTestId } = renderWithTheme(
+      <Button
+        text="A button"
+        icon={<Icon testID="custom-button-icon-left" icon="add" size="small" />}
+        rightIcon={
+          <Icon testID="custom-button-icon-right" icon="add" size="small" />
+        }
+        onPress={jest.fn()}
+      />
+    );
+
+    expect(toJSON()).toMatchSnapshot();
+    expect(getByTestId('custom-button-icon-left')).toBeDefined();
+    expect(getByTestId('custom-button-icon-right')).toBeDefined();
+  });
+
   it('renders loading icon', () => {
     const { getByTestId, toJSON } = renderWithTheme(
       <Button text="A button" testID="button" onPress={jest.fn()} loading />

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

@@ -24,7 +24,7 @@ describe('StyledButtonContainer', () => {
     ${'text-danger'}
   `('has $themeVariant style', ({ themeVariant }): void => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonContainer themeVariant={themeVariant}>
+      <StyledButtonContainer themeButtonVariant={themeVariant}>
         <Text>Title</Text>
       </StyledButtonContainer>
     );
@@ -34,7 +34,7 @@ describe('StyledButtonContainer', () => {
 
   it('renders disabled correctly', () => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonContainer themeVariant="filled-primary" disabled>
+      <StyledButtonContainer themeButtonVariant="filled-primary" disabled>
         <Text>Title</Text>
       </StyledButtonContainer>
     );
@@ -57,7 +57,9 @@ describe('StyledButtonText', () => {
     ${'text-danger'}
   `('has $themeVariant style', ({ themeVariant }) => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonText themeVariant={themeVariant}>Example</StyledButtonText>
+      <StyledButtonText themeButtonVariant={themeVariant}>
+        Example
+      </StyledButtonText>
     );
 
     expect(toJSON()).toMatchSnapshot();
@@ -65,7 +67,7 @@ describe('StyledButtonText', () => {
 
   it('renders disabled correctly', () => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonText themeVariant="filled-primary" disabled>
+      <StyledButtonText themeButtonVariant="filled-primary" disabled>
         Example
       </StyledButtonText>
     );
@@ -102,7 +104,7 @@ describe('StyledButtonIcon', () => {
     ${'text-danger'}
   `('has $themeVariant style', ({ themeVariant }) => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonIcon icon="bell" themeVariant={themeVariant} />
+      <StyledButtonIcon icon="bell" themeButtonVariant={themeVariant} />
     );
 
     expect(toJSON()).toMatchSnapshot();
@@ -110,7 +112,11 @@ describe('StyledButtonIcon', () => {
 
   it('renders disabled correctly', () => {
     const { toJSON } = renderWithTheme(
-      <StyledButtonIcon icon="bell" themeVariant="filled-primary" disabled />
+      <StyledButtonIcon
+        icon="bell"
+        themeButtonVariant="filled-primary"
+        disabled
+      />
     );
 
     expect(toJSON()).toMatchSnapshot();