✨ add the ability to disable/enable font scaling (disabled by default)

troberts-28 · Jan 9, 2024 · 5b82e9f · 5b82e9f
1 parent 8ce2b44
commit 5b82e9f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/components/TimerPicker/DurationScroll.tsx b/src/components/TimerPicker/DurationScroll.tsx
@@ -48,6 +48,7 @@ export type LimitType = {
 };
 
 interface DurationScrollProps {
+    allowFontScaling?: boolean;
     numberOfItems: number;
     label?: string | React.ReactElement;
     initialValue?: number;
@@ -83,6 +84,7 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
             disableInfiniteScroll = false,
             limit,
             aggressivelyGetLatestDuration,
+            allowFontScaling = false,
             is12HourPicker,
             amLabel,
             pmLabel,
@@ -166,6 +168,7 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
                         style={styles.pickerItemContainer}
                         testID="picker-item">
                         <Text
+                            allowFontScaling={allowFontScaling}
                             style={[
                                 styles.pickerItem,
                                 intItem > adjustedLimited.max ||
@@ -179,7 +182,9 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
                             <View
                                 style={styles.pickerAmPmContainer}
                                 pointerEvents="none">
-                                <Text style={[styles.pickerAmPmLabel]}>
+                                <Text
+                                    style={[styles.pickerAmPmLabel]}
+                                    allowFontScaling={allowFontScaling}>
                                     {isAm ? amLabel : pmLabel}
                                 </Text>
                             </View>
@@ -190,6 +195,7 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
             [
                 adjustedLimited.max,
                 adjustedLimited.min,
+                allowFontScaling,
                 amLabel,
                 is12HourPicker,
                 pmLabel,
@@ -364,7 +370,11 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
                 />
                 <View style={styles.pickerLabelContainer} pointerEvents="none">
                     {typeof label === "string" ? (
-                        <Text style={styles.pickerLabel}>{label}</Text>
+                        <Text
+                            allowFontScaling={allowFontScaling}
+                            style={styles.pickerLabel}>
+                            {label}
+                        </Text>
                     ) : (
                         label ?? null
                     )}

diff --git a/src/components/TimerPicker/index.tsx b/src/components/TimerPicker/index.tsx
@@ -32,6 +32,7 @@ export interface TimerPickerRef {
 }
 
 export interface TimerPickerProps {
+    allowFontScaling?: boolean;
     onDurationChange?: (duration: {
         hours: number;
         minutes: number;
@@ -67,6 +68,7 @@ export interface TimerPickerProps {
 const TimerPicker = forwardRef<TimerPickerRef, TimerPickerProps>(
     (
         {
+            allowFontScaling = false,
             onDurationChange,
             initialHours = 0,
             initialMinutes = 0,
@@ -167,6 +169,7 @@ const TimerPicker = forwardRef<TimerPickerRef, TimerPickerProps>(
                             hourLabel ?? (!use12HourPicker ? "h" : undefined)
                         }
                         initialValue={initialHours}
+                        allowFontScaling={allowFontScaling}
                         aggressivelyGetLatestDuration={
                             aggressivelyGetLatestDuration
                         }
@@ -195,6 +198,7 @@ const TimerPicker = forwardRef<TimerPickerRef, TimerPickerProps>(
                         numberOfItems={59}
                         label={minuteLabel ?? "m"}
                         initialValue={initialMinutes}
+                        allowFontScaling={allowFontScaling}
                         aggressivelyGetLatestDuration={
                             aggressivelyGetLatestDuration
                         }
@@ -221,6 +225,7 @@ const TimerPicker = forwardRef<TimerPickerRef, TimerPickerProps>(
                         numberOfItems={59}
                         label={secondLabel ?? "s"}
                         initialValue={initialSeconds}
+                        allowFontScaling={allowFontScaling}
                         aggressivelyGetLatestDuration={
                             aggressivelyGetLatestDuration
                         }

diff --git a/src/components/index.tsx b/src/components/index.tsx
@@ -83,6 +83,7 @@ const TimerPickerModal = forwardRef<TimerPickerModalRef, TimerPickerModalProps>(
             secondLabel,
             padWithNItems = 1,
             disableInfiniteScroll = false,
+            allowFontScaling = false,
             use12HourPicker,
             amLabel,
             pmLabel,
@@ -219,6 +220,7 @@ const TimerPickerModal = forwardRef<TimerPickerModalRef, TimerPickerModalProps>(
                             secondLabel={secondLabel}
                             padWithNItems={padWithNItems}
                             disableInfiniteScroll={disableInfiniteScroll}
+                            allowFontScaling={allowFontScaling}
                             use12HourPicker={use12HourPicker}
                             amLabel={amLabel}
                             pmLabel={pmLabel}