Skip to content

Commit fa943f4

Browse files
committed
fix: lint issues
1 parent 27ab445 commit fa943f4

File tree

9 files changed

+45
-43
lines changed

9 files changed

+45
-43
lines changed

package/src/components/ChannelList/ChannelList.tsx

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { ChannelListMessenger, ChannelListMessengerProps } from './ChannelListMe
1212
import { useAddedToChannelNotification } from './hooks/listeners/useAddedToChannelNotification';
1313
import { useChannelDeleted } from './hooks/listeners/useChannelDeleted';
1414
import { useChannelHidden } from './hooks/listeners/useChannelHidden';
15+
import { useChannelMemberUpdated } from './hooks/listeners/useChannelMemberUpdated';
1516
import { useChannelTruncated } from './hooks/listeners/useChannelTruncated';
1617
import { useChannelUpdated } from './hooks/listeners/useChannelUpdated';
1718
import { useChannelVisible } from './hooks/listeners/useChannelVisible';
@@ -33,7 +34,6 @@ import type { DefaultStreamChatGenerics } from '../../types/types';
3334
import { ChannelPreviewMessenger } from '../ChannelPreview/ChannelPreviewMessenger';
3435
import { EmptyStateIndicator as EmptyStateIndicatorDefault } from '../Indicators/EmptyStateIndicator';
3536
import { LoadingErrorIndicator as LoadingErrorIndicatorDefault } from '../Indicators/LoadingErrorIndicator';
36-
import { useChannelMemberUpdated } from './hooks/listeners/useChannelMemberUpdated';
3737

