react-native-persona 1.2.5 → 1.2.6

package/CHANGELOG.md

@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+## [v1.2.6] - 2021-09-20
+
+### Changed
+
+- Added passthrough for title and body text sizes
+
 ## [v1.2.5] - 2021-09-10
 
 ### Changed

package/ios/PersonaInquiry.swift

@@ -162,9 +162,11 @@ extension PersonaInquiry {
             theme.titleTextColor = color
         }
         
-        if let fontName = dictionary["titleTextFont"],
-           let font = UIFont(name: fontName, size: 28) {
-            theme.titleTextFont = font
+        if let fontName = dictionary["titleTextFont"] {
+           let fontSize = int(from: dictionary["titleTextSize"]) ?? 28
+           if let font = UIFont(name: fontName, size: CGFloat(fontSize)) {
+              theme.titleTextFont = font
+           }
         }
 
         if let alignment = alignment(from: dictionary["titleTextAlignment"]) {
@@ -180,9 +182,11 @@ extension PersonaInquiry {
             theme.bodyTextColor = color
         }
         
-        if let fontName = dictionary["bodyTextFont"],
-           let font = UIFont(name: fontName, size: 17) {
-            theme.bodyTextFont = font
+        if let fontName = dictionary["bodyTextFont"] {
+           let fontSize = int(from: dictionary["bodyTextSize"]) ?? 17
+           if let font = UIFont(name: fontName, size: CGFloat(fontSize)) {
+              theme.bodyTextFont = font
+           }
         }
 
         if let alignment = alignment(from: dictionary["bodyTextAlignment"]) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-persona",
   "title": "React Native Persona",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Launch a mobile native implementation of the Persona inquiry flow from React Native.",
   "main": "src/index.js",
   "bin": {

package/persona-tools/Theme.js

@@ -16,8 +16,10 @@ var ANDROID_THEME_CONFIG_KEY;
     ANDROID_THEME_CONFIG_KEY["accentColor"] = "accentColor";
     ANDROID_THEME_CONFIG_KEY["titleTextColor"] = "titleTextColor";
     ANDROID_THEME_CONFIG_KEY["titleTextFont"] = "titleTextFont";
+    ANDROID_THEME_CONFIG_KEY["titleTextSize"] = "titleTextSize";
     ANDROID_THEME_CONFIG_KEY["bodyTextColor"] = "bodyTextColor";
     ANDROID_THEME_CONFIG_KEY["bodyTextFont"] = "bodyTextFont";
+    ANDROID_THEME_CONFIG_KEY["bodyTextSize"] = "bodyTextSize";
     ANDROID_THEME_CONFIG_KEY["footnoteTextColor"] = "footnoteTextColor";
     ANDROID_THEME_CONFIG_KEY["footnoteTextFont"] = "footnoteTextFont";
     // formLabelTextColor = "formLabelTextColor",
@@ -51,9 +53,11 @@ var IOS_THEME_CONFIG_KEY;
     IOS_THEME_CONFIG_KEY["overlayBackgroundColor"] = "overlayBackgroundColor";
     IOS_THEME_CONFIG_KEY["titleTextColor"] = "titleTextColor";
     IOS_THEME_CONFIG_KEY["titleTextFont"] = "titleTextFont";
+    IOS_THEME_CONFIG_KEY["titleTextSize"] = "titleTextSize";
     IOS_THEME_CONFIG_KEY["titleTextAlignment"] = "titleTextAlignment";
     IOS_THEME_CONFIG_KEY["bodyTextColor"] = "bodyTextColor";
     IOS_THEME_CONFIG_KEY["bodyTextFont"] = "bodyTextFont";
+    IOS_THEME_CONFIG_KEY["bodyTextSize"] = "bodyTextSize";
     IOS_THEME_CONFIG_KEY["bodyTextAlignment"] = "bodyTextAlignment";
     IOS_THEME_CONFIG_KEY["footnoteTextColor"] = "footnoteTextColor";
     IOS_THEME_CONFIG_KEY["footnoteTextFont"] = "footnoteTextFont";

package/persona-tools/Theme.ts

@@ -13,9 +13,11 @@ export enum ANDROID_THEME_CONFIG_KEY {
 
   titleTextColor = "titleTextColor",
   titleTextFont = "titleTextFont",
+  titleTextSize = "titleTextSize",
 
   bodyTextColor = "bodyTextColor",
   bodyTextFont = "bodyTextFont",
+  bodyTextSize = "bodyTextSize",
 
   footnoteTextColor = "footnoteTextColor",
   footnoteTextFont = "footnoteTextFont",
@@ -54,9 +56,11 @@ export enum IOS_THEME_CONFIG_KEY {
   overlayBackgroundColor = "overlayBackgroundColor",
   titleTextColor = "titleTextColor",
   titleTextFont = "titleTextFont",
+  titleTextSize = "titleTextSize",
   titleTextAlignment = "titleTextAlignment",
   bodyTextColor = "bodyTextColor",
   bodyTextFont = "bodyTextFont",
+  bodyTextSize = "bodyTextSize",
   bodyTextAlignment = "bodyTextAlignment",
   footnoteTextColor = "footnoteTextColor",
   footnoteTextFont = "footnoteTextFont",

package/persona-tools/lib/AndroidResourcePrinter.js

@@ -126,7 +126,7 @@ class AndroidResourcePrinter {
         });
     }
     titleText() {
-        if (this.theme.titleTextColor || this.theme.titleTextFont) {
+        if (this.theme.titleTextColor || this.theme.titleTextSize || this.theme.titleTextFont) {
             this.printQueue.push(() => {
                 this.root = this.root
                     .ele("item", { name: "personaTitleTextAppearance" })
@@ -155,9 +155,10 @@ class AndroidResourcePrinter {
                 }
                 // Default values taken from `Persona.Text.Title`
                 // in shared/src/main/res/values/styles.xml
+                const textSize = this.theme.titleTextSize ? `${this.theme.titleTextSize}sp` : "26sp";
                 this.root = this.root
                     .ele("item", { name: "android:textSize" })
-                    .txt("26sp")
+                    .txt(textSize)
                     .up()
                     .ele("item", { name: "android:textStyle" })
                     .txt("bold")
@@ -175,7 +176,7 @@ class AndroidResourcePrinter {
         }
     }
     bodyText() {
-        if (this.theme.bodyTextColor || this.theme.bodyTextFont) {
+        if (this.theme.bodyTextColor || this.theme.bodyTextSize || this.theme.bodyTextFont) {
             this.printQueue.push(() => {
                 this.root = this.root
                     .ele("item", { name: "personaBodyTextAppearance" })
@@ -204,10 +205,12 @@ class AndroidResourcePrinter {
                 }
                 // Default values taken from `Persona.Text.Body`
                 // in shared/src/main/res/values/styles.xml
+                const textSize = this.theme.bodyTextSize ? `${this.theme.bodyTextSize}sp` : "18sp";
                 this.root = this.root
                     .ele("item", { name: "android:textSize" })
-                    .txt("18sp")
+                    .txt(textSize)
                     .up();
+
                 this.root = this.root.up();
             });
         }

package/persona-tools/lib/AndroidResourcePrinter.spec.js

@@ -11,8 +11,10 @@ const EMPTY_THEME = {
     accentColor: null,
     titleTextColor: null,
     titleTextFont: null,
+    titleTextSize: null,
     bodyTextColor: null,
     bodyTextFont: null,
+    bodyTextSize: null,
     footnoteTextColor: null,
     footnoteTextFont: null,
     // formLabelTextColor: null,

package/persona-tools/lib/AndroidResourcePrinter.spec.ts

@@ -8,8 +8,10 @@ const EMPTY_THEME: AndroidThemeObject = {
   accentColor: null,
   titleTextColor: null,
   titleTextFont: null,
+  titleTextSize: null,
   bodyTextColor: null,
   bodyTextFont: null,
+  bodyTextSize: null,
   footnoteTextColor: null,
   footnoteTextFont: null,
   // formLabelTextColor: null,
@@ -800,8 +802,10 @@ it("fullTheme", () => {
     accentColor: "#FF0000",
     titleTextColor: "#FF0000",
     titleTextFont: "Arial",
+    titleTextSize: "40",
     bodyTextColor: "#FF0000",
     bodyTextFont: "Arial",
+    bodyTextSize: "4",
     footnoteTextColor: "#FF0000",
     footnoteTextFont: "Arial",
     // formLabelTextColor: "#FF0000",
@@ -869,13 +873,13 @@ it("fullTheme", () => {
       <style name=\\"RN.Persona.Text.Title\\" parent=\\"Persona.Text.Body\\">
         <item name=\\"android:textColor\\">#FF0000</item>
         <item name=\\"android:fontFamily\\">Arial</item>
-        <item name=\\"android:textSize\\">26sp</item>
+        <item name=\\"android:textSize\\">40sp</item>
         <item name=\\"android:textStyle\\">bold</item>
       </style>
       <style name=\\"RN.Persona.Text.Body\\" parent=\\"Persona.Text.Body\\">
         <item name=\\"android:textColor\\">#FF0000</item>
         <item name=\\"android:fontFamily\\">Arial</item>
-        <item name=\\"android:textSize\\">18sp</item>
+        <item name=\\"android:textSize\\">4sp</item>
       </style>
       <style name=\\"TextAppearance.AppCompat.Small\\">
         <item name=\\"android:textSize\\">@dimen/abc_text_size_small_material</item>

package/persona-tools/lib/AndroidResourcePrinter.ts

@@ -145,7 +145,7 @@ class AndroidResourcePrinter {
   }
 
   private titleText() {
-    if (this.theme.titleTextColor || this.theme.titleTextFont) {
+    if (this.theme.titleTextColor || this.theme.titleTextSize || this.theme.titleTextFont) {
       this.printQueue.push(() => {
         this.root = this.root
           .ele("item", { name: "personaTitleTextAppearance" })
@@ -178,9 +178,10 @@ class AndroidResourcePrinter {
 
         // Default values taken from `Persona.Text.Title`
         // in shared/src/main/res/values/styles.xml
+        const textSize = this.theme.titleTextSize ? `${this.theme.titleTextSize}sp` : "26sp";
         this.root = this.root
           .ele("item", { name: "android:textSize" })
-          .txt("26sp")
+          .txt(textSize)
           .up()
           .ele("item", { name: "android:textStyle" })
           .txt("bold")
@@ -199,7 +200,7 @@ class AndroidResourcePrinter {
   }
 
   private bodyText() {
-    if (this.theme.bodyTextColor || this.theme.bodyTextFont) {
+    if (this.theme.bodyTextColor || this.theme.bodyTextSize || this.theme.bodyTextFont) {
       this.printQueue.push(() => {
         this.root = this.root
           .ele("item", { name: "personaBodyTextAppearance" })
@@ -230,11 +231,10 @@ class AndroidResourcePrinter {
             .up();
         }
 
-        // Default values taken from `Persona.Text.Body`
-        // in shared/src/main/res/values/styles.xml
+        const textSize = this.theme.titleTextSize ? `${this.theme.bodyTextSize}sp` : "18sp";
         this.root = this.root
           .ele("item", { name: "android:textSize" })
-          .txt("18sp")
+          .txt(textSize)
           .up();
 
         this.root = this.root.up();