fix: android menu placement (#2345)

OneKeyHQ · Jan 4, 2023 · df68fe0 · df68fe0
1 parent aa16bfa
commit df68fe0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/packages/components/src/Layout/Header/LayoutHeaderDesktop.tsx b/packages/components/src/Layout/Header/LayoutHeaderDesktop.tsx
@@ -23,7 +23,7 @@ export function LayoutHeaderDesktop() {
       <HStack space={2} alignItems="center">
         <NetworkAccountSelectorTriggerDesktop />
         <Box>
-          <HomeMoreMenu placement="bottom right">
+          <HomeMoreMenu>
             <IconButton
               name="EllipsisVerticalOutline"
               size="lg"

diff --git a/packages/components/src/Layout/Header/LayoutHeaderMobile.tsx b/packages/components/src/Layout/Header/LayoutHeaderMobile.tsx
@@ -4,12 +4,15 @@ import { HStack, IconButton } from '@onekeyhq/components';
 import { NetworkAccountSelectorTriggerMobile } from '@onekeyhq/kit/src/components/NetworkAccountSelector';
 import WalletSelectorTrigger from '@onekeyhq/kit/src/components/WalletSelector/WalletSelectorTrigger/WalletSelectorTrigger';
 import HomeMoreMenu from '@onekeyhq/kit/src/views/Overlay/HomeMoreMenu';
+import platformEnv from '@onekeyhq/shared/src/platformEnv';
 
 const headerLeft = () => <WalletSelectorTrigger />;
 const headerRight = () => (
   <HStack space={3} alignItems="center">
     <NetworkAccountSelectorTriggerMobile />
-    <HomeMoreMenu placement="bottom right">
+    <HomeMoreMenu
+      offset={platformEnv.isNativeAndroid ? 25 : 0}
+    >
       <IconButton
         name="EllipsisVerticalOutline"
         type="plain"

diff --git a/packages/kit/src/views/Overlay/BaseMenu.tsx b/packages/kit/src/views/Overlay/BaseMenu.tsx
@@ -24,11 +24,17 @@ interface IBaseMenu extends IMenu {
   options: IMenuOptions;
 }
 
-const BaseMenu: FC<IBaseMenu> = ({ options, children, ...rest }) => {
+const BaseMenu: FC<IBaseMenu> = ({
+  options,
+  children,
+  placement = 'bottom right',
+  ...rest
+}) => {
   const intl = useIntl();
   return (
     <Menu
       w={190}
+      placement={placement}
       trigger={(triggerProps) =>
         cloneElement(Children.only(children as ReactElement), triggerProps)
       }

diff --git a/packages/kit/src/views/Wallet/AccountInfo/index.tsx b/packages/kit/src/views/Wallet/AccountInfo/index.tsx
@@ -32,6 +32,7 @@ import {
   TabRoutes,
 } from '@onekeyhq/kit/src/routes/types';
 import type { SendRoutesParams } from '@onekeyhq/kit/src/views/Send/types';
+import platformEnv from '@onekeyhq/shared/src/platformEnv';
 
 import backgroundApiProxy from '../../../background/instance/backgroundApiProxy';
 import { useNavigationActions } from '../../../hooks';
@@ -308,7 +309,7 @@ const AccountOption: FC<AccountOptionProps> = ({ isSmallView }) => {
       </Box>
 
       <Box flex={{ base: 1, sm: 0 }} mx={3} minW="56px" alignItems="center">
-        <AccountMoreMenu offset={30} placement="bottom right">
+        <AccountMoreMenu offset={platformEnv.isNativeAndroid ? 55 : 30}>
           <IconButton
             circle
             size={isSmallView ? 'xl' : 'lg'}