@idealyst/components 1.1.6 → 1.1.8

package/src/Input/Input.native.tsx

@@ -1,10 +1,55 @@
-import React, { useState, isValidElement, useMemo } from 'react';
-import { View, TextInput, TouchableOpacity } from 'react-native';
+import React, { useState, isValidElement, useMemo, useEffect, useRef, useCallback } from 'react';
+import { View, TextInput, TouchableOpacity, Platform, TextInputProps } from 'react-native';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import { useUnistyles } from 'react-native-unistyles';
 import { InputProps } from './types';
 import { inputStyles } from './Input.styles';
 import { getNativeFormAccessibilityProps } from '../utils/accessibility';
 
+// Inner TextInput component that can be memoized to prevent re-renders
+// for Android secure text entry
+type InnerTextInputProps = {
+  inputRef: React.ForwardedRef<TextInput>;
+  value: string | undefined;
+  onChangeText: ((text: string) => void) | undefined;
+  isAndroidSecure: boolean;
+  textInputProps: Omit<TextInputProps, 'value' | 'defaultValue' | 'onChangeText'>;
+  inputStyle: any;
+};
+
+const InnerTextInput = React.memo<InnerTextInputProps>(
+  ({ inputRef, value, onChangeText, isAndroidSecure, textInputProps, inputStyle }) => {
+    return (
+      <TextInput
+        ref={inputRef}
+        // For Android secure text entry, don't pass value prop at all
+        // Let TextInput manage its own state to preserve character reveal animation
+        {...(isAndroidSecure ? {} : { value })}
+        onChangeText={onChangeText}
+        style={inputStyle}
+        {...textInputProps}
+      />
+    );
+  },
+  (prevProps, nextProps) => {
+    // For Android secure text entry, skip re-renders when only value changes
+    if (nextProps.isAndroidSecure) {
+      // Only re-render if non-value props change
+      const valueChanged = prevProps.value !== nextProps.value;
+      const otherPropsChanged =
+        prevProps.onChangeText !== nextProps.onChangeText ||
+        prevProps.isAndroidSecure !== nextProps.isAndroidSecure ||
+        prevProps.textInputProps !== nextProps.textInputProps ||
+        prevProps.inputStyle !== nextProps.inputStyle;
+
+      if (valueChanged && !otherPropsChanged) {
+        return true; // Skip re-render
+      }
+    }
+    return false; // Allow re-render
+  }
+);
+
 const Input = React.forwardRef<TextInput, InputProps>(({
   value,
   onChangeText,
@@ -41,11 +86,30 @@ const Input = React.forwardRef<TextInput, InputProps>(({
   const [isFocused, setIsFocused] = useState(false);
   const [isPasswordVisible, setIsPasswordVisible] = useState(false);
 
+  // Track if this is a secure field that needs Android workaround
+  const isSecureField = inputType === 'password' || secureTextEntry;
+  const needsAndroidSecureWorkaround = Platform.OS === 'android' && isSecureField && !isPasswordVisible;
+
+  // For Android secure text entry, we use an internal ref to track value
+  const internalValueRef = useRef(value ?? '');
+
+  // Sync external value changes to internal ref (for programmatic updates)
+  useEffect(() => {
+    if (value !== undefined) {
+      internalValueRef.current = value;
+    }
+  }, [value]);
+
+  // Get theme for icon sizes and colors
+  const { theme } = useUnistyles();
+  const iconSize = theme.sizes.input[size].iconSize;
+  const iconColor = theme.colors.text.secondary;
+
   // Determine if we should show password toggle
   const isPasswordField = inputType === 'password' || secureTextEntry;
   const shouldShowPasswordToggle = isPasswordField && (showPasswordToggle !== false);
 
-  const getKeyboardType = () => {
+  const getKeyboardType = useCallback((): 'default' | 'email-address' | 'numeric' => {
     switch (inputType) {
       case 'email':
         return 'email-address';
@@ -56,43 +120,34 @@ const Input = React.forwardRef<TextInput, InputProps>(({
       default:
         return 'default';
     }
-  };
+  }, [inputType]);
 
-  const handleFocus = () => {
+  const handleFocus = useCallback(() => {
     setIsFocused(true);
-    if (onFocus) {
-      onFocus();
-    }
-  };
+    onFocus?.();
+  }, [onFocus]);
 
-  const handlePress = () => {
-    if (onPress) {
-      onPress();
-    }
-  }
+  const handlePress = useCallback(() => {
+    onPress?.();
+  }, [onPress]);
 
-  const handleBlur = () => {
+  const handleBlur = useCallback(() => {
     setIsFocused(false);
-    if (onBlur) {
-      onBlur();
-    }
-  };
+    onBlur?.();
+  }, [onBlur]);
 
   const togglePasswordVisibility = () => {
     setIsPasswordVisible(!isPasswordVisible);
   };
 
-  // Apply variants to the stylesheet
-  inputStyles.useVariants({
-    size,
-    type,
-    focused: isFocused,
-    hasError,
-    disabled,
-    margin,
-    marginVertical,
-    marginHorizontal,
-  });
+  // Memoized change handler for InnerTextInput
+  const handleChangeText = useCallback((text: string) => {
+    internalValueRef.current = text;
+    onChangeText?.(text);
+  }, [onChangeText]);
+
+  // Memoized input style
+  const inputStyle = useMemo(() => (inputStyles.input as any)({}), []);
 
   // Generate native accessibility props
   const nativeA11yProps = useMemo(() => {
@@ -120,17 +175,55 @@ const Input = React.forwardRef<TextInput, InputProps>(({
     hasError,
   ]);
 
+  // Memoized TextInput props (everything except value/onChangeText)
+  const textInputProps = useMemo(() => ({
+    onPress: handlePress,
+    placeholder,
+    editable: !disabled,
+    keyboardType: getKeyboardType(),
+    secureTextEntry: isSecureField && !isPasswordVisible,
+    autoCapitalize,
+    onFocus: handleFocus,
+    onBlur: handleBlur,
+    placeholderTextColor: '#999999',
+    ...nativeA11yProps,
+  }), [
+    handlePress,
+    placeholder,
+    disabled,
+    getKeyboardType,
+    isSecureField,
+    isPasswordVisible,
+    autoCapitalize,
+    handleFocus,
+    handleBlur,
+    nativeA11yProps,
+  ]);
+
+  // Apply variants to the stylesheet (for size and spacing)
+  inputStyles.useVariants({
+    size,
+    margin,
+    marginVertical,
+    marginHorizontal,
+  });
+
+  // Compute dynamic styles - call as functions for theme reactivity
+  const containerStyle = (inputStyles.container as any)({ type, focused: isFocused, hasError, disabled });
+  const leftIconContainerStyle = (inputStyles.leftIconContainer as any)({});
+  const rightIconContainerStyle = (inputStyles.rightIconContainer as any)({});
+  const passwordToggleStyle = (inputStyles.passwordToggle as any)({});
+
   // Helper to render left icon
   const renderLeftIcon = () => {
     if (!leftIcon) return null;
 
     if (typeof leftIcon === 'string') {
-      const iconStyle = inputStyles.leftIcon;
       return (
         <MaterialCommunityIcons
           name={leftIcon}
-          size={iconStyle.width}
-          color={iconStyle.color}
+          size={iconSize}
+          color={iconColor}
         />
       );
     } else if (isValidElement(leftIcon)) {
@@ -145,12 +238,11 @@ const Input = React.forwardRef<TextInput, InputProps>(({
     if (!rightIcon) return null;
 
     if (typeof rightIcon === 'string') {
-      const iconStyle = inputStyles.rightIcon;
       return (
         <MaterialCommunityIcons
           name={rightIcon}
-          size={iconStyle.width}
-          color={iconStyle.color}
+          size={iconSize}
+          color={iconColor}
         />
       );
     } else if (isValidElement(rightIcon)) {
@@ -161,48 +253,40 @@ const Input = React.forwardRef<TextInput, InputProps>(({
   };
 
   return (
-    <View style={[inputStyles.container, style]} testID={testID} nativeID={id}>
+    <View style={[containerStyle, style]} testID={testID} nativeID={id}>
       {/* Left Icon */}
       {leftIcon && (
-        <View style={inputStyles.leftIconContainer}>
+        <View style={leftIconContainerStyle}>
           {renderLeftIcon()}
         </View>
       )}
 
       {/* Input */}
-      <TextInput
-        onPress={handlePress}
-        ref={ref}
+      <InnerTextInput
+        inputRef={ref}
         value={value}
-        onChangeText={onChangeText}
-        placeholder={placeholder}
-        editable={!disabled}
-        keyboardType={getKeyboardType()}
-        secureTextEntry={(secureTextEntry || inputType === 'password') && !isPasswordVisible}
-        autoCapitalize={autoCapitalize}
-        onFocus={handleFocus}
-        onBlur={handleBlur}
-        style={inputStyles.input}
-        placeholderTextColor="#999999"
-        {...nativeA11yProps}
+        onChangeText={handleChangeText}
+        isAndroidSecure={needsAndroidSecureWorkaround}
+        inputStyle={inputStyle}
+        textInputProps={textInputProps}
       />
 
       {/* Right Icon or Password Toggle */}
       {shouldShowPasswordToggle ? (
         <TouchableOpacity
-          style={inputStyles.passwordToggle}
+          style={passwordToggleStyle}
           onPress={togglePasswordVisibility}
           disabled={disabled}
           accessibilityLabel={isPasswordVisible ? 'Hide password' : 'Show password'}
         >
           <MaterialCommunityIcons
             name={isPasswordVisible ? 'eye-off' : 'eye'}
-            size={inputStyles.passwordToggleIcon.width}
-            color={inputStyles.passwordToggleIcon.color}
+            size={iconSize}
+            color={iconColor}
           />
         </TouchableOpacity>
       ) : rightIcon ? (
-        <View style={inputStyles.rightIconContainer}>
+        <View style={rightIconContainerStyle}>
           {renderRightIcon()}
         </View>
       ) : null}

package/src/Input/Input.styles.old.tsx

@@ -0,0 +1,289 @@
+import { StyleSheet } from 'react-native-unistyles';
+import { Theme, Size } from '@idealyst/theme';
+import { buildSizeVariants } from '../utils/buildSizeVariants';
+import {
+  buildMarginVariants,
+  buildMarginVerticalVariants,
+  buildMarginHorizontalVariants,
+} from '../utils/buildViewStyleVariants';
+import { InputSize, InputType } from './types';
+import { applyExtensions } from '../extensions/applyExtension';
+
+export type InputVariants = {
+    size: InputSize;
+    type: InputType;
+    focused: boolean;
+    hasError: boolean;
+    disabled: boolean;
+}
+
+type InputDynamicProps = {
+    type?: InputType;
+    focused?: boolean;
+    hasError?: boolean;
+    disabled?: boolean;
+};
+
+/**
+ * Get container border/background styles based on type, focused, hasError, disabled
+ */
+function getContainerDynamicStyles(theme: Theme, props: InputDynamicProps) {
+    const { type = 'outlined', focused = false, hasError = false, disabled = false } = props;
+    const focusColor = theme.intents.primary.primary;
+    const errorColor = theme.intents.error.primary;
+
+    // Base styles by type
+    let backgroundColor = 'transparent';
+    let borderWidth = 1;
+    let borderColor = theme.colors.border.primary;
+    let borderStyle = 'solid' as const;
+
+    if (type === 'filled') {
+        backgroundColor = theme.colors.surface.secondary;
+        borderWidth = 0;
+    } else if (type === 'bare') {
+        backgroundColor = 'transparent';
+        borderWidth = 0;
+    }
+
+    // Error state takes precedence
+    if (hasError) {
+        borderColor = errorColor;
+        borderWidth = 1;
+    }
+
+    // Focus state (error still takes precedence for color)
+    if (focused && !hasError) {
+        borderColor = focusColor;
+        borderWidth = 1;
+    }
+
+    // Disabled state
+    if (disabled) {
+        backgroundColor = theme.colors.surface.secondary;
+    }
+
+    return {
+        backgroundColor,
+        borderWidth,
+        borderColor,
+        borderStyle,
+    };
+}
+
+/**
+ * Create dynamic container styles
+ */
+function createContainerStyles(theme: Theme) {
+    return (props: InputDynamicProps) => {
+        const { type = 'outlined', focused = false, hasError = false, disabled = false } = props;
+        const dynamicStyles = getContainerDynamicStyles(theme, props);
+        const focusColor = theme.intents.primary.primary;
+        const errorColor = theme.intents.error.primary;
+
+        // Web-specific border and shadow
+        let webBorder = `1px solid ${dynamicStyles.borderColor}`;
+        let webBoxShadow = 'none';
+
+        if (type === 'filled' || type === 'bare') {
+            webBorder = 'none';
+        }
+
+        if (hasError) {
+            webBorder = `1px solid ${errorColor}`;
+            if (focused) {
+                webBoxShadow = `0 0 0 2px ${errorColor}20`;
+            }
+        } else if (focused) {
+            webBorder = `1px solid ${focusColor}`;
+            webBoxShadow = `0 0 0 2px ${focusColor}20`;
+        }
+
+        return {
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            width: '100%',
+            minWidth: 0,
+            borderRadius: 8,
+            ...dynamicStyles,
+            opacity: disabled ? 0.6 : 1,
+            variants: {
+                size: buildSizeVariants(theme, 'input', (size) => ({
+                    height: size.height,
+                    paddingHorizontal: size.paddingHorizontal,
+                })),
+                // Spacing variants from FormInputStyleProps
+                margin: buildMarginVariants(theme),
+                marginVertical: buildMarginVerticalVariants(theme),
+                marginHorizontal: buildMarginHorizontalVariants(theme),
+            },
+            _web: {
+                boxSizing: 'border-box',
+                transition: 'border-color 0.2s ease, box-shadow 0.2s ease',
+                border: webBorder,
+                boxShadow: webBoxShadow,
+                cursor: disabled ? 'not-allowed' : 'text',
+            },
+        } as const;
+    };
+}
+
+/**
+ * Create left icon container styles
+ */
+function createLeftIconContainerStyles(theme: Theme) {
+    return () => ({
+        display: 'flex' as const,
+        alignItems: 'center' as const,
+        justifyContent: 'center' as const,
+        flexShrink: 0,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                marginRight: size.iconMargin,
+            })),
+        },
+    });
+}
+
+/**
+ * Create right icon container styles
+ */
+function createRightIconContainerStyles(theme: Theme) {
+    return () => ({
+        display: 'flex' as const,
+        alignItems: 'center' as const,
+        justifyContent: 'center' as const,
+        flexShrink: 0,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                marginLeft: size.iconMargin,
+            })),
+        },
+    });
+}
+
+/**
+ * Create left icon styles
+ */
+function createLeftIconStyles(theme: Theme) {
+    return () => ({
+        color: theme.colors.text.secondary,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                fontSize: size.iconSize,
+                width: size.iconSize,
+                height: size.iconSize,
+            })),
+        },
+    });
+}
+
+/**
+ * Create right icon styles
+ */
+function createRightIconStyles(theme: Theme) {
+    return () => ({
+        display: 'flex' as const,
+        alignItems: 'center' as const,
+        justifyContent: 'center' as const,
+        flexShrink: 0,
+        color: theme.colors.text.secondary,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                fontSize: size.iconSize,
+                width: size.iconSize,
+                height: size.iconSize,
+            })),
+        },
+    });
+}
+
+/**
+ * Create password toggle styles
+ */
+function createPasswordToggleStyles(theme: Theme) {
+    return () => ({
+        display: 'flex' as const,
+        alignItems: 'center' as const,
+        justifyContent: 'center' as const,
+        flexShrink: 0,
+        padding: 0,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                marginLeft: size.iconMargin,
+            })),
+        },
+        _web: {
+            background: 'transparent',
+            border: 'none',
+            cursor: 'pointer',
+            _hover: {
+                opacity: 0.7,
+            },
+            _active: {
+                opacity: 0.5,
+            },
+        },
+    });
+}
+
+/**
+ * Create password toggle icon styles
+ */
+function createPasswordToggleIconStyles(theme: Theme) {
+    return () => ({
+        display: 'flex' as const,
+        alignItems: 'center' as const,
+        justifyContent: 'center' as const,
+        flexShrink: 0,
+        color: theme.colors.text.secondary,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                fontSize: size.iconSize,
+                width: size.iconSize,
+                height: size.iconSize,
+            })),
+        },
+    });
+}
+
+/**
+ * Create input styles
+ */
+function createInputStyles(theme: Theme) {
+    return () => ({
+        flex: 1,
+        minWidth: 0,
+        backgroundColor: 'transparent',
+        color: theme.colors.text.primary,
+        fontWeight: '400' as const,
+        variants: {
+            size: buildSizeVariants(theme, 'input', (size) => ({
+                fontSize: size.fontSize,
+            })),
+        },
+        _web: {
+            border: 'none',
+            outline: 'none',
+            fontFamily: 'inherit',
+        },
+    });
+}
+
+// Styles are inlined here instead of in @idealyst/theme because Unistyles' Babel
+// transform on native cannot resolve function calls to extract variant structures.
+export const inputStyles = StyleSheet.create((theme: Theme) => {
+  // Apply extensions to main visual elements
+
+  return applyExtensions('Input', theme, {container: createContainerStyles(theme),
+    input: createInputStyles(theme),
+        // Additional styles (merged from return)
+        // Minor utility styles (not extended)
+    leftIconContainer: createLeftIconContainerStyles(theme)(),
+    rightIconContainer: createRightIconContainerStyles(theme)(),
+    leftIcon: createLeftIconStyles(theme)(),
+    rightIcon: createRightIconStyles(theme)(),
+    passwordToggle: createPasswordToggleStyles(theme)(),
+    passwordToggleIcon: createPasswordToggleIconStyles(theme)()});
+});