@idealyst/components 1.1.7 → 1.1.8

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)()});
+});

package/src/Input/Input.styles.tsx

@@ -1,89 +1,69 @@
+/**
+ * Input styles using defineStyle with $iterator expansion.
+ */
 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';
+import { defineStyle, ThemeStyleWrapper } from '@idealyst/theme';
+import type { Theme as BaseTheme } from '@idealyst/theme';
+import { ViewStyleSize } from '../utils/viewStyleProps';
+
+// Required: Unistyles must see StyleSheet usage in original source to process this file
+void StyleSheet;
 
+// Wrap theme for $iterator support
+type Theme = ThemeStyleWrapper<BaseTheme>;
 
-export type InputVariants = {
-    size: InputSize;
-    type: InputType;
-    focused: boolean;
-    hasError: boolean;
-    disabled: boolean;
-}
+type InputType = 'outlined' | 'filled' | 'bare';
 
-type InputDynamicProps = {
+export type InputDynamicProps = {
     type?: InputType;
     focused?: boolean;
     hasError?: boolean;
     disabled?: boolean;
+    margin?: ViewStyleSize;
+    marginVertical?: ViewStyleSize;
+    marginHorizontal?: ViewStyleSize;
 };
 
 /**
- * Get container border/background styles based on type, focused, hasError, disabled
+ * Input styles with type/state handling.
  */
-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;
-    }
+export const inputStyles = defineStyle('Input', (theme: Theme) => ({
+    container: ({ type = 'outlined', focused = false, hasError = false, disabled = false }: InputDynamicProps) => {
+        const focusColor = theme.intents.primary.primary;
+        const errorColor = theme.intents.error.primary;
 
-    // Focus state (error still takes precedence for color)
-    if (focused && !hasError) {
-        borderColor = focusColor;
-        borderWidth = 1;
-    }
+        // Base styles by type
+        let backgroundColor = 'transparent';
+        let borderWidth = 1;
+        let borderColor = theme.colors.border.primary;
+
+        if (type === 'filled') {
+            backgroundColor = theme.colors.surface.secondary;
+            borderWidth = 0;
+        } else if (type === 'bare') {
+            backgroundColor = 'transparent';
+            borderWidth = 0;
+        }
 
-    // Disabled state
-    if (disabled) {
-        backgroundColor = theme.colors.surface.secondary;
-    }
+        // Error state takes precedence
+        if (hasError) {
+            borderColor = errorColor;
+            borderWidth = 1;
+        }
 
-    return {
-        backgroundColor,
-        borderWidth,
-        borderColor,
-        borderStyle,
-    };
-}
+        // Focus state (error still takes precedence for color)
+        if (focused && !hasError) {
+            borderColor = focusColor;
+            borderWidth = 1;
+        }
 
-/**
- * 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;
+        // Disabled state
+        if (disabled) {
+            backgroundColor = theme.colors.surface.secondary;
+        }
 
         // Web-specific border and shadow
-        let webBorder = `1px solid ${dynamicStyles.borderColor}`;
+        let webBorder = `1px solid ${borderColor}`;
         let webBoxShadow = 'none';
 
         if (type === 'filled' || type === 'bare') {
@@ -101,23 +81,32 @@ function createContainerStyles(theme: Theme) {
         }
 
         return {
-            display: 'flex',
-            flexDirection: 'row',
-            alignItems: 'center',
+            display: 'flex' as const,
+            flexDirection: 'row' as const,
+            alignItems: 'center' as const,
             width: '100%',
             minWidth: 0,
             borderRadius: 8,
-            ...dynamicStyles,
+            backgroundColor,
+            borderWidth,
+            borderColor,
+            borderStyle: 'solid' as const,
             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),
+                // $iterator expands for each input size
+                size: {
+                    height: theme.sizes.$input.height,
+                    paddingHorizontal: theme.sizes.$input.paddingHorizontal,
+                },
+                margin: {
+                    margin: theme.sizes.$view.padding,
+                },
+                marginVertical: {
+                    marginVertical: theme.sizes.$view.padding,
+                },
+                marginHorizontal: {
+                    marginHorizontal: theme.sizes.$view.padding,
+                },
             },
             _web: {
                 boxSizing: 'border-box',
@@ -127,168 +116,108 @@ function createContainerStyles(theme: Theme) {
                 cursor: disabled ? 'not-allowed' : 'text',
             },
         } as const;
-    };
-}
+    },
 
-/**
- * Create left icon container styles
- */
-function createLeftIconContainerStyles(theme: Theme) {
-    return () => ({
+    input: (_props: InputDynamicProps) => ({
+        flex: 1,
+        minWidth: 0,
+        backgroundColor: 'transparent' as const,
+        color: theme.colors.text.primary,
+        fontWeight: '400' as const,
+        variants: {
+            size: {
+                fontSize: theme.sizes.$input.fontSize,
+            },
+        },
+        _web: {
+            border: 'none',
+            outline: 'none',
+            fontFamily: 'inherit',
+        },
+    }),
+
+    leftIconContainer: (_props: InputDynamicProps) => ({
         display: 'flex' as const,
         alignItems: 'center' as const,
         justifyContent: 'center' as const,
         flexShrink: 0,
         variants: {
-            size: buildSizeVariants(theme, 'input', (size) => ({
-                marginRight: size.iconMargin,
-            })),
+            size: {
+                marginRight: theme.sizes.$input.iconMargin,
+            },
         },
-    });
-}
+    }),
 
-/**
- * Create right icon container styles
- */
-function createRightIconContainerStyles(theme: Theme) {
-    return () => ({
+    rightIconContainer: (_props: InputDynamicProps) => ({
         display: 'flex' as const,
         alignItems: 'center' as const,
         justifyContent: 'center' as const,
         flexShrink: 0,
         variants: {
-            size: buildSizeVariants(theme, 'input', (size) => ({
-                marginLeft: size.iconMargin,
-            })),
+            size: {
+                marginLeft: theme.sizes.$input.iconMargin,
+            },
         },
-    });
-}
+    }),
 
-/**
- * Create left icon styles
- */
-function createLeftIconStyles(theme: Theme) {
-    return () => ({
+    leftIcon: (_props: InputDynamicProps) => ({
         color: theme.colors.text.secondary,
         variants: {
-            size: buildSizeVariants(theme, 'input', (size) => ({
-                fontSize: size.iconSize,
-                width: size.iconSize,
-                height: size.iconSize,
-            })),
+            size: {
+                fontSize: theme.sizes.$input.iconSize,
+                width: theme.sizes.$input.iconSize,
+                height: theme.sizes.$input.iconSize,
+            },
         },
-    });
-}
+    }),
 
-/**
- * Create right icon styles
- */
-function createRightIconStyles(theme: Theme) {
-    return () => ({
+    rightIcon: (_props: InputDynamicProps) => ({
         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,
-            })),
+            size: {
+                fontSize: theme.sizes.$input.iconSize,
+                width: theme.sizes.$input.iconSize,
+                height: theme.sizes.$input.iconSize,
+            },
         },
-    });
-}
+    }),
 
