Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IOAPPX-429] Enable allowFontScaling by default in the IOText component #359

Merged
merged 8 commits into from
Dec 17, 2024
Merged

[IOAPPX-429] Enable allowFontScaling by default in the IOText component #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df0b135
Enable `allowFontScaling` by default
dmnplb Nov 18, 2024
10a71dc
Update `jest` snapshots
dmnplb Nov 18, 2024
6c81bc1
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Nov 21, 2024
c1cca74
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Nov 21, 2024
4aec8d8
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Nov 21, 2024
41f5c55
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Dec 2, 2024
b4c59fd
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Dec 16, 2024
9ca01fe
Merge branch 'main' into IOAPPX-429-enable-font-scaling-by-default
dmnplb Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ exports[`Test Advice Components Advice Snapshot 1`] = `
}
/>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="body"
maxFontSizeMultiplier={1.5}
style={
Expand Down
4 changes: 2 additions & 2 deletions src/components/banner/__test__/__snapshots__/banner.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ exports[`Test Banner Components Banner Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -396,7 +396,7 @@ exports[`Test Banner Components Banner Snapshot 1`] = `
<Text
accessibilityElementsHidden={true}
accessible={false}
allowFontScaling={false}
allowFontScaling={true}
ellipsizeMode="tail"
importantForAccessibility="no-hide-descendants"
maxFontSizeMultiplier={1.5}
Expand Down
6 changes: 3 additions & 3 deletions src/components/buttons/__test__/__snapshots__/button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ exports[`Test Buttons Components ButtonLink Snapshot 1`] = `
<Text
accessibilityElementsHidden={true}
accessible={false}
allowFontScaling={false}
allowFontScaling={true}
ellipsizeMode="tail"
importantForAccessibility="no-hide-descendants"
maxFontSizeMultiplier={1.5}
Expand Down Expand Up @@ -930,7 +930,7 @@ exports[`Test Buttons Components ButtonOutline Snapshot 1`] = `
<Text
accessibilityElementsHidden={true}
accessible={false}
allowFontScaling={false}
allowFontScaling={true}
ellipsizeMode="tail"
importantForAccessibility="no-hide-descendants"
maxFontSizeMultiplier={1.5}
Expand Down Expand Up @@ -1056,7 +1056,7 @@ exports[`Test Buttons Components ButtonSolid Snapshot 1`] = `
<Text
accessibilityElementsHidden={true}
accessible={false}
allowFontScaling={false}
allowFontScaling={true}
ellipsizeMode="tail"
importantForAccessibility="no-hide-descendants"
maxFontSizeMultiplier={1.5}
Expand Down
26 changes: 13 additions & 13 deletions src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,7 @@ exports[`Test List Item Components ListItemAction Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -1840,7 +1840,7 @@ exports[`Test List Item Components ListItemIDP Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -1913,7 +1913,7 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = `
accessible={true}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="footnote"
maxFontSizeMultiplier={1.5}
style={
Expand All @@ -1933,7 +1933,7 @@ exports[`Test List Item Components ListItemInfo Snapshot 1`] = `
label
</Text>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
numberOfLines={2}
Expand Down Expand Up @@ -2039,7 +2039,7 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="footnote"
maxFontSizeMultiplier={1.5}
style={
Expand All @@ -2059,7 +2059,7 @@ exports[`Test List Item Components ListItemInfoCopy Snapshot 1`] = `
label
</Text>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
numberOfLines={2}
Expand Down Expand Up @@ -2223,7 +2223,7 @@ exports[`Test List Item Components ListItemNav Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -2448,7 +2448,7 @@ exports[`Test List Item Components ListItemNavAlert Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -2610,7 +2610,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
numberOfLines={1}
Expand Down Expand Up @@ -2698,7 +2698,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = `
</RNSVGGroup>
</RNSVGSvgView>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="footnote"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -2732,7 +2732,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -2983,7 +2983,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
numberOfLines={1}
Expand Down Expand Up @@ -3017,7 +3017,7 @@ exports[`Test List Item Components ListItemRadioWithAmount Snapshot 2`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="headline"
maxFontSizeMultiplier={1.5}
style={
Expand Down
20 changes: 10 additions & 10 deletions src/components/numberpad/__test__/__snapshots__/NumberPad.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -173,7 +173,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -254,7 +254,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -351,7 +351,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -432,7 +432,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -513,7 +513,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -610,7 +610,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -691,7 +691,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -772,7 +772,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down Expand Up @@ -1010,7 +1010,7 @@ exports[`NumberPad Should match the snapshot 1`] = `
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
dynamicTypeRamp="title2"
maxFontSizeMultiplier={1.5}
style={
Expand Down
12 changes: 6 additions & 6 deletions src/components/toast/__tests__/__snapshots__/ToastNotification.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -501,7 +501,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -550,7 +550,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -599,7 +599,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -648,7 +648,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down Expand Up @@ -697,7 +697,7 @@ exports[`Test ToastNotification component should match snapshot for props ({ mes
}
>
<Text
allowFontScaling={false}
allowFontScaling={true}
maxFontSizeMultiplier={1.5}
style={
[
Expand Down
10 changes: 4 additions & 6 deletions src/components/typography/IOText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import {
TextStyle,
View
} from "react-native";
import { IOColors, useIOExperimentalDesign, useIOTheme } from "../../core";
import { IOColors, useIOTheme } from "../../core";
import { useBoldTextEnabled } from "../../utils/accessibility";
import {
IOFontFamily,
IOFontWeight,
IOFontSizeMultiplier,
IOFontWeight,
makeFontStyleObject
} from "../../utils/fonts";

Expand Down Expand Up @@ -95,7 +95,7 @@ export const IOText = forwardRef<View, IOTextProps>(
textStyle,
style,
children,
allowFontScaling,
allowFontScaling = true,
maxFontSizeMultiplier,
...props
},
Expand All @@ -104,8 +104,6 @@ export const IOText = forwardRef<View, IOTextProps>(
const theme = useIOTheme();
const boldEnabled = useBoldTextEnabled();

const { isExperimental } = useIOExperimentalDesign();

const computedStyleObj = useMemo(
() =>
calculateTextStyle(
Expand Down Expand Up @@ -143,7 +141,7 @@ export const IOText = forwardRef<View, IOTextProps>(

/* Accessible typography based on the `fontScale` parameter */
const accessibleFontSizeProps: ComponentProps<typeof Text> = {
allowFontScaling: allowFontScaling ?? isExperimental,
allowFontScaling,
maxFontSizeMultiplier: maxFontSizeMultiplier ?? IOFontSizeMultiplier
};

Expand Down
Loading
Loading