uilib-native 4.1.3 → 4.3.2

package/.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#2f8c2f",
+        "activityBar.background": "#2f8c2f",
+        "activityBar.foreground": "#e7e7e7",
+        "activityBar.inactiveForeground": "#e7e7e799",
+        "activityBarBadge.background": "#3838a7",
+        "activityBarBadge.foreground": "#e7e7e7",
+        "commandCenter.border": "#e7e7e799",
+        "sash.hoverBorder": "#2f8c2f",
+        "statusBar.background": "#226622",
+        "statusBar.foreground": "#e7e7e7",
+        "statusBarItem.hoverBackground": "#2f8c2f",
+        "statusBarItem.remoteBackground": "#226622",
+        "statusBarItem.remoteForeground": "#e7e7e7",
+        "tab.activeBorder": "#2f8c2f",
+        "titleBar.activeBackground": "#226622",
+        "titleBar.activeForeground": "#e7e7e7",
+        "titleBar.inactiveBackground": "#22662299",
+        "titleBar.inactiveForeground": "#e7e7e799"
+    }
+}

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,11 +1,11 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-5:12
+ADDED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-4:12
 	package
-		ADDED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:4:5-39
 		INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml
+		ADDED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:2:1-4:12
 		INJECTED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml
 	xmlns:android
 		ADDED from /Users/michaelle/Dev/public-ui-lib/lib/android/src/main/AndroidManifest.xml:3:5-63

package/android/build.gradle

