Merge pull request #12 from sj-distributor/11-add-allowfontscaling-co…

…nfig add allowfontscaling property
sj-distributor · Aug 10, 2023 · 8fd133d · 8fd133d
2 parents 8756e99 + c025370
commit 8fd133d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 39 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sj-distributor/react-native-confirm-modal",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "A React Native Confirm Modal",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

diff --git a/src/confirm-dialog.tsx b/src/confirm-dialog.tsx
@@ -12,7 +12,7 @@ import {
   EasingFunction,
 } from 'react-native';
 import Styles from './style';
-import type { IConfirmDialogProps } from './types';
+import type { ConfirmDialogProps } from './types';
 
 const EasignOut: EasingFunction = Easing.bezier(0.25, 0.46, 0.45, 0.94);
 const EasingIn: EasingFunction = Easing.out(EasignOut);
@@ -36,12 +36,13 @@ const ConfirmDialog = memo(
     confirmStyle,
     containerStyle,
     cancelTextStyle,
+    allowFontScaling = true,
     confirmTextStyle,
     descriptionStyle: overrideDescriptionStyle,
     cancelTextVisible = true,
     modalBackgroundStyle,
     buttonContainerStyle: overrideButtonContainerStyle,
-  }: IConfirmDialogProps) => {
+  }: ConfirmDialogProps) => {
     const styles = useRef(Styles()).current;
 
     useEffect(() => {
@@ -110,7 +111,7 @@ const ConfirmDialog = memo(
 
     return (
       <View style={styles.flexContainer}>
-        <RNModal transparent visible={open} animationType={'none'}>
+        <RNModal visible={open} transparent animationType={'none'}>
           <Animated.View
             style={[
               styles.overlay,
@@ -131,18 +132,23 @@ const ConfirmDialog = memo(
           >
             <View style={[styles.modalView, containerStyle]}>
               {!!title && (
-                <Text style={[styles.titleStyle, overrideTitleStyle]}>
+                <Text
+                  style={[styles.titleStyle, overrideTitleStyle]}
+                  allowFontScaling={allowFontScaling}
+                >
                   {title}
                 </Text>
               )}
 
               {!!description && (
                 <Text
                   style={[styles.descriptionStyle, overrideDescriptionStyle]}
+                  allowFontScaling={allowFontScaling}
                 >
                   {description}
                 </Text>
               )}
+
               <View
                 style={[
                   styles.buttonContainerStyle,
@@ -166,6 +172,7 @@ const ConfirmDialog = memo(
                         styles.cancelButtonStyle,
                         cancelTextStyle,
                       ]}
+                      allowFontScaling={allowFontScaling}
                     >
                       {cancelText}
                     </Text>
@@ -188,6 +195,7 @@ const ConfirmDialog = memo(
                         styles.confirmButtonStyle,
                         confirmTextStyle,
                       ]}
+                      allowFontScaling={allowFontScaling}
                     >
                       {confirmText}
                     </Text>

diff --git a/src/types.ts b/src/types.ts
@@ -36,48 +36,18 @@ export type ConfirmModalType = {
 
   descriptionStyle?: StyleProp<TextStyle>;
 
+  allowFontScaling?: boolean;
+
   cancelTextVisible?: boolean;
 
   modalBackgroundStyle?: StyleProp<ViewStyle>;
 
   buttonContainerStyle?: StyleProp<ViewStyle>;
 };
 
-export interface IConfirmDialogProps {
+export type ConfirmDialogProps = ConfirmModalType & {
   open: boolean;
-
-  title?: string;
-
-  description?: string;
-
-  cancelText?: string;
-
-  confirmText?: string;
-
-  onCancel?: () => void;
-
-  onConfirm?: () => void;
-
-  titleStyle?: StyleProp<TextStyle>;
-
-  cancelStyle?: StyleProp<ViewStyle>;
-
-  confirmStyle?: StyleProp<ViewStyle>;
-
-  containerStyle?: StyleProp<ViewStyle>;
-
-  cancelTextStyle?: StyleProp<TextStyle>;
-
-  confirmTextStyle?: StyleProp<TextStyle>;
-
-  descriptionStyle?: StyleProp<TextStyle>;
-
-  cancelTextVisible?: boolean;
-
-  modalBackgroundStyle?: StyleProp<ViewStyle>;
-
-  buttonContainerStyle?: StyleProp<ViewStyle>;
-}
+};
 
 export type ResolveRejectType = [
   (value: boolean | PromiseLike<boolean>) => void,