uilib-native 4.1.0 → 4.1.1

package/android/src/main/java/com/wix/reactnativeuilib/dynamicfont/DynamicFontModule.java

@@ -1,35 +1,24 @@
 package com.wix.reactnativeuilib.dynamicfont;
 
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.util.Base64;
+
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.views.text.ReactFontManager;
 
-import android.app.Activity;
-import android.graphics.Typeface;
-import android.util.Base64;
-
 import java.io.File;
 import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 public class DynamicFontModule extends ReactContextBaseJavaModule {
   int tempNameCounter = 0;
 
-  private final ReactApplicationContext reactContext;
-
   public DynamicFontModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    this.reactContext = reactContext;
   }
 
   @Override
@@ -136,7 +125,7 @@ public class DynamicFontModule extends ReactContextBaseJavaModule {
       Typeface typeface = Typeface.createFromFile(cacheFile);
 
       //Cache the font for react
-      ReactFontManager.getInstance().setTypeface(name, typeface.getStyle(), typeface);
+      ReactFontManager.getInstance().setTypeface(name, Typeface.NORMAL, typeface);
 
       cacheFile.delete();
     } catch(Exception e) {

package/components/DynamicFonts/FontDownloader.ts

@@ -1,5 +1,5 @@
 import {Platform} from 'react-native';
-import fs from 'react-native-fs';
+import RNFS from './RNFSPackage';
 import {FontExtension} from './FontLoader';
 
 const DEFAULT_DYNAMIC_FONTS_FOLDER = '/dynamicFonts';
@@ -20,6 +20,7 @@ export type FontDownloaderProps = {
 // 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) {
     this.props = {
@@ -27,11 +28,18 @@ export default class FontDownloader {
       downloadErrorMessage: DEFAULT_DOWNLOAD_ERROR_MESSAGE,
       ...props
     };
+
+    if (!RNFS) {
+      throw new Error(`RNUILib FontDownloader requires installing "react-native-fs" dependency`);
+    }
+    this.fs = RNFS;
   }
 
   private getPrivateFolder() {
     const {dynamicFontsFolder} = this.props;
-    return (Platform.OS === 'android' ? fs.ExternalDirectoryPath : fs.DocumentDirectoryPath) + dynamicFontsFolder;
+    return (
+      (Platform.OS === 'android' ? this.fs.ExternalDirectoryPath : this.fs.DocumentDirectoryPath) + dynamicFontsFolder
+    );
   }
 
   private getPrivateFilePath(fileName: string) {
@@ -44,13 +52,13 @@ export default class FontDownloader {
 
   private async _isFontDownloaded(fileName: string) {
     const privateFilePath = this.getPrivateFilePath(fileName);
-    return await fs.exists(privateFilePath);
+    return await this.fs.exists(privateFilePath);
   }
 
   private async createPrivateFolderIfNeeded() {
     const privateFolder = this.getPrivateFolder();
-    if (!(await fs.exists(privateFolder))) {
-      await fs.mkdir(privateFolder);
+    if (!(await this.fs.exists(privateFolder))) {
+      await this.fs.mkdir(privateFolder);
     }
   }
 
@@ -95,7 +103,8 @@ export default class FontDownloader {
     const downloadLocation = this.getPrivateFilePath(fileName);
 
     try {
-      const result = await fs.downloadFile(this.getDownloadFontOptions(fontUri, downloadLocation, timeout)).promise;
+      const result = await this.fs.downloadFile(this.getDownloadFontOptions(fontUri, downloadLocation, timeout))
+        .promise;
       if (result.statusCode === 200) {
         return downloadLocation;
       } else {
@@ -126,8 +135,8 @@ export default class FontDownloader {
     let base64FontString;
     const fileName = this.getFileName(fontName, fontExtension);
     const privateFilePath = this.getPrivateFilePath(fileName);
-    if (await fs.exists(privateFilePath)) {
-      base64FontString = await fs.readFile(privateFilePath, 'base64').catch(() => {});
+    if (await this.fs.exists(privateFilePath)) {
+      base64FontString = await this.fs.readFile(privateFilePath, 'base64').catch(() => {});
     }
 
     return base64FontString;

package/components/DynamicFonts/RNFSPackage.ts

@@ -0,0 +1,6 @@
+let RNFS: typeof import('react-native-fs') | undefined;
+try {
+  RNFS = require('react-native-fs');
+} catch (error) {}
+
+export default RNFS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index.js",