@butternutbox/pawprint-native 0.25.0 → 0.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@butternutbox/pawprint-native",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "type": "module",
   "description": "ButternutBox Pawprint Design System - React Native Components",
   "main": "./dist/index.cjs",

package/src/components/atoms/Button/Button.stories.tsx

@@ -5,20 +5,18 @@ import type { ButtonProps } from "./Button"
 import { Typography } from "../Typography"
 import { Icon } from "../Icon"
 import {
-  Check,
+  Facebook,
   IosShare,
   Whatsapp,
-  KeyboardDoubleArrowDown
+  Mail
 } from "@butternutbox/pawprint-icons/core"
 
 const iconElements: Record<string, React.ReactNode> = {
   None: undefined,
-  KeyboardDoubleArrowDown: (
-    <Icon icon={KeyboardDoubleArrowDown} colour="primary" />
-  ),
-  IosShare: <Icon icon={IosShare} colour="primary" />,
-  Whatsapp: <Icon icon={Whatsapp} colour="primary" />,
-  Check: <Icon icon={Check} colour="primary" />
+  Facebook: <Icon icon={Facebook} size="sm" colour="action-default" />,
+  IosShare: <Icon icon={IosShare} size="sm" colour="action-default" />,
+  Whatsapp: <Icon icon={Whatsapp} size="sm" colour="action-default" />,
+  Mail: <Icon icon={Mail} size="sm" colour="action-default" />
 }
 
 const iconArgType = {
@@ -155,28 +153,104 @@ export const WithStartIcon = () => (
         <View style={styles.row}>
           <Button
             size={size}
-            startIcon={<Icon icon={KeyboardDoubleArrowDown} colour="primary" />}
+            startIcon={
+              <Icon icon={Facebook} size="sm" colour="action-default" />
+            }
           >
-            Add
+            Share
           </Button>
           <Button
             size={size}
-            startIcon={<Icon icon={IosShare} colour="success" />}
+            startIcon={
+              <Icon icon={IosShare} size="sm" colour="action-default" />
+            }
           >
-            Search
+            Export
           </Button>
           <Button
             size={size}
-            startIcon={<Icon icon={Whatsapp} colour="warning" />}
+            startIcon={
+              <Icon icon={Whatsapp} size="sm" colour="action-default" />
+            }
           >
-            Settings
+            Message
           </Button>
           <Button
             size={size}
-            startIcon={<Icon icon={Check} colour="error" />}
+            startIcon={<Icon icon={Mail} size="sm" colour="action-default" />}
             colour="secondary"
           >
-            Confirm
+            Send
+          </Button>
+        </View>
+      </View>
+    ))}
+  </View>
+)
+
+export const WithEndIcon = () => (
+  <View style={styles.column}>
+    {(["sm", "md", "lg"] as const).map((size) => (
+      <View key={size} style={styles.section}>
+        <Typography size="sm" weight="semiBold" color="tertiary">
+          {size}
+        </Typography>
+        <View style={styles.row}>
+          <Button
+            size={size}
+            endIcon={<Icon icon={Facebook} size="sm" colour="action-default" />}
+          >
+            Connect
+          </Button>
+          <Button
+            size={size}
+            endIcon={<Icon icon={IosShare} size="sm" colour="action-default" />}
+          >
+            Share
+          </Button>
+          <Button
+            size={size}
+            endIcon={<Icon icon={Whatsapp} size="sm" colour="action-default" />}
+          >
+            Chat
+          </Button>
+          <Button
+            size={size}
+            endIcon={<Icon icon={Mail} size="sm" colour="action-default" />}
+            colour="secondary"
+          >
+            Email
+          </Button>
+        </View>
+      </View>
+    ))}
+  </View>
+)
+
+export const WithBothIcons = () => (
+  <View style={styles.column}>
+    {(["sm", "md", "lg"] as const).map((size) => (
+      <View key={size} style={styles.section}>
+        <Typography size="sm" weight="semiBold" color="tertiary">
+          {size}
+        </Typography>
+        <View style={styles.row}>
+          <Button
+            size={size}
+            startIcon={
+              <Icon icon={Facebook} size="sm" colour="action-default" />
+            }
+            endIcon={<Icon icon={IosShare} size="sm" colour="action-default" />}
+          >
+            Share
+          </Button>
+          <Button
+            size={size}
+            startIcon={<Icon icon={Mail} size="sm" colour="action-default" />}
+            endIcon={<Icon icon={Whatsapp} size="sm" colour="action-default" />}
+            variant="outlined"
+          >
+            Contact
           </Button>
         </View>
       </View>

package/src/components/atoms/Button/Button.tsx

@@ -193,6 +193,17 @@ const Button = React.forwardRef<View, ButtonProps>(
 
     const variantStyles = getVariantStyles(pressed)
 
+    const renderIcon = (icon: React.ReactNode): React.ReactNode => {
+      if (!React.isValidElement(icon)) return icon
+      const iconElement = icon as React.ReactElement<any>
+      if (!pressed) {
+        return icon
+      }
+      return React.cloneElement(iconElement, {
+        customColour: variantStyles.textColor
+      })
+    }
+
     return (
       <StyledButton
         ref={ref}
@@ -220,7 +231,7 @@ const Button = React.forwardRef<View, ButtonProps>(
         buttonFullWidth={fullWidth}
         {...rest}
       >
-        {startIcon && <IconWrapper>{startIcon}</IconWrapper>}
+        {startIcon && <IconWrapper>{renderIcon(startIcon)}</IconWrapper>}
         {/* `Typography` is a DIRECT child of the button row (no wrapping View)
             so its `<Text>` participates in flex shrink and wraps long /
             translated labels to multiple lines under the button's `minHeight`.
@@ -241,7 +252,7 @@ const Button = React.forwardRef<View, ButtonProps>(
         >
           {children}
         </Typography>
-        {endIcon && <IconWrapper>{endIcon}</IconWrapper>}
+        {endIcon && <IconWrapper>{renderIcon(endIcon)}</IconWrapper>}
         {loading && (
           <StyledSpinnerWrapper>
             <Spinner