From a88778b536f1a149c8d50a0fa1ee3997255ce3ab Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Fri, 27 Jan 2023 12:34:15 -0500
Subject: [PATCH] Adds quick reactions to stories

---
 _locales/en/messages.json                     |  6 +-
 .../components/StoryViewsNRepliesModal.scss   | 25 +++---
 ts/components/StoryViewer.tsx                 |  9 +-
 .../StoryViewsNRepliesModal.stories.tsx       | 13 ---
 ts/components/StoryViewsNRepliesModal.tsx     | 82 ++++---------------
 5 files changed, 40 insertions(+), 95 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0f5fa2c2ae..4c44e66f1d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -6065,6 +6065,10 @@
     "message": "Reply",
     "description": "Button label to reply to a story"
   },
+  "icu:StoryViewer__reply-placeholder": {
+    "messageformat": "Reply to {firstName}",
+    "description": "Button label to reply to a story"
+  },
   "StoryViewer__reply-group": {
     "message": "Reply to Group",
     "description": "Button label to reply to a group story"
@@ -6134,7 +6138,7 @@
     "description": "Title for replies tab"
   },
   "StoryViewsNRepliesModal__react": {
-    "message": "React to story",
+    "message": "(deleted 01/25/23) React to story",
     "description": "aria-label for reaction button"
   },
   "StoryViewsNRepliesModal__reacted": {
diff --git a/stylesheets/components/StoryViewsNRepliesModal.scss b/stylesheets/components/StoryViewsNRepliesModal.scss
index fc7af545d3..3e421554a4 100644
--- a/stylesheets/components/StoryViewsNRepliesModal.scss
+++ b/stylesheets/components/StoryViewsNRepliesModal.scss
@@ -62,7 +62,7 @@ $footer-height: 36px;
 
   &__composer {
     flex: 1;
-    margin-right: 16px;
+    margin-top: 6px;
   }
 
   &__emoji-button {
@@ -114,16 +114,6 @@ $footer-height: 36px;
     }
   }
 
-  &__react {
-    @include button-reset;
-    @include color-svg(
-      '../images/icons/v2/add-reaction-outline-24.svg',
-      $color-white
-    );
-    height: 22px;
-    width: 22px;
-  }
-
   &__view {
     align-items: center;
     display: flex;
@@ -246,6 +236,19 @@ $footer-height: 36px;
     color: $color-gray-25;
     margin: 160px 16px;
   }
+
+  .module-ReactionPickerPicker {
+    background: inherit;
+    border: none;
+    box-shadow: none;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  .module-emoji-picker {
+    bottom: 55px;
+    position: absolute;
+  }
 }
 
 .Tabs.StoryViewsNRepliesModal__tabs {
diff --git a/ts/components/StoryViewer.tsx b/ts/components/StoryViewer.tsx
index ff5f64de72..cc1c15d600 100644
--- a/ts/components/StoryViewer.tsx
+++ b/ts/components/StoryViewer.tsx
@@ -601,7 +601,12 @@ export function StoryViewer({
             />
           )}
           <div className="StoryViewer__protection StoryViewer__protection--top" />
-          <div className="StoryViewer__container">
+          <div
+            className="StoryViewer__container"
+            onDoubleClick={() =>
+              setCurrentViewTarget(StoryViewTargetType.Replies)
+            }
+          >
             <StoryImage
               attachment={attachment}
               firstName={firstName || title}
@@ -908,7 +913,6 @@ export function StoryViewer({
         {(currentViewTarget === StoryViewTargetType.Replies ||
           currentViewTarget === StoryViewTargetType.Views) && (
           <StoryViewsNRepliesModal
-            conversationTitle={group?.title ?? title}
             authorTitle={firstName || title}
             canReply={Boolean(canReply)}
             getPreferredBadge={getPreferredBadge}
@@ -942,7 +946,6 @@ export function StoryViewer({
             replies={replies}
             skinTone={skinTone}
             sortedGroupMembers={group?.sortedGroupMembers}
-            storyPreviewAttachment={attachment}
             views={views}
             viewTarget={currentViewTarget}
             onChangeViewTarget={setCurrentViewTarget}
diff --git a/ts/components/StoryViewsNRepliesModal.stories.tsx b/ts/components/StoryViewsNRepliesModal.stories.tsx
index c6194af730..c6c20db368 100644
--- a/ts/components/StoryViewsNRepliesModal.stories.tsx
+++ b/ts/components/StoryViewsNRepliesModal.stories.tsx
@@ -8,11 +8,9 @@ import { useArgs } from '@storybook/addons';
 import type { PropsType } from './StoryViewsNRepliesModal';
 import * as durations from '../util/durations';
 import enMessages from '../../_locales/en/messages.json';
-import { IMAGE_JPEG } from '../types/MIME';
 import { SendStatus } from '../messages/MessageSendState';
 import { StoryViewsNRepliesModal } from './StoryViewsNRepliesModal';
 import { UUID } from '../types/UUID';
-import { fakeAttachment } from '../test-both/helpers/fakeAttachment';
 import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation';
 import { setupI18n } from '../util/setupI18n';
 import { StoryViewTargetType } from '../types/Stories';
@@ -54,17 +52,6 @@ export default {
     replies: {
       defaultValue: [],
     },
-    storyPreviewAttachment: {
-      defaultValue: fakeAttachment({
-        thumbnail: {
-          contentType: IMAGE_JPEG,
-          height: 64,
-          objectUrl: '/fixtures/nathan-anderson-316188-unsplash.jpg',
-          path: '',
-          width: 40,
-        },
-      }),
-    },
     views: {
       defaultValue: [],
     },
diff --git a/ts/components/StoryViewsNRepliesModal.tsx b/ts/components/StoryViewsNRepliesModal.tsx
index 2c3395e1ae..18172556f5 100644
--- a/ts/components/StoryViewsNRepliesModal.tsx
+++ b/ts/components/StoryViewsNRepliesModal.tsx
@@ -9,10 +9,8 @@ import React, {
   useState,
 } from 'react';
 import classNames from 'classnames';
-import { usePopper } from 'react-popper';
 import { noop } from 'lodash';
 
-import type { AttachmentType } from '../types/Attachment';
 import type { DraftBodyRangesType, LocalizerType } from '../types/Util';
 import type { ConversationType } from '../state/ducks/conversations';
 import type { EmojiPickDataType } from './emoji/EmojiPicker';
@@ -29,14 +27,12 @@ import { Emojify } from './conversation/Emojify';
 import { Message, TextDirection } from './conversation/Message';
 import { MessageTimestamp } from './conversation/MessageTimestamp';
 import { Modal } from './Modal';
-import { Quote } from './conversation/Quote';
 import { ReactionPicker } from './conversation/ReactionPicker';
 import { Tabs } from './Tabs';
 import { Theme } from '../util/theme';
 import { ThemeType } from '../types/Util';
 import { WidthBreakpoint } from './_util';
 import { getAvatarColor } from '../types/Colors';
-import { getStoryReplyText } from '../util/getStoryReplyText';
 import { shouldNeverBeCalled } from '../util/shouldNeverBeCalled';
 import { ContextMenu } from './ContextMenu';
 import { ConfirmationDialog } from './ConfirmationDialog';
@@ -79,7 +75,6 @@ export enum StoryViewsNRepliesTab {
 }
 
 export type PropsType = {
-  conversationTitle: string;
   authorTitle: string;
   canReply: boolean;
   getPreferredBadge: PreferredBadgeSelectorType;
@@ -104,7 +99,6 @@ export type PropsType = {
   replies: ReadonlyArray<ReplyType>;
   skinTone?: number;
   sortedGroupMembers?: ReadonlyArray<ConversationType>;
-  storyPreviewAttachment?: AttachmentType;
   views: ReadonlyArray<StorySendStateType>;
   viewTarget: StoryViewTargetType;
   onChangeViewTarget: (target: StoryViewTargetType) => unknown;
@@ -113,7 +107,6 @@ export type PropsType = {
 };
 
 export function StoryViewsNRepliesModal({
-  conversationTitle,
   authorTitle,
   canReply,
   getPreferredBadge,
@@ -134,7 +127,6 @@ export function StoryViewsNRepliesModal({
   replies,
   skinTone,
   sortedGroupMembers,
-  storyPreviewAttachment,
   views,
   viewTarget,
   onChangeViewTarget,
@@ -153,7 +145,6 @@ export function StoryViewsNRepliesModal({
   const shouldScrollToBottomRef = useRef(true);
   const bottomRef = useRef<HTMLDivElement>(null);
   const [messageBodyText, setMessageBodyText] = useState('');
-  const [showReactionPicker, setShowReactionPicker] = useState(false);
 
   const currentTab = useMemo<StoryViewsNRepliesTab>(() => {
     return viewTarget === StoryViewTargetType.Replies
@@ -185,17 +176,6 @@ export function StoryViewsNRepliesModal({
     [inputApiRef, onUseEmoji]
   );
 
-  const [referenceElement, setReferenceElement] =
-    useState<HTMLButtonElement | null>(null);
-  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(
-    null
-  );
-
-  const { styles, attributes } = usePopper(referenceElement, popperElement, {
-    placement: 'top-start',
-    strategy: 'fixed',
-  });
-
   let composerElement: JSX.Element | undefined;
 
   useLayoutEffect(() => {
@@ -218,22 +198,18 @@ export function StoryViewsNRepliesModal({
   } else if (canReply) {
     composerElement = (
       <>
-        {!group && (
-          <Quote
-            authorTitle={authorTitle}
-            conversationColor="ultramarine"
-            conversationTitle={conversationTitle}
-            i18n={i18n}
-            isFromMe={false}
-            isGiftBadge={false}
-            isStoryReply
-            isViewOnce={false}
-            moduleClassName="StoryViewsNRepliesModal__quote"
-            rawAttachment={storyPreviewAttachment}
-            referencedMessageNotFound={false}
-            text={getStoryReplyText(i18n, storyPreviewAttachment)}
-          />
-        )}
+        <ReactionPicker
+          i18n={i18n}
+          onPick={emoji => {
+            if (!group) {
+              onClose();
+            }
+            onReact(emoji);
+          }}
+          onSetSkinTone={onSetSkinTone}
+          preferredReactionEmoji={preferredReactionEmoji}
+          renderEmojiPicker={renderEmojiPicker}
+        />
         <div className="StoryViewsNRepliesModal__compose-container">
           <div className="StoryViewsNRepliesModal__composer">
             <CompositionInput
@@ -255,7 +231,9 @@ export function StoryViewsNRepliesModal({
               placeholder={
                 group
                   ? i18n('StoryViewer__reply-group')
-                  : i18n('StoryViewer__reply')
+                  : i18n('icu:StoryViewer__reply-placeholder', {
+                      firstName: authorTitle,
+                    })
               }
               sortedGroupMembers={sortedGroupMembers}
               theme={ThemeType.dark}
@@ -271,36 +249,6 @@ export function StoryViewsNRepliesModal({
               />
             </CompositionInput>
           </div>
-          <button
-            aria-label={i18n('StoryViewsNRepliesModal__react')}
-            className="StoryViewsNRepliesModal__react"
-            onClick={() => {
-              setShowReactionPicker(!showReactionPicker);
-            }}
-            ref={setReferenceElement}
-            type="button"
-          />
-          {showReactionPicker && (
-            <div
-              ref={setPopperElement}
-              style={styles.popper}
-              {...attributes.popper}
-            >
-              <ReactionPicker
-                i18n={i18n}
-                onClose={() => {
-                  setShowReactionPicker(false);
-                }}
-                onPick={emoji => {
-                  setShowReactionPicker(false);
-                  onReact(emoji);
-                }}
-                onSetSkinTone={onSetSkinTone}
-                preferredReactionEmoji={preferredReactionEmoji}
-                renderEmojiPicker={renderEmojiPicker}
-              />
-            </div>
-          )}
         </div>
       </>
     );