From e39efa92c2df2df35e7c8b371dedc6eb11cf4133 Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Thu, 2 May 2024 11:25:53 -0700
Subject: [PATCH] make triggers accessible

---
 src/components/dms/ActionsWrapper.web.tsx | 46 ++++++++++-------------
 src/components/dms/MessageMenu.tsx        | 36 ++++++++++--------
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/components/dms/ActionsWrapper.web.tsx b/src/components/dms/ActionsWrapper.web.tsx
index 90e4643659..2593573b53 100644
--- a/src/components/dms/ActionsWrapper.web.tsx
+++ b/src/components/dms/ActionsWrapper.web.tsx
@@ -1,11 +1,10 @@
 import React from 'react'
-import {View} from 'react-native'
+import {StyleSheet, View} from 'react-native'
 import {ChatBskyConvoDefs} from '@atproto-labs/api'
 
 import {atoms as a} from '#/alf'
 import {MessageMenu} from '#/components/dms/MessageMenu'
 import {useMenuControl} from '#/components/Menu'
-import {Text} from '#/components/Typography'
 
 export function ActionsWrapper({
   message,
@@ -32,44 +31,39 @@ export function ActionsWrapper({
     <View
       onMouseEnter={onMouseEnter}
       onMouseLeave={onMouseLeave}
-      style={[a.flex_1, a.flex_row]}>
+      onFocus={onMouseEnter}
+      onBlur={onMouseLeave}
+      style={StyleSheet.flatten([a.flex_1, a.flex_row])}>
       {isFromSelf && (
         <View
           style={[
+            a.mr_md,
             {
-              width: 100,
               marginLeft: 'auto',
-              alignItems: 'flex-end',
             },
           ]}>
-          <ActionBar control={menuControl} message={message} />
+          <MessageMenu
+            message={message}
+            control={menuControl}
+            triggerOpacity={showActions ? 1 : 0}
+          />
         </View>
       )}
       <View
-        style={[
-          {
-            maxWidth: '65%',
-          },
-        ]}>
+        style={{
+          maxWidth: '65%',
+        }}>
         {children}
       </View>
       {!isFromSelf && (
-        <View style={[{width: 100}]}>{showActions && <Text>Hello</Text>}</View>
+        <View style={[a.flex_row, a.align_center, a.ml_xl]}>
+          <MessageMenu
+            message={message}
+            control={menuControl}
+            triggerOpacity={showActions ? 1 : 0}
+          />
+        </View>
       )}
     </View>
   )
 }
-
-function ActionBar({
-  control,
-  message,
-}: {
-  control: Menu.MenuControlProps
-  message: ChatBskyConvoDefs.MessageView
-}) {
-  return (
-    <View style={[a.flex_row, a.mx_md]}>
-      <MessageMenu message={message} control={control} />
-    </View>
-  )
-}
diff --git a/src/components/dms/MessageMenu.tsx b/src/components/dms/MessageMenu.tsx
index 7b158a536f..c000265d53 100644
--- a/src/components/dms/MessageMenu.tsx
+++ b/src/components/dms/MessageMenu.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import {Pressable} from 'react-native'
+import {Pressable, View} from 'react-native'
 import {ChatBskyConvoDefs} from '@atproto-labs/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -17,8 +17,10 @@ export let MessageMenu = ({
   message,
   control,
   hideTrigger,
+  triggerOpacity,
 }: {
   hideTrigger?: boolean
+  triggerOpacity?: number
   message: ChatBskyConvoDefs.MessageView
   control: Menu.MenuControlProps
 }): React.ReactNode => {
@@ -41,21 +43,23 @@ export let MessageMenu = ({
     <>
       <Menu.Root control={control}>
         {!hideTrigger && (
-          <Menu.Trigger label={_(msg`Chat settings`)}>
-            {({props, state}) => (
-              <Pressable
-                {...props}
-                style={[
-                  a.p_sm,
-                  a.rounded_full,
-                  (state.hovered || state.pressed) && t.atoms.bg_contrast_25,
-                  // make sure pfp is in the middle
-                  {marginLeft: -10},
-                ]}>
-                <DotsHorizontal size="sm" style={t.atoms.text} />
-              </Pressable>
-            )}
-          </Menu.Trigger>
+          <View style={{opacity: triggerOpacity}}>
+            <Menu.Trigger label={_(msg`Chat settings`)}>
+              {({props, state}) => (
+                <Pressable
+                  {...props}
+                  style={[
+                    a.p_sm,
+                    a.rounded_full,
+                    (state.hovered || state.pressed) && t.atoms.bg_contrast_25,
+                    // make sure pfp is in the middle
+                    {marginLeft: -10},
+                  ]}>
+                  <DotsHorizontal size="sm" style={t.atoms.text} />
+                </Pressable>
+              )}
+            </Menu.Trigger>
+          </View>
         )}
 
         <Menu.Outer>