stream-chat-react-native-core 4.4.0-beta.2 → 4.4.0

package/src/components/Attachment/Card.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {
   Image,
   ImageStyle,
+  Linking,
   StyleProp,
   StyleSheet,
   Text,
@@ -13,8 +14,6 @@ import {
 
 import type { Attachment } from 'stream-chat';
 
-import { useGoToURL } from './hooks/useGoToURL';
-
 import {
   MessageContextValue,
   useMessageContext,
@@ -68,6 +67,17 @@ const styles = StyleSheet.create({
   },
 });
 
+const goToURL = (url?: string) => {
+  if (!url) return;
+  Linking.canOpenURL(url).then((supported) => {
+    if (supported) {
+      Linking.openURL(url);
+    } else {
+      console.log(`Don't know how to open URI: ${url}`);
+    }
+  });
+};
+
 export type CardPropsWithContext<
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 > = Attachment<StreamChatGenerics> &
@@ -139,9 +149,7 @@ const CardWithContext = <
 
   const uri = image_url || thumb_url;
 
-  const [error, openURL] = useGoToURL(og_scrape_url || uri);
-
-  const defaultOnPress = () => !error && openURL && openURL();
+  const defaultOnPress = () => goToURL(og_scrape_url || uri);
 
   return (
     <TouchableOpacity

package/src/components/Attachment/FileAttachment.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import {
+  Linking,
   StyleProp,
   StyleSheet,
   Text,
@@ -11,8 +12,6 @@ import {
 
 import type { Attachment } from 'stream-chat';
 
-import { useGoToURL } from './hooks/useGoToURL';
-
 import { AttachmentActions as AttachmentActionsDefault } from '../../components/Attachment/AttachmentActions';
 import { FileIcon as FileIconDefault } from '../../components/Attachment/FileIcon';
 import {
@@ -95,9 +94,7 @@ const FileAttachmentWithContext = <
     },
   } = useTheme();
 
-  const [error, openURL] = useGoToURL(attachment.asset_url);
-
-  const defaultOnPress = () => !error && openURL && openURL();
+  const defaultOnPress = () => goToURL(attachment.asset_url);
 
   return (
     <TouchableOpacity
@@ -193,4 +190,15 @@ export const getFileSizeDisplayText = (size?: number | string) => {
   return `${Math.floor(Math.floor(size / 10000) / 100)} MB`;
 };
 
+export const goToURL = (url?: string) => {
+  if (!url) return;
+  Linking.canOpenURL(url).then((supported) => {
+    if (supported) {
+      Linking.openURL(url);
+    } else {
+      console.log(`Don't know how to open URI: ${url}`);
+    }
+  });
+};
+
 FileAttachment.displayName = 'FileAttachment{messageSimple{file}}';

package/src/components/Attachment/__tests__/Attachment.test.js

@@ -1,8 +1,5 @@
 import React from 'react';
 
-import { Linking } from 'react-native';
-
-import { act, renderHook } from '@testing-library/react-hooks';
 import { fireEvent, render, waitFor } from '@testing-library/react-native';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -18,7 +15,6 @@ import {
 import { generateMessage } from '../../../mock-builders/generator/message';
 import { Attachment } from '../Attachment';
 import { AttachmentActions } from '../AttachmentActions';
-import { useGoToURL } from '../hooks/useGoToURL';
 
 const getAttachmentComponent = (props) => {
   const message = generateMessage();
@@ -124,39 +120,4 @@ describe('Attachment', () => {
       expect(getByTestId('card-attachment')).toBeTruthy();
     });
   });
-
-  it('should open the URL in the browser', async () => {
-    jest.spyOn(Linking, 'canOpenURL').mockImplementation(jest.fn().mockResolvedValue(true));
-
-    jest.spyOn(Linking, 'openURL').mockImplementation(jest.fn().mockResolvedValue(false));
-
-    const { result, waitFor } = renderHook(() => useGoToURL('www.google.com'));
-
-    const [error, openURL] = result.current;
-
-    await act(openURL);
-
-    await waitFor(() => {
-      expect(Linking.canOpenURL).toHaveBeenCalled();
-      expect(error).not.toBeTruthy();
-      expect(Linking.openURL).toHaveBeenCalled();
-    });
-  });
-
-  it('should open the URL in the browser when no url', async () => {
-    jest.spyOn(Linking, 'canOpenURL').mockImplementation(jest.fn().mockResolvedValue(false));
-
-    jest.spyOn(Linking, 'openURL').mockImplementation(jest.fn().mockResolvedValue(true));
-
-    const { result, waitForNextUpdate } = await renderHook(() => useGoToURL());
-    const [error, openURL] = result.current;
-
-    act(openURL);
-
-    await waitForNextUpdate(() => {
-      expect(Linking.canOpenURL).toHaveBeenCalled();
-      expect(error).toBeTruthy();
-      expect(Linking.openURL).not.toHaveBeenCalled();
-    });
-  });
 });

package/src/components/Message/MessageSimple/utils/renderText.tsx

@@ -147,16 +147,10 @@ export const renderText = <
     },
   };
 
-  const onLink = (url: string) => {
-    const pattern = new RegExp(/^\S+:\/\//);
-    if (!pattern.test(url)) {
-      url = 'http://' + url;
-    }
-
-    return onLinkParams
+  const onLink = (url: string) =>
+    onLinkParams
       ? onLinkParams(url)
       : Linking.canOpenURL(url).then((canOpenUrl) => canOpenUrl && Linking.openURL(url));
-  };
 
   const link: ReactNodeOutput = (node, output, { ...state }) => {
     const onPress = (event: GestureResponderEvent) => {

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.4.0-beta.2"
+  "version": "4.4.0"
 }

package/lib/commonjs/components/Attachment/hooks/useGoToURL.js

@@ -1,42 +0,0 @@
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useGoToURL = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _react = require("react");
-
-var _reactNative = require("react-native");
-
-var useGoToURL = function useGoToURL(url) {
-  var _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      error = _useState2[0],
-      setError = _useState2[1];
-
-  var finalUrl = url;
-  var pattern = new RegExp(/^\S+:\/\//);
-
-  if (!pattern.test(finalUrl)) {
-    finalUrl = 'http://' + url;
-  }
-
-  var openURL = function openURL() {
-    return _reactNative.Linking.canOpenURL(finalUrl).then(function (supported) {
-      if (supported) {
-        _reactNative.Linking.openURL(finalUrl);
-      } else {
-        setError(true);
-        console.log("Don't know how to open URI: " + finalUrl);
-      }
-    });
-  };
-
-  return [error, openURL];
-};
-
-exports.useGoToURL = useGoToURL;
-//# sourceMappingURL=useGoToURL.js.map

package/lib/commonjs/components/Attachment/hooks/useGoToURL.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["useGoToURL.ts"],"names":["useGoToURL","url","error","setError","finalUrl","pattern","RegExp","test","openURL","Linking","canOpenURL","then","supported","console","log"],"mappings":";;;;;;;;;AAAA;;AACA;;AAIO,IAAMA,UAA0B,GAAG,SAA7BA,UAA6B,CAACC,GAAD,EAAkB;AAC1D,kBAA0B,qBAAkB,KAAlB,CAA1B;AAAA;AAAA,MAAOC,KAAP;AAAA,MAAcC,QAAd;;AAEA,MAAIC,QAAQ,GAAGH,GAAf;AACA,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAW,WAAX,CAAhB;;AAEA,MAAI,CAACD,OAAO,CAACE,IAAR,CAAaH,QAAb,CAAL,EAA6B;AAC3BA,IAAAA,QAAQ,GAAG,YAAYH,GAAvB;AACD;;AAED,MAAMO,OAAO,GAAG,SAAVA,OAAU;AAAA,WACdC,qBAAQC,UAAR,CAAmBN,QAAnB,EAA6BO,IAA7B,CAAkC,UAACC,SAAD,EAAe;AAC/C,UAAIA,SAAJ,EAAe;AACbH,6BAAQD,OAAR,CAAgBJ,QAAhB;AACD,OAFD,MAEO;AACLD,QAAAA,QAAQ,CAAC,IAAD,CAAR;AACAU,QAAAA,OAAO,CAACC,GAAR,kCAA2CV,QAA3C;AACD;AACF,KAPD,CADc;AAAA,GAAhB;;AAUA,SAAO,CAACF,KAAD,EAAQM,OAAR,CAAP;AACD,CArBM","sourcesContent":["import { useState } from 'react';\nimport { Linking } from 'react-native';\n\nexport type UseGoToURLType = (url?: string) => [boolean, () => Promise<void>];\n\nexport const useGoToURL: UseGoToURLType = (url?: string) => {\n  const [error, setError] = useState<boolean>(false);\n\n  let finalUrl = url as string;\n  const pattern = new RegExp(/^\\S+:\\/\\//);\n\n  if (!pattern.test(finalUrl)) {\n    finalUrl = 'http://' + url;\n  }\n\n  const openURL = () =>\n    Linking.canOpenURL(finalUrl).then((supported) => {\n      if (supported) {\n        Linking.openURL(finalUrl);\n      } else {\n        setError(true);\n        console.log(`Don't know how to open URI: ${finalUrl}`);\n      }\n    });\n\n  return [error, openURL];\n};\n"]}

package/lib/module/components/Attachment/hooks/useGoToURL.js

@@ -1,42 +0,0 @@
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useGoToURL = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _react = require("react");
-
-var _reactNative = require("react-native");
-
-var useGoToURL = function useGoToURL(url) {
-  var _useState = (0, _react.useState)(false),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-      error = _useState2[0],
-      setError = _useState2[1];
-
-  var finalUrl = url;
-  var pattern = new RegExp(/^\S+:\/\//);
-
-  if (!pattern.test(finalUrl)) {
-    finalUrl = 'http://' + url;
-  }
-
-  var openURL = function openURL() {
-    return _reactNative.Linking.canOpenURL(finalUrl).then(function (supported) {
-      if (supported) {
-        _reactNative.Linking.openURL(finalUrl);
-      } else {
-        setError(true);
-        console.log("Don't know how to open URI: " + finalUrl);
-      }
-    });
-  };
-
-  return [error, openURL];
-};
-
-exports.useGoToURL = useGoToURL;
-//# sourceMappingURL=useGoToURL.js.map

package/lib/module/components/Attachment/hooks/useGoToURL.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["useGoToURL.ts"],"names":["useGoToURL","url","error","setError","finalUrl","pattern","RegExp","test","openURL","Linking","canOpenURL","then","supported","console","log"],"mappings":";;;;;;;;;AAAA;;AACA;;AAIO,IAAMA,UAA0B,GAAG,SAA7BA,UAA6B,CAACC,GAAD,EAAkB;AAC1D,kBAA0B,qBAAkB,KAAlB,CAA1B;AAAA;AAAA,MAAOC,KAAP;AAAA,MAAcC,QAAd;;AAEA,MAAIC,QAAQ,GAAGH,GAAf;AACA,MAAMI,OAAO,GAAG,IAAIC,MAAJ,CAAW,WAAX,CAAhB;;AAEA,MAAI,CAACD,OAAO,CAACE,IAAR,CAAaH,QAAb,CAAL,EAA6B;AAC3BA,IAAAA,QAAQ,GAAG,YAAYH,GAAvB;AACD;;AAED,MAAMO,OAAO,GAAG,SAAVA,OAAU;AAAA,WACdC,qBAAQC,UAAR,CAAmBN,QAAnB,EAA6BO,IAA7B,CAAkC,UAACC,SAAD,EAAe;AAC/C,UAAIA,SAAJ,EAAe;AACbH,6BAAQD,OAAR,CAAgBJ,QAAhB;AACD,OAFD,MAEO;AACLD,QAAAA,QAAQ,CAAC,IAAD,CAAR;AACAU,QAAAA,OAAO,CAACC,GAAR,kCAA2CV,QAA3C;AACD;AACF,KAPD,CADc;AAAA,GAAhB;;AAUA,SAAO,CAACF,KAAD,EAAQM,OAAR,CAAP;AACD,CArBM","sourcesContent":["import { useState } from 'react';\nimport { Linking } from 'react-native';\n\nexport type UseGoToURLType = (url?: string) => [boolean, () => Promise<void>];\n\nexport const useGoToURL: UseGoToURLType = (url?: string) => {\n  const [error, setError] = useState<boolean>(false);\n\n  let finalUrl = url as string;\n  const pattern = new RegExp(/^\\S+:\\/\\//);\n\n  if (!pattern.test(finalUrl)) {\n    finalUrl = 'http://' + url;\n  }\n\n  const openURL = () =>\n    Linking.canOpenURL(finalUrl).then((supported) => {\n      if (supported) {\n        Linking.openURL(finalUrl);\n      } else {\n        setError(true);\n        console.log(`Don't know how to open URI: ${finalUrl}`);\n      }\n    });\n\n  return [error, openURL];\n};\n"]}

package/lib/typescript/components/Attachment/hooks/useGoToURL.d.ts

@@ -1,2 +0,0 @@
-export declare type UseGoToURLType = (url?: string) => [boolean, () => Promise<void>];
-export declare const useGoToURL: UseGoToURLType;

package/src/components/Attachment/hooks/useGoToURL.ts

@@ -1,27 +0,0 @@
-import { useState } from 'react';
-import { Linking } from 'react-native';
-
-export type UseGoToURLType = (url?: string) => [boolean, () => Promise<void>];
-
-export const useGoToURL: UseGoToURLType = (url?: string) => {
-  const [error, setError] = useState<boolean>(false);
-
-  let finalUrl = url as string;
-  const pattern = new RegExp(/^\S+:\/\//);
-
-  if (!pattern.test(finalUrl)) {
-    finalUrl = 'http://' + url;
-  }
-
-  const openURL = () =>
-    Linking.canOpenURL(finalUrl).then((supported) => {
-      if (supported) {
-        Linking.openURL(finalUrl);
-      } else {
-        setError(true);
-        console.log(`Don't know how to open URI: ${finalUrl}`);
-      }
-    });
-
-  return [error, openURL];
-};