From 2899d720290ea93e93b997066beea8cd7380f8b6 Mon Sep 17 00:00:00 2001
From: Anton Arnautov <arnautov.anton@gmail.com>
Date: Mon, 20 Feb 2023 13:24:07 +0100
Subject: [PATCH] feat(Reactions): switch options type to array to guarantee
 order

---
 src/components/Reactions/ReactionSelector.tsx | 98 +++++++++----------
 src/components/Reactions/ReactionsList.tsx    |  6 +-
 .../Reactions/SimpleReactionsList.tsx         |  6 +-
 .../Reactions/hooks/useProcessReactions.tsx   |  6 +-
 src/components/Reactions/reactionOptions.tsx  | 26 ++---
 5 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/components/Reactions/ReactionSelector.tsx b/src/components/Reactions/ReactionSelector.tsx
index e4cc4a5b12..45c40ef2aa 100644
--- a/src/components/Reactions/ReactionSelector.tsx
+++ b/src/components/Reactions/ReactionSelector.tsx
@@ -150,57 +150,55 @@ const UnMemoizedReactionSelector = React.forwardRef(
           </div>
         )}
         <ul className='str-chat__message-reactions-list str-chat__message-reactions-options'>
-          {Object.entries(reactionOptions).map(
-            ([reactionType, { Component, name: reactionName }]) => {
-              const latestUser = getLatestUserForReactionType(reactionType);
-              const count = reactionCounts && reactionCounts[reactionType];
-              return (
-                <li key={`item-${reactionType}`}>
-                  <button
-                    aria-label={`Select Reaction: ${reactionName || reactionType}`}
-                    className={clsx(
-                      'str-chat__message-reactions-list-item str-chat__message-reactions-option',
-                      {
-                        'str-chat__message-reactions-option-selected': iHaveReactedWithReaction(
-                          reactionType,
-                        ),
-                      },
-                    )}
-                    data-text={reactionType}
-                    onClick={(event) => handleReaction(reactionType, event)}
-                  >
-                    {!!count && detailedView && (
-                      <div
-                        className='latest-user str-chat__message-reactions-last-user'
-                        onClick={hideTooltip}
-                        onMouseEnter={(e) => showTooltip(e, reactionType)}
-                        onMouseLeave={hideTooltip}
-                      >
-                        {latestUser ? (
-                          <Avatar
-                            image={latestUser.image}
-                            name={latestUser.name}
-                            size={20}
-                            user={latestUser}
-                          />
-                        ) : (
-                          <div className='latest-user-not-found' />
-                        )}
-                      </div>
-                    )}
-                    <span className='str-chat__message-reaction-emoji'>
-                      <Component />
+          {reactionOptions.map(({ Component, name: reactionName, type: reactionType }) => {
+            const latestUser = getLatestUserForReactionType(reactionType);
+            const count = reactionCounts && reactionCounts[reactionType];
+            return (
+              <li key={reactionType}>
+                <button
+                  aria-label={`Select Reaction: ${reactionName || reactionType}`}
+                  className={clsx(
+                    'str-chat__message-reactions-list-item str-chat__message-reactions-option',
+                    {
+                      'str-chat__message-reactions-option-selected': iHaveReactedWithReaction(
+                        reactionType,
+                      ),
+                    },
+                  )}
+                  data-text={reactionType}
+                  onClick={(event) => handleReaction(reactionType, event)}
+                >
+                  {!!count && detailedView && (
+                    <div
+                      className='latest-user str-chat__message-reactions-last-user'
+                      onClick={hideTooltip}
+                      onMouseEnter={(e) => showTooltip(e, reactionType)}
+                      onMouseLeave={hideTooltip}
+                    >
+                      {latestUser ? (
+                        <Avatar
+                          image={latestUser.image}
+                          name={latestUser.name}
+                          size={20}
+                          user={latestUser}
+                        />
+                      ) : (
+                        <div className='latest-user-not-found' />
+                      )}
+                    </div>
+                  )}
+                  <span className='str-chat__message-reaction-emoji'>
+                    <Component />
+                  </span>
+                  {Boolean(count) && detailedView && (
+                    <span className='str-chat__message-reactions-list-item__count'>
+                      {count || ''}
                     </span>
-                    {Boolean(count) && detailedView && (
-                      <span className='str-chat__message-reactions-list-item__count'>
-                        {count || ''}
-                      </span>
-                    )}
-                  </button>
-                </li>
-              );
-            },
-          )}
+                  )}
+                </button>
+              </li>
+            );
+          })}
         </ul>
       </div>
     );
