WRQ-11247: Added fontScale prop for large text mode scale values

packages/ui/resolution/ResolutionDecorator.js

@@ -9,7 +9,7 @@
 import PropTypes from 'prop-types';
 import hoc from '@enact/core/hoc';
 
-import {init, config as riConfig, defineScreenTypes, getResolutionClasses} from './resolution';
+import {init, config as riConfig, defineScreenTypes, getResolutionClasses, updateBaseFontSize, calculateFontSize} from './resolution';
 
 /**
  * Default config for `ResolutionDecorator`.
@@ -97,7 +97,8 @@
 		static displayName = 'ResolutionDecorator';
 
 		static propTypes = /** @lends ui/resolution.ResolutionDecorator.prototype */ {
-			className: PropTypes.string
+			className: PropTypes.string,
+			fontScale: PropTypes.number
 		};
 
 		constructor (props) {
@@ -116,6 +117,12 @@
 			this.rootNode = ReactDOM.findDOMNode(this);
 		}
 
+		componentDidUpdate (prevProps) {
+			if (prevProps.fontScale !== this.props.fontScale) {
+				updateBaseFontSize(calculateFontSize(null, this.props.fontScale));
+			}
+		}
+
 		componentWillUnmount () {
 			if (config.dynamic) window.removeEventListener('resize', this.handleResize);
 		}

packages/ui/resolution/resolution.js

@@ -194,18 +194,18 @@
  * @returns {String}          The calculated pixel size (with unit suffix. Ex: "24px").
  * @public
  */
-function calculateFontSize (type) {
+function calculateFontSize (type, fontScale = 1) {
 	const scrObj = getScreenTypeObject(type);
 	const shouldScaleFontSize = (config.intermediateScreenHandling === 'scale') && (config.matchSmallerScreenType ? workspaceBounds.width > scrObj.width && workspaceBounds.height > scrObj.height :
 		workspaceBounds.width < scrObj.width && workspaceBounds.height < scrObj.height);
 	let size;
 
 	if (orientation === 'portrait' && config.orientationHandling === 'scale') {
-		size = scrObj.height / scrObj.width * scrObj.pxPerRem;
+		size = scrObj.height / scrObj.width * (scrObj.pxPerRem * fontScale);
 	} else {
-		size = scrObj.pxPerRem;
+		size = (scrObj.pxPerRem * fontScale);
 		if (orientation === 'landscape' && shouldScaleFontSize) {
-			size = parseInt(workspaceBounds.height * scrObj.pxPerRem / scrObj.height);
+			size = parseInt(workspaceBounds.height * (scrObj.pxPerRem * fontScale) / scrObj.height);
 		}
 	}
 	return size + 'px';
@@ -494,5 +494,6 @@
 	scaleToRem,
 	selectSrc,
 	unit,
-	unitToPixelFactors
+	unitToPixelFactors,
+	updateBaseFontSize
 };