@yahoo/uds-mobile 2.24.0-beta.8 → 2.24.0-beta.9

package/dist/fontScaling/useFontScale.cjs

@@ -26,20 +26,33 @@ function getFontScale() {
 * Pass the SP size that the geometry accompanies on Android so this mirrors
 * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy
 * scalar behavior for custom callers that do not know their base size.
+* On iOS this follows the global text-size curve; accompanying text should
+* omit `dynamicTypeRamp` so its native size uses the same multiplier.
 *
 * Subscribes to font-scale changes only — rotation does not re-render, and
 * components re-render solely when the user changes the OS text size.
 * Returns 1 when the nearest font-scaling provider has `enabled: false`.
 */
-function useFontScale(cap, fontSize) {
+function useFontScaleValue(cap, fontSize, honorResolvedComponentOverride = false) {
 	const enabled = require_fontScaling_FontScalingContext.useFontScalingEnabled();
 	const fontScale = (0, react.useSyncExternalStore)(subscribe, getFontScale, getFontScale);
-	if (!enabled) return 1;
+	if (!enabled && !honorResolvedComponentOverride) return 1;
 	const effectiveCap = typeof cap === "number" && cap >= 1 ? cap : Number.POSITIVE_INFINITY;
-	const cappedFontScale = Math.min(fontScale, effectiveCap);
 	const platformVersion = Number(react_native.Platform.Version);
-	const nativeScale = react_native.Platform.OS === "android" && platformVersion >= 34 && typeof fontSize === "number" && fontSize > 0 ? require_fontScaling_androidNonlinearFontScaling.convertAndroidSpToDp(fontSize, cappedFontScale) / fontSize : cappedFontScale;
-	return Math.max(1, nativeScale);
+	const nativeScale = react_native.Platform.OS === "android" && platformVersion >= 34 && typeof fontSize === "number" && fontSize > 0 ? require_fontScaling_androidNonlinearFontScaling.convertAndroidSpToDp(fontSize, fontScale, platformVersion) / fontSize : fontScale;
+	return Math.max(1, Math.min(nativeScale, effectiveCap));
+}
+function useFontScale(cap, fontSize) {
+	return useFontScaleValue(cap, fontSize);
+}
+/**
+* Internal component path. A resolved cap is defined under rollback mode only
+* when it came from an explicit component prop, which the public contract says
+* must continue to apply.
+*/
+function useComponentFontScale(cap, fontSize) {
+	return useFontScaleValue(cap, fontSize, cap !== void 0);
 }
 //#endregion
+exports.useComponentFontScale = useComponentFontScale;
 exports.useFontScale = useFontScale;

package/dist/fontScaling/useFontScale.d.cts

@@ -1,24 +1,12 @@
 
 //#region src/fontScaling/useFontScale.d.ts
+declare function useFontScale(cap?: number | null, fontSize?: number): number;
 /**
- * The effective scale for `fontSize`, clamped to `[1, cap]`, for sizing
- * containers around scaled text (e.g. a checkbox box growing with its
- * checkmark).
- *
- * `cap` uses the same semantics as `maxFontSizeMultiplier`: a number >= 1
- * caps the scale; `null`, `0`, or `undefined` leave it uncapped. The result
- * is never below 1 so containers never shrink under their token metrics
- * (font scales < 1 shrink text only, as today).
- *
- * Pass the SP size that the geometry accompanies on Android so this mirrors
- * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy
- * scalar behavior for custom callers that do not know their base size.
- *
- * Subscribes to font-scale changes only — rotation does not re-render, and
- * components re-render solely when the user changes the OS text size.
- * Returns 1 when the nearest font-scaling provider has `enabled: false`.
+ * Internal component path. A resolved cap is defined under rollback mode only
+ * when it came from an explicit component prop, which the public contract says
+ * must continue to apply.
  */
-declare function useFontScale(cap?: number | null, fontSize?: number): number;
+declare function useComponentFontScale(cap?: number | null, fontSize?: number): number;
 //#endregion
-export { useFontScale };
+export { useComponentFontScale, useFontScale };
 //# sourceMappingURL=useFontScale.d.cts.map

package/dist/fontScaling/useFontScale.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"useFontScale.d.cts","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;iBAmCS,YAAA,CAAa,GAAA,kBAAqB,QAAA"}
+{"version":3,"file":"useFontScale.d.cts","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"mappings":";;iBA+DS,YAAA,CAAa,GAAA,kBAAqB,QAAA;;;;;;iBASlC,qBAAA,CAAsB,GAAA,kBAAqB,QAAA"}

package/dist/fontScaling/useFontScale.d.ts

@@ -1,24 +1,12 @@
 
 //#region src/fontScaling/useFontScale.d.ts
+declare function useFontScale(cap?: number | null, fontSize?: number): number;
 /**
- * The effective scale for `fontSize`, clamped to `[1, cap]`, for sizing
- * containers around scaled text (e.g. a checkbox box growing with its
- * checkmark).
- *
- * `cap` uses the same semantics as `maxFontSizeMultiplier`: a number >= 1
- * caps the scale; `null`, `0`, or `undefined` leave it uncapped. The result
- * is never below 1 so containers never shrink under their token metrics
- * (font scales < 1 shrink text only, as today).
- *
- * Pass the SP size that the geometry accompanies on Android so this mirrors
- * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy
- * scalar behavior for custom callers that do not know their base size.
- *
- * Subscribes to font-scale changes only — rotation does not re-render, and
- * components re-render solely when the user changes the OS text size.
- * Returns 1 when the nearest font-scaling provider has `enabled: false`.
+ * Internal component path. A resolved cap is defined under rollback mode only
+ * when it came from an explicit component prop, which the public contract says
+ * must continue to apply.
  */
-declare function useFontScale(cap?: number | null, fontSize?: number): number;
+declare function useComponentFontScale(cap?: number | null, fontSize?: number): number;
 //#endregion
-export { useFontScale };
+export { useComponentFontScale, useFontScale };
 //# sourceMappingURL=useFontScale.d.ts.map

package/dist/fontScaling/useFontScale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFontScale.d.ts","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;iBAmCS,YAAA,CAAa,GAAA,kBAAqB,QAAA"}
+{"version":3,"file":"useFontScale.d.ts","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"mappings":";;iBA+DS,YAAA,CAAa,GAAA,kBAAqB,QAAA;;;;;;iBASlC,qBAAA,CAAsB,GAAA,kBAAqB,QAAA"}

package/dist/fontScaling/useFontScale.js

@@ -24,22 +24,34 @@ function getFontScale() {
 * Pass the SP size that the geometry accompanies on Android so this mirrors
 * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy
 * scalar behavior for custom callers that do not know their base size.
+* On iOS this follows the global text-size curve; accompanying text should
+* omit `dynamicTypeRamp` so its native size uses the same multiplier.
 *
 * Subscribes to font-scale changes only — rotation does not re-render, and
 * components re-render solely when the user changes the OS text size.
 * Returns 1 when the nearest font-scaling provider has `enabled: false`.
 */
-function useFontScale(cap, fontSize) {
+function useFontScaleValue(cap, fontSize, honorResolvedComponentOverride = false) {
 	const enabled = useFontScalingEnabled();
 	const fontScale = useSyncExternalStore(subscribe, getFontScale, getFontScale);
-	if (!enabled) return 1;
+	if (!enabled && !honorResolvedComponentOverride) return 1;
 	const effectiveCap = typeof cap === "number" && cap >= 1 ? cap : Number.POSITIVE_INFINITY;
-	const cappedFontScale = Math.min(fontScale, effectiveCap);
 	const platformVersion = Number(Platform.Version);
-	const nativeScale = Platform.OS === "android" && platformVersion >= 34 && typeof fontSize === "number" && fontSize > 0 ? convertAndroidSpToDp(fontSize, cappedFontScale) / fontSize : cappedFontScale;
-	return Math.max(1, nativeScale);
+	const nativeScale = Platform.OS === "android" && platformVersion >= 34 && typeof fontSize === "number" && fontSize > 0 ? convertAndroidSpToDp(fontSize, fontScale, platformVersion) / fontSize : fontScale;
+	return Math.max(1, Math.min(nativeScale, effectiveCap));
+}
+function useFontScale(cap, fontSize) {
+	return useFontScaleValue(cap, fontSize);
+}
+/**
+* Internal component path. A resolved cap is defined under rollback mode only
+* when it came from an explicit component prop, which the public contract says
+* must continue to apply.
+*/
+function useComponentFontScale(cap, fontSize) {
+	return useFontScaleValue(cap, fontSize, cap !== void 0);
 }
 //#endregion
-export { useFontScale };
+export { useComponentFontScale, useFontScale };
 
 //# sourceMappingURL=useFontScale.js.map

package/dist/fontScaling/useFontScale.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFontScale.js","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"sourcesContent":["import { useSyncExternalStore } from 'react';\nimport { Dimensions, Platform } from 'react-native';\n\nimport { convertAndroidSpToDp } from './androidNonlinearFontScaling';\nimport { useFontScalingEnabled } from './FontScalingContext';\n\nfunction subscribe(onStoreChange: () => void): () => void {\n  const subscription = Dimensions.addEventListener('change', onStoreChange);\n  return () => subscription.remove();\n}\n\n// Unistyles' rt.fontScale is stale when the OS text size changes while the\n// app is running; Dimensions reflects the live value on both platforms.\nfunction getFontScale(): number {\n  return Dimensions.get('window').fontScale;\n}\n\n/**\n * The effective scale for `fontSize`, clamped to `[1, cap]`, for sizing\n * containers around scaled text (e.g. a checkbox box growing with its\n * checkmark).\n *\n * `cap` uses the same semantics as `maxFontSizeMultiplier`: a number >= 1\n * caps the scale; `null`, `0`, or `undefined` leave it uncapped. The result\n * is never below 1 so containers never shrink under their token metrics\n * (font scales < 1 shrink text only, as today).\n *\n * Pass the SP size that the geometry accompanies on Android so this mirrors\n * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy\n * scalar behavior for custom callers that do not know their base size.\n *\n * Subscribes to font-scale changes only — rotation does not re-render, and\n * components re-render solely when the user changes the OS text size.\n * Returns 1 when the nearest font-scaling provider has `enabled: false`.\n */\nfunction useFontScale(cap?: number | null, fontSize?: number): number {\n  const enabled = useFontScalingEnabled();\n  const fontScale = useSyncExternalStore(subscribe, getFontScale, getFontScale);\n  if (!enabled) {\n    return 1;\n  }\n\n  const effectiveCap = typeof cap === 'number' && cap >= 1 ? cap : Number.POSITIVE_INFINITY;\n  const cappedFontScale = Math.min(fontScale, effectiveCap);\n  const platformVersion = Number(Platform.Version);\n  const nativeScale =\n    Platform.OS === 'android' &&\n    platformVersion >= 34 &&\n    typeof fontSize === 'number' &&\n    fontSize > 0\n      ? convertAndroidSpToDp(fontSize, cappedFontScale) / fontSize\n      : cappedFontScale;\n\n  return Math.max(1, nativeScale);\n}\n\nexport { useFontScale };\n"],"mappings":";;;;;;AAMA,SAAS,UAAU,eAAuC;CACxD,MAAM,eAAe,WAAW,iBAAiB,UAAU,cAAc;CACzE,aAAa,aAAa,QAAQ;;AAKpC,SAAS,eAAuB;CAC9B,OAAO,WAAW,IAAI,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;AAqBlC,SAAS,aAAa,KAAqB,UAA2B;CACpE,MAAM,UAAU,uBAAuB;CACvC,MAAM,YAAY,qBAAqB,WAAW,cAAc,aAAa;CAC7E,IAAI,CAAC,SACH,OAAO;CAGT,MAAM,eAAe,OAAO,QAAQ,YAAY,OAAO,IAAI,MAAM,OAAO;CACxE,MAAM,kBAAkB,KAAK,IAAI,WAAW,aAAa;CACzD,MAAM,kBAAkB,OAAO,SAAS,QAAQ;CAChD,MAAM,cACJ,SAAS,OAAO,aAChB,mBAAmB,MACnB,OAAO,aAAa,YACpB,WAAW,IACP,qBAAqB,UAAU,gBAAgB,GAAG,WAClD;CAEN,OAAO,KAAK,IAAI,GAAG,YAAY"}
+{"version":3,"file":"useFontScale.js","names":[],"sources":["../../src/fontScaling/useFontScale.ts"],"sourcesContent":["import { useSyncExternalStore } from 'react';\nimport { Dimensions, Platform } from 'react-native';\n\nimport { convertAndroidSpToDp } from './androidNonlinearFontScaling';\nimport { useFontScalingEnabled } from './FontScalingContext';\n\nfunction subscribe(onStoreChange: () => void): () => void {\n  const subscription = Dimensions.addEventListener('change', onStoreChange);\n  return () => subscription.remove();\n}\n\n// Unistyles' rt.fontScale is stale when the OS text size changes while the\n// app is running; Dimensions reflects the live value on both platforms.\nfunction getFontScale(): number {\n  return Dimensions.get('window').fontScale;\n}\n\n/**\n * The effective scale for `fontSize`, clamped to `[1, cap]`, for sizing\n * containers around scaled text (e.g. a checkbox box growing with its\n * checkmark).\n *\n * `cap` uses the same semantics as `maxFontSizeMultiplier`: a number >= 1\n * caps the scale; `null`, `0`, or `undefined` leave it uncapped. The result\n * is never below 1 so containers never shrink under their token metrics\n * (font scales < 1 shrink text only, as today).\n *\n * Pass the SP size that the geometry accompanies on Android so this mirrors\n * Android 14+'s nonlinear scaling. Omitting `fontSize` preserves the legacy\n * scalar behavior for custom callers that do not know their base size.\n * On iOS this follows the global text-size curve; accompanying text should\n * omit `dynamicTypeRamp` so its native size uses the same multiplier.\n *\n * Subscribes to font-scale changes only — rotation does not re-render, and\n * components re-render solely when the user changes the OS text size.\n * Returns 1 when the nearest font-scaling provider has `enabled: false`.\n */\nfunction useFontScaleValue(\n  cap?: number | null,\n  fontSize?: number,\n  honorResolvedComponentOverride = false,\n): number {\n  const enabled = useFontScalingEnabled();\n  const fontScale = useSyncExternalStore(subscribe, getFontScale, getFontScale);\n  if (!enabled && !honorResolvedComponentOverride) {\n    return 1;\n  }\n\n  const effectiveCap = typeof cap === 'number' && cap >= 1 ? cap : Number.POSITIVE_INFINITY;\n  const platformVersion = Number(Platform.Version);\n  const nativeScale =\n    Platform.OS === 'android' &&\n    platformVersion >= 34 &&\n    typeof fontSize === 'number' &&\n    fontSize > 0\n      ? convertAndroidSpToDp(fontSize, fontScale, platformVersion) / fontSize\n      : fontScale;\n\n  // React Native applies maxFontSizeMultiplier after the platform conversion.\n  // This matters on Android 14+, where the converted size is nonlinear.\n  return Math.max(1, Math.min(nativeScale, effectiveCap));\n}\n\nfunction useFontScale(cap?: number | null, fontSize?: number): number {\n  return useFontScaleValue(cap, fontSize);\n}\n\n/**\n * Internal component path. A resolved cap is defined under rollback mode only\n * when it came from an explicit component prop, which the public contract says\n * must continue to apply.\n */\nfunction useComponentFontScale(cap?: number | null, fontSize?: number): number {\n  return useFontScaleValue(cap, fontSize, cap !== undefined);\n}\n\nexport { useComponentFontScale, useFontScale };\n"],"mappings":";;;;;;AAMA,SAAS,UAAU,eAAuC;CACxD,MAAM,eAAe,WAAW,iBAAiB,UAAU,cAAc;CACzE,aAAa,aAAa,QAAQ;;AAKpC,SAAS,eAAuB;CAC9B,OAAO,WAAW,IAAI,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;AAuBlC,SAAS,kBACP,KACA,UACA,iCAAiC,OACzB;CACR,MAAM,UAAU,uBAAuB;CACvC,MAAM,YAAY,qBAAqB,WAAW,cAAc,aAAa;CAC7E,IAAI,CAAC,WAAW,CAAC,gCACf,OAAO;CAGT,MAAM,eAAe,OAAO,QAAQ,YAAY,OAAO,IAAI,MAAM,OAAO;CACxE,MAAM,kBAAkB,OAAO,SAAS,QAAQ;CAChD,MAAM,cACJ,SAAS,OAAO,aAChB,mBAAmB,MACnB,OAAO,aAAa,YACpB,WAAW,IACP,qBAAqB,UAAU,WAAW,gBAAgB,GAAG,WAC7D;CAIN,OAAO,KAAK,IAAI,GAAG,KAAK,IAAI,aAAa,aAAa,CAAC;;AAGzD,SAAS,aAAa,KAAqB,UAA2B;CACpE,OAAO,kBAAkB,KAAK,SAAS;;;;;;;AAQzC,SAAS,sBAAsB,KAAqB,UAA2B;CAC7E,OAAO,kBAAkB,KAAK,UAAU,QAAQ,KAAA,EAAU"}