-
Notifications
You must be signed in to change notification settings - Fork 306
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: mf-5108 tooltip overflow #10524
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@UncleBill Try |
@zhouhanseng Try this diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
index 93be6d220..cb8e82df6 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
@@ -1,7 +1,7 @@
import { Icons } from '@masknet/icons'
import { RestorableScroll, UserAssetsProvider } from '@masknet/shared'
import { NetworkPluginID, PopupRoutes } from '@masknet/shared-base'
-import { makeStyles } from '@masknet/theme'
+import { Boundary, makeStyles } from '@masknet/theme'
import { useAccount, useChainContext, useWallet } from '@masknet/web3-hooks-base'
import { TabContext, TabList, TabPanel } from '@mui/lab'
import { Box, Button, Tab, styled, tabClasses, tabsClasses } from '@mui/material'
@@ -151,23 +151,25 @@ export const WalletAssetsUI = memo<WalletAssetsUIProps>(function WalletAssetsUI(
pluginID={NetworkPluginID.PLUGIN_EVM}
account={account}
defaultCollectionId={params.get(SEARCH_KEY) || undefined}>
- <Box className={classes.panels}>
- <RestorableScroll scrollKey="assets">
- <TabPanel value={WalletAssetTabs.Tokens} className={classes.tabPanel}>
- <AssetsList />
- </TabPanel>
- </RestorableScroll>
- <TabPanel value={WalletAssetTabs.Collectibles} className={classes.tabPanel}>
- <RestorableScroll scrollKey="collectibles" targetRef={scrollTargetRef}>
- <WalletCollections onAddToken={onAddToken} scrollTargetRef={scrollTargetRef} />
+ <Boundary>
+ <Box className={classes.panels}>
+ <RestorableScroll scrollKey="assets">
+ <TabPanel value={WalletAssetTabs.Tokens} className={classes.tabPanel}>
+ <AssetsList />
+ </TabPanel>
</RestorableScroll>
- </TabPanel>
- <RestorableScroll scrollKey="activities">
- <TabPanel value={WalletAssetTabs.Activity} className={classes.tabPanel}>
- <ActivityList />
+ <TabPanel value={WalletAssetTabs.Collectibles} className={classes.tabPanel}>
+ <RestorableScroll scrollKey="collectibles" targetRef={scrollTargetRef}>
+ <WalletCollections onAddToken={onAddToken} scrollTargetRef={scrollTargetRef} />
+ </RestorableScroll>
</TabPanel>
- </RestorableScroll>
- </Box>
+ <RestorableScroll scrollKey="activities">
+ <TabPanel value={WalletAssetTabs.Activity} className={classes.tabPanel}>
+ <ActivityList />
+ </TabPanel>
+ </RestorableScroll>
+ </Box>
+ </Boundary>
</UserAssetsProvider>
</TabContext>
</div>
diff --git a/packages/shared/src/UI/components/ReversedAddress/index.tsx b/packages/shared/src/UI/components/ReversedAddress/index.tsx
index 5dca99f00..b6b7f6213 100644
--- a/packages/shared/src/UI/components/ReversedAddress/index.tsx
+++ b/packages/shared/src/UI/components/ReversedAddress/index.tsx
@@ -2,7 +2,7 @@ import { type ComponentProps, memo } from 'react'
import type { NetworkPluginID } from '@masknet/shared-base'
import { useReverseAddress, useWeb3Others } from '@masknet/web3-hooks-base'
import { Typography } from '@mui/material'
-import { ShadowRootTooltip } from '@masknet/theme'
+import { ShadowRootTooltip, useBoundedPopperProps } from '@masknet/theme'
import { isSameAddress } from '@masknet/web3-shared-base'
export interface ReverseAddressProps extends ComponentProps<typeof Typography> {
@@ -20,13 +20,21 @@ export const ReversedAddress = memo<ReverseAddressProps>(({ address, pluginID, s
const showDomain = !!domain && Others.isValidDomain(domain)
const uiLabel = showDomain ? Others.formatDomainName(domain) : Others.formatAddress(address, size) ?? address
const hasEllipsis = showDomain ? uiLabel !== domain : !isSameAddress(uiLabel, address)
+ const popperProps = useBoundedPopperProps()
const node = (
<Typography fontWeight={700} {...rest}>
{uiLabel}
</Typography>
)
-
- return hasEllipsis ? <ShadowRootTooltip title={showDomain ? domain : address}>{node}</ShadowRootTooltip> : node
+ return hasEllipsis ? (
+ <ShadowRootTooltip
+ PopperProps={{ ...popperProps, style: { whiteSpace: 'break-spaces', zIndex: 10 } }}
+ title={showDomain ? domain : address}>
+ {node}
+ </ShadowRootTooltip>
+ ) : (
+ node
+ )
})
ReversedAddress.displayName = 'ReversedAddress' |
ignore all whitespace diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
index 93be6d220..cb8e82df6 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/components/WalletAssets/index.tsx
@@ -1,7 +1,7 @@
import { Icons } from '@masknet/icons'
import { RestorableScroll, UserAssetsProvider } from '@masknet/shared'
import { NetworkPluginID, PopupRoutes } from '@masknet/shared-base'
-import { makeStyles } from '@masknet/theme'
+import { Boundary, makeStyles } from '@masknet/theme'
import { useAccount, useChainContext, useWallet } from '@masknet/web3-hooks-base'
import { TabContext, TabList, TabPanel } from '@mui/lab'
import { Box, Button, Tab, styled, tabClasses, tabsClasses } from '@mui/material'
@@ -151,6 +151,7 @@ export const WalletAssetsUI = memo<WalletAssetsUIProps>(function WalletAssetsUI(
pluginID={NetworkPluginID.PLUGIN_EVM}
account={account}
defaultCollectionId={params.get(SEARCH_KEY) || undefined}>
+ <Boundary>
<Box className={classes.panels}>
<RestorableScroll scrollKey="assets">
<TabPanel value={WalletAssetTabs.Tokens} className={classes.tabPanel}>
@@ -168,6 +169,7 @@ export const WalletAssetsUI = memo<WalletAssetsUIProps>(function WalletAssetsUI(
</TabPanel>
</RestorableScroll>
</Box>
+ </Boundary>
</UserAssetsProvider>
</TabContext>
</div>
diff --git a/packages/shared/src/UI/components/ReversedAddress/index.tsx b/packages/shared/src/UI/components/ReversedAddress/index.tsx
index 5dca99f00..b6b7f6213 100644
--- a/packages/shared/src/UI/components/ReversedAddress/index.tsx
+++ b/packages/shared/src/UI/components/ReversedAddress/index.tsx
@@ -2,7 +2,7 @@ import { type ComponentProps, memo } from 'react'
import type { NetworkPluginID } from '@masknet/shared-base'
import { useReverseAddress, useWeb3Others } from '@masknet/web3-hooks-base'
import { Typography } from '@mui/material'
-import { ShadowRootTooltip } from '@masknet/theme'
+import { ShadowRootTooltip, useBoundedPopperProps } from '@masknet/theme'
import { isSameAddress } from '@masknet/web3-shared-base'
export interface ReverseAddressProps extends ComponentProps<typeof Typography> {
@@ -20,13 +20,21 @@ export const ReversedAddress = memo<ReverseAddressProps>(({ address, pluginID, s
const showDomain = !!domain && Others.isValidDomain(domain)
const uiLabel = showDomain ? Others.formatDomainName(domain) : Others.formatAddress(address, size) ?? address
const hasEllipsis = showDomain ? uiLabel !== domain : !isSameAddress(uiLabel, address)
+ const popperProps = useBoundedPopperProps()
const node = (
<Typography fontWeight={700} {...rest}>
{uiLabel}
</Typography>
)
-
- return hasEllipsis ? <ShadowRootTooltip title={showDomain ? domain : address}>{node}</ShadowRootTooltip> : node
+ return hasEllipsis ? (
+ <ShadowRootTooltip
+ PopperProps={{ ...popperProps, style: { whiteSpace: 'break-spaces', zIndex: 10 } }}
+ title={showDomain ? domain : address}>
+ {node}
+ </ShadowRootTooltip>
+ ) : (
+ node
+ )
})
ReversedAddress.displayName = 'ReversedAddress' |
guanbinrui
approved these changes
Aug 21, 2023
Need approval from @UncleBill. |
@UncleBill Works now, thank you! |
UncleBill
approved these changes
Aug 21, 2023
@guanbinrui done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
https://mask.atlassian.net/browse/MF-5108
Closes # (NO_ISSUE)
Type of change
Previews
Checklist
console.log
sIf this PR depends on external APIs:
chrome-extension://[id]
moz-extension://[id]