diff --git a/src/components/Reactions/ReactionsList.tsx b/src/components/Reactions/ReactionsList.tsx
index c587dde59b..d1275763c6 100644
--- a/src/components/Reactions/ReactionsList.tsx
+++ b/src/components/Reactions/ReactionsList.tsx
@@ -101,10 +101,10 @@ const UnMemoizedReactionsList = <
     >
       <ul className='str-chat__message-reactions'>
         {latestReactionTypes.map((reactionType) => {
-          const [, Reaction] = getEmojiByReactionType(reactionType) ?? [];
+          const ReactionOption = getEmojiByReactionType(reactionType);
           const isOwnReaction = iHaveReactedWithReaction(reactionType);
           return (
-            Reaction && (
+            ReactionOption && (
               <li
                 className={clsx('str-chat__message-reaction', {
                   'str-chat__message-reaction-own': isOwnReaction,
@@ -118,7 +118,7 @@ const UnMemoizedReactionsList = <
                 >
                   {
                     <span className='str-chat__message-reaction-emoji'>
-                      <Reaction.Component />
+                      <ReactionOption.Component />
                     </span>
                   }
                   &nbsp;
diff --git a/src/components/Reactions/SimpleReactionsList.tsx b/src/components/Reactions/SimpleReactionsList.tsx
index 2f97804507..a19df8e2b3 100644
--- a/src/components/Reactions/SimpleReactionsList.tsx
+++ b/src/components/Reactions/SimpleReactionsList.tsx
@@ -110,13 +110,13 @@ const UnMemoizedSimpleReactionsList = <
         onMouseLeave={() => setTooltipReactionType(undefined)}
       >
         {latestReactionTypes.map((reactionType, i) => {
-          const [, Reaction] = getEmojiByReactionType(reactionType) ?? [];
+          const ReactionOption = getEmojiByReactionType(reactionType);
           const isOwnReaction = iHaveReactedWithReaction(reactionType);
           const tooltipVisible = tooltipReactionType === reactionType;
           const tooltipContent = getUsersPerReactionType(tooltipReactionType)?.join(', ');
 
           return (
-            Reaction && (
+            ReactionOption && (
               <li
                 className={clsx('str-chat__simple-reactions-list-item', {
                   'str-chat__message-reaction-own': isOwnReaction,
@@ -130,7 +130,7 @@ const UnMemoizedSimpleReactionsList = <
                   onMouseLeave={() => setTooltipReactionType(undefined)}
                   title={tooltipContent}
                 >
-                  <Reaction.Component />
+                  <ReactionOption.Component />
                   &nbsp;
                   {tooltipVisible && themeVersion === '1' && (
                     <div className='str-chat__simple-reactions-list-tooltip'>
diff --git a/src/components/Reactions/hooks/useProcessReactions.tsx b/src/components/Reactions/hooks/useProcessReactions.tsx
index 3f2066281f..5df8af9265 100644
--- a/src/components/Reactions/hooks/useProcessReactions.tsx
+++ b/src/components/Reactions/hooks/useProcessReactions.tsx
@@ -37,7 +37,7 @@ export const useProcessReactions = <
   );
 
   const getEmojiByReactionType = useCallback(
-    (reactionType: string) => Object.entries(reactionOptions).find(([rt]) => rt === reactionType),
+    (reactionType: string) => reactionOptions.find(({ type }) => type === reactionType),
     [reactionOptions],
   );
 
@@ -54,7 +54,7 @@ export const useProcessReactions = <
 
   const supportedReactionMap = useMemo(
     () =>
-      Object.keys(reactionOptions).reduce<Record<string, boolean>>((map, reactionType) => {
+      reactionOptions.reduce<Record<string, boolean>>((map, { type: reactionType }) => {
         map[reactionType] = true;
         return map;
       }, {}),
@@ -62,7 +62,7 @@ export const useProcessReactions = <
   );
 
   const supportedReactionsArePresent = useMemo(
-    () => latestReactionTypes.some((type) => supportedReactionMap[type]),
+    () => latestReactionTypes.some((reactionType) => supportedReactionMap[reactionType]),
     [latestReactionTypes, supportedReactionMap],
   );
 
diff --git a/src/components/Reactions/reactionOptions.tsx b/src/components/Reactions/reactionOptions.tsx
index 5e4d888d0a..f1866e40bc 100644
--- a/src/components/Reactions/reactionOptions.tsx
+++ b/src/components/Reactions/reactionOptions.tsx
@@ -1,18 +1,20 @@
+/* eslint-disable sort-keys */
 /* eslint-disable react/display-name */
 import React from 'react';
 
 import { StreamEmoji } from './StreamEmoji';
 
-export type ReactionOptions = Record<
-  string,
-  { Component: React.ComponentType; aliases?: string[]; name?: string }
->;
+export type ReactionOptions = Array<{
+  Component: React.ComponentType;
+  type: string;
+  name?: string;
+}>;
 
-export const defaultReactionOptions: ReactionOptions = {
-  angry: { Component: () => <StreamEmoji fallback='😠' type='angry' />, name: 'Angry' },
-  haha: { Component: () => <StreamEmoji fallback='😂' type='haha' />, name: 'Joy' },
-  like: { Component: () => <StreamEmoji fallback='👍' type='like' />, name: 'Thumbs up' },
-  love: { Component: () => <StreamEmoji fallback='❤️' type='love' />, name: 'Heart' },
-  sad: { Component: () => <StreamEmoji fallback='😔' type='sad' />, name: 'Sad' },
-  wow: { Component: () => <StreamEmoji fallback='😲' type='wow' />, name: 'Astonished' },
-};
+export const defaultReactionOptions: ReactionOptions = [
+  { type: 'angry', Component: () => <StreamEmoji fallback='😠' type='angry' />, name: 'Angry' },
+  { type: 'haha', Component: () => <StreamEmoji fallback='😂' type='haha' />, name: 'Joy' },
+  { type: 'like', Component: () => <StreamEmoji fallback='👍' type='like' />, name: 'Thumbs up' },
+  { type: 'love', Component: () => <StreamEmoji fallback='❤️' type='love' />, name: 'Heart' },
+  { type: 'sad', Component: () => <StreamEmoji fallback='😔' type='sad' />, name: 'Sad' },
+  { type: 'wow', Component: () => <StreamEmoji fallback='😲' type='wow' />, name: 'Astonished' },
+];