Skip to content

Commit ee42915

Browse files
bang9bang9
committed
chore: moved default queries to params default value
1 parent 3693856 commit ee42915

10 files changed

+82
-40
lines changed

‎packages/uikit-react-native/src/fragments/createGroupChannelBannedUsersFragment.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
import { useUserList } from '@sendbird/uikit-chat-hooks';
44
import { useActionMenu } from '@sendbird/uikit-react-native-foundation';
5-
import { NOOP, useFreshCallback } from '@sendbird/uikit-utils';
5+
import { useFreshCallback } from '@sendbird/uikit-utils';
66

77
import StatusComposition from '../components/StatusComposition';
88
import UserActionBar from '../components/UserActionBar';
@@ -18,14 +18,17 @@ const createGroupChannelBannedUsersFragment = (
1818
): GroupChannelBannedUsersFragment => {
1919
const GroupChannelBannedUsersModule = createGroupChannelBannedUsersModule(initModule);
2020

21-
return ({ onPressHeaderLeft = NOOP, channel, renderUser, queryCreator }) => {
21+
return ({
22+
onPressHeaderLeft,
23+
channel,
24+
renderUser,
25+
queryCreator = () => channel.createBannedUserListQuery({ limit: 20 }),
26+
}) => {
2227
const { STRINGS } = useLocalization();
2328
const { currentUser, sdk } = useSendbirdChat();
2429
const { openMenu } = useActionMenu();
2530

26-
const { users, deleteUser, loading, next, refresh, error } = useUserList(sdk, {
27-
queryCreator: queryCreator ?? (() => channel.createBannedUserListQuery({ limit: 20 })),
28-
});
31+
const { users, deleteUser, loading, next, refresh, error } = useUserList(sdk, { queryCreator });
2932

3033
const _renderUser: NonNullable<typeof renderUser> = useFreshCallback((props) => {
3134
if (renderUser) return renderUser(props);

‎packages/uikit-react-native/src/fragments/createGroupChannelMembersFragment.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ const createGroupChannelMembersFragment = (
2020
): GroupChannelMembersFragment => {
2121
const UserListModule = createUserListModule<SendbirdMember>(initModule);
2222

23-
return ({ channel, onPressHeaderLeft, onPressHeaderRight, renderUser, queryCreator }) => {
23+
return ({
24+
channel,
25+
onPressHeaderLeft,
26+
onPressHeaderRight,
27+
renderUser,
28+
sortComparator,
29+
queryCreator = () => channel.createMemberListQuery({ limit: 20 }),
30+
}) => {
2431
const handlerId = useUniqHandlerId('GroupChannelMembersFragment');
2532

2633
const refreshSchedule = useRef<NodeJS.Timeout>();
@@ -30,7 +37,8 @@ const createGroupChannelMembersFragment = (
3037
const { show } = useUserProfile();
3138

3239
const { users, refresh, loading, next, error, upsertUser, deleteUser } = useUserList(sdk, {
33-
queryCreator: queryCreator ?? (() => channel.createMemberListQuery({ limit: 20 })),
40+
queryCreator,
41+
sortComparator,
3442
});
3543

3644
useChannelHandler(sdk, handlerId, {

‎packages/uikit-react-native/src/fragments/createGroupChannelMutedMembersFragment.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ const createGroupChannelMutedMembersFragment = (
1818
): GroupChannelMutedMembersFragment => {
1919
const GroupChannelMutedMembersModule = createGroupChannelMutedMembersModule(initModule);
2020

21-
return ({ onPressHeaderLeft = NOOP, channel, renderUser, queryCreator }) => {
21+
return ({
22+
onPressHeaderLeft = NOOP,
23+
channel,
24+
renderUser,
25+
queryCreator = () => channel.createMutedUserListQuery({ limit: 20 }),
26+
}) => {
2227
const handlerId = useUniqHandlerId('GroupChannelMutedMembersFragment');
2328

2429
const { STRINGS } = useLocalization();
2530
const { sdk, currentUser } = useSendbirdChat();
2631
const { openMenu } = useActionMenu();
2732

28-
const { users, deleteUser, upsertUser, loading, refresh, error, next } = useUserList(sdk, {
29-
queryCreator: queryCreator ?? (() => channel.createMutedUserListQuery({ limit: 20 })),
30-
});
33+
const { users, deleteUser, upsertUser, loading, refresh, error, next } = useUserList(sdk, { queryCreator });
3134

3235
useChannelHandler(sdk, handlerId, {
3336
onUserMuted(eventChannel, user) {

‎packages/uikit-react-native/src/fragments/createGroupChannelOperatorsFragment.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,21 @@ const createGroupChannelOperatorsFragment = (
1515
): GroupChannelOperatorsFragment => {
1616
const GroupChannelOperatorsModule = createGroupChannelOperatorsModule(initModule);
1717

18-
return ({ channel, onPressHeaderLeft, onPressHeaderRight, renderUser, queryCreator }) => {
18+
return ({
19+
channel,
20+
onPressHeaderLeft,
21+
onPressHeaderRight,
22+
renderUser,
23+
queryCreator = () => channel.createOperatorListQuery({ limit: 20 }),
24+
}) => {
1925
const handlerId = useUniqHandlerId('GroupChannelOperatorsFragment');
2026

2127
const { STRINGS } = useLocalization();
2228
const { sdk, currentUser } = useSendbirdChat();
2329
const { openMenu } = useActionMenu();
2430
const { show } = useUserProfile();
2531

26-
const { users, deleteUser, upsertUser, loading, refresh, next, error } = useUserList(sdk, {
27-
queryCreator: queryCreator ?? (() => channel.createOperatorListQuery({ limit: 20 })),
28-
});
32+
const { users, deleteUser, upsertUser, loading, refresh, next, error } = useUserList(sdk, { queryCreator });
2933

3034
useChannelHandler(sdk, handlerId, {
3135
onUserLeft(eventChannel, user) {

‎packages/uikit-react-native/src/fragments/createGroupChannelRegisterOperatorFragment.tsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ const createGroupChannelRegisterOperatorFragment = (
1616
): GroupChannelRegisterOperatorFragment => {
1717
const UserListModule = createUserListModule<SendbirdMember>(initModule);
1818

19-
return ({ channel, onPressHeaderLeft, sortComparator, renderUser, onPressHeaderRight, queryCreator }) => {
19+
return ({
20+
channel,
21+
onPressHeaderLeft,
22+
sortComparator,
23+
renderUser,
24+
onPressHeaderRight,
25+
queryCreator = () => channel.createMemberListQuery({ limit: 20 }),
26+
}) => {
2027
const { sdk, currentUser } = useSendbirdChat();
2128
const { STRINGS } = useLocalization();
22-
const { users, refreshing, refresh, next, error, loading } = useUserList(sdk, {
23-
queryCreator: queryCreator ?? (() => channel.createMemberListQuery({ limit: 20 })),
24-
sortComparator,
25-
});
29+
const { users, refreshing, refresh, next, error, loading } = useUserList(sdk, { queryCreator, sortComparator });
2630

2731
const _renderUser: NonNullable<typeof renderUser> = useCallback(
2832
(user, selectedUsers, setSelectedUsers) => {

‎packages/uikit-react-native/src/fragments/createOpenChannelBannedUsersFragment.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22

33
import { useUserList } from '@sendbird/uikit-chat-hooks';
44
import { useActionMenu } from '@sendbird/uikit-react-native-foundation';
5-
import { NOOP, useFreshCallback } from '@sendbird/uikit-utils';
5+
import { useFreshCallback } from '@sendbird/uikit-utils';
66

77
import StatusComposition from '../components/StatusComposition';
88
import UserActionBar from '../components/UserActionBar';
@@ -18,14 +18,17 @@ const createOpenChannelBannedUsersFragment = (
1818
): OpenChannelBannedUsersFragment => {
1919
const OpenChannelBannedUsersModule = createOpenChannelBannedUsersModule(initModule);
2020

21-
return ({ onPressHeaderLeft = NOOP, channel, renderUser, queryCreator }) => {
21+
return ({
22+
onPressHeaderLeft,
23+
channel,
24+
renderUser,
25+
queryCreator = () => channel.createBannedUserListQuery({ limit: 20 }),
26+
}) => {
2227
const { STRINGS } = useLocalization();
2328
const { currentUser, sdk } = useSendbirdChat();
2429
const { openMenu } = useActionMenu();
2530

26-
const { users, deleteUser, loading, next, refresh, error } = useUserList(sdk, {
27-
queryCreator: queryCreator ?? (() => channel.createBannedUserListQuery({ limit: 20 })),
28-
});
31+
const { users, deleteUser, loading, next, refresh, error } = useUserList(sdk, { queryCreator });
2932

3033
const _renderUser: NonNullable<typeof renderUser> = useFreshCallback((props) => {
3134
if (renderUser) return renderUser(props);

‎packages/uikit-react-native/src/fragments/createOpenChannelMutedParticipantsFragment.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ const createOpenChannelMutedParticipantsFragment = (
1818
): OpenChannelMutedParticipantsFragment => {
1919
const OpenChannelMutedParticipantsModule = createOpenChannelMutedParticipantsModule(initModule);
2020

21-
return ({ onPressHeaderLeft = NOOP, channel, renderUser, queryCreator }) => {
21+
return ({
22+
onPressHeaderLeft = NOOP,
23+
channel,
24+
renderUser,
25+
queryCreator = () => channel.createMutedUserListQuery({ limit: 20 }),
26+
}) => {
2227
const handlerId = useUniqHandlerId('OpenChannelMutedParticipants');
2328

2429
const { STRINGS } = useLocalization();
2530
const { sdk, currentUser } = useSendbirdChat();
2631
const { openMenu } = useActionMenu();
2732

28-
const { users, deleteUser, upsertUser, loading, refresh, error, next } = useUserList(sdk, {
29-
queryCreator: queryCreator ?? (() => channel.createMutedUserListQuery({ limit: 20 })),
30-
});
33+
const { users, deleteUser, upsertUser, loading, refresh, error, next } = useUserList(sdk, { queryCreator });
3134

3235
useChannelHandler(
3336
sdk,

‎packages/uikit-react-native/src/fragments/createOpenChannelOperatorsFragment.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,21 @@ const createOpenChannelOperatorsFragment = (
1616
): OpenChannelOperatorsFragment => {
1717
const OpenChannelOperatorsModule = createOpenChannelOperatorsModule(initModule);
1818

19-
return ({ onPressHeaderLeft = NOOP, onPressHeaderRight = NOOP, channel, renderUser, queryCreator }) => {
19+
return ({
20+
onPressHeaderLeft = NOOP,
21+
onPressHeaderRight = NOOP,
22+
channel,
23+
renderUser,
24+
queryCreator = () => channel.createOperatorListQuery({ limit: 20 }),
25+
}) => {
2026
const handlerId = useUniqHandlerId('OpenChannelOperatorsFragment');
2127

2228
const { STRINGS } = useLocalization();
2329
const { sdk, currentUser } = useSendbirdChat();
2430
const { openMenu } = useActionMenu();
2531
const { show } = useUserProfile();
2632

27-
const { users, deleteUser, upsertUser, loading, refresh, next, error } = useUserList(sdk, {
28-
queryCreator: queryCreator ?? (() => channel.createOperatorListQuery({ limit: 20 })),
29-
});
33+
const { users, deleteUser, upsertUser, loading, refresh, next, error } = useUserList(sdk, { queryCreator });
3034

3135
useChannelHandler(
3236
sdk,

‎packages/uikit-react-native/src/fragments/createOpenChannelParticipantsFragment.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ const createOpenChannelParticipantsFragment = (
2020
): OpenChannelParticipantsFragment => {
2121
const UserListModule = createUserListModule<SendbirdParticipant>(initModule);
2222

23-
return ({ channel, onPressHeaderLeft, renderUser, queryCreator, sortComparator }) => {
23+
return ({
24+
channel,
25+
onPressHeaderLeft,
26+
renderUser,
27+
sortComparator,
28+
queryCreator = () => channel.createParticipantListQuery({ limit: 20 }),
29+
}) => {
2430
const handlerId = useUniqHandlerId('OpenChannelParticipantsFragment');
2531

2632
const refreshSchedule = useRef<NodeJS.Timeout>();
@@ -30,7 +36,7 @@ const createOpenChannelParticipantsFragment = (
3036
const { show } = useUserProfile();
3137

3238
const { users, refresh, loading, next, error, upsertUser, deleteUser } = useUserList(sdk, {
33-
queryCreator: queryCreator ?? (() => channel.createParticipantListQuery({ limit: 20 })),
39+
queryCreator,
3440
sortComparator,
3541
});
3642

‎packages/uikit-react-native/src/fragments/createOpenChannelRegisterOperatorFragment.tsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ const createOpenChannelRegisterOperatorFragment = (
1616
): OpenChannelRegisterOperatorFragment => {
1717
const UserListModule = createUserListModule<SendbirdParticipant>(initModule);
1818

19-
return ({ channel, onPressHeaderLeft, sortComparator, renderUser, onPressHeaderRight, queryCreator }) => {
19+
return ({
20+
channel,
21+
onPressHeaderLeft,
22+
sortComparator,
23+
renderUser,
24+
onPressHeaderRight,
25+
queryCreator = () => channel.createParticipantListQuery({ limit: 20 }),
26+
}) => {
2027
const { sdk, currentUser } = useSendbirdChat();
2128
const { STRINGS } = useLocalization();
22-
const { users, refreshing, refresh, next, error, loading } = useUserList(sdk, {
23-
queryCreator: queryCreator ?? (() => channel.createParticipantListQuery({ limit: 20 })),
24-
sortComparator,
25-
});
29+
const { users, refreshing, refresh, next, error, loading } = useUserList(sdk, { queryCreator, sortComparator });
2630

2731
const _renderUser: NonNullable<typeof renderUser> = useCallback(
2832
(user, selectedUsers, setSelectedUsers) => {

0 commit comments

Comments
 (0)