@codeleap/mobile 1.9.15 → 1.9.18

package/src/components/TextInput.tsx

@@ -1,245 +1,245 @@
-import * as React from 'react'
-import {
-  ComponentVariants,
-  FormTypes,
-  IconPlaceholder,
-  TextInputComposition,
-  TextInputStyles,
-  useBooleanToggle,
-  useDefaultComponentStyle,
-  useValidate,
-} from '@codeleap/common'
-import { ComponentPropsWithoutRef, forwardRef, useImperativeHandle, useRef, useState } from 'react'
-import { Text } from './Text'
-import { View, ViewProps } from './View'
-import { StylesOf } from '../types/utility'
-import { Icon } from './Icon'
-import { NativeSyntheticEvent, StyleSheet, TextInput as NativeTextInput, TextInputChangeEventData } from 'react-native'
-import { Touchable, TouchableProps } from './Touchable'
-import { MaskedTextInput } from '../modules/textInputMask'
-import { TextInputMaskProps } from '../modules/types/textInputMask'
-
-type IconProp = { name: IconPlaceholder; action?: () => void }
-
-type NativeProps = ComponentPropsWithoutRef<typeof NativeTextInput>
-
-export type TextInputProps =
-  Partial<TextInputMaskProps> &
-  ComponentVariants<typeof TextInputStyles> &
-  Omit<NativeProps, 'value'> &
-  {
-    multiline?: boolean
-    onChangeText?: (text: string) => void
-    disabled?: boolean
-    edited?: boolean
-    type?: string
-    label?: React.ReactNode
-    debugName: string
-    leftIcon?: IconProp
-    rightIcon?: IconProp
-    styles?: StylesOf<TextInputComposition>
-    validate?: FormTypes.ValidatorFunctionWithoutForm | string
-    value?: string
-    password?: boolean
-    visibilityToggle?: boolean
-    touchableWrapper?: boolean
-    onPress?: () => void
-    masking?: FormTypes.TextField['masking']
-    innerWrapperProps?: TouchableProps | ViewProps
-    onChangeMask?: TextInputMaskProps['onChangeText']
-    required?:boolean
-  }
-
-export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops, inputRef) => {
-  const {
-    onChange,
-    type,
-    value,
-    onChangeText,
-    disabled,
-    edited,
-    onFocus,
-    onBlur,
-    variants,
-    label,
-    leftIcon,
-    rightIcon,
-    styles,
-    validate,
-    password,
-    visibilityToggle,
-    touchableWrapper,
-    innerWrapperProps,
-    masking = null,
-    onChangeMask,
-    debugName,
-    required = false,
-    ...props
-  } = rawprops
-
-  const [isFocused, setFocus] = useState(false)
-  const [editedState, setEdited] = useState(edited)
-
-  const input = useRef<any>(null)
-  const [textIsVisible, setTextVisible] = useBooleanToggle(false)
-  const variantStyles = useDefaultComponentStyle('TextInput', {
-    variants,
-    styles,
-  })
-  const InputElement = masking ? MaskedTextInput : NativeTextInput
-
-  const handleBlur: TextInputProps['onBlur'] = (e) => {
-    if (!editedState && value) setEdited(true)
-    setFocus(false)
-
-    if (onBlur) {
-      onBlur(e)
-    }
-  }
-
-  const handleFocus: TextInputProps['onFocus'] = (e) => {
-    setFocus(true)
-    if (onFocus) {
-      onFocus(e)
-    }
-  }
-  const handleMaskChange = (masked, unmasked) => {
-    if (onChangeText) onChangeText((typeof masking === 'object' && masking?.saveFormatted) ? masked : unmasked)
-    if (onChangeMask) onChangeMask(masked, unmasked)
-  }
-  const handleChange = (event: NativeSyntheticEvent<TextInputChangeEventData>) => {
-    const text = event.nativeEvent.text
-
-    if (onChange) onChange(event)
-    if (onChangeText) onChangeText(text)
-  }
-
-  useImperativeHandle(inputRef, () => ({ ...input.current, focus: () => {
-    input.current?.focus?.()
-  }, isTextInput: true }))
-
-  const { showError, error } = useValidate(value, validate)
-
-  const leftIconStyle = {
-    ...variantStyles.icon,
-    ...(isFocused ? variantStyles['icon:focus'] : {}),
-    ...(showError ? variantStyles['icon:error'] : {}),
-    ...variantStyles.leftIcon,
-    ...(isFocused ? variantStyles['leftIcon:focus'] : {}),
-    ...(showError ? variantStyles['leftIcon:error'] : {}),
-  }
-
-  const rightIconStyle = {
-    ...variantStyles.icon,
-    ...(isFocused ? variantStyles['icon:focus'] : {}),
-    ...(showError ? variantStyles['icon:error'] : {}),
-    ...variantStyles.rightIcon,
-    ...(isFocused ? variantStyles['rightIcon:focus'] : {}),
-    ...(showError ? variantStyles['rightIcon:error'] : {}),
-  }
-
-  const buttonIconWrapperStyle = {
-    ...variantStyles.buttonIconWrapper,
-    ...(isFocused ? variantStyles['buttonIconWrapper:focus'] : {}),
-    ...(showError ? variantStyles['buttonIconWrapper:error'] : {}),
-  }
-  function getStyles(key: TextInputComposition) {
-    const requestedStyles = [
-      variantStyles[key],
-      isFocused ? variantStyles[key + ':focus'] : {},
-      showError ? variantStyles[key + ':error'] : {},
-    ]
-    return requestedStyles
-  }
-
-  function handlePress() {
-    if (props.onPress) {
-      props.onPress()
-    } else {
-      input.current?.focus?.()
-    }
-  }
-
-  return (
-    <Touchable
-      style={getStyles('wrapper')}
-      debugName={debugName}
-      onPress={handlePress}
-      {...innerWrapperProps}
-    >
-      <InputLabel
-        label={label}
-        style={getStyles('label')}
-        asteriskStyle={getStyles('requiredAsterisk')}
-        wrapperStyle={getStyles('labelWrapper')}
-        required={required}
-      />
-      <View style={getStyles('innerWrapper')} {...innerWrapperProps}>
-        <InputIcon {...leftIcon} style={leftIconStyle} wrapperStyle={buttonIconWrapperStyle} />
-        {/* @ts-ignore */}
-        <InputElement
-          ref={input}
-          secureTextEntry={password && !textIsVisible}
-          onChange={(e) => masking ? onChange?.(e) : handleChange(e)}
-          value={value}
-          editable={disabled}
-          onFocus={handleFocus}
-          onBlur={handleBlur}
-          placeholderTextColor={StyleSheet.flatten(getStyles('placeholder'))?.color}
-          selectionColor={StyleSheet.flatten(getStyles('selection'))?.color}
-          includeRawValueInChangeText={true}
-          {...props}
-          {...(masking ? { onChangeText: handleMaskChange, type: masking?.type } : {})}
-          style={getStyles('textField')}
-        />
-        {
-          visibilityToggle ?
-            <InputIcon name={
-              (textIsVisible ? 'input-visiblity:visible' : 'input-visiblity:hidden') as IconPlaceholder
-            } action={() => setTextVisible()} style={rightIconStyle} wrapperStyle={buttonIconWrapperStyle}/>
-            :
-            <InputIcon {...rightIcon} style={rightIconStyle} wrapperStyle={buttonIconWrapperStyle} />
-        }
-      </View>
-      <FormError message={error.message} style={getStyles('error')} />
-    </Touchable>
-  )
-})
-
-export const FormError = ({ message, ...props }) => {
-  if (['number', 'string', 'undefined'].includes(typeof message)) {
-    const text = message ? `${message.charAt(0).toUpperCase() + message.slice(1)}` : ' '
-    return <Text text={text} variants={['p2', 'marginTop:1']} {...props} />
-  }
-  return message
-}
-
-export const InputIcon: React.FC<{ style: any; wrapperStyle: any } & IconProp> = ({ name, style, action, wrapperStyle = {}}) => {
-  if (!name) return null
-  if (action) {
-    return <Touchable debugName={`${name} icon button`} onPress={() => action()} style={wrapperStyle} >
-      <Icon name={name} style={style}/>
-    </Touchable>
-  }
-  return <Icon name={name} style={style} />
-}
-
-export const InputLabel = ({ label, variants = [], styles = {}, style, asteriskStyle = null, required = false, wrapperStyle = null }) => {
-  const labelStyles = useDefaultComponentStyle('TextInput', {
-    variants, styles, transform: StyleSheet.flatten,
-  })
-
-  if (!label) return null
-
-  switch (typeof label) {
-    case 'string':
-      return <View style={ wrapperStyle || labelStyles.labelWrapper}>
-        <Text style={style || labelStyles.label} text={label} />
-        {required && <Text style={asteriskStyle || labelStyles.requiredAsterisk} text={' *'} />}
-      </View>
-    case 'object':
-      return label
-    default:
-      return null
-  }
-}
+import * as React from 'react'
+import {
+  ComponentVariants,
+  FormTypes,
+  IconPlaceholder,
+  TextInputComposition,
+  TextInputStyles,
+  useBooleanToggle,
+  useDefaultComponentStyle,
+  useValidate,
+} from '@codeleap/common'
+import { ComponentPropsWithoutRef, forwardRef, useImperativeHandle, useRef, useState } from 'react'
+import { Text } from './Text'
+import { View, ViewProps } from './View'
+import { StylesOf } from '../types/utility'
+import { Icon } from './Icon'
+import { NativeSyntheticEvent, StyleSheet, TextInput as NativeTextInput, TextInputChangeEventData } from 'react-native'
+import { Touchable, TouchableProps } from './Touchable'
+import { MaskedTextInput } from '../modules/textInputMask'
+import { TextInputMaskProps } from '../modules/types/textInputMask'
+
+type IconProp = { name: IconPlaceholder; action?: () => void }
+
+type NativeProps = ComponentPropsWithoutRef<typeof NativeTextInput>
+
+export type TextInputProps =
+  Partial<TextInputMaskProps> &
+  ComponentVariants<typeof TextInputStyles> &
+  Omit<NativeProps, 'value'> &
+  {
+    multiline?: boolean
+    onChangeText?: (text: string) => void
+    disabled?: boolean
+    edited?: boolean
+    type?: string
+    label?: React.ReactNode
+    debugName: string
+    leftIcon?: IconProp
+    rightIcon?: IconProp
+    styles?: StylesOf<TextInputComposition>
+    validate?: FormTypes.ValidatorFunctionWithoutForm | string
+    value?: string
+    password?: boolean
+    visibilityToggle?: boolean
+    touchableWrapper?: boolean
+    onPress?: () => void
+    masking?: FormTypes.TextField['masking']
+    innerWrapperProps?: TouchableProps | ViewProps
+    onChangeMask?: TextInputMaskProps['onChangeText']
+    required?:boolean
+  }
+
+export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops, inputRef) => {
+  const {
+    onChange,
+    type,
+    value,
+    onChangeText,
+    disabled,
+    edited,
+    onFocus,
+    onBlur,
+    variants,
+    label,
+    leftIcon,
+    rightIcon,
+    styles,
+    validate,
+    password,
+    visibilityToggle,
+    touchableWrapper,
+    innerWrapperProps,
+    masking = null,
+    onChangeMask,
+    debugName,
+    required = false,
+    ...props
+  } = rawprops
+
+  const [isFocused, setFocus] = useState(false)
+  const [editedState, setEdited] = useState(edited)
+
+  const input = useRef<any>(null)
+  const [textIsVisible, setTextVisible] = useBooleanToggle(false)
+  const variantStyles = useDefaultComponentStyle('TextInput', {
+    variants,
+    styles,
+  })
+  const InputElement = masking ? MaskedTextInput : NativeTextInput
+
+  const handleBlur: TextInputProps['onBlur'] = (e) => {
+    if (!editedState && value) setEdited(true)
+    setFocus(false)
+
+    if (onBlur) {
+      onBlur(e)
+    }
+  }
+
+  const handleFocus: TextInputProps['onFocus'] = (e) => {
+    setFocus(true)
+    if (onFocus) {
+      onFocus(e)
+    }
+  }
+  const handleMaskChange = (masked, unmasked) => {
+    if (onChangeText) onChangeText((typeof masking === 'object' && masking?.saveFormatted) ? masked : unmasked)
+    if (onChangeMask) onChangeMask(masked, unmasked)
+  }
+  const handleChange = (event: NativeSyntheticEvent<TextInputChangeEventData>) => {
+    const text = event.nativeEvent.text
+
+    if (onChange) onChange(event)
+    if (onChangeText) onChangeText(text)
+  }
+
+  useImperativeHandle(inputRef, () => ({ ...input.current, focus: () => {
+    input.current?.focus?.()
+  }, isTextInput: true }))
+
+  const { showError, error } = useValidate(value, validate)
+
+  const leftIconStyle = {
+    ...variantStyles.icon,
+    ...(isFocused ? variantStyles['icon:focus'] : {}),
+    ...(showError ? variantStyles['icon:error'] : {}),
+    ...variantStyles.leftIcon,
+    ...(isFocused ? variantStyles['leftIcon:focus'] : {}),
+    ...(showError ? variantStyles['leftIcon:error'] : {}),
+  }
+
+  const rightIconStyle = {
+    ...variantStyles.icon,
+    ...(isFocused ? variantStyles['icon:focus'] : {}),
+    ...(showError ? variantStyles['icon:error'] : {}),
+    ...variantStyles.rightIcon,
+    ...(isFocused ? variantStyles['rightIcon:focus'] : {}),
+    ...(showError ? variantStyles['rightIcon:error'] : {}),
+  }
+
+  const buttonIconWrapperStyle = {
+    ...variantStyles.buttonIconWrapper,
+    ...(isFocused ? variantStyles['buttonIconWrapper:focus'] : {}),
+    ...(showError ? variantStyles['buttonIconWrapper:error'] : {}),
+  }
+  function getStyles(key: TextInputComposition) {
+    const requestedStyles = [
+      variantStyles[key],
+      isFocused ? variantStyles[key + ':focus'] : {},
+      showError ? variantStyles[key + ':error'] : {},
+    ]
+    return requestedStyles
+  }
+
+  function handlePress() {
+    if (props.onPress) {
+      props.onPress()
+    } else {
+      input.current?.focus?.()
+    }
+  }
+
+  return (
+    <Touchable
+      style={getStyles('wrapper')}
+      debugName={debugName}
+      onPress={handlePress}
+      {...innerWrapperProps}
+    >
+      <InputLabel
+        label={label}
+        style={getStyles('label')}
+        asteriskStyle={getStyles('requiredAsterisk')}
+        wrapperStyle={getStyles('labelWrapper')}
+        required={required}
+      />
+      <View style={getStyles('innerWrapper')} {...innerWrapperProps}>
+        <InputIcon {...leftIcon} style={leftIconStyle} wrapperStyle={buttonIconWrapperStyle} />
+        {/* @ts-ignore */}
+        <InputElement
+          ref={input}
+          secureTextEntry={password && !textIsVisible}
+          onChange={(e) => masking ? onChange?.(e) : handleChange(e)}
+          value={value}
+          editable={disabled}
+          onFocus={handleFocus}
+          onBlur={handleBlur}
+          placeholderTextColor={StyleSheet.flatten(getStyles('placeholder'))?.color}
+          selectionColor={StyleSheet.flatten(getStyles('selection'))?.color}
+          includeRawValueInChangeText={true}
+          {...props}
+          {...(masking ? { onChangeText: handleMaskChange, type: masking?.type } : {})}
+          style={getStyles('textField')}
+        />
+        {
+          visibilityToggle ?
+            <InputIcon name={
+              (textIsVisible ? 'input-visiblity:visible' : 'input-visiblity:hidden') as IconPlaceholder
+            } action={() => setTextVisible()} style={rightIconStyle} wrapperStyle={buttonIconWrapperStyle}/>
+            :
+            <InputIcon {...rightIcon} style={rightIconStyle} wrapperStyle={buttonIconWrapperStyle} />
+        }
+      </View>
+      <FormError message={error.message} style={getStyles('error')} />
+    </Touchable>
+  )
+})
+
+export const FormError = ({ message, ...props }) => {
+  if (['number', 'string', 'undefined'].includes(typeof message)) {
+    const text = message ? `${message.charAt(0).toUpperCase() + message.slice(1)}` : ' '
+    return <Text text={text} variants={['p2', 'marginTop:1']} {...props} />
+  }
+  return message
+}
+
+export const InputIcon: React.FC<{ style: any; wrapperStyle: any } & IconProp> = ({ name, style, action, wrapperStyle = {}}) => {
+  if (!name) return null
+  if (action) {
+    return <Touchable debugName={`${name} icon button`} onPress={() => action()} style={wrapperStyle} >
+      <Icon name={name} style={style}/>
+    </Touchable>
+  }
+  return <Icon name={name} style={style} />
+}
+
+export const InputLabel = ({ label, variants = [], styles = {}, style, asteriskStyle = null, required = false, wrapperStyle = null }) => {
+  const labelStyles = useDefaultComponentStyle('TextInput', {
+    variants, styles, transform: StyleSheet.flatten,
+  })
+
+  if (!label) return null
+
+  switch (typeof label) {
+    case 'string':
+      return <View style={ wrapperStyle || labelStyles.labelWrapper}>
+        <Text style={style || labelStyles.label} text={label} />
+        {required && <Text style={asteriskStyle || labelStyles.requiredAsterisk} text={' *'} />}
+      </View>
+    case 'object':
+      return label
+    default:
+      return null
+  }
+}

package/src/components/Touchable.tsx

@@ -1,64 +1,67 @@
-import * as React from 'react'
-import { ComponentPropsWithoutRef, forwardRef } from 'react'
-import {
-  ComponentVariants,
-  useDefaultComponentStyle,
-  BaseViewProps,
-  ViewStyles,
-  useCodeleapContext,
-  AnyFunction,
-} from '@codeleap/common'
-import { TouchableOpacity as NativeTouchable } from 'react-native'
-
-import { createAnimatableComponent } from 'react-native-animatable'
-export type TouchableProps = Omit<
-  ComponentPropsWithoutRef<typeof NativeTouchable>,
-  'onPress'
-> & {
-  variants?: ComponentVariants<typeof ViewStyles>['variants']
-  component?: any
-  ref?: React.Ref<NativeTouchable>
-  debugName: string
-  debugComponent?: string
-  onPress?: AnyFunction
-} & BaseViewProps
-
-export const Touchable: React.FC<TouchableProps> = forwardRef<
-  NativeTouchable,
-  TouchableProps
->((touchableProps, ref) => {
-  const {
-    variants = [],
-    children,
-    onPress,
-    style,
-    debugName,
-    debugComponent,
-    ...props
-  } = touchableProps
-
-  const variantStyles = useDefaultComponentStyle('View', {
-    variants,
-  })
-
-  const { logger } = useCodeleapContext()
-  const press = () => {
-    if (!onPress) { throw { message: 'No onPress passed to touchable', touchableProps } }
-    logger.log(
-      `<${debugComponent || 'Touchable'}/>  pressed`,
-      { debugName, style, variants },
-      'User interaction',
-    )
-    onPress && onPress()
-  }
-
-  const styles = [variantStyles.wrapper, style]
-
-  return (
-    <NativeTouchable onPress={press} style={styles} {...props} ref={ref}>
-      {children}
-    </NativeTouchable>
-  )
-})
-
-export const AnimatedTouchable = createAnimatableComponent(Touchable) as unknown as typeof Touchable
+import * as React from 'react'
+import { ComponentPropsWithoutRef, forwardRef } from 'react'
+import {
+  ComponentVariants,
+  useDefaultComponentStyle,
+  BaseViewProps,
+  ViewStyles,
+  useCodeleapContext,
+  AnyFunction,
+} from '@codeleap/common'
+import { TouchableOpacity as NativeTouchable } from 'react-native'
+
+import { createAnimatableComponent } from 'react-native-animatable'
+export type TouchableProps = Omit<
+  ComponentPropsWithoutRef<typeof NativeTouchable>,
+  'onPress'
+> & {
+  variants?: ComponentVariants<typeof ViewStyles>['variants']
+  component?: any
+  ref?: React.Ref<NativeTouchable>
+  debugName: string
+  debugComponent?: string
+  onPress?: AnyFunction
+} & BaseViewProps
+
+export const Touchable: React.FC<TouchableProps> = forwardRef<
+  NativeTouchable,
+  TouchableProps
+>((touchableProps, ref) => {
+  const {
+    variants = [],
+    children,
+    onPress,
+    style,
+    debugName,
+    debugComponent,
+    ...props
+  } = touchableProps
+
+  const variantStyles = useDefaultComponentStyle('View', {
+    variants,
+  })
+
+  const { logger: contextLogger } = useCodeleapContext()
+  const press = () => {
+    if (!onPress) { throw { message: 'No onPress passed to touchable', touchableProps } }
+
+    const activeLogger = logger || contextLogger
+
+    activeLogger.log(
+      `<${debugComponent || 'Touchable'}/>  pressed`,
+      debugName || variants,
+      'User interaction',
+    )
+    onPress && onPress()
+  }
+
+  const styles = [variantStyles.wrapper, style]
+
+  return (
+    <NativeTouchable onPress={press} style={styles} {...props} ref={ref}>
+      {children}
+    </NativeTouchable>
+  )
+})
+
+export const AnimatedTouchable = createAnimatableComponent(Touchable) as unknown as typeof Touchable