-/**
- * Create password toggle styles
- */
-function createPasswordToggleStyles(theme: Theme) {
-    return () => ({
+    passwordToggle: (_props: InputDynamicProps) => ({
         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,
-            })),
+            size: {
+                marginLeft: theme.sizes.$input.iconMargin,
+            },
         },
         _web: {
             background: 'transparent',
             border: 'none',
             cursor: 'pointer',
-            _hover: {
-                opacity: 0.7,
-            },
-            _active: {
-                opacity: 0.5,
-            },
+            _hover: { opacity: 0.7 },
+            _active: { opacity: 0.5 },
         },
-    });
-}
+    }),
 
-/**
- * Create password toggle icon styles
- */
-function createPasswordToggleIconStyles(theme: Theme) {
-    return () => ({
+    passwordToggleIcon: (_props: InputDynamicProps) => ({
         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',
+            size: {
+                fontSize: theme.sizes.$input.iconSize,
+                width: theme.sizes.$input.iconSize,
+                height: theme.sizes.$input.iconSize,
+            },
         },
-    });
-}
-
-// 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
-  const extended = applyExtensions('Input', theme, {
-    container: createContainerStyles(theme),
-    input: createInputStyles(theme),
-  });
-
-  return {
-    ...extended,
-    // Minor utility styles (not extended)
-    leftIconContainer: createLeftIconContainerStyles(theme)(),
-    rightIconContainer: createRightIconContainerStyles(theme)(),
-    leftIcon: createLeftIconStyles(theme)(),
-    rightIcon: createRightIconStyles(theme)(),
-    passwordToggle: createPasswordToggleStyles(theme)(),
-    passwordToggleIcon: createPasswordToggleIconStyles(theme)(),
-  };
-});
+    }),
+}));