Remove context view

src/components/Timeline/Default.tsx

@@ -1,6 +1,3 @@
-import menuInstance from '@components/contextMenu/instance'
-import menuShare from '@components/contextMenu/share'
-import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -19,9 +16,8 @@ import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { Fragment, useRef, useState } from 'react'
+import React, { useRef, useState } from 'react'
 import { Pressable, StyleProp, View, ViewStyle } from 'react-native'
-import * as ContextMenu from 'zeego/context-menu'
 import StatusContext from './Shared/Context'
 import TimelineFeedback from './Shared/Feedback'
 import TimelineFiltered, { FilteredProps, shouldFilter } from './Shared/Filtered'
@@ -126,15 +122,6 @@ const TimelineDefault: React.FC<Props> = ({
     </>
   )
 
-  const mShare = menuShare({
-    visibility: status.visibility,
-    type: 'status',
-    url: status.url || status.uri,
-    rawContent
-  })
-  const mStatus = menuStatus({ status, queryKey })
-  const mInstance = menuInstance({ status, queryKey })
-
   if (!isMyAccount) {
     let filterResults: FilteredProps['filterResults'] = []
     const [filterRevealed, setFilterRevealed] = useState(false)
@@ -183,67 +170,14 @@ const TimelineDefault: React.FC<Props> = ({
         <View style={mainStyle}>{main()}</View>
       ) : (
         <>
-          <ContextMenu.Root>
+          <Pressable
-            <ContextMenu.Trigger>
+            accessible={highlighted ? false : true}
-              <Pressable
+            style={mainStyle}
-                accessible={highlighted ? false : true}
+            disabled={highlighted}
-                style={mainStyle}
+            onPress={() => navigation.push('Tab-Shared-Toot', { toot: status })}
-                disabled={highlighted}
+            onLongPress={() => {}}
-                onPress={() => navigation.push('Tab-Shared-Toot', { toot: status })}
+            children={main()}
-                onLongPress={() => {}}
+          />
-                children={main()}
-              />
-            </ContextMenu.Trigger>
-
-            <ContextMenu.Content>
-              {[mShare, mStatus, mInstance].map((menu, i) => (
-                <Fragment key={i}>
-                  {menu.map((group, index) => (
-                    <ContextMenu.Group key={index}>
-                      {group.map(item => {
-                        switch (item.type) {
-                          case 'item':
-                            return (
-                              <ContextMenu.Item key={item.key} {...item.props}>
-                                <ContextMenu.ItemTitle children={item.title} />
-                                {item.icon ? (
-                                  <ContextMenu.ItemIcon ios={{ name: item.icon }} />
-                                ) : null}
-                              </ContextMenu.Item>
-                            )
-                          case 'sub':
-                            return (
-                              // @ts-ignore
-                              <ContextMenu.Sub key={item.key}>
-                                <ContextMenu.SubTrigger
-                                  key={item.trigger.key}
-                                  {...item.trigger.props}
-                                >
-                                  <ContextMenu.ItemTitle children={item.trigger.title} />
-                                  {item.trigger.icon ? (
-                                    <ContextMenu.ItemIcon ios={{ name: item.trigger.icon }} />
-                                  ) : null}
-                                </ContextMenu.SubTrigger>
-                                <ContextMenu.SubContent>
-                                  {item.items.map(sub => (
-                                    <ContextMenu.Item key={sub.key} {...sub.props}>
-                                      <ContextMenu.ItemTitle children={sub.title} />
-                                      {sub.icon ? (
-                                        <ContextMenu.ItemIcon ios={{ name: sub.icon }} />
-                                      ) : null}
-                                    </ContextMenu.Item>
-                                  ))}
-                                </ContextMenu.SubContent>
-                              </ContextMenu.Sub>
-                            )
-                        }
-                      })}
-                    </ContextMenu.Group>
-                  ))}
-                </Fragment>
-              ))}
-            </ContextMenu.Content>
-          </ContextMenu.Root>
           <TimelineHeaderAndroid />
         </>
       )}

src/components/Timeline/Notifications.tsx

@@ -1,6 +1,3 @@
-import menuInstance from '@components/contextMenu/instance'
-import menuShare from '@components/contextMenu/share'
-import menuStatus from '@components/contextMenu/status'
 import TimelineActioned from '@components/Timeline/Shared/Actioned'
 import TimelineActions from '@components/Timeline/Shared/Actions'
 import TimelineAttachment from '@components/Timeline/Shared/Attachment'
@@ -18,9 +15,8 @@ import { usePreferencesQuery } from '@utils/queryHooks/preferences'
 import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
-import React, { Fragment, useState } from 'react'
+import React, { useState } from 'react'
 import { Pressable, View } from 'react-native'
-import * as ContextMenu from 'zeego/context-menu'
 import StatusContext from './Shared/Context'
 import TimelineFiltered, { FilteredProps, shouldFilter } from './Shared/Filtered'
 import TimelineFullConversation from './Shared/FullConversation'
@@ -100,14 +96,6 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
     )
   }
 
