@codeleap/mobile 3.10.7 → 3.11.1

package/package.json

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

package/src/components/FileInput/index.tsx

@@ -41,10 +41,10 @@ const pickerDefaults = {
   cropping: true,
 }
 
-function parsePickerData(data:ImageOrVideo):FileResult {
+function parsePickerData(data: ImageOrVideo): FileResult {
 
   const filePathData = parseFilePathData(data.path)
-  const d:MobileFile = {
+  const d: MobileFile = {
     ...data,
     name: filePathData.name,
     size: data.size,
@@ -78,9 +78,17 @@ const _FileInput = forwardRef<
     onOpenFileSystem = null,
     onError,
   } = fileInputProps
-  const resolveWithFile = useRef<(file:FileResult[]) => any>()
+  const resolveWithFile = useRef<(file: FileResult[]) => any>()
   const { logger } = useCodeleapContext()
 
+  const handleResolve = (files: Array<FileResult>) => {
+    if (resolveWithFile.current) {
+      resolveWithFile?.current?.(files)
+      resolveWithFile.current = null
+    }
+    onFileSelect?.(files)
+  }
+
   async function openFileSystem() {
     try {
       let files = await DocumentPicker.pick(options)
@@ -88,13 +96,9 @@ const _FileInput = forwardRef<
         files = [files]
       }
 
-      const filesWithPreview = files.map((file) => ({ preview: file.uri, file }))
+      const filesWithPreview = files.map((file) => ({ preview: file.uri, file })) as FileResult[]
 
-      if (resolveWithFile.current) {
-        resolveWithFile.current(filesWithPreview)
-        resolveWithFile.current = undefined
-      }
-      onFileSelect?.(filesWithPreview)
+      handleResolve?.(filesWithPreview)
     } catch (err) {
       handleError(err)
     }
@@ -113,13 +117,13 @@ const _FileInput = forwardRef<
   } as Options
 
   const handlePickerResolution = (data: ImageOrVideo | ImageOrVideo[]) => {
-    let imageArray:ImageOrVideo[] = []
+    let imageArray: ImageOrVideo[] = []
     if (!Array.isArray(data)) {
       imageArray = [data]
     } else {
       imageArray = data
     }
-    onFileSelect(imageArray.map(parsePickerData))
+    handleResolve?.(imageArray.map(parsePickerData))
   }
   const onPress = (open?: FileInputImageSource, options?: Options) => {
     if (open == 'fs') {
@@ -166,7 +170,7 @@ const _FileInput = forwardRef<
             {
               text: 'Cancel',
               style: 'cancel',
-              onPress: () => {},
+              onPress: () => { },
               ...alertProps?.options?.[0],
             },
           ],
@@ -200,7 +204,7 @@ export const FileInput = _FileInput as unknown as ((props: FileInputProps) => JS
 export const useFileInput = () => {
   const inputRef = useRef<FileInputRef>(null)
 
-  const openFilePicker = (imageSource:FileInputImageSource = null):Promise<FileResult[]> => {
+  const openFilePicker = (imageSource: FileInputImageSource = null): Promise<FileResult[]> => {
     return inputRef.current?.openFilePicker(imageSource)
   }
 

package/src/utils/PermissionManager/context.tsx

@@ -24,14 +24,14 @@ function getStatuses(state: PermissionsRecord) {
   return Object.fromEntries(statuses)
 }
 
-export function Provider({ children, AppPermissions, modalConfig }:PermissionProviderProps) {
+export function Provider({ children, AppPermissions, modalConfig }: PermissionProviderProps) {
 
   const [state, setState] = useState(() => getStatuses(AppPermissions.values))
 
-  onMount(() => {
+  onUpdate(() => {
 
-    AppState.addEventListener('change', (state) => {
-      if (state === 'active') {
+    const subscription = AppState.addEventListener('change', (appState) => {
+      if (appState === 'active') {
         AppPermissions.update().then((vals) => {
           const statuses = getStatuses(vals)
           if (!deepEqual(statuses, state)) {
@@ -41,49 +41,53 @@ export function Provider({ children, AppPermissions, modalConfig }:PermissionPro
       }
     })
 
-  })
+    return () => {
+      subscription.remove()
+    }
+  }, [
+    JSON.stringify(state),
+  ])
 
   const setPermissionState = (forPermission: string, status: PermissionTypes.PermissionState) => {
     setState({
       ...state,
-      [forPermission]: status
+      [forPermission]: status,
     })
-  } 
-
+  }
 
   return <PermissionContext.Provider value={{
     state,
     modalConfig: modalConfig,
     manager: AppPermissions,
-    setState: setPermissionState
+    setState: setPermissionState,
   }}>
     {children}
   </PermissionContext.Provider>
 }
 
-type TAskManyResults<T extends string> =Record<T, PermissionTypes.PermissionStatus> & {
+type TAskManyResults<T extends string> = Record<T, PermissionTypes.PermissionStatus> & {
   overall
   : PermissionTypes.PermissionStatus
 }
 
-type AskManyOpts<T extends string|number|symbol > = {
+type AskManyOpts<T extends string | number | symbol> = {
   breakOnDenied?: T[]
 }
 
 export type UsePermissions<
   _PermissionNames extends string,
   PermissionNames extends string = `${_PermissionNames}?` | _PermissionNames> = () => TPermissionContext & {
-  askPermission: (name: PermissionNames, onResolve?: (status: PermissionTypes.PermissionStatus) => any) => Promise<PermissionTypes.PermissionStatus>
-  askMany<T extends PermissionNames, R = TAskManyResults<T>>(
-    perms: T[],
-    onResolve?: (res:R) => any,
-    options?: AskManyOpts<T>
-  ):Promise<
-    R
-  >
-}
+    askPermission: (name: PermissionNames, onResolve?: (status: PermissionTypes.PermissionStatus) => any) => Promise<PermissionTypes.PermissionStatus>
+    askMany<T extends PermissionNames, R = TAskManyResults<T>>(
+      perms: T[],
+      onResolve?: (res: R) => any,
+      options?: AskManyOpts<T>
+    ): Promise<
+      R
+    >
+  }
 
-export const usePermissions:UsePermissions<any> = () => {
+export const usePermissions: UsePermissions<any> = () => {
   const modalCtx = useModalContext()
   const permissionCtx = useContext(PermissionContext)
 
@@ -120,7 +124,7 @@ export const usePermissions:UsePermissions<any> = () => {
 
   const askMany = async (
     perms: any[],
-    onResolve?: (res:any) => any,
+    onResolve?: (res: any) => any,
     options?: AskManyOpts<any>,
   ) => {
 
@@ -184,7 +188,7 @@ export const usePermissions:UsePermissions<any> = () => {
         modalCtx.toggleModal(prevModal, false, {})
       })
     }
-    const res:Parameters<typeof onResolve>[0] = {
+    const res: Parameters<typeof onResolve>[0] = {
       ...results,
       overall: Object.values(results).every(x => x === 'granted') ? 'granted' : 'denied',
     }