Merge pull request #15 from juniorklawa/feat/rest-props

Feat/rest props
juniorklawa · May 26, 2021 · e806340 · e806340
2 parents 8d4fff9 + f1c005f
commit e806340
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "size",
     "responsive"
   ],
-  "version": "1.0.18",
+  "version": "1.1.0",
   "description": "React Native component for Android and iOS that provides several ways to resize text within a certain dimension/parent.",
   "homepage": "https://github.com/juniorklawa/react-native-auto-size-text",
   "main": "lib/index.js",

diff --git a/src/__tests__/__snapshots__/AutoSizeText.spec.tsx.snap b/src/__tests__/__snapshots__/AutoSizeText.spec.tsx.snap
@@ -3,6 +3,7 @@
 exports[`AutoSizeText snapshot AutoSizeText renders correctly 1`] = `
 <Text
   adjustsFontSizeToFit={true}
+  mode="max_lines"
   numberOfLines={3}
   onTextLayout={[Function]}
   style={

diff --git a/src/components/Group.tsx b/src/components/Group.tsx
@@ -6,19 +6,20 @@ import { AutoSizeTextProps } from '../types';
 const Group = (props: AutoSizeTextProps) => {
   const [maxSize] = React.useState<number>(1000);
 
-  const { children, style } = props;
+  const { children, style, ...rest } = props;
 
   return (
     <Text
-      adjustsFontSizeToFit
       testID='group'
+      adjustsFontSizeToFit
       numberOfLines={maxSize}
       style={[
         style,
         {
           fontSize: maxSize,
         },
       ]}
+      {...rest}
     >
       {children}
     </Text>

diff --git a/src/components/MaxLines.tsx b/src/components/MaxLines.tsx
@@ -4,7 +4,7 @@ import { NativeSyntheticEvent, Text, TextLayoutEventData } from 'react-native';
 import { AutoSizeTextProps } from '../types';
 
 const MaxLines = (props: AutoSizeTextProps) => {
-  const { fontSize, children, style, numberOfLines } = props;
+  const { fontSize, children, style, numberOfLines, ...rest } = props;
 
   const [currentFont, setCurrentFont] = React.useState<number>(
     fontSize as number
@@ -27,6 +27,7 @@ const MaxLines = (props: AutoSizeTextProps) => {
           fontSize: currentFont,
         },
       ]}
+      {...rest}
       onTextLayout={handleResizing}
     >
       {children}

diff --git a/src/components/MinFontSize.tsx b/src/components/MinFontSize.tsx
@@ -9,7 +9,14 @@ import {
 import { AutoSizeTextProps } from '../types';
 
 const MinFontSize = (props: AutoSizeTextProps) => {
-  const { fontSize, children, style, numberOfLines, minFontSize } = props;
+  const {
+    fontSize,
+    children,
+    style,
+    numberOfLines,
+    minFontSize,
+    ...rest
+  } = props;
 
   const [currentFont, setCurrentFont] = React.useState(fontSize);
   const handleResizing = (e: NativeSyntheticEvent<TextLayoutEventData>) => {
@@ -41,6 +48,7 @@ const MinFontSize = (props: AutoSizeTextProps) => {
           fontSize: currentFont,
         },
       ]}
+      {...rest}
       onTextLayout={handleResizing}
     >
       {children}

diff --git a/src/components/OverflowReplacement.tsx b/src/components/OverflowReplacement.tsx
@@ -10,6 +10,7 @@ const OverflowReplacement = (props: AutoSizeTextProps) => {
     style,
     numberOfLines,
     overflowReplacement,
+    ...rest
   } = props;
   const [currentText, setCurrentText] = React.useState<string>('');
 
@@ -32,6 +33,7 @@ const OverflowReplacement = (props: AutoSizeTextProps) => {
           fontSize: fontSize,
         },
       ]}
+      {...rest}
       onTextLayout={handleResizing}
     >
       {currentText ? currentText : children}

diff --git a/src/components/PresetFontSizes.tsx b/src/components/PresetFontSizes.tsx
@@ -9,7 +9,7 @@ import {
 import { AutoSizeTextProps } from '../types';
 
 const PresetFontSizes = (props: AutoSizeTextProps) => {
-  const { fontSizePresets, children, style, numberOfLines } = props;
+  const { fontSizePresets, children, style, numberOfLines, ...rest } = props;
   const [currentFont, setCurrentFont] = React.useState<number>(
     fontSizePresets![0] as number
   );
@@ -46,6 +46,7 @@ const PresetFontSizes = (props: AutoSizeTextProps) => {
         },
       ]}
       onTextLayout={handleResizing}
+      {...rest}
     >
       {children}
     </Text>

diff --git a/src/components/StepGranularity.tsx b/src/components/StepGranularity.tsx
@@ -9,7 +9,14 @@ import {
 import { AutoSizeTextProps } from '../types';
 
 const StepGranularity = (props: AutoSizeTextProps) => {
-  const { fontSize, children, style, numberOfLines, granularity } = props;
+  const {
+    fontSize,
+    children,
+    style,
+    numberOfLines,
+    granularity,
+    ...rest
+  } = props;
   const [currentFont, setCurrentFont] = React.useState(fontSize);
   const handleResizing = (e: NativeSyntheticEvent<TextLayoutEventData>) => {
     const { lines } = e.nativeEvent;
@@ -35,6 +42,7 @@ const StepGranularity = (props: AutoSizeTextProps) => {
         },
       ]}
       onTextLayout={handleResizing}
+      {...rest}
     >
       {children}
     </Text>