refactor: access methods directly

microlinkhq · Oct 10, 2019 · 8a41cee · 8a41cee
1 parent b43785b
commit 8a41cee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/packages/react/src/index.js b/packages/react/src/index.js
@@ -68,16 +68,19 @@ function Microlink (props) {
     [isLazyEnabled, hasIntersected]
   )
 
-  const fetchData = useCallback(() => {
-    if (canFetchData) {
-      setLoading(true)
-      const fetch = isFunction(setData)
-        ? Promise.resolve({})
-        : fetchFromApi(props.url, apiUrl, apiUrlProps)
-
-      fetch.then(({ data }) => mergeData(data))
-    }
-  }, [apiUrl, canFetchData, setData, apiUrlProps])
+  const fetchData = useCallback(
+    () => {
+      if (canFetchData) {
+        setLoading(true)
+        const fetch = isFunction(setData)
+          ? Promise.resolve({})
+          : fetchFromApi(props.url, apiUrl, apiUrlProps)
+
+        fetch.then(({ data }) => mergeData(data))
+      }
+    },
+    [apiUrl, canFetchData, setData, apiUrlProps.headers['x-api-key']]
+  )
 
   const mergeData = useCallback(
     fetchData => {

diff --git a/packages/react/src/utils/index.js b/packages/react/src/utils/index.js
@@ -1,5 +1,5 @@
 import { css } from 'styled-components'
-import mql from '@microlink/mql'
+import { fetchFromApi, getApiUrl as createApiUrl } from '@microlink/mql'
 
 const REGEX_HTTPS = /^https/
 const REGEX_LOCALHOST = /http:\/\/localhost/
@@ -38,7 +38,7 @@ export const getApiUrl = ({
   media,
   ...opts
 }) =>
-  mql.getApiUrl(url, {
+  createApiUrl(url, {
     apiKey,
     video: media.includes('video'),
     screenshot: media.includes('screenshot'),
@@ -47,7 +47,7 @@ export const getApiUrl = ({
     ...opts
   })
 
-export const fetchFromApi = mql.fetchFromApi
+export { fetchFromApi }
 
 export const isLarge = cardSize => cardSize === 'large'