-  const mShare = menuShare({
-    visibility: notification.status?.visibility,
-    type: 'status',
-    url: notification.status?.url || notification.status?.uri
-  })
-  const mStatus = menuStatus({ status: notification.status, queryKey })
-  const mInstance = menuInstance({ status: notification.status, queryKey })
-
   if (!isMyAccount) {
     let filterResults: FilteredProps['filterResults'] = []
     const [filterRevealed, setFilterRevealed] = useState(false)
@@ -143,67 +131,18 @@ const TimelineNotifications: React.FC<Props> = ({ notification, queryKey }) => {
         spoilerHidden
       }}
     >
-      <ContextMenu.Root>
+      <Pressable
-        <ContextMenu.Trigger>
+        style={{
-          <Pressable
+          padding: StyleConstants.Spacing.Global.PagePadding,
-            style={{
+          backgroundColor: colors.backgroundDefault,
-              padding: StyleConstants.Spacing.Global.PagePadding,
+          paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
-              backgroundColor: colors.backgroundDefault,
+        }}
-              paddingBottom: notification.status ? 0 : StyleConstants.Spacing.Global.PagePadding
+        onPress={() =>
-            }}
+          notification.status && navigation.push('Tab-Shared-Toot', { toot: notification.status })
-            onPress={() =>
+        }
-              notification.status &&
+        onLongPress={() => {}}
-              navigation.push('Tab-Shared-Toot', { toot: notification.status })
+        children={main()}
-            }
+      />
-            onLongPress={() => {}}
-            children={main()}
-          />
-        </ContextMenu.Trigger>
-
-        <ContextMenu.Content>
-          {[mShare, mStatus, mInstance].map((menu, i) => (
-            <Fragment key={i}>
-              {menu.map((group, index) => (
-                <ContextMenu.Group key={index}>
-                  {group.map(item => {
-                    switch (item.type) {
-                      case 'item':
-                        return (
-                          <ContextMenu.Item key={item.key} {...item.props}>
-                            <ContextMenu.ItemTitle children={item.title} />
-                            {item.icon ? <ContextMenu.ItemIcon ios={{ name: item.icon }} /> : null}
-                          </ContextMenu.Item>
-                        )
-                      case 'sub':
-                        return (
-                          // @ts-ignore
-                          <ContextMenu.Sub key={item.key}>
-                            <ContextMenu.SubTrigger key={item.trigger.key} {...item.trigger.props}>
-                              <ContextMenu.ItemTitle children={item.trigger.title} />
-                              {item.trigger.icon ? (
-                                <ContextMenu.ItemIcon ios={{ name: item.trigger.icon }} />
-                              ) : null}
-                            </ContextMenu.SubTrigger>
-                            <ContextMenu.SubContent>
-                              {item.items.map(sub => (
-                                <ContextMenu.Item key={sub.key} {...sub.props}>
-                                  <ContextMenu.ItemTitle children={sub.title} />
-                                  {sub.icon ? (
-                                    <ContextMenu.ItemIcon ios={{ name: sub.icon }} />
-                                  ) : null}
-                                </ContextMenu.Item>
-                              ))}
-                            </ContextMenu.SubContent>
-                          </ContextMenu.Sub>
-                        )
-                    }
-                  })}
-                </ContextMenu.Group>
-              ))}
-            </Fragment>
-          ))}
-        </ContextMenu.Content>
-      </ContextMenu.Root>
       <TimelineHeaderAndroid />
     </StatusContext.Provider>
   )

src/components/Timeline/Shared/HeaderDefault.tsx

@@ -1,4 +1,5 @@
 import menuAccount from '@components/contextMenu/account'
+import menuInstance from '@components/contextMenu/instance'
 import menuShare from '@components/contextMenu/share'
 import menuStatus from '@components/contextMenu/status'
 import Icon from '@components/Icon'
@@ -17,7 +18,8 @@ import HeaderSharedReplies from './HeaderShared/Replies'
 import HeaderSharedVisibility from './HeaderShared/Visibility'
 
 const TimelineHeaderDefault: React.FC = () => {
-  const { queryKey, status, disableDetails, rawContent, isRemote } = useContext(StatusContext)
+  const { queryKey, status, disableDetails, rawContent, isRemote, highlighted } =
+    useContext(StatusContext)
   if (!status) return null
 
   const { colors } = useTheme()
@@ -37,6 +39,7 @@ const TimelineHeaderDefault: React.FC = () => {
     ...(status && { status })
   })
   const mStatus = menuStatus({ status, queryKey })
+  const mInstance = highlighted ? menuInstance({ status, queryKey }) : []
 
   return (
     <View style={{ flex: 1, flexDirection: 'row' }}>
@@ -87,7 +90,7 @@ const TimelineHeaderDefault: React.FC = () => {
             </DropdownMenu.Trigger>
 
             <DropdownMenu.Content>
-              {[mShare, mAccount, mStatus].map((menu, i) => (
+              {[mShare, mAccount, mStatus, mInstance].map((menu, i) => (
                 <Fragment key={i}>
                   {menu.map((group, index) => (
                     <DropdownMenu.Group key={index}>