@@ -9,6 +9,7 @@ project.ext {
 }
 
 android {
+    namespace "com.wix.reactnativeuilib"
     compileSdkVersion project.ext.compileSdkVersion
     buildToolsVersion project.ext.buildToolsVersion
 

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.wix.reactnativeuilib">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/components/DynamicFonts/FontDownloader.d.ts

@@ -0,0 +1,41 @@
+import { FontExtension } from './FontLoader';
+export type FontDownloaderProps = {
+    /**
+     * Should be In the following convention: '/NAME'
+     */
+    dynamicFontsFolder?: string;
+    downloadErrorMessage?: string;
+    /**
+     * Enable debug mode to print extra logs
+     */
+    debug?: boolean;
+};
+export default class FontDownloader {
+    private readonly props;
+    private readonly fs;
+    constructor(props: FontDownloaderProps);
+    private log;
+    private getPrivateFolder;
+    private getPrivateFilePath;
+    private getFileName;
+    private _isFontDownloaded;
+    private createPrivateFolderIfNeeded;
+    private getDownloadFontOptions;
+    /**
+     * Download the font
+     * @param fontUri the remote location of the font
+     * @param fontName the full name of the font
+     * @param fontExtension the extension of the font, i.e. '.ttf' or '.otf'
+     * @param timeout a timeout for the download to fail after
+     * @returns the full path of the download
+     */
+    downloadFont(fontUri: string, fontName: string, fontExtension: FontExtension, timeout: number): Promise<string>;
+    /**
+     * Is the font cached (already downloaded)
+     * @param {*} fontName the full name of the font
+     * @param {*} fontExtension the extension of the font, i.e. '.ttf' or '.otf'
+     */
+    isFontDownloaded(fontName: string, fontExtension: FontExtension): Promise<boolean>;
+    readFontFromDisk(fontName: string, fontExtension: FontExtension): Promise<string | void>;
+    deleteFontFromDisk(fontFullName: string): Promise<void>;
+}

package/components/DynamicFonts/{FontDownloader.ts → FontDownloader.js}

@@ -1,86 +1,58 @@
-import {Platform} from 'react-native';
-import RNFS from './RNFSPackage';
-import {FontExtension} from './FontLoader';
-
+import { Platform } from 'react-native';
+import RNFS from "./RNFSPackage";
 const DEFAULT_DYNAMIC_FONTS_FOLDER = '/dynamicFonts';
 const DEFAULT_DOWNLOAD_ERROR_MESSAGE = 'An error occurred downloading the file:';
-
-export type FontDownloaderProps = {
-  /**
-   * Should be In the following convention: '/NAME'
-   */
-  dynamicFontsFolder?: string;
-  downloadErrorMessage?: string;
-  /**
-   * Enable debug mode to print extra logs
-   */
-  debug?: boolean;
-};
-
 // TODO: this can probably be a more general "downloader" if we so choose
 export default class FontDownloader {
-  private readonly props: FontDownloaderProps;
-  private readonly fs: NonNullable<typeof RNFS>;
-
-  constructor(props: FontDownloaderProps) {
+  constructor(props) {
     this.props = {
       dynamicFontsFolder: DEFAULT_DYNAMIC_FONTS_FOLDER,
       downloadErrorMessage: DEFAULT_DOWNLOAD_ERROR_MESSAGE,
       ...props
     };
-
     if (!RNFS) {
       throw new Error(`RNUILib FontDownloader requires installing "react-native-fs" dependency`);
     }
     this.fs = RNFS;
   }
-
-  private log(message?: any, ...optionalParams: any[]) {
-    const {debug} = this.props;
+  log(message, ...optionalParams) {
+    const {
+      debug
+    } = this.props;
     if (debug) {
       console.log(message, optionalParams);
     }
   }
-
-  private getPrivateFolder() {
-    const {dynamicFontsFolder} = this.props;
-    return (
-      (Platform.OS === 'android' ? this.fs.ExternalDirectoryPath : this.fs.DocumentDirectoryPath) + dynamicFontsFolder
-    );
+  getPrivateFolder() {
+    const {
+      dynamicFontsFolder
+    } = this.props;
+    return (Platform.OS === 'android' ? this.fs.ExternalDirectoryPath : this.fs.DocumentDirectoryPath) + dynamicFontsFolder;
   }
-
-  private getPrivateFilePath(fileName: string) {
+  getPrivateFilePath(fileName) {
     return this.getPrivateFolder() + '/' + fileName;
   }
-
-  private getFileName(fontName: string, fontExtension: FontExtension) {
+  getFileName(fontName, fontExtension) {
     return fontName + '.' + fontExtension;
   }
-
-  private async _isFontDownloaded(fileName: string) {
+  async _isFontDownloaded(fileName) {
     const privateFilePath = this.getPrivateFilePath(fileName);
     return await this.fs.exists(privateFilePath);
   }
-
-  private async createPrivateFolderIfNeeded() {
+  async createPrivateFolderIfNeeded() {
     const privateFolder = this.getPrivateFolder();
     if (!(await this.fs.exists(privateFolder))) {
       await this.fs.mkdir(privateFolder);
     }
   }
-
-  private getDownloadFontOptions(fontUri: string, downloadLocation: string, readTimeout: number) {
-    const platformSpecificOptions =
-      Platform.OS === 'ios'
-        ? {
-          background: false,
-          discretionary: true,
-          cacheable: false
-        }
-        : {
-          connectionTimeout: readTimeout
-        };
-
+  getDownloadFontOptions(fontUri, downloadLocation, readTimeout) {
+    const platformSpecificOptions = Platform.OS === 'ios' ? {
+      background: false,
+      discretionary: true,
+      cacheable: false
+    } : {
+      connectionTimeout: readTimeout
+    };
     return {
       fromUrl: fontUri,
       toFile: downloadLocation,
@@ -100,19 +72,16 @@ export default class FontDownloader {
    * @param timeout a timeout for the download to fail after
    * @returns the full path of the download
    */
-  public async downloadFont(fontUri: string,
-    fontName: string,
-    fontExtension: FontExtension,
-    timeout: number): Promise<string> {
-    const {downloadErrorMessage} = this.props;
+  async downloadFont(fontUri, fontName, fontExtension, timeout) {
+    const {
+      downloadErrorMessage
+    } = this.props;
     await this.createPrivateFolderIfNeeded();
     const fileName = this.getFileName(fontName, fontExtension);
     const downloadLocation = this.getPrivateFilePath(fileName);
-
     try {
       this.log(fontName, 'Starting to download');
-      const result = await this.fs.downloadFile(this.getDownloadFontOptions(fontUri, downloadLocation, timeout))
-        .promise;
+      const result = await this.fs.downloadFile(this.getDownloadFontOptions(fontUri, downloadLocation, timeout)).promise;
       if (result.statusCode === 200) {
         this.log(fontName, 'Finished downloading');
         return downloadLocation;
@@ -137,12 +106,11 @@ export default class FontDownloader {
    * @param {*} fontName the full name of the font
    * @param {*} fontExtension the extension of the font, i.e. '.ttf' or '.otf'
    */
-  public async isFontDownloaded(fontName: string, fontExtension: FontExtension): Promise<boolean> {
+  async isFontDownloaded(fontName, fontExtension) {
     const fileName = this.getFileName(fontName, fontExtension);
     return await this._isFontDownloaded(fileName);
   }
-
-  public async readFontFromDisk(fontName: string, fontExtension: FontExtension): Promise<string | void> {
+  async readFontFromDisk(fontName, fontExtension) {
     let base64FontString;
     const fileName = this.getFileName(fontName, fontExtension);
     const privateFilePath = this.getPrivateFilePath(fileName);
@@ -155,11 +123,9 @@ export default class FontDownloader {
     } else {
       this.log(fontName, 'File does not exist (read)');
     }
-
     return base64FontString;
   }
-
-  public async deleteFontFromDisk(fontFullName: string): Promise<void> {
+  async deleteFontFromDisk(fontFullName) {
     const privateFilePath = this.getPrivateFilePath(fontFullName);
     if (await this.fs.exists(privateFilePath)) {
       this.log(fontFullName, 'Starting to delete');
@@ -171,4 +137,4 @@ export default class FontDownloader {
       this.log(fontFullName, 'File does not exist (delete)');
     }
   }
-}
+}

package/components/DynamicFonts/FontLoader.d.ts

@@ -0,0 +1,35 @@
+export type FontExtension = 'ttf' | 'otf';
+export type LoadFontInput = {
+    /**
+     * Specify registered font name (doesn't work for iOS)
+     */
+    fontName: string;
+    /**
+     * This can be a data URI or raw base64...
+     * if it is raw base64 type must be specified,
+     * but defaults to TTF (data URI mime: font/ttf or font/otf)
+     */
+    base64FontString: string;
+    /**
+     * Specify the type of font in the encoded data (ttf or otf). Defaults to "ttf"
+     */
+    fontExtension: FontExtension;
+    /**
+     * Force the loading of the font even if previously loaded it
+     */
+    forceLoad?: boolean;
+};
+export type FontLoaderProps = {
+    /**
+     * Enable debug mode to print extra logs
+     */
+    debug?: boolean;
+};
+export default class FontLoader {
+    private readonly props;
+    private readonly loadedFonts;
+    constructor(props: FontLoaderProps);
+    private log;
+    loadFont: ({ fontName, base64FontString, fontExtension, forceLoad }: LoadFontInput) => Promise<string>;
+    loadFonts: (fonts: LoadFontInput | LoadFontInput[], forceLoad?: boolean) => Promise<string[]>;
+}

package/components/DynamicFonts/{FontLoader.ts → FontLoader.js}

@@ -1,72 +1,37 @@
-import {NativeModules} from 'react-native';
-
-const {DynamicFont} = NativeModules;
-
-export type FontExtension = 'ttf' | 'otf';
-
-export type LoadFontInput = {
-  /**
-   * Specify registered font name (doesn't work for iOS)
-   */
-  fontName: string;
-  /**
-   * This can be a data URI or raw base64...
-   * if it is raw base64 type must be specified,
-   * but defaults to TTF (data URI mime: font/ttf or font/otf)
-   */
-  base64FontString: string;
-  /**
-   * Specify the type of font in the encoded data (ttf or otf). Defaults to "ttf"
-   */
-  fontExtension: FontExtension;
-  /**
-   * Force the loading of the font even if previously loaded it
-   */
-  forceLoad?: boolean;
-};
-
-export type FontLoaderProps = {
-  /**
-   * Enable debug mode to print extra logs
-   */
-  debug?: boolean;
-};
-
+import { NativeModules } from 'react-native';
+const {
+  DynamicFont
+} = NativeModules;
 export default class FontLoader {
-  private readonly props: FontLoaderProps;
-  private readonly loadedFonts = new Map<string, string>();
-
-  constructor(props: FontLoaderProps) {
+  loadedFonts = new Map();
+  constructor(props) {
     this.props = props;
   }
-
-  private log(message?: any, ...optionalParams: any[]) {
-    const {debug} = this.props;
+  log(message, ...optionalParams) {
+    const {
+      debug
+    } = this.props;
     if (debug) {
       console.log(message, optionalParams);
     }
   }
-
-  public loadFont = ({
+  loadFont = ({
     fontName,
     base64FontString,
     fontExtension = 'ttf',
     forceLoad = false
-  }: LoadFontInput): Promise<string> => {
+  }) => {
     /* Check if this font was already loaded */
     if (!forceLoad && this.loadedFonts.has(fontName)) {
       this.log(fontName, 'Already loaded');
-      return Promise.resolve(this.loadedFonts.get(fontName) as string);
+      return Promise.resolve(this.loadedFonts.get(fontName));
     }
-
     if (!fontName) {
       throw new Error('fontName is a required argument');
     }
-
     if (!base64FontString) {
       throw new Error('base64FontString is a required argument');
     }
-
     this.log(fontName, 'Starting to load');
     /* Load font via native binary code */
     return new Promise((resolve, reject) => {
@@ -74,8 +39,7 @@ export default class FontLoader {
         name: fontName,
         data: base64FontString,
         type: fontExtension
-      },
-      (err: string, givenName: string) => {
+      }, (err, givenName) => {
         if (err) {
           reject(err);
           return;
@@ -112,12 +76,14 @@ export default class FontLoader {
   //   });
   // };
 
-  public loadFonts = (fonts: LoadFontInput | LoadFontInput[], forceLoad?: boolean) => {
+  loadFonts = (fonts, forceLoad) => {
     if (!fonts) {
       return Promise.resolve([]);
     }
-
     const fontsArray = fonts instanceof Array ? fonts : [fonts];
-    return Promise.all(fontsArray.filter(font => font).map(font => this.loadFont({forceLoad, ...font})));
+    return Promise.all(fontsArray.filter(font => font).map(font => this.loadFont({
+      forceLoad,
+      ...font
+    })));
   };
-}
+}

package/components/DynamicFonts/NoPermissionsAcquirer.d.ts

@@ -0,0 +1,3 @@
+export default class NoPermissionsAcquirer {
+    getPermissions(): Promise<void>;
+}

package/components/DynamicFonts/{NoPermissionsAcquirer.ts → NoPermissionsAcquirer.js}

@@ -1,5 +1,5 @@
 export default class NoPermissionsAcquirer {
-  public async getPermissions() {
+  async getPermissions() {
     return Promise.resolve();
   }
-}
+}

package/components/DynamicFonts/PermissionsAcquirer.android.d.ts

@@ -0,0 +1,13 @@
+export type PermissionsAcquirerProps = {
+    requestPermissionsTitle?: string;
+    requestPermissionsMessage?: string;
+    requestPermissionsPositiveButtonText?: string;
+    permissionsRefusalMessage?: string;
+    permissionsErrorMessage?: string;
+};
+export default class PermissionsAcquirer {
+    private readonly props;
+    constructor(props: PermissionsAcquirerProps);
+    checkPermissions(): Promise<boolean>;
+    getPermissions(): Promise<void>;
+}

package/components/DynamicFonts/{PermissionsAcquirer.android.ts → PermissionsAcquirer.android.js}

@@ -1,44 +1,28 @@
-import {Platform, PermissionsAndroid} from 'react-native';
+import { Platform, PermissionsAndroid } from 'react-native';
 const AndroidOsVersion = Platform.OS === 'android' ? Platform.constants.Release : undefined;
-
-export type PermissionsAcquirerProps = {
-  requestPermissionsTitle?: string;
-  requestPermissionsMessage?: string;
-  requestPermissionsPositiveButtonText?: string;
-  permissionsRefusalMessage?: string;
-  permissionsErrorMessage?: string;
-};
-
-const DEFAULT_PERMISSIONS_ACQUIRER_PROPS: Required<PermissionsAcquirerProps> = {
+const DEFAULT_PERMISSIONS_ACQUIRER_PROPS = {
   requestPermissionsTitle: 'Allow Storage Access',
   requestPermissionsMessage: 'Give the app permission to access the files and storage on your device.',
   requestPermissionsPositiveButtonText: 'Continue',
   permissionsRefusalMessage: 'Please edit your permission settings to continue.',
   permissionsErrorMessage: `We weren't able to obtain the required permissions. Please try Again.`
 };
-
 export default class PermissionsAcquirer {
-  private readonly props;
-  constructor(props: PermissionsAcquirerProps) {
+  constructor(props) {
     this.props = props;
   }
-
-  public async checkPermissions() {
+  async checkPermissions() {
     return await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE);
   }
-
-  public async getPermissions() {
-    if ((AndroidOsVersion && Number(AndroidOsVersion) >= 13) || (await this.checkPermissions())) {
+  async getPermissions() {
+    if (AndroidOsVersion && Number(AndroidOsVersion) >= 13 || (await this.checkPermissions())) {
       return Promise.resolve();
     }
-
     try {
       const result = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
         title: this.props.requestPermissionsTitle ?? DEFAULT_PERMISSIONS_ACQUIRER_PROPS.requestPermissionsTitle,
         message: this.props.requestPermissionsMessage ?? DEFAULT_PERMISSIONS_ACQUIRER_PROPS.requestPermissionsMessage,
-        buttonPositive:
-          this.props.requestPermissionsPositiveButtonText ??
-          DEFAULT_PERMISSIONS_ACQUIRER_PROPS.requestPermissionsPositiveButtonText
+        buttonPositive: this.props.requestPermissionsPositiveButtonText ?? DEFAULT_PERMISSIONS_ACQUIRER_PROPS.requestPermissionsPositiveButtonText
       });
       if (result === PermissionsAndroid.RESULTS.GRANTED) {
         return Promise.resolve();
@@ -55,4 +39,4 @@ export default class PermissionsAcquirer {
       });
     }
   }
-}
+}

package/components/DynamicFonts/PermissionsAcquirer.ios.js

@@ -0,0 +1,2 @@
+import PermissionsAcquirer from "./NoPermissionsAcquirer";
+export default PermissionsAcquirer;

package/components/DynamicFonts/{PermissionsAcquirer.ios.ts → PermissionsAcquirer.web.d.ts}

@@ -1,3 +1,2 @@
 import PermissionsAcquirer from './NoPermissionsAcquirer';
-
 export default PermissionsAcquirer;

package/components/DynamicFonts/PermissionsAcquirer.web.js

@@ -0,0 +1,2 @@
+import PermissionsAcquirer from "./NoPermissionsAcquirer";
+export default PermissionsAcquirer;

package/components/DynamicFonts/RNFSPackage.d.ts

@@ -0,0 +1,2 @@
+declare let RNFS: typeof import('react-native-fs') | undefined;
+export default RNFS;

package/components/DynamicFonts/RNFSPackage.js

@@ -0,0 +1,5 @@
+let RNFS;
+try {
+  RNFS = require('react-native-fs');
+} catch (error) {}
+export default RNFS;

package/components/DynamicFonts/index.d.ts

@@ -0,0 +1,61 @@
+import { FontExtension } from './FontLoader';
+import { FontDownloaderProps } from './FontDownloader';
+import type { PermissionsAcquirerProps } from './PermissionsAcquirer.android';
+type DynamicFontsProps = {
+    fontDownloadingProps?: Omit<FontDownloaderProps, 'debug'>;
+    permissionsAcquirerProps?: PermissionsAcquirerProps;
+    fontLoadErrorMessage?: string;
+    /**
+     * Enable debug mode to print extra logs
+     */
+    debug?: boolean;
+    /**
+     * Do not request permissions
+     */
+    doNotRequestPermissions?: boolean;
+};
+type GetFontInput = {
+    /**
+     * The uri of the font (to be downloaded from)
+     */
+    fontUri: string;
+    /**
+     * The full name of the font
+     */
+    fontName: string;
+    /**
+     * The extension of the font, i.e. '.ttf' or '.otf'
+     */
+    fontExtension: FontExtension;
+    /**
+     * Milliseconds for the download to complete in (defaults to 5000)
+     */
+    timeout?: number;
+};
+export { DynamicFontsProps, FontExtension, GetFontInput };
+export default class DynamicFonts {
+    private readonly props;
+    private readonly permissionsAcquirer;
+    private readonly fontLoader;
+    private readonly fontDownloader;
+    constructor(props: DynamicFontsProps);
+    private log;
+    private loadFont;
+    /**
+     * Get font - download from uri (or from cache if already downloaded) and load it to memory
+     * You need to handle errors in the form of Promise.reject
+     * @param fontUri the uri of the font (to be downloaded from)
+     * @param fontName the full name of the font
+     * @param fontExtension the extension of the font, i.e. '.ttf' or '.otf'
+     * @param timeout milliseconds for the download to complete in (defaults to 5000)
+     */
+    getFont({ fontUri, fontName, fontExtension, timeout }: GetFontInput): Promise<string>;
+    getFonts(fonts: GetFontInput | GetFontInput[]): Promise<string[]>;
+    private buildFontData;
+    getFontFamily(rootUri: string, fontNames: string[], fontExtension: FontExtension, fontNamePrefix?: string, retries?: number): Promise<string[]>;
+    private deleteFontFromDisk;
+    deleteFont(fontName: string, fontExtension: FontExtension): Promise<void>;
+    deleteFontFamily(fontNames: string[], fontExtension: FontExtension, fontNamePrefix?: string): Promise<void>;
+    isFontDownloaded(fontName: string, fontExtension: FontExtension): Promise<boolean>;
+    isFontFamilyDownloaded(rootUri: string, fontNames: string[], fontExtension: FontExtension, fontNamePrefix?: string): Promise<boolean>;
+}