Merge branch 'master' into vishal/docs-fix

Author: Amin Mahboubi

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [3.0.0](https://github.com/GetStream/stream-chat-react/releases/tag/v3.0.0) 2020-09-30
+
+### BREAKING CHANGES
+
+- Image component renamed to ImageComponent [#554](https://github.com/GetStream/stream-chat-react/pull/554)
+
+## [2.6.2](https://github.com/GetStream/stream-chat-react/releases/tag/v2.6.2) 2020-09-29
+
+### Fix
+
+- Fixed several type issues [#552](https://github.com/GetStream/stream-chat-react/pull/552)
+
+## [2.6.1](https://github.com/GetStream/stream-chat-react/releases/tag/v2.6.1) 2020-09-29
+
+### Fix
+
+- Fixed an issue with MessageLivestream where mutes and flags were not happening [#551](https://github.com/GetStream/stream-chat-react/pull/551)
+
 ## [2.6.0](https://github.com/GetStream/stream-chat-react/releases/tag/v2.6.0) 2020-09-29
 
 ### Feature

docs/build/bundle.852685aa.js

@@ -1,6 +1,6 @@
 {
   "name": "stream-chat-react",
-  "version": "2.6.0",
+  "version": "3.0.0",
   "description": "React components to create chat conversations or livestream style chat",
   "author": "GetStream",
   "homepage": "https://getstream.io/chat/",

docs/build/bundle.852685aa.js.LICENSE.txt

@@ -10,7 +10,10 @@ import DefaultAudio from './Audio';
 import DefaultCard from './Card';
 import DefaultFile from './FileAttachment';
 
-import { Image as DefaultImage, Gallery as DefaultGallery } from '../Gallery';
+import {
+  ImageComponent as DefaultImage,
+  Gallery as DefaultGallery,
+} from '../Gallery';
 
 export const SUPPORTED_VIDEO_FORMATS = [
   'video/mp4',
@@ -127,7 +130,7 @@ export const renderAttachmentActions = (props) => {
 export const renderGallery = (props) => {
   const { attachment: a, Gallery } = props;
   return renderAttachmentWithinContainer(
-    <Gallery images={a.images} key="gallery" />,
+    <Gallery images={a.images || []} key="gallery" />,
     a,
     'gallery',
   );

package.json

@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';
 import { MAX_QUERY_CHANNELS_LIMIT } from '../utils';
 /**
  * @typedef {import('stream-chat').Channel} Channel
- * @param {import('stream-chat').StreamChat} client
+ * @param {import('types').StreamChatReactClient} client
  * @param {import('stream-chat').ChannelFilters} filters
  * @param {import('stream-chat').ChannelSort} [sort]
  * @param {import('stream-chat').ChannelOptions} [options]

src/components/Attachment/Attachment.js

@@ -22,7 +22,7 @@ export const moveChannelUp = (cid, channels) => {
 };
 
 /**
- * @param {import('stream-chat').StreamChat} client
+ * @param {import('types').StreamChatReactClient} client
  * @param {string} type
  * @param {string} id
  */

src/components/ChannelList/hooks/usePaginatedChannels.js

@@ -11,7 +11,7 @@ import { sanitizeUrl } from '@braintree/sanitize-url';
  * @example ../../docs/Image.md
  * @extends {React.PureComponent<import('type').ImageProps>}
  */
-class Image extends React.PureComponent {
+class ImageComponent extends React.PureComponent {
   static propTypes = {
     /** The full size image url */
     image_url: PropTypes.string,
@@ -56,4 +56,4 @@ class Image extends React.PureComponent {
   }
 }
 
-export default Image;
+export default ImageComponent;

src/components/ChannelList/utils.js

@@ -5,23 +5,27 @@ import { cleanup, render, fireEvent, waitFor } from '@testing-library/react';
 
 import '@testing-library/jest-dom';
 
-import Image from '../Image';
+import ImageComponent from '../Image';
 
 const mockImageAssets = 'https://placeimg.com/640/480/any';
 
 afterEach(cleanup); // eslint-disable-line
 
 describe('Image', () => {
   it('should render component with default props', () => {
-    const tree = renderer.create(<Image images={mockImageAssets} />).toJSON();
+    const tree = renderer
+      .create(<ImageComponent images={mockImageAssets} />)
+      .toJSON();
     expect(tree).toMatchSnapshot();
   });
 
   describe('it should prevent unsafe image uri protocols in the rendered image src', () => {
     it('should prevent javascript protocol in image src', () => {
       // eslint-disable-next-line no-script-url
       const xssJavascriptUri = 'javascript:alert("p0wn3d")';
-      const { getByTestId } = render(<Image image_url={xssJavascriptUri} />);
+      const { getByTestId } = render(
+        <ImageComponent image_url={xssJavascriptUri} />,
+      );
       expect(getByTestId('image-test')).not.toHaveAttribute(
         'src',
         xssJavascriptUri,
@@ -30,28 +34,30 @@ describe('Image', () => {
     it('should prevent javascript protocol in thumbnail src', () => {
       // eslint-disable-next-line no-script-url
       const xssJavascriptUri = 'javascript:alert("p0wn3d")';
-      const { getByTestId } = render(<Image thumb_url={xssJavascriptUri} />);
+      const { getByTestId } = render(
+        <ImageComponent thumb_url={xssJavascriptUri} />,
+      );
       expect(getByTestId('image-test')).not.toHaveAttribute(
         'src',
         xssJavascriptUri,
       );
     });
     it('should prevent dataUris in image src', () => {
       const xssDataUri = 'data:image/svg+xml;base64,DANGEROUSENCODEDSVG';
-      const { getByTestId } = render(<Image image_url={xssDataUri} />);
+      const { getByTestId } = render(<ImageComponent image_url={xssDataUri} />);
       expect(getByTestId('image-test')).not.toHaveAttribute('src', xssDataUri);
     });
     it('should prevent dataUris in thumb src', () => {
       const xssDataUri = 'data:image/svg+xml;base64,DANGEROUSENCODEDSVG';
-      const { getByTestId } = render(<Image thumb_url={xssDataUri} />);
+      const { getByTestId } = render(<ImageComponent thumb_url={xssDataUri} />);
       expect(getByTestId('image-test')).not.toHaveAttribute('src', xssDataUri);
     });
   });
 
   it('should open modal on image click', async () => {
     jest.spyOn(console, 'warn').mockImplementation(() => null);
     const { getByTestId, getByTitle } = render(
-      <Image images={mockImageAssets} />,
+      <ImageComponent images={mockImageAssets} />,
     );
     fireEvent.click(getByTestId('image-test'));
 

src/components/Gallery/Image.js

@@ -1,4 +1,4 @@
 export { default as Gallery } from './Gallery';
-export { default as Image } from './Image';
+export { default as ImageComponent } from './Image';
 export { default as ModalImage } from './ModalImage';
 export { default as ModalWrapper } from './ModalWrapper';