javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 03:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ios): new a11y properties for managing font scale (#10260)

Browse Source
This commit is contained in:
Dimitris-Rafail Katsampas
2023-04-06 02:20:15 +03:00
committed by GitHub
parent 2f9e5c0b84
commit 7aaa1d899d
11 changed files with 196 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
packages/core/ui/text-base/index.ios.ts
View File

@ -4,11 +4,12 @@ import { CSSShadow } from '../styling/css-shadow';
// Requires
import { Font } from '../styling/font';
import { iosAccessibilityAdjustsFontSizeProperty, iosAccessibilityMaxFontScaleProperty, iosAccessibilityMinFontScaleProperty } from '../../accessibility/accessibility-properties';
import { TextBaseCommon, textProperty, formattedTextProperty, textAlignmentProperty, textDecorationProperty, textTransformProperty, textShadowProperty, letterSpacingProperty, lineHeightProperty, maxLinesProperty, resetSymbol } from './text-base-common';
import { Color } from '../../color';
import { FormattedString } from './formatted-string';
import { Span } from './span';
import { colorProperty, fontInternalProperty, fontScaleProperty, Length } from '../styling/style-properties';
import { colorProperty, fontInternalProperty, fontScaleInternalProperty, Length } from '../styling/style-properties';
import { isString, isNullOrUndefined } from '../../utils/types';
import { iOSNativeHelper } from '../../utils';
import { Trace } from '../../trace';
@ -187,29 +188,49 @@ export class TextBase extends TextBaseCommon {
if (!(value instanceof Font) || !this.formattedText) {
let nativeView = this.nativeTextViewProtected;
nativeView = nativeView instanceof UIButton ? nativeView.titleLabel : nativeView;
if (value instanceof Font) {
// Apply a11y font scale if not set
if (value.fontScale !== this.style._fontScale) {
value.fontScale = this.style._fontScale;
}
nativeView.font = value.getUIFont(nativeView.font);
} else {
nativeView.font = value;
}
nativeView.font = value instanceof Font ? value.getUIFont(nativeView.font) : value;
}
}
[fontScaleProperty.setNative](value: number) {
[fontScaleInternalProperty.setNative](value: number) {
const nativeView = this.nativeTextViewProtected instanceof UIButton ? this.nativeTextViewProtected.titleLabel : this.nativeTextViewProtected;
const currentFont = this.style.fontInternal || Font.default.withFontSize(nativeView.font.pointSize);
if (currentFont.fontScale !== value) {
const newFont = currentFont.withFontScale(value);
this.style.fontInternal = newFont;
let finalValue;
if (this.iosAccessibilityAdjustsFontSize) {
finalValue = value;
if (this.iosAccessibilityMinFontScale && this.iosAccessibilityMinFontScale > value) {
finalValue = this.iosAccessibilityMinFontScale;
}
if (this.iosAccessibilityMaxFontScale && this.iosAccessibilityMaxFontScale < value) {
finalValue = this.iosAccessibilityMaxFontScale;
}
} else {
finalValue = 1.0;
}
const newFont = currentFont.withFontScale(finalValue);
this.style.fontInternal = newFont;
// Request layout on font scale as it's not done automatically
if (currentFont.fontScale !== finalValue) {
this.requestLayout();
}
}
[iosAccessibilityAdjustsFontSizeProperty.setNative](value: boolean) {
this[fontScaleInternalProperty.setNative](this.style.fontScaleInternal);
}
[iosAccessibilityMinFontScaleProperty.setNative](value: number) {
this[fontScaleInternalProperty.setNative](this.style.fontScaleInternal);
}
[iosAccessibilityMaxFontScaleProperty.setNative](value: number) {
this[fontScaleInternalProperty.setNative](this.style.fontScaleInternal);
}
[textAlignmentProperty.setNative](value: CoreTypes.TextAlignmentType) {
const nativeView = <UITextField | UITextView | UILabel>this.nativeTextViewProtected;
switch (value) {