rnnovaui 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rnnovaui",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "",
   "main": "src/index.js",
   "react-native": "src/index.js",

package/src/components/Button/UIButton.js

@@ -1,12 +1,16 @@
 import React, { memo, useCallback } from "react";
 
-import { ActivityIndicator, Pressable, StyleSheet, View } from "react-native";
+import {
+  ActivityIndicator,
+  Pressable,
+  StyleSheet,
+  Text,
+  View,
+} from "react-native";
 
 import { useUITheme } from "../../theme";
 
-import { UIText } from "../Text";
-
-const BUTTON_VARIANTS = {
+const VARIANTS = {
   solid: "solid",
   outline: "outline",
   ghost: "ghost",
@@ -15,77 +19,65 @@ const BUTTON_VARIANTS = {
   success: "success",
 };
 
-const BUTTON_SIZES = {
+const SIZES = {
   sm: "sm",
   md: "md",
   lg: "lg",
   xl: "xl",
 };
 
-const UIButtonComponent = ({
+function UIButtonComponent({
   title,
-
   children,
 
   variant = "solid",
-
   size = "md",
 
   disabled = false,
-
   loading = false,
-
   fullWidth = false,
 
-  leftIcon = null,
-
-  rightIcon = null,
+  leftIcon,
+  rightIcon,
 
   onPress,
-
   onLongPress,
-
   onPressIn,
-
   onPressOut,
 
   style,
-
   contentStyle,
-
   textStyle,
 
-  testID,
+  activeOpacity = 0.82,
 
+  testID,
   accessibilityLabel,
-
   accessibilityHint,
 
-  accessibilityRole = "button",
-
-  hitSlop,
-
-  pressRetentionOffset,
+  ...props
+}) {
+  const themeResult = useUITheme();
 
-  android_ripple = true,
+  /*
+   * Support both possible provider shapes:
+   *
+   * themeResult.theme.colors
+   * themeResult.colors
+   */
+  const theme = themeResult?.theme || themeResult || {};
 
-  activeOpacity = 0.82,
+  const colors = theme.colors || {};
 
-  ...props
-}) => {
-  const { theme } = useUITheme();
+  const safeVariant = VARIANTS[variant] || VARIANTS.solid;
 
-  const safeVariant = BUTTON_VARIANTS[variant]
-    ? variant
-    : BUTTON_VARIANTS.solid;
+  const safeSize = SIZES[size] || SIZES.md;
 
-  const safeSize = BUTTON_SIZES[size] ? size : BUTTON_SIZES.md;
+  const buttonColors = getButtonColors(safeVariant, colors);
 
-  const isDisabled = Boolean(disabled) || Boolean(loading);
+  const dimensions = getButtonDimensions(safeSize);
 
-  const colors = getVariantColors(safeVariant, theme.colors);
-
-  const dimensions = getSizeDimensions(safeSize, theme);
+  const isDisabled = disabled || loading;
 
   const handlePress = useCallback(
     (event) => {
@@ -93,9 +85,7 @@ const UIButtonComponent = ({
         return;
       }
 
-      if (typeof onPress === "function") {
-        onPress(event);
-      }
+      onPress?.(event);
     },
     [isDisabled, onPress],
   );
@@ -106,9 +96,7 @@ const UIButtonComponent = ({
         return;
       }
 
-      if (typeof onLongPress === "function") {
-        onLongPress(event);
-      }
+      onLongPress?.(event);
     },
     [isDisabled, onLongPress],
   );
@@ -119,9 +107,7 @@ const UIButtonComponent = ({
         return;
       }
 
-      if (typeof onPressIn === "function") {
-        onPressIn(event);
-      }
+      onPressIn?.(event);
     },
     [isDisabled, onPressIn],
   );
@@ -132,34 +118,12 @@ const UIButtonComponent = ({
         return;
       }
 
-      if (typeof onPressOut === "function") {
-        onPressOut(event);
-      }
+      onPressOut?.(event);
     },
     [isDisabled, onPressOut],
   );
 
-  const ripple = android_ripple
-    ? {
-        color: colors.ripple,
-        borderless: false,
-      }
-    : undefined;
-
-  /*
-   * Important:
-   *
-   * title = text
-   *
-   * children = arbitrary JSX
-   *
-   * We NEVER put arbitrary children
-   * inside UIText.
-   */
-  const hasCustomChildren = children !== undefined && children !== null;
-
-  const accessibilityText =
-    accessibilityLabel ?? (typeof title === "string" ? title : undefined);
+  const hasChildren = children !== undefined && children !== null;
 
   return (
     <Pressable
@@ -170,35 +134,36 @@ const UIButtonComponent = ({
       onLongPress={handleLongPress}
       onPressIn={handlePressIn}
       onPressOut={handlePressOut}
-      hitSlop={hitSlop}
-      pressRetentionOffset={pressRetentionOffset}
-      android_ripple={ripple}
-      accessibilityRole={accessibilityRole}
-      accessibilityLabel={accessibilityText}
+      accessibilityRole="button"
+      accessibilityLabel={
+        accessibilityLabel || (typeof title === "string" ? title : undefined)
+      }
       accessibilityHint={accessibilityHint}
       accessibilityState={{
         disabled: isDisabled,
-        busy: Boolean(loading),
+        busy: loading,
       }}
       style={({ pressed }) => [
         styles.button,
 
         {
+          height: dimensions.height,
+
           minHeight: dimensions.height,
 
           paddingHorizontal: dimensions.paddingHorizontal,
 
-          borderRadius: theme.radius.button,
+          borderRadius: dimensions.borderRadius,
 
-          backgroundColor: colors.background,
+          backgroundColor: buttonColors.background,
 
-          borderColor: colors.border,
+          borderColor: buttonColors.border,
 
-          borderWidth: colors.border ? 1 : 0,
+          borderWidth: buttonColors.border ? 1 : 0,
 
           width: fullWidth ? "100%" : undefined,
 
-          opacity: isDisabled ? 0.55 : pressed ? activeOpacity : 1,
+          opacity: isDisabled ? 0.5 : pressed ? activeOpacity : 1,
         },
 
         style,
@@ -209,8 +174,6 @@ const UIButtonComponent = ({
           styles.content,
 
           {
-            minHeight: dimensions.height - 2,
-
             gap: dimensions.gap,
           },
 
@@ -218,162 +181,171 @@ const UIButtonComponent = ({
         ]}
       >
         {loading ? (
-          <ActivityIndicator size="small" color={colors.text} />
-        ) : (
-          leftIcon
-        )}
+          <ActivityIndicator size="small" color={buttonColors.text} />
+        ) : leftIcon ? (
+          <View style={styles.icon}>{leftIcon}</View>
+        ) : null}
 
-        {hasCustomChildren ? (
+        {hasChildren ? (
           <View style={styles.children}>{children}</View>
-        ) : title !== undefined && title !== null ? (
-          <UIText
-            variant={dimensions.textVariant}
-            color={colors.text}
-            style={[styles.title, textStyle]}
+        ) : title ? (
+          <Text
             numberOfLines={1}
+            style={[
+              styles.text,
+
+              {
+                color: buttonColors.text,
+
+                fontSize: dimensions.fontSize,
+
+                lineHeight: dimensions.lineHeight,
+              },
+
+              textStyle,
+            ]}
           >
             {title}
-          </UIText>
+          </Text>
         ) : null}
 
         {!loading && rightIcon ? (
-          <View style={styles.iconRight}>{rightIcon}</View>
+          <View style={styles.icon}>{rightIcon}</View>
         ) : null}
       </View>
     </Pressable>
   );
-};
+}
 
-function getVariantColors(variant, colors) {
-  switch (variant) {
-    case BUTTON_VARIANTS.outline:
-      return {
-        background: colors.transparent,
+/**
+ * IMPORTANT:
+ *
+ * Variant resolution is completely independent
+ * from spacing/radius/typography.
+ *
+ * Therefore even if the theme is incomplete,
+ * variants still work.
+ */
+function getButtonColors(variant, colors) {
+  const primary = colors.primary || "#FF5A1F";
 
-        border: colors.primary,
+  const primarySoft = colors.primarySoft || "#FFF0EA";
 
-        text: colors.primary,
+  const success = colors.success || "#16A34A";
 
-        ripple: colors.primarySoft,
-      };
+  const danger = colors.danger || "#DC2626";
 
-    case BUTTON_VARIANTS.ghost:
-      return {
-        background: colors.transparent,
+  const text = colors.text || "#111111";
 
-        border: null,
+  const onPrimary = colors.onPrimary || "#FFFFFF";
 
-        text: colors.primary,
+  const border = colors.border || "#E5E5E5";
 
-        ripple: colors.primarySoft,
+  switch (variant) {
+    case VARIANTS.outline:
+      return {
+        background: "transparent",
+        border: primary,
+        text: primary,
       };
 
-    case BUTTON_VARIANTS.soft:
+    case VARIANTS.ghost:
       return {
-        background: colors.primarySoft,
-
+        background: "transparent",
         border: null,
-
-        text: colors.primary,
-
-        ripple: colors.primary,
+        text: primary,
       };
 
-    case BUTTON_VARIANTS.danger:
+    case VARIANTS.soft:
       return {
-        background: colors.danger,
-
-        border: colors.danger,
-
-        text: colors.onPrimary,
-
-        ripple: colors.dangerSoft || colors.danger,
+        background: primarySoft,
+        border: null,
+        text: primary,
       };
 
-    case BUTTON_VARIANTS.success:
+    case VARIANTS.danger:
       return {
-        background: colors.success,
-
-        border: colors.success,
-
-        text: colors.onPrimary,
+        background: danger,
+        border: danger,
+        text: onPrimary,
+      };
 
-        ripple: colors.successSoft || colors.success,
+    case VARIANTS.success:
+      return {
+        background: success,
+        border: success,
+        text: onPrimary,
       };
 
-    case BUTTON_VARIANTS.solid:
+    case VARIANTS.solid:
     default:
       return {
-        background: colors.primary,
-
-        border: colors.primary,
-
-        text: colors.onPrimary,
-
-        ripple: colors.primaryPressed || colors.primary,
+        background: primary,
+        border: primary,
+        text: onPrimary,
       };
   }
 }
 
-function getSizeDimensions(size, theme) {
+/**
+ * Sizes intentionally use fixed fallback
+ * values so the button cannot break when
+ * theme.sizes is missing.
+ */
+function getButtonDimensions(size) {
   switch (size) {
-    case BUTTON_SIZES.sm:
+    case SIZES.sm:
       return {
-        height: theme.sizes.button.sm,
-
-        paddingHorizontal: theme.spacing.md,
-
-        gap: theme.spacing.xs,
-
-        textVariant: "label",
+        height: 36,
+        paddingHorizontal: 14,
+        gap: 6,
+        borderRadius: 10,
+        fontSize: 13,
+        lineHeight: 18,
       };
 
-    case BUTTON_SIZES.lg:
+    case SIZES.lg:
       return {
-        height: theme.sizes.button.lg,
-
-        paddingHorizontal: theme.spacing.xl,
-
-        gap: theme.spacing.sm,
-
-        textVariant: "bodyMedium",
+        height: 52,
+        paddingHorizontal: 22,
+        gap: 8,
+        borderRadius: 14,
+        fontSize: 16,
+        lineHeight: 22,
       };
 
-    case BUTTON_SIZES.xl:
+    case SIZES.xl:
       return {
-        height: theme.sizes.button.xl,
-
-        paddingHorizontal: theme.spacing.xl2,
-
-        gap: theme.spacing.sm,
-
-        textVariant: "bodyMedium",
+        height: 60,
+        paddingHorizontal: 26,
+        gap: 8,
+        borderRadius: 16,
+        fontSize: 17,
+        lineHeight: 24,
       };
 
-    case BUTTON_SIZES.md:
+    case SIZES.md:
     default:
       return {
-        height: theme.sizes.button.md,
-
-        paddingHorizontal: theme.spacing.lg,
-
-        gap: theme.spacing.sm,
-
-        textVariant: "label",
+        height: 44,
+        paddingHorizontal: 18,
+        gap: 8,
+        borderRadius: 12,
+        fontSize: 14,
+        lineHeight: 20,
       };
   }
 }
 
 const styles = StyleSheet.create({
   button: {
+    flexShrink: 0,
     alignItems: "center",
     justifyContent: "center",
     overflow: "hidden",
-    flexShrink: 0,
   },
 
   content: {
-    width: "100%",
     flexDirection: "row",
     alignItems: "center",
     justifyContent: "center",
@@ -386,20 +358,24 @@ const styles = StyleSheet.create({
     justifyContent: "center",
   },
 
-  title: {
-    flexShrink: 1,
-    textAlign: "center",
-  },
-
-  iconRight: {
+  icon: {
     alignItems: "center",
     justifyContent: "center",
     flexShrink: 0,
   },
+
+  text: {
+    flexShrink: 1,
+    fontWeight: "600",
+    textAlign: "center",
+    includeFontPadding: false,
+  },
 });
 
 export const UIButton = memo(UIButtonComponent);
 
 UIButton.displayName = "UIButton";
 
-export { BUTTON_VARIANTS as UIButtonVariants, BUTTON_SIZES as UIButtonSizes };
+export const UIButtonVariants = VARIANTS;
+
+export const UIButtonSizes = SIZES;