Merge pull request #776 from shoutem/feature/fix-resolveFontFamily-with-undefined-fontName

Definitely-Not-Vlad · web-flow · commit e82e4dd60ae2 · 2023-01-10T13:39:44.000+01:00
Default to Rubik-Regular for fontName when resolving font family
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shoutem/ui",
-  "version": "6.1.1",
+  "version": "6.1.2-rc.0",
   "description": "Styleable set of components for React Native applications",
   "scripts": {
     "lint": "eslint .",
diff --git a/theme.js b/theme.js
@@ -68,7 +68,7 @@ export function responsiveHeight(dimension, actualRefVal = window.height) {
 // 'fontWeight' and 'fontStyle' aren't always supplied for every component, so we're setting default
 // values of 'normal'.
 export function resolveFontFamily(
-  fontName,
+  fontName = 'Rubik-Regular',
   fontWeight = 'normal',
   fontStyle = 'normal',
 ) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@shoutem/ui",`
`3`		`- "version": "6.1.1",`
	`3`	`+ "version": "6.1.2-rc.0",`
`4`	`4`	`"description": "Styleable set of components for React Native applications",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"lint": "eslint .",`