3838
export type ChannelListProps<
3939
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
@@ -125,6 +125,22 @@ export type ChannelListProps<
125125
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
126126
event: Event<StreamChatGenerics>,
127127
) => void;
128+
/**
129+
* Function that overrides default behavior when a channel member.updated event is triggered
130+
* @param lockChannelOrder If set to true, channels won't dynamically sort by most recent message, defaults to false
131+
* @param setChannels Setter for internal state property - `channels`. It's created from useState() hook.
132+
* @param event An [Event object](https://getstream.io/chat/docs/event_object) corresponding to `member.updated` event
133+
* @param filters Channel filters
134+
* @param sort Channel sort options
135+
* @overrideType Function
136+
*/
137+
onChannelMemberUpdated?: (
138+
lockChannelOrder: boolean,
139+
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
140+
event: Event<StreamChatGenerics>,
141+
filters?: ChannelFilters<StreamChatGenerics>,
142+
sort?: ChannelSort<StreamChatGenerics>,
143+
) => void;
128144
/**
129145
* Function to customize behavior when a channel gets truncated
130146
*
@@ -194,6 +210,7 @@ export type ChannelListProps<
194210
event: Event<StreamChatGenerics>,
195211
filters?: ChannelFilters<StreamChatGenerics>,
196212
) => void;
213+
197214
/**
198215
* Function that overrides default behavior when a user gets removed from a channel
199216
*
@@ -206,23 +223,6 @@ export type ChannelListProps<
206223
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
207224
event: Event<StreamChatGenerics>,
208225
) => void;
209-
210-
/**
211-
* Function that overrides default behavior when a channel member.updated event is triggered
212-
* @param lockChannelOrder If set to true, channels won't dynamically sort by most recent message, defaults to false
213-
* @param setChannels Setter for internal state property - `channels`. It's created from useState() hook.
214-
* @param event An [Event object](https://getstream.io/chat/docs/event_object) corresponding to `member.updated` event
215-
* @param filters Channel filters
216-
* @param sort Channel sort options
217-
* @overrideType Function
218-
*/
219-
onChannelMemberUpdated?: (
220-
lockChannelOrder: boolean,
221-
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
222-
event: Event<StreamChatGenerics>,
223-
filters?: ChannelFilters<StreamChatGenerics>,
224-
sort?: ChannelSort<StreamChatGenerics>,
225-
) => void;
226226
/**
227227
* Object containing channel query options
228228
* @see See [Channel query documentation](https://getstream.io/chat/docs/query_channels) for a list of available option fields
@@ -316,9 +316,9 @@ export const ChannelList = <
316316

317317
// Setup event listeners
318318
useAddedToChannelNotification({
319+
filters,
319320
onAddedToChannel,
320321
setChannels,
321-
filters,
322322
sort,
323323
});
324324

@@ -333,10 +333,10 @@ export const ChannelList = <
333333
});
334334

335335
useChannelMemberUpdated({
336+
filters,
336337
lockChannelOrder,
337-
setChannels,
338338
onChannelMemberUpdated,
339-
filters,
339+
setChannels,
340340
sort,
341341
});
342342

@@ -358,17 +358,17 @@ export const ChannelList = <
358358
});
359359

360360
useNewMessage({
361+
filters,
361362
lockChannelOrder,
362363
onNewMessage,
363364
setChannels,
364-
filters,
365365
sort,
366366
});
367367

368368
useNewMessageNotification({
369+
filters,
369370
onNewMessageNotification,
370371
setChannels,
371-
filters,
372372
});
373373

374374
useRemovedFromChannelNotification({

package/src/components/ChannelList/hooks/listeners/useAddedToChannelNotification.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ import { findLastPinnedChannelIndex, findPinnedAtSortOrder } from '../utils';
1313
type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
1414
{
1515
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
16+
filters?: ChannelFilters<StreamChatGenerics>;
1617
onAddedToChannel?: (
1718
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
1819
event: Event<StreamChatGenerics>,
1920
filters?: ChannelFilters<StreamChatGenerics>,
2021
sort?: ChannelSort<StreamChatGenerics>,
2122
) => void;
22-
filters?: ChannelFilters<StreamChatGenerics>;
2323
sort?: ChannelSort<StreamChatGenerics>;
2424
};
2525

2626
export const useAddedToChannelNotification = <
2727
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
2828
>({
29+
filters,
2930
onAddedToChannel,
3031
setChannels,
31-
filters,
3232
sort,
3333
}: Parameters<StreamChatGenerics>) => {
3434
const { client } = useChatContext<StreamChatGenerics>();

package/src/components/ChannelList/hooks/listeners/useChannelMemberUpdated.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@ type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultSt
1515
{
1616
lockChannelOrder: boolean;
1717
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
18+
filters?: ChannelFilters<StreamChatGenerics>;
1819
onChannelMemberUpdated?: (
1920
lockChannelOrder: boolean,
2021
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
2122
event: Event<StreamChatGenerics>,
2223
filters?: ChannelFilters<StreamChatGenerics>,
2324
sort?: ChannelSort<StreamChatGenerics>,
2425
) => void;
25-
filters?: ChannelFilters<StreamChatGenerics>;
2626
sort?: ChannelSort<StreamChatGenerics>;
2727
};
2828

2929
export const useChannelMemberUpdated = <
3030
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
3131
>({
32+
filters,
3233
lockChannelOrder,
3334
onChannelMemberUpdated,
3435
setChannels,
35-
filters,
3636
sort,
3737
}: Parameters<StreamChatGenerics>) => {
3838
const { client } = useChatContext<StreamChatGenerics>();
3939

4040
useEffect(() => {
41-
const handleEvent = async (event: Event<StreamChatGenerics>) => {
41+
const handleEvent = (event: Event<StreamChatGenerics>) => {
4242
if (typeof onChannelMemberUpdated === 'function') {
4343
onChannelMemberUpdated(lockChannelOrder, setChannels, event, filters, sort);
4444
} else {

package/src/components/ChannelList/hooks/listeners/useNewMessage.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultSt
1212
{
1313
lockChannelOrder: boolean;
1414
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
15+
filters?: ChannelFilters<StreamChatGenerics>;
1516
onNewMessage?: (
1617
lockChannelOrder: boolean,
1718
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
1819
event: Event<StreamChatGenerics>,
1920
filters?: ChannelFilters<StreamChatGenerics>,
2021
sort?: ChannelSort<StreamChatGenerics>,
2122
) => void;
22-
filters?: ChannelFilters<StreamChatGenerics>;
2323
sort?: ChannelSort<StreamChatGenerics>;
2424
};
2525

2626
export const useNewMessage = <
2727
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
2828
>({
29+
filters,
2930
lockChannelOrder,
3031
onNewMessage,
3132
setChannels,
32-
filters,
3333
sort,
3434
}: Parameters<StreamChatGenerics>) => {
3535
const { client } = useChatContext<StreamChatGenerics>();
@@ -81,7 +81,7 @@ export const useNewMessage = <
8181
}
8282
return moveChannelUp<StreamChatGenerics>({
8383
channels,
84-
channelToMove: channelToMove,
84+
channelToMove,
8585
channelToMoveIndexWithinChannels: targetChannelIndex,
8686
sort,
8787
});

package/src/components/ChannelList/hooks/listeners/useNewMessageNotification.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ import { isChannelArchived } from '../utils';
1313
type Parameters<StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics> =
1414
{
1515
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>;
16+
filters?: ChannelFilters<StreamChatGenerics>;
1617
onNewMessageNotification?: (
1718
setChannels: React.Dispatch<React.SetStateAction<Channel<StreamChatGenerics>[] | null>>,
1819
event: Event<StreamChatGenerics>,
1920
filters?: ChannelFilters<StreamChatGenerics>,
2021
) => void;
21-
filters?: ChannelFilters<StreamChatGenerics>;
2222
};
2323

2424
export const useNewMessageNotification = <
2525
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
2626
>({
27+
filters,
2728
onNewMessageNotification,
2829
setChannels,
29-
filters,
3030
}: Parameters<StreamChatGenerics>) => {
3131
const { client } = useChatContext<StreamChatGenerics>();
3232

package/src/components/ChannelList/hooks/useChannelMembershipState.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { useEffect, useState } from 'react';
2+
3+
import { Channel, ChannelState } from 'stream-chat';
4+
25
import { useChatContext } from '../../../contexts/chatContext/ChatContext';
36
import { DefaultStreamChatGenerics } from '../../../types/types';
4-
import { Channel, ChannelState } from 'stream-chat';
57

68
export const useChannelMembershipState = <
79
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
@@ -26,7 +28,7 @@ export const useChannelMembershipState = <
2628
);
2729

2830
return () => subscriptions.forEach((subscription) => subscription.unsubscribe());
29-
}, [channel?.state.membership, client]);
31+
}, [channel, client]);
3032

3133
return membership;
3234
};

package/src/components/ChannelList/hooks/utils/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Channel } from 'stream-chat';
2+
23
import { DefaultStreamChatGenerics } from '../../../../types/types';
34
import { ChannelListProps } from '../../ChannelList';
45

package/src/components/ChannelList/utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import type { Channel, ChannelSort, StreamChat } from 'stream-chat';
22

3-
import type { DefaultStreamChatGenerics } from '../../types/types';
43
import { findLastPinnedChannelIndex, shouldConsiderPinnedChannels } from './hooks/utils';
54

5+
import type { DefaultStreamChatGenerics } from '../../types/types';
6+
67
type MoveParameters<
78
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
89
> = {

package/src/icons/Archieve.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ import Svg, { Path } from 'react-native-svg';
33

44
import { IconProps } from './utils/base';
55

6-
export const Archieve: React.FC<IconProps> = ({ height = 512, width = 512, ...rest }) => {
7-
return (
8-
<Svg height={height} viewBox={'0 0 512 512'} width={width} {...rest}>
9-
<Path d='M32 32l448 0c17.7 0 32 14.3 32 32l0 32c0 17.7-14.3 32-32 32L32 128C14.3 128 0 113.7 0 96L0 64C0 46.3 14.3 32 32 32zm0 128l448 0 0 256c0 35.3-28.7 64-64 64L96 480c-35.3 0-64-28.7-64-64l0-256zm128 80c0 8.8 7.2 16 16 16l160 0c8.8 0 16-7.2 16-16s-7.2-16-16-16l-160 0c-8.8 0-16 7.2-16 16z' />
10-
</Svg>
11-
);
12-
};
6+
export const Archieve: React.FC<IconProps> = ({ height = 512, width = 512, ...rest }) => (
7+
<Svg height={height} viewBox={'0 0 512 512'} width={width} {...rest}>
8+
<Path d='M32 32l448 0c17.7 0 32 14.3 32 32l0 32c0 17.7-14.3 32-32 32L32 128C14.3 128 0 113.7 0 96L0 64C0 46.3 14.3 32 32 32zm0 128l448 0 0 256c0 35.3-28.7 64-64 64L96 480c-35.3 0-64-28.7-64-64l0-256zm128 80c0 8.8 7.2 16 16 16l160 0c8.8 0 16-7.2 16-16s-7.2-16-16-16l-160 0c-8.8 0-16 7.2-16 16z' />
9+
</Svg>
10+
);

0 commit comments

Comments
 (0)