Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ export const CommandsMenu = () => {
const channelConfig = messageComposer.channel.getConfig();
const commands = useMemo<(CommandResponse & { name: string })[]>(
() =>
(channelConfig?.commands ?? []).filter(
(command): command is CommandResponse & { name: string } => !!command.name,
),
(channelConfig?.commands ?? [])
.filter(
(command): command is CommandResponse & { name: string } => !!command.name,
)
.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
[channelConfig],
);

Expand Down
3 changes: 2 additions & 1 deletion src/components/Reactions/ReactionsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ const UnMemoizedReactionsList = (props: ReactionsListProps) => {
null,
);
const { t } = useTranslationContext('ReactionsList');
const { MessageReactionsDetail = DefaultMessageReactionsDetail } = useComponentContext();
const { MessageReactionsDetail = DefaultMessageReactionsDetail } =
useComponentContext();
const { isMyMessage, message } = useMessageContext('ReactionsList');

const divRef = useRef<ComponentRef<'div'>>(null);
Expand Down
3 changes: 2 additions & 1 deletion src/components/Reactions/hooks/useProcessReactions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ export const useProcessReactions = (params: UseProcessReactionsParams) => {
const hasReactions = existingReactions.length > 0;

const totalReactionCount = useMemo(
() => Object.values(reactionGroups ?? {}).reduce((total, { count }) => total + count, 0),
() =>
Object.values(reactionGroups ?? {}).reduce((total, { count }) => total + count, 0),

[reactionGroups],
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,15 @@ export const SuggestionList = ({

const contextMenuItems = useMemo<ContextMenuItemComponent[]>(() => {
if (!component) return [];
return (items ?? []).map((item, i) => {
const sortedItems =
suggestions?.searchSource.type === 'commands'
? [...(items ?? [])].sort((a, b) =>
String((a as { name?: string }).name ?? '').localeCompare(
String((b as { name?: string }).name ?? ''),
),
)
: (items ?? []);
return sortedItems.map((item, i) => {
const Item: ContextMenuItemComponent = ({
closeMenu: _, // eslint-disable-line @typescript-eslint/no-unused-vars
openSubmenu: __, //eslint-disable-line @typescript-eslint/no-unused-vars
Expand All @@ -141,6 +149,7 @@ export const SuggestionList = ({
focusedItemIndex,
setFocusedItemIndex,
AutocompleteSuggestionItem,
suggestions?.searchSource.type,
]);

const ItemsWrapper = useCallback(
Expand Down
Loading