Merge pull request #225 from thibmaek/patch-1

Add the option to pass headers to useImageDimensions

Author: LinusU

package.json

@@ -26,7 +26,7 @@
     "@testing-library/react-native": "7.2.0",
     "@types/jest": "27.0.2",
     "@types/react": "16.14.17",
-    "@types/react-native": "0.62.18",
+    "@types/react-native": "0.64.12",
     "all-contributors-cli": "6.15.0",
     "auto": "9.26.8",
     "eslint": "7.3.1",

src/useImageDimensions.ts

@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react'
-import {Image, ImageRequireSource} from 'react-native'
+import {Image, ImageRequireSource, ImageURISource} from 'react-native'
 
 export interface URISource {
   uri: string
@@ -21,10 +21,12 @@ export interface ImageDimensionsResult {
 
 /**
  * @param source either a remote URL or a local file resource.
+ * @param headers headers to be passed to a remote URL resource.
  * @returns original image dimensions (width, height and aspect ratio).
  */
 export function useImageDimensions(
   source: ImageDimensionsSource,
+  headers?: ImageURISource['headers'],
 ): ImageDimensionsResult {
   const [result, setResult] = useState<ImageDimensionsResult>({loading: true})
 
@@ -44,15 +46,28 @@ export function useImageDimensions(
       if (typeof source === 'object' && source.uri) {
         setResult({loading: true})
 
-        Image.getSize(
-          source.uri,
-          (width, height) =>
-            setResult({
-              dimensions: {width, height, aspectRatio: width / height},
-              loading: false,
-            }),
-          (error) => setResult({error, loading: false}),
-        )
+        if (typeof headers === 'object') {
+          Image.getSizeWithHeaders(
+            source.uri,
+            headers,
+            (width, height) =>
+              setResult({
+                dimensions: {width, height, aspectRatio: width / height},
+                loading: false,
+              }),
+            (error) => setResult({error, loading: false}),
+          )
+        } else {
+          Image.getSize(
+            source.uri,
+            (width, height) =>
+              setResult({
+                dimensions: {width, height, aspectRatio: width / height},
+                loading: false,
+              }),
+            (error) => setResult({error, loading: false}),
+          )
+        }
 
         return
       }
@@ -61,7 +76,7 @@ export function useImageDimensions(
     } catch (error) {
       setResult({error, loading: false})
     }
-  }, [source])
+  }, [source, headers])
 
   return result
 }

src/useKeyboard.ts

@@ -15,7 +15,7 @@ const initialValue = {
 export function useKeyboard() {
   const [shown, setShown] = useState(false)
   const [coordinates, setCoordinates] = useState<{
-    start: ScreenRect
+    start: undefined | ScreenRect
     end: ScreenRect
   }>(initialValue)
   const [keyboardHeight, setKeyboardHeight] = useState<number>(0)

yarn.lock

@@ -1875,10 +1875,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-native@0.62.18":
-  version "0.62.18"
-  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.18.tgz#ad63691e7c44edef2beeb6af52b2eb942c3ed8a1"
-  integrity sha512-7QfU8EzIYxYqeXpPf8QNv2xi8hrePlgTbRATRo+plRSdVfJu7N6sAXqrFxKJp6bGLvp82GV1gczl93gqiAfXPA==
+"@types/react-native@0.64.12":
+  version "0.64.12"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.12.tgz#1c6a3226c26d7a5949cdf8878e6cfe95fe0951d6"
+  integrity sha512-sw6WGSaL219zqrgdb4kQUtFB9iGXC/LmecLZ+UUWEgwYvD0YH81FqWYmONa2HuTkOFAsxu2bK4DspkWRUHIABQ==
   dependencies:
     "@types/react" "*"