conversation control tweaks

eramdam · Jul 29, 2021 · 9a191bc · 9a191bc
1 parent 503417b
commit 9a191bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/components/conversationControlsButton.tsx b/src/components/conversationControlsButton.tsx
@@ -22,8 +22,9 @@ export const ConversationControlsButton: FC<{
       const accountKey = data.request.accountKey;
       const tweetId = data.response.id_str;
       const client = getClient(accountKey);
+      const isReplyingToATweet = Boolean(data.response.in_reply_to_status_id_str);
 
-      if (!client || conversationMode === TwitterConversationModes.EVERYONE) {
+      if (!client || conversationMode === TwitterConversationModes.EVERYONE || isReplyingToATweet) {
         return;
       }
 
@@ -83,6 +84,11 @@ export const ConversationControlsButton: FC<{
             .-gif-hidden & {
               left: 13px;
             }
+
+            .js-in-reply-to:not(.is-hidden) ~ .compose-text-container &,
+            .js-compose-message-recipient-container:not(.is-hidden) ~ .compose-text-container & {
+              display: none !important;
+            }
           `,
           'js-show-tip'
         )}

diff --git a/src/features/conversationControl.tsx b/src/features/conversationControl.tsx
@@ -64,12 +64,7 @@ export const addConversationControls = makeBTDModule(({TD, jq, mR, settings}) =>
     unmountComponentAtNode(root);
   }
 
-  onComposerShown((isVisible) => {
-    if (!isVisible) {
-      unmount();
-      return;
-    }
-
+  function mount() {
     root = document.createElement('div');
     root.id = 'btdConversationControl';
     if (!settings.showGifPicker) {
@@ -88,5 +83,14 @@ export const addConversationControls = makeBTDModule(({TD, jq, mR, settings}) =>
       />,
       root
     );
+  }
+
+  onComposerShown((isVisible) => {
+    if (!isVisible) {
+      unmount();
+      return;
+    }
+
+    mount();
   });
 });