@automattic/charts 4.9.0 → 4.10.0

package/src/utils/resolve-font-size.ts

@@ -1,13 +1,16 @@
+const toFontSize = ( size: number ): number | undefined =>
+	Number.isFinite( size ) && size >= 0 ? size : undefined;
+
 /**
  * Resolve a theme `fontSize` value into a plain number suitable for
  * canvas-based measurement (e.g. `getStringWidth`).
  *
  * Accepts:
- * - A number — returned as-is
+ * - A finite, non-negative number — returned as-is
  * - A pixel string like `"12px"` — parsed and returned as a number
  *
- * Returns `undefined` for any other input (missing value, NaN, or
- * relative units like `rem`/`em`/`%`/`vh`) so callers can fall back to
+ * Returns `undefined` for any other input (missing value, a non-finite or
+ * negative size, or relative units like `rem`/`em`/`%`/`vh`) so callers can fall back to
  * their own default. Relative units are intentionally rejected because
  * we cannot resolve them to absolute pixels here without a parent
  * computed style, and silently returning the unitless prefix
@@ -18,19 +21,15 @@
  */
 export const resolveFontSize = ( val?: number | string ): number | undefined => {
 	if ( typeof val === 'number' ) {
-		return isNaN( val ) ? undefined : val;
+		return toFontSize( val );
 	}
 
 	if ( typeof val === 'string' ) {
 		// Only accept plain numeric strings or pixel values.
 		// Reject rem, em, %, vh, vw, etc. — they cannot be resolved to
 		// absolute pixels without a computed style context.
-		const match = val.trim().match( /^(-?\d+\.?\d*|-?\.\d+)(px)?$/ );
-		if ( ! match ) {
-			return undefined;
-		}
-		const parsed = parseFloat( match[ 1 ] );
-		return isNaN( parsed ) ? undefined : parsed;
+		const match = val.trim().match( /^\+?((?:\d*\.)?\d+)(px)?$/ );
+		return match ? toFontSize( parseFloat( match[ 1 ] ) ) : undefined;
 	}
 
 	return undefined;

package/src/utils/test/resolve-font-size.test.ts

@@ -11,8 +11,8 @@ describe( 'resolveFontSize', () => {
 			expect( resolveFontSize( 13.5 ) ).toBe( 13.5 );
 		} );
 
-		it( 'returns undefined for NaN', () => {
-			expect( resolveFontSize( NaN ) ).toBeUndefined();
+		it.each( [ NaN, Infinity, -12 ] )( 'returns undefined for %p', val => {
+			expect( resolveFontSize( val ) ).toBeUndefined();
 		} );
 	} );
 
@@ -25,8 +25,17 @@ describe( 'resolveFontSize', () => {
 		it( 'parses pixel strings', () => {
 			expect( resolveFontSize( '12px' ) ).toBe( 12 );
 			expect( resolveFontSize( '13.5px' ) ).toBe( 13.5 );
+			expect( resolveFontSize( '.5px' ) ).toBe( 0.5 );
+			expect( resolveFontSize( '+12px' ) ).toBe( 12 );
 		} );
 
+		it.each( [ '12.px', '12.', '-12px', '-.5', '9'.repeat( 400 ) + 'px' ] )(
+			'rejects %p, which is not a valid font size',
+			val => {
+				expect( resolveFontSize( val ) ).toBeUndefined();
+			}
+		);
+
 		it( 'trims whitespace before parsing', () => {
 			expect( resolveFontSize( '  14px  ' ) ).toBe( 14 );
 		} );