@codeleap/mobile 5.4.0 → 5.4.2

package/dist/components/Calendar/index.js

@@ -1,82 +1,80 @@
 import React, { useCallback, useMemo } from 'react';
-import { TypeGuards } from '@codeleap/types';
 import { Calendar as RNCalendar } from 'react-native-calendars';
 import { MobileStyleRegistry } from '../../Registry';
 import { useStylesFor } from '../../hooks';
 import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
-dayjs.extend(utc);
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+import { dateUtils } from '@codeleap/utils';
+dayjs.extend(isSameOrBefore);
 export * from './styles';
 export * from './types';
+const DATE_FORMAT = 'YYYY-MM-DD';
 export const Calendar = (props) => {
-    const { style, value, onValueChange, parseToDate, ...calendarProps } = props;
+    const { style, value, onValueChange, ...calendarProps } = props;
     const styles = useStylesFor(Calendar.styleRegistryName, style);
-    const isDateValue = TypeGuards.isInstance(value, Date);
-    const isDateRange = Array.isArray(value);
+    const isRange = Array.isArray(value);
     const stringValue = useMemo(() => {
-        if (isDateRange) {
-            return value.map(date => isDateValue ? dayjs.utc(date).format('YYYY-MM-DD') : date ?? '');
+        if (!value)
+            return isRange ? [] : '';
+        if (isRange) {
+            return value.map((v) => dateUtils.removeTimezoneAndFormat(v));
         }
-        return isDateValue ? dayjs.utc(value).format('YYYY-MM-DD') : value ?? '';
-    }, [value]);
+        return dateUtils.removeTimezoneAndFormat(value);
+    }, [value, isRange]);
     const markedDates = useMemo(() => {
-        if (isDateRange && Array.isArray(stringValue)) {
-            if (stringValue.length === 0)
-                return {};
-            if (stringValue.length === 1) {
-                const [start] = [...stringValue];
-                const dateStr = dayjs(start).format('YYYY-MM-DD');
-                return { [dateStr]: { selected: true } };
-            }
-            const [start, end] = [...stringValue];
-            const startDate = dayjs(start);
-            const endDate = dayjs(end);
-            const markedDates = {};
-            let currentDate = startDate;
-            while (currentDate.isBefore(endDate) || currentDate.isSame(endDate)) {
-                const dateStr = currentDate.format('YYYY-MM-DD');
-                markedDates[dateStr] = {
-                    selected: true,
-                    ...(currentDate.isSame(startDate) && { startingDay: true }),
-                    ...(currentDate.isSame(endDate) && { endingDay: true })
-                };
-                currentDate = currentDate.add(1, 'day');
-            }
-            return markedDates;
+        if (!isRange) {
+            return stringValue ? { [stringValue]: { selected: true } } : {};
+        }
+        const rangeValues = stringValue;
+        if (rangeValues.length === 0)
+            return {};
+        if (rangeValues.length === 1) {
+            return { [rangeValues[0]]: { selected: true } };
         }
-        return { [stringValue]: { selected: true } };
-    }, [stringValue]);
-    const onChange = useCallback((date) => {
-        if (isDateRange) {
-            const newValue = Array.isArray(value) ? [...value] : [];
+        const [start, end] = rangeValues;
+        const startDate = dayjs(start);
+        const endDate = dayjs(end);
+        const marked = {};
+        let current = startDate;
+        while (current.isSameOrBefore(endDate)) {
+            const dateStr = dateUtils.removeTimezoneAndFormat(current);
+            marked[dateStr] = {
+                selected: true,
+                ...(current.isSame(startDate) && { startingDay: true }),
+                ...(current.isSame(endDate) && { endingDay: true }),
+            };
+            current = current.add(1, 'day');
+        }
+        return marked;
+    }, [stringValue, isRange]);
+    const handleDateChange = useCallback((date) => {
+        if (!onValueChange)
+            return;
+        const selected = dayjs(date.dateString).startOf('day');
+        if (isRange) {
+            const current = Array.isArray(value) ? value : [];
             let newDates = [];
-            if (newValue.length === 0 || newValue.length === 2) {
-                newDates = [date.dateString];
+            if (current.length === 0 || current.length === 2) {
+                newDates = [selected];
             }
-            else if (newValue.length === 1) {
-                const firstDate = newValue[0];
-                const secondDate = date.dateString;
-                if (dayjs(firstDate).isAfter(dayjs(secondDate))) {
-                    newDates = [secondDate, firstDate];
-                }
-                else {
-                    newDates = [firstDate, secondDate];
-                }
+            else if (current.length === 1) {
+                const first = dayjs(current[0]).startOf('day');
+                newDates = first.isAfter(selected)
+                    ? [selected, first]
+                    : [first, selected];
             }
-            const parsedDates = isDateValue || parseToDate ?
-                newDates.map(d => dayjs(d).toDate()) :
-                newDates;
-            onValueChange?.(parsedDates);
+            onValueChange(newDates);
         }
         else {
-            const newValue = isDateValue || parseToDate ? dayjs(date.dateString).toDate() : date.dateString;
-            onValueChange?.(newValue);
+            onValueChange(selected);
         }
-    }, [onValueChange, value]);
+    }, [onValueChange, value, isRange]);
     const currentValue = useMemo(() => {
-        return isDateRange ? (Array.isArray(stringValue) ? stringValue[0] : '') : stringValue;
-    }, [stringValue]);
-    return (<RNCalendar onDayPress={onChange} current={currentValue} monthFormat={'MMMM yyyy'} {...calendarProps} markedDates={{
+        return isRange
+            ? (Array.isArray(stringValue) ? stringValue[0] : '')
+            : stringValue;
+    }, [stringValue, isRange]);
+    return (<RNCalendar onDayPress={handleDateChange} current={currentValue} monthFormat={'MMMM yyyy'} {...calendarProps} markedDates={{
             ...markedDates,
             ...calendarProps?.markedDates
         }} style={styles?.wrapper} headerStyle={styles?.header} theme={{
@@ -90,8 +88,6 @@ Calendar.rootElement = 'wrapper';
 Calendar.withVariantTypes = (styles) => {
     return Calendar;
 };
-Calendar.defaultProps = {
-    parseToDate: false,
-};
+Calendar.defaultProps = {};
 MobileStyleRegistry.registerComponent(Calendar);
 //# sourceMappingURL=index.js.map

package/dist/components/Calendar/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Calendar/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Calendar/index.tsx"],"names":[],"mappings":"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"}

package/dist/components/Calendar/types.d.ts

@@ -1,10 +1,10 @@
 import { StyledProp } from '@codeleap/styles';
 import { CalendarProps as RNCalendarProps } from 'react-native-calendars';
 import { CalendarComposition } from './styles';
-export type CalendarValue = (string | string[]) | (Date | Date[]);
+import { Dayjs } from 'dayjs';
+export type CalendarValue = Dayjs | Dayjs[];
 export type CalendarProps = Omit<RNCalendarProps, 'style'> & {
     onValueChange: (date: CalendarValue) => void;
     value: CalendarValue;
     style?: StyledProp<CalendarComposition>;
-    parseToDate?: boolean;
 };

package/dist/components/CalendarInput/index.js

@@ -5,13 +5,11 @@ import { useStylesFor } from '../../hooks';
 import { View } from '../View';
 import { Calendar } from '../Calendar';
 import { TextInput } from '../TextInput';
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc';
 import Animated, { FadeOut, FadeIn } from 'react-native-reanimated';
 import { useInputBase } from '../InputBase';
 import { fields } from '@codeleap/form';
 import { useInputOverlay } from '../InputBase/useInputOverlay';
-dayjs.extend(utc);
+import { dateUtils } from '@codeleap/utils';
 export * from './styles';
 export * from './types';
 export const CalendarInput = (props) => {
@@ -25,15 +23,15 @@ export const CalendarInput = (props) => {
     const [inputHeight, setInputHeight] = useState(0);
     const [isOpen, toggle] = useInputOverlay(autoClosePeersCalendars);
     const formattedValue = useMemo(() => {
-        const isRange = Array.isArray(inputValue);
-        if (isRange ? inputValue?.some(v => !v) : !inputValue)
+        if (!inputValue)
             return '';
-        if (isRange) {
-            return inputValue
-                .map(date => dayjs.utc(date).format(format))
-                .join(' - ');
+        if (Array.isArray(inputValue)) {
+            const filled = inputValue.filter(Boolean);
+            if (filled.length < inputValue.length)
+                return '';
+            return filled.map((v) => dateUtils.removeTimezoneAndFormat(v)).join(' - ');
         }
-        return dayjs.utc(inputValue).format(format);
+        return dateUtils.removeTimezoneAndFormat(inputValue);
     }, [inputValue, format]);
     return (<View style={[styles.wrapper, { position: 'relative' }]}>
       <TextInput placeholder='Select Date' disabled={disabled} {...textInputProps} style={compositionStyles.input} leftIcon={!leftIcon ? null : {
@@ -54,7 +52,7 @@ export const CalendarInput = (props) => {
             } : {
                 marginTop: gap,
             }}>
-          <Calendar style={compositionStyles.calendar} value={inputValue} onValueChange={onInputValueChange} parseToDate {...calendarProps}/>
+          <Calendar style={compositionStyles.calendar} value={inputValue} onValueChange={onInputValueChange} {...calendarProps}/>
         </Animated.View>)}
     </View>);
 };

package/dist/components/CalendarInput/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CalendarInput/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/CalendarInput/index.tsx"],"names":[],"mappings":"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"}

package/dist/components/FileInput/index.d.ts

@@ -2,7 +2,9 @@ import React from 'react';
 import { Options } from 'react-native-image-crop-picker';
 import { FileInputImageSource, FileInputProps, FileInputRef, FileResult } from './types';
 export * from './types';
-export declare const FileInput: (props: FileInputProps) => JSX.Element;
+export declare const FileInput: ((props: FileInputProps) => JSX.Element) & {
+    defaultProps: Partial<FileInputProps>;
+};
 export declare const useFileInput: () => {
     openFilePicker: (imageSource?: FileInputImageSource, options?: Partial<Options>) => Promise<FileResult[]>;
     ref: React.MutableRefObject<FileInputRef>;

package/dist/components/FileInput/index.js

@@ -1,8 +1,8 @@
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { parseFilePathData } from '@codeleap/utils';
-import { OSAlert } from '../../utils';
 import ImageCropPicker from 'react-native-image-crop-picker';
 import DocumentPicker from 'react-native-document-picker';
+import { alert } from '@codeleap/modals';
 export * from './types';
 const pickerDefaults = {
     cropping: true,
@@ -23,7 +23,10 @@ function parsePickerData(data) {
     };
 }
 const _FileInput = forwardRef((fileInputProps, ref) => {
-    const { onFileSelect, options, type = 'image', alertProps, pickerOptions, onOpenCamera = null, onOpenGallery = null, onOpenFileSystem = null, onError, } = fileInputProps;
+    const { onFileSelect, options, type = 'image', pickerOptions, onOpenGallery = null, onOpenFileSystem = null, onError, alertProps, } = {
+        ...fileInputProps,
+        ...FileInput.defaultProps,
+    };
     const resolveWithFile = useRef();
     const handleResolve = (files) => {
         if (resolveWithFile.current) {
@@ -80,23 +83,11 @@ const _FileInput = forwardRef((fileInputProps, ref) => {
                 onPress('library', options);
             }
             else {
-                OSAlert.ask({
+                alert.ask({
                     title: 'Change Image',
                     body: 'Do you want to take a new picture or select an existing one?',
                     ...alertProps,
                     options: [
-                        {
-                            text: alertProps?.options?.[0]?.text || 'Camera',
-                            onPress: () => {
-                                if (onOpenCamera) {
-                                    onOpenCamera(() => onPress('camera'));
-                                }
-                                else {
-                                    onPress('camera');
-                                }
-                            },
-                            ...alertProps?.options?.[1],
-                        },
                         {
                             text: 'Library',
                             onPress: () => {
@@ -107,15 +98,14 @@ const _FileInput = forwardRef((fileInputProps, ref) => {
                                     onPress('library');
                                 }
                             },
-                            ...alertProps?.options?.[2],
+                            ...alertProps?.options?.[0],
                         },
                         {
                             text: 'Cancel',
                             style: 'cancel',
-                            onPress: () => { },
-                            ...alertProps?.options?.[0],
+                            ...alertProps?.options?.[1]
                         },
-                    ],
+                    ]
                 });
             }
         }
@@ -139,6 +129,7 @@ const _FileInput = forwardRef((fileInputProps, ref) => {
     return null;
 });
 export const FileInput = _FileInput;
+FileInput.defaultProps = {};
 export const useFileInput = () => {
     const inputRef = useRef(null);
     const openFilePicker = (imageSource = null, options = {}) => {

package/dist/components/FileInput/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/FileInput/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/FileInput/index.tsx"],"names":[],"mappings":"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"}

package/dist/components/FileInput/types.d.ts

@@ -1,7 +1,7 @@
 import { AnyRef, MobileInputFile } from '@codeleap/types';
 import { DocumentPickerOptions } from 'react-native-document-picker';
 import { Options } from 'react-native-image-crop-picker';
-import { OSAlert } from '../../utils';
+import { AlertOptions } from '@codeleap/modals';
 export type FileInputImageSource = 'camera' | 'library' | 'fs';
 export type FileResult = MobileInputFile | string | number;
 export type FileInputRef = {
@@ -13,10 +13,9 @@ export type FileInputProps = {
     options?: DocumentPickerOptions;
     ref?: AnyRef<FileInputRef>;
     type?: 'image' | 'anyFile';
-    alertProps?: Parameters<typeof OSAlert.ask>[0];
+    alertProps?: AlertOptions & {};
     pickerOptions?: Partial<Options>;
     required?: boolean;
-    onOpenCamera?: (resolve: (() => void)) => Promise<void>;
     onOpenFileSystem?: (resolve: (() => void)) => Promise<void>;
     onOpenGallery?: (resolve: (() => void)) => Promise<void>;
     onError?: (error: any) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/mobile",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {
@@ -9,28 +9,28 @@
     "directory": "packages/mobile"
   },
   "devDependencies": {
-    "@codeleap/types": "5.4.0",
-    "@codeleap/utils": "5.4.0",
-    "@codeleap/hooks": "5.4.0",
-    "@codeleap/form": "5.4.0",
-    "@codeleap/query": "5.4.0",
-    "@codeleap/logger": "5.4.0",
-    "@codeleap/config": "5.4.0",
-    "@codeleap/modals": "5.4.0"
+    "@codeleap/types": "5.4.2",
+    "@codeleap/utils": "5.4.2",
+    "@codeleap/hooks": "5.4.2",
+    "@codeleap/form": "5.4.2",
+    "@codeleap/query": "5.4.2",
+    "@codeleap/logger": "5.4.2",
+    "@codeleap/config": "5.4.2",
+    "@codeleap/modals": "5.4.2"
   },
   "scripts": {
     "build": "tsc --build",
     "lint": "eslint -c  .eslintrc.js --fix \"./src/**/*.{ts,tsx,js,jsx}\""
   },
   "peerDependencies": {
-    "@codeleap/types": "5.4.0",
-    "@codeleap/utils": "5.4.0",
-    "@codeleap/hooks": "5.4.0",
-    "@codeleap/form": "5.4.0",
-    "@codeleap/query": "5.4.0",
-    "@codeleap/logger": "5.4.0",
-    "@codeleap/styles": "5.4.0",
-    "@codeleap/modals": "5.4.0",
+    "@codeleap/types": "5.4.2",
+    "@codeleap/utils": "5.4.2",
+    "@codeleap/hooks": "5.4.2",
+    "@codeleap/form": "5.4.2",
+    "@codeleap/query": "5.4.2",
+    "@codeleap/logger": "5.4.2",
+    "@codeleap/styles": "5.4.2",
+    "@codeleap/modals": "5.4.2",
     "@d11/react-native-fast-image": "8.9.2",
     "@react-native-firebase/messaging": "21.12.0",
     "@react-navigation/bottom-tabs": "7.3.10",

package/package.json.bak

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/mobile",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {

package/src/components/Calendar/index.tsx

@@ -1,116 +1,107 @@
 import React, { useCallback, useMemo } from 'react'
-import { TypeGuards } from '@codeleap/types'
 import { Calendar as RNCalendar, DateData } from 'react-native-calendars'
 import { AnyRecord, IJSX, StyledComponentProps } from '@codeleap/styles'
 import { MobileStyleRegistry } from '../../Registry'
 import { useStylesFor } from '../../hooks'
 import { CalendarProps } from './types'
-import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
+import dayjs, { Dayjs } from 'dayjs'
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
+import { dateUtils } from '@codeleap/utils'
 
-dayjs.extend(utc)
+dayjs.extend(isSameOrBefore)
 
 export * from './styles'
 export * from './types'
 
+const DATE_FORMAT = 'YYYY-MM-DD'
+
 export const Calendar = (props: CalendarProps) => {
   const {
     style,
     value,
     onValueChange,
-    parseToDate,
     ...calendarProps
   } = props
 
   const styles = useStylesFor(Calendar.styleRegistryName, style)
 
-  const isDateValue = TypeGuards.isInstance(value, Date)
-  const isDateRange = Array.isArray(value)
+  const isRange = Array.isArray(value)
 
   const stringValue = useMemo(() => {
-    if (isDateRange) {
-      return value.map(date => 
-        isDateValue ? dayjs.utc(date).format('YYYY-MM-DD') : date ?? ''
-      )
+    if (!value) return isRange ? [] : ''
+
+    if (isRange) {
+      return (value as any).map((v) => dateUtils.removeTimezoneAndFormat(v))
     }
 
-    return isDateValue ? dayjs.utc(value).format('YYYY-MM-DD') : value ?? ''
-  }, [value])
+    return dateUtils.removeTimezoneAndFormat(value)
+  }, [value, isRange])
 
   const markedDates = useMemo(() => {
-    if (isDateRange && Array.isArray(stringValue)) {
-      if (stringValue.length === 0) return {}
-      if (stringValue.length === 1) {
-        const [start] = [...stringValue]
+    if (!isRange) {
+      return stringValue ? { [stringValue as string]: { selected: true } } : {}
+    }
 
-        const dateStr = dayjs(start).format('YYYY-MM-DD')
+    const rangeValues = stringValue as string[]
+    if (rangeValues.length === 0) return {}
 
-        return { [dateStr]: { selected: true } }
-      }
-      
-      const [start, end] = [...stringValue]
-      const startDate = dayjs(start)
-      const endDate = dayjs(end)
-      
-      const markedDates: Record<string, any> = {}
-      
-      let currentDate = startDate
-
-      while (currentDate.isBefore(endDate) || currentDate.isSame(endDate)) {
-        const dateStr = currentDate.format('YYYY-MM-DD')
-
-        markedDates[dateStr] = {
-          selected: true,
-          ...(currentDate.isSame(startDate) && { startingDay: true }),
-          ...(currentDate.isSame(endDate) && { endingDay: true })
-        }
-        
-        currentDate = currentDate.add(1, 'day')
+    if (rangeValues.length === 1) {
+      return { [rangeValues[0]]: { selected: true } }
+    }
+
+    const [start, end] = rangeValues
+    const startDate = dayjs(start)
+    const endDate = dayjs(end)
+    const marked: Record<string, any> = {}
+    let current = startDate
+
+    while (current.isSameOrBefore(endDate)) {
+      const dateStr = dateUtils.removeTimezoneAndFormat(current)
+      marked[dateStr] = {
+        selected: true,
+        ...(current.isSame(startDate) && { startingDay: true }),
+        ...(current.isSame(endDate) && { endingDay: true }),
       }
-      
-      return markedDates
+      current = current.add(1, 'day')
     }
-    
-    return { [stringValue as string]: { selected: true } }
-  }, [stringValue])
-
-  const onChange = useCallback((date: DateData) => {
-    if (isDateRange) {
-      const newValue = Array.isArray(value) ? [...value] : []
-      let newDates: any = []
-      
-      if (newValue.length === 0 || newValue.length === 2) {
-        newDates = [date.dateString]
-      } else if (newValue.length === 1) {
-        const firstDate = newValue[0]
-        const secondDate = date.dateString
-        
-        if (dayjs(firstDate).isAfter(dayjs(secondDate))) {
-          newDates = [secondDate, firstDate]
-        } else {
-          newDates = [firstDate, secondDate]
-        }
+
+    return marked
+  }, [stringValue, isRange])
+
+  const handleDateChange = useCallback((date: DateData) => {
+    if (!onValueChange) return
+
+    const selected = dayjs(date.dateString).startOf('day')
+
+    if (isRange) {
+      const current = Array.isArray(value) ? value : []
+      let newDates: Dayjs[] = []
+
+      if (current.length === 0 || current.length === 2) {
+        newDates = [selected]
+      } else if (current.length === 1) {
+        const first = dayjs(current[0]).startOf('day')
+        newDates = first.isAfter(selected) 
+          ? [selected, first] 
+          : [first, selected]
       }
-      
-      const parsedDates = isDateValue || parseToDate ? 
-        newDates.map(d => dayjs(d).toDate()) : 
-        newDates
-      
-      onValueChange?.(parsedDates)
+
+      onValueChange(newDates)
     } else {
-      const newValue = isDateValue || parseToDate ? dayjs(date.dateString).toDate() : date.dateString
-      onValueChange?.(newValue)
+      onValueChange(selected)
     }
-  }, [onValueChange, value])
+  }, [onValueChange, value, isRange])
 
   const currentValue = useMemo(() => {
-    return isDateRange ? (Array.isArray(stringValue) ? stringValue[0] : '') : stringValue
-  }, [stringValue])
-  
+    return isRange 
+      ? (Array.isArray(stringValue) ? stringValue[0] : '') 
+      : stringValue
+  }, [stringValue, isRange])
+
   return (
     <RNCalendar
-      onDayPress={onChange}
-      current={currentValue}
+      onDayPress={handleDateChange}
+      current={currentValue as string}
       monthFormat={'MMMM yyyy'}
       {...calendarProps}
       markedDates={{
@@ -135,8 +126,6 @@ Calendar.withVariantTypes = <S extends AnyRecord>(styles: S) => {
   return Calendar as (props: StyledComponentProps<CalendarProps, typeof styles>) => IJSX
 }
 
-Calendar.defaultProps = {
-  parseToDate: false,
-} as Partial<CalendarProps>
+Calendar.defaultProps = {} as Partial<CalendarProps>
 
 MobileStyleRegistry.registerComponent(Calendar)

package/src/components/Calendar/types.ts

@@ -1,8 +1,9 @@
 import { StyledProp } from '@codeleap/styles'
 import { CalendarProps as RNCalendarProps } from 'react-native-calendars'
 import { CalendarComposition } from './styles'
+import { Dayjs } from 'dayjs'
 
-export type CalendarValue = (string | string[]) | (Date | Date[])
+export type CalendarValue = Dayjs | Dayjs[]
 
 export type CalendarProps =
   Omit<RNCalendarProps, 'style'> &
@@ -10,5 +11,4 @@ export type CalendarProps =
     onValueChange: (date: CalendarValue) => void
     value: CalendarValue
     style?: StyledProp<CalendarComposition>
-    parseToDate?: boolean
   }

package/src/components/CalendarInput/index.tsx

@@ -4,16 +4,13 @@ import { MobileStyleRegistry } from '../../Registry'
 import { useStylesFor } from '../../hooks'
 import { CalendarInputProps } from './types'
 import { View } from '../View'
-import { Calendar, CalendarProps } from '../Calendar'
+import { Calendar } from '../Calendar'
 import { TextInput } from '../TextInput'
-import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
 import Animated, { FadeOut, FadeIn } from 'react-native-reanimated'
 import { useInputBase } from '../InputBase'
 import { fields } from '@codeleap/form'
 import { useInputOverlay } from '../InputBase/useInputOverlay'
-
-dayjs.extend(utc)
+import { dateUtils } from '@codeleap/utils'
 
 export * from './styles'
 export * from './types'
@@ -46,26 +43,24 @@ export const CalendarInput = (props: CalendarInputProps) => {
   const {
     inputValue,
     onInputValueChange,
-  } = useInputBase<CalendarProps['value']>(field, fields.date as any, { value, onValueChange })
+  } = useInputBase<any>(field, fields.date as any, { value, onValueChange })
 
   const [inputHeight, setInputHeight] = useState(0)
 
   const [isOpen, toggle] = useInputOverlay(autoClosePeersCalendars)
 
   const formattedValue = useMemo(() => {
-    const isRange = Array.isArray(inputValue)
-
-    if (isRange ? inputValue?.some(v => !v) : !inputValue) return ''
-    
-    if (isRange) {
-      return inputValue
-        .map(date => dayjs.utc(date).format(format))
-        .join(' - ')
+    if (!inputValue) return ''
+  
+    if (Array.isArray(inputValue)) {
+      const filled = inputValue.filter(Boolean)
+      if (filled.length < inputValue.length) return ''
+      return filled.map((v) => dateUtils.removeTimezoneAndFormat(v)).join(' - ')
     }
-    
-    return dayjs.utc(inputValue).format(format)
+  
+    return dateUtils.removeTimezoneAndFormat(inputValue)
   }, [inputValue, format])
-
+  
   return (
     <View style={[styles.wrapper, { position: 'relative' }]}>
       <TextInput
@@ -108,7 +103,6 @@ export const CalendarInput = (props: CalendarInputProps) => {
             style={compositionStyles.calendar}
             value={inputValue}
             onValueChange={onInputValueChange}
-            parseToDate
             {...calendarProps}
           />
         </Animated.View>

package/src/components/FileInput/index.tsx

@@ -1,10 +1,10 @@
 import React, { forwardRef, useImperativeHandle, useRef } from 'react'
 import { MobileFile } from '@codeleap/types'
 import { parseFilePathData } from '@codeleap/utils'
-import { OSAlert } from '../../utils'
 import ImageCropPicker, { ImageOrVideo, Options } from 'react-native-image-crop-picker'
 import DocumentPicker from 'react-native-document-picker'
 import { FileInputImageSource, FileInputProps, FileInputRef, FileResult } from './types'
+import { alert } from '@codeleap/modals'
 
 export * from './types'
 
@@ -35,13 +35,15 @@ const _FileInput = forwardRef<FileInputRef, FileInputProps>((fileInputProps, ref
     onFileSelect,
     options,
     type = 'image',
-    alertProps,
     pickerOptions,
-    onOpenCamera = null,
     onOpenGallery = null,
     onOpenFileSystem = null,
     onError,
-  } = fileInputProps
+    alertProps,
+  } = {
+    ...fileInputProps,
+    ...FileInput.defaultProps,
+  }
 
   const resolveWithFile = useRef<(file: FileResult[]) => any>()
 
@@ -56,6 +58,7 @@ const _FileInput = forwardRef<FileInputRef, FileInputProps>((fileInputProps, ref
   async function openFileSystem() {
     try {
       let files = await DocumentPicker.pick(options)
+
       if (!Array.isArray(files)) {
         files = [files]
       }
@@ -103,22 +106,11 @@ const _FileInput = forwardRef<FileInputRef, FileInputProps>((fileInputProps, ref
       } else if (imageSource === 'library') {
         onPress('library', options)
       } else {
-        OSAlert.ask({
+        alert.ask({
           title: 'Change Image',
           body: 'Do you want to take a new picture or select an existing one?',
           ...alertProps,
           options: [
-            {
-              text: alertProps?.options?.[0]?.text || 'Camera',
-              onPress: () => {
-                if (onOpenCamera) {
-                  onOpenCamera(() => onPress('camera'))
-                } else {
-                  onPress('camera')
-                }
-              },
-              ...alertProps?.options?.[1],
-            },
             {
               text: 'Library',
               onPress: () => {
@@ -128,26 +120,23 @@ const _FileInput = forwardRef<FileInputRef, FileInputProps>((fileInputProps, ref
                   onPress('library')
                 }
               },
-              ...alertProps?.options?.[2],
+              ...alertProps?.options?.[0],
             },
             {
               text: 'Cancel',
               style: 'cancel',
-              onPress: () => { },
-              ...alertProps?.options?.[0],
+              ...alertProps?.options?.[1]
             },
-          ],
+          ]
         })
       }
     } else {
       if (onOpenFileSystem) {
         onOpenFileSystem(() => onPress('fs'))
       } else {
-
         onPress('fs')
       }
     }
-
   }
 
   useImperativeHandle(ref, () => ({
@@ -162,7 +151,9 @@ const _FileInput = forwardRef<FileInputRef, FileInputProps>((fileInputProps, ref
   return null
 })
 
-export const FileInput = _FileInput as unknown as ((props: FileInputProps) => JSX.Element)
+export const FileInput = _FileInput as unknown as ((props: FileInputProps) => JSX.Element) & { defaultProps: Partial<FileInputProps> }
+
+FileInput.defaultProps = {}
 
 export const useFileInput = () => {
   const inputRef = useRef<FileInputRef>(null)
@@ -175,4 +166,4 @@ export const useFileInput = () => {
     openFilePicker,
     ref: inputRef as React.MutableRefObject<FileInputRef>,
   }
-}
+}

package/src/components/FileInput/types.ts

@@ -1,7 +1,7 @@
 import { AnyRef, MobileInputFile } from '@codeleap/types'
 import { DocumentPickerOptions } from 'react-native-document-picker'
 import { Options } from 'react-native-image-crop-picker'
-import { OSAlert } from '../../utils'
+import { AlertOptions } from '@codeleap/modals'
 
 export type FileInputImageSource = 'camera' | 'library' | 'fs'
 
@@ -17,11 +17,10 @@ export type FileInputProps = {
   options?: DocumentPickerOptions
   ref?: AnyRef<FileInputRef>
   type?: 'image' | 'anyFile'
-  alertProps?: Parameters<typeof OSAlert.ask>[0]
+  alertProps?: AlertOptions & {}
   pickerOptions?: Partial<Options>
   required?: boolean
-  onOpenCamera?: (resolve: (() => void)) => Promise<void>
   onOpenFileSystem?: (resolve: (() => void)) => Promise<void>
   onOpenGallery?: (resolve: (() => void)) => Promise<void>
   onError?: (error: any) => void
-}
+}