@codeleap/mobile 1.9.33 → 2.0.0

package/src/components/Slider/index.tsx

@@ -12,6 +12,8 @@ import {
 import { InputLabel } from '../TextInput'
 import { SliderProps } from './types'
 
+export * from './styles'
+
 export const Slider: React.FC<SliderProps> = (sliderProps) => {
   const [tooltipVisible, setTooltipVisible] = React.useState(false)
 

package/src/components/Slider/styles.ts

@@ -0,0 +1,75 @@
+import { assignTextStyle, createDefaultVariantFactory, includePresets } from '@codeleap/common'
+
+export type SliderComposition =
+  | 'wrapper'
+  | 'handle'
+  | 'track'
+  | 'label'
+  | 'selectedTrack'
+  | 'inputContainer'
+  | 'tooltip'
+  | 'tooltip:visible'
+  | 'tooltip:hidden'
+  | 'trackLabels'
+  | 'mark'
+  | 'tooltipArrow'
+  | 'tooltipText'
+
+const createSliderStyle = createDefaultVariantFactory<SliderComposition>()
+
+const presets = includePresets((styles) => createSliderStyle(() => ({ wrapper: styles })),
+)
+
+export const SliderStyles = {
+  ...presets,
+  default: createSliderStyle((theme) => ({
+    wrapper: {},
+    handle: {
+      backgroundColor: theme.colors.primary,
+    },
+    selectedTrack: {
+      backgroundColor: theme.colors.primary,
+    },
+    track: {
+      backgroundColor: theme.colors.gray,
+    },
+    tooltip: {
+      padding: theme.spacing.value(0.5),
+      backgroundColor: theme.colors.primary,
+      position: 'relative',
+      borderRadius: theme.borderRadius.small,
+    },
+    'tooltip:visible': {
+      opacity: 1,
+    },
+    'tooltip:hidden': {
+      opacity: 0,
+    },
+    mark: {
+      position: 'absolute',
+      backgroundColor: theme.colors.primary,
+      borderRadius: 29,
+      height: 10,
+      width: 10,
+      top: -5,
+    },
+    trackLabels: {
+      position: 'absolute',
+      top: 8,
+      ...assignTextStyle('p3')(theme).text,
+    },
+    tooltipArrow: {
+      height: 6,
+      width: 6,
+      position: 'absolute',
+      backgroundColor: theme.colors.primary,
+      transform: [{ rotate: '45deg' }],
+      bottom: -3,
+      left: '50%',
+    },
+    tooltipText: {
+      color: theme.colors.white,
+      ...assignTextStyle('p3')(theme).text,
+    },
+  })),
+}

package/src/components/Slider/types.ts

@@ -1,6 +1,11 @@
-import { ComponentVariants, Form, SliderComposition, SliderStyles } from '@codeleap/common'
+import { ComponentVariants, Form } from '@codeleap/common'
+
+import {
+  SliderComposition, SliderStyles,
+} from './styles'
+
 import { SliderProps as RNSliderProps } from '@miblanchard/react-native-slider/lib/types'
-import { StylesOf } from '../../types/utility'
+import { StylesOf } from '../../types'
 import { ViewProps } from '../View'
 export type SliderProps = Partial<Omit<RNSliderProps, 'value' | 'onValueChange'>> & {
     debounce?: number

package/src/components/{Switch.tsx → Switch/index.tsx}

@@ -1,7 +1,6 @@
 import * as React from 'react'
 import {
-  SwitchStyles,
-  SwitchComposition,
+
   ComponentVariants,
   useDefaultComponentStyle,
   StylesOf,
@@ -11,9 +10,14 @@ import {
 } from '@codeleap/common'
 import { ComponentPropsWithRef, forwardRef, ReactNode } from 'react'
 import { StyleSheet, Switch as NativeSwitch } from 'react-native'
-import { InputLabel, FormError } from './TextInput'
-import { View } from './View'
+import { InputLabel, FormError } from '../TextInput'
+import { View } from '../View'
 
+import {
+  SwitchStyles,
+  SwitchComposition,
+} from './styles'
+export * from './styles'
 type NativeSwitchProps = Omit<
   ComponentPropsWithRef<typeof NativeSwitch>,
   'thumbColor' | 'trackColor'
@@ -70,6 +74,7 @@ export const Switch = forwardRef<NativeSwitch, SwitchProps>(
             trackColor={{ false: trackColor, true: trackColor }}
             ios_backgroundColor={trackColor}
             value={value}
+            ref={ref}
             {...props}
           />
           <InputLabel label={label} style={getStyles('label')} />

package/src/components/Switch/styles.ts

@@ -0,0 +1,37 @@
+import { createDefaultVariantFactory, includePresets } from '@codeleap/common'
+
+export type SwitchParts = 'wrapper' | 'label' | 'input' | 'error' | 'inputWrapper'
+export type SwitchComposition =
+  | SwitchParts
+  | `${SwitchParts}:disabled`
+  | `${SwitchParts}:on`
+
+const createSwitchStyle = createDefaultVariantFactory<SwitchComposition>()
+
+const presets = includePresets((styles) => createSwitchStyle(() => ({ wrapper: styles })),
+)
+
+export const SwitchStyles = {
+  ...presets,
+  default: createSwitchStyle((theme) => ({
+    wrapper: {},
+    inputWrapper: {
+      ...theme.presets.row,
+      ...theme.presets.alignCenter,
+    },
+    label: {
+      ...theme.spacing.marginLeft(0.5),
+    },
+    input: {
+      color: theme.colors.white,
+      backgroundColor: theme.colors.gray,
+    },
+    'input:on': {
+      color: theme.colors.primary,
+      backgroundColor: theme.colors.gray,
+    },
+    error: {
+      color: theme.colors.negative,
+    },
+  })),
+}

package/src/components/{Text.tsx → Text/index.tsx}

@@ -4,13 +4,17 @@ import {
   ComponentVariants,
   useDefaultComponentStyle,
   BaseViewProps,
-  TextStyles,
+
 } from '@codeleap/common'
 import { Animated, StyleSheet, Text as NativeText } from 'react-native'
 import { MotiText as _MotiText, MotiProps } from 'moti'
-import { useAnimateColor } from '../utils/hooks'
+import { useAnimateColor } from '../../utils'
+import { TextStyles } from './styles'
+
+export * from './styles'
+
 export type TextProps = ComponentPropsWithoutRef<typeof NativeText> & {
-  text?: string
+  text?: React.ReactNode
   variants?: ComponentVariants<typeof TextStyles>['variants']
   animated?: boolean
   colorChangeConfig?: Partial<Animated.TimingAnimationConfig>

package/src/components/Text/styles.ts

@@ -0,0 +1,34 @@
+import { assignTextStyle, createDefaultVariantFactory, includePresets } from '@codeleap/common'
+
+export type TextComposition = 'text'
+const createTextStyle = createDefaultVariantFactory<TextComposition>()
+
+const presets = includePresets((styles) => createTextStyle(() => ({ text: styles })),
+)
+
+export const TextStyles = {
+  ...presets,
+  default: createTextStyle((theme) => ({
+    text: {
+      fontFamily: theme.typography.fontFamily,
+      ...assignTextStyle('p1')(theme).text,
+    },
+  })),
+  h1: assignTextStyle('h1'),
+  h2: assignTextStyle('h2'),
+  h3: assignTextStyle('h3'),
+  h4: assignTextStyle('h4'),
+  h5: assignTextStyle('h5'),
+  h6: assignTextStyle('h6'),
+  p1: assignTextStyle('p1'),
+  p2: assignTextStyle('p2'),
+  p3: assignTextStyle('p3'),
+  p4: assignTextStyle('p4'),
+  link: assignTextStyle('p1'),
+  OSAlertBody: createTextStyle((theme) => ({
+    text: {
+      ...assignTextStyle('p1')(theme).text,
+      ...theme.presets.textCenter,
+    },
+  })),
+}

package/src/components/TextInput/Label.tsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import { useDefaultComponentStyle } from '@codeleap/common'
+import { StyleSheet } from 'react-native'
+import { Text } from '../Text'
+import { View } from '../View'
+
+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/{TextInput.tsx → TextInput/index.tsx}

@@ -2,22 +2,33 @@ import * as React from 'react'
 import {
   ComponentVariants,
   FormTypes,
+  getNestedStylesByKey,
   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 { Text } from '../Text'
+import { View, ViewProps } from '../View'
+import { StylesOf } from '../../types'
+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'
+import { Touchable, TouchableProps } from '../Touchable'
+import { MaskedTextInput, TextInputMaskProps } from '../../modules/textInputMask'
+import { InputLabel } from './Label'
+
+export { InputLabel } from './Label'
+
+export * from './styles'
+
+import {
+  InputIconComposition,
+  TextInputComposition,
+  TextInputStyles,
+} from './styles'
+import { ActionIcon, ActionIconParts, ActionIconProps } from '../ActionIcon'
 
 type IconProp = { name: IconPlaceholder; action?: () => void }
 
@@ -35,8 +46,8 @@ export type TextInputProps =
     type?: string
     label?: React.ReactNode
     debugName: string
-    leftIcon?: IconProp
-    rightIcon?: IconProp
+    leftIcon?: Partial<ActionIconProps>
+    rightIcon?: Partial<ActionIconProps>
     styles?: StylesOf<TextInputComposition>
     validate?: FormTypes.ValidatorFunctionWithoutForm | string
     value?: string
@@ -46,7 +57,7 @@ export type TextInputProps =
     onPress?: () => void
     masking?: FormTypes.TextField['masking']
     innerWrapperProps?: ViewProps
-    wrapperProps?: TouchableProps | ViewProps
+    wrapperProps?: TouchableProps
     onChangeMask?: TextInputMaskProps['onChangeText']
     required?:boolean
   }
@@ -54,7 +65,6 @@ export type TextInputProps =
 export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops, inputRef) => {
   const {
     onChange,
-    type,
     value,
     onChangeText,
     disabled,
@@ -70,7 +80,6 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
     validate,
     password,
     visibilityToggle,
-    touchableWrapper,
     innerWrapperProps,
     masking = null,
     onChangeMask,
@@ -84,9 +93,10 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
 
   const input = useRef<any>(null)
   const [textIsVisible, setTextVisible] = useBooleanToggle(false)
-  const variantStyles = useDefaultComponentStyle('TextInput', {
+  const variantStyles = useDefaultComponentStyle<'u:TextInput', typeof TextInputStyles>('u:TextInput', {
     variants,
     styles,
+    transform: StyleSheet.flatten,
   })
   const InputElement = masking ? MaskedTextInput : NativeTextInput
 
@@ -122,29 +132,12 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
 
   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 commonIconStyles = getNestedStylesByKey('icon', variantStyles)
 
-  const rightIconStyle = {
-    ...variantStyles.icon,
-    ...(isFocused ? variantStyles['icon:focus'] : {}),
-    ...(showError ? variantStyles['icon:error'] : {}),
-    ...variantStyles.rightIcon,
-    ...(isFocused ? variantStyles['rightIcon:focus'] : {}),
-    ...(showError ? variantStyles['rightIcon:error'] : {}),
-  }
+  const leftIconStyles = getNestedStylesByKey('leftIcon', variantStyles)
+
+  const rightIconStyles = getNestedStylesByKey('rightIcon', variantStyles)
 
-  const buttonIconWrapperStyle = {
-    ...variantStyles.buttonIconWrapper,
-    ...(isFocused ? variantStyles['buttonIconWrapper:focus'] : {}),
-    ...(showError ? variantStyles['buttonIconWrapper:error'] : {}),
-  }
   function getStyles(key: TextInputComposition) {
     const requestedStyles = [
       variantStyles[key],
@@ -162,12 +155,19 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
     }
   }
 
+  const visibilityToggleProps = visibilityToggle ? {
+    onPress: () => setTextVisible(),
+    icon: (textIsVisible ? 'input-visiblity:visible' : 'input-visiblity:hidden') as IconPlaceholder,
+    debugName: `${debugName} toggle visibility`,
+  } : {}
+
   return (
     <Touchable
       style={getStyles('wrapper')}
       debugName={debugName}
       onPress={handlePress}
       {...wrapperProps}
+      android_ripple={null}
     >
       <InputLabel
         label={label}
@@ -177,7 +177,14 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
         required={required}
       />
       <View style={getStyles('innerWrapper')} {...innerWrapperProps}>
-        <InputIcon {...leftIcon} style={leftIconStyle} wrapperStyle={buttonIconWrapperStyle} />
+        <InputIcon
+          isFocused={isFocused}
+          showError={showError}
+          styles={leftIconStyles}
+          commonStyles={commonIconStyles}
+          debugName={`${debugName} left icon`}
+          {...leftIcon}
+        />
         {/* @ts-ignore */}
         <InputElement
           ref={input}
@@ -196,14 +203,16 @@ export const TextInput = forwardRef<NativeTextInput, TextInputProps>((rawprops,
           } } : {})}
           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} />
-        }
+        <InputIcon
+          isFocused={isFocused}
+          showError={showError}
+          styles={rightIconStyles}
+          commonStyles={commonIconStyles}
+          debugName={`${debugName} right icon`}
+          {...rightIcon}
+          {...visibilityToggleProps}
+        />
+
       </View>
       <FormError message={error.message} style={getStyles('error')} />
     </Touchable>
@@ -218,32 +227,37 @@ export const FormError = ({ message, ...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} />
-}
+type InputIconProps = {
+  styles: StylesOf<InputIconComposition>
+  commonStyles: StylesOf<InputIconComposition>
+  isFocused: boolean
+  showError: boolean
+} & Omit<ActionIconProps, 'styles'>
 
-export const InputLabel = ({ label, variants = [], styles = {}, style, asteriskStyle = null, required = false, wrapperStyle = null }) => {
-  const labelStyles = useDefaultComponentStyle('TextInput', {
-    variants, styles, transform: StyleSheet.flatten,
-  })
+export const InputIcon:React.FC<InputIconProps> = ({ styles, commonStyles, isFocused, showError, ...props }) => {
+  if (!props.icon) return null
 
-  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
+  function getStyles(key: ActionIconParts | '') {
+    if (key === 'icon') key = ''
+    const requestedStyles = [
+      commonStyles[key],
+      isFocused ? commonStyles[key + ':focus'] : {},
+      showError ? commonStyles[key + ':error'] : {},
+      styles[key],
+      isFocused ? styles[key + ':focus'] : {},
+      showError ? styles[key + ':error'] : {},
+    ]
+    return StyleSheet.flatten(requestedStyles)
+  }
+  const iconStyles = {
+    icon: getStyles('icon'),
+    touchablePressable: getStyles('touchablePressable'),
+    touchableWrapper: getStyles('touchableWrapper'),
+    touchableRipple: getStyles('touchableRipple'),
   }
+
+  return <ActionIcon
+    styles={iconStyles}
+    {...props}
+  />
 }

package/src/components/TextInput/styles.ts

@@ -0,0 +1,120 @@
+import { assignTextStyle, createDefaultVariantFactory, includePresets } from '@codeleap/common'
+import { ActionIconParts } from '../ActionIcon'
+
+export type IconParts = Exclude<ActionIconParts, 'icon' | 'icon:disabled'>
+type InputIcons = 'icon' | 'leftIcon' | 'rightIcon'
+
+export type InputIconComposition = `${InputIcons}${Capitalize<IconParts>}`
+| InputIcons
+
+type TextInputParts =
+  | 'wrapper'
+  | InputIconComposition
+  | 'textField'
+  | 'label'
+  | 'innerWrapper'
+  | 'error'
+  | 'placeholder'
+  | 'selection'
+  | 'requiredAsterisk'
+  | 'labelWrapper'
+
+export type TextInputComposition =
+  | `${TextInputParts}:error`
+  | `${TextInputParts}:focus`
+  | TextInputParts
+
+const createTextInputStyle =
+  createDefaultVariantFactory<TextInputComposition>()
+
+const presets = includePresets((styles) => createTextInputStyle(() => ({ wrapper: styles })))
+
+export const TextInputStyles = {
+  ...presets,
+  default: createTextInputStyle((theme) => ({
+    textField: {
+      ...theme.spacing.padding(0),
+      ...theme.spacing.paddingHorizontal(1),
+      ...assignTextStyle('p1')(theme).text,
+      minWidth: 1,
+      backgroundColor: 'transparent',
+      flex: 1,
+    },
+    placeholder: {
+      color: theme.colors.lightGray,
+    },
+    selection: {
+      color: theme.colors.primary,
+    },
+    wrapper: {
+      display: 'flex',
+      flexDirection: 'column',
+
+    },
+    innerWrapper: {
+      ...theme.spacing.paddingVertical(0.5),
+      ...theme.spacing.paddingHorizontal(1),
+      ...theme.presets.row,
+      ...theme.border.neutral(1),
+      display: 'flex',
+      alignItems: 'center',
+    },
+
+    label: {
+      ...theme.spacing.marginBottom(1),
+      ...assignTextStyle('h5')(theme).text,
+    },
+    'icon': {
+      color: theme.colors.neutral,
+    },
+    'icon:error': {
+      color: theme.colors.negative,
+    },
+    'icon:focus': {
+      color: theme.colors.primary,
+    },
+    leftIconTouchableWrapper: {
+      ...theme.spacing.marginRight(1),
+    },
+    rightIconTouchableWrapper: {
+      ...theme.spacing.marginLeft(1),
+    },
+    error: {
+      color: theme.colors.negative,
+      ...theme.spacing.marginTop(0.5),
+    },
+
+    'label:error': {
+      color: theme.colors.negative,
+    },
+
+    'innerWrapper:error': {
+      ...theme.border.negative(1),
+    },
+    'innerWrapper:focus': {
+      ...theme.border.primary(1),
+    },
+    requiredAsterisk: {
+      color: theme.colors.negative,
+    },
+    labelWrapper: {
+      ...theme.presets.row,
+    },
+  })),
+  line: createTextInputStyle((theme) => ({
+    innerWrapper: {
+      ...theme.border.neutral({ width: 1, directions: ['bottom'] }),
+    },
+  })),
+  box: createTextInputStyle((theme) => ({
+    innerWrapper: {
+      ...theme.border.neutral(1),
+    },
+  })),
+  pill: createTextInputStyle((theme) => ({
+    innerWrapper: {
+      ...theme.border.neutral(1),
+      borderRadius: 15,
+    },
+  })),
+}