Skip to content

Tweak tooltip configuration #1801

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 24, 2025
Merged

Tweak tooltip configuration #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0071bd
Update to latest react 18
DannyDelott Feb 24, 2025
2ca3727
Move tooltip provider to top-level, update react-dom
DannyDelott Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/hyperdrive-trading/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
"process": "^0.11.10",
"react-awesome-reveal": "^4.3.1",
"@emotion/react": "^11.14.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-helmet": "^6.1.0",
"react-hot-toast": "^2.4.0",
"react-loading-skeleton": "^3.3.1",
Expand Down
2 changes: 0 additions & 2 deletions apps/hyperdrive-trading/src/network/wagmiClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
VITE_LOCALHOST_NODE_RPC_URL,
VITE_CUSTOM_CHAIN_NODE_RPC_URL,
VITE_CUSTOM_CHAIN_CHAIN_ID,
VITE_REWARDS_FORK_NODE_RPC_URL,
VITE_REWARDS_FORK_CHAIN_ID,
VITE_WALLET_CONNECT_PROJECT_ID,
VITE_SEPOLIA_RPC_URL,
VITE_MAINNET_RPC_URL,
Expand Down Expand Up @@ -98,7 +96,7 @@
},
}).filter(
// Remove configs that don't have a proper RPC URL defined in the .env
([_, config]) => config.rpcUrl !== undefined,

Check warning on line 99 in apps/hyperdrive-trading/src/network/wagmiClient.ts

View workflow job for this annotation

GitHub Actions / verify (lint) 

'_' is defined but never used. Allowed unused args must match /^unused/u
),
);

Expand Down
5 changes: 4 additions & 1 deletion apps/hyperdrive-trading/src/ui/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { RainbowKitProvider } from "@rainbow-me/rainbowkit";
import "@rainbow-me/rainbowkit/styles.css";
import "@usecapsule/react-sdk/styles.css";

import * as Tooltip from "@radix-ui/react-tooltip";
import {
ErrorBoundary as RollbarErrorBoundary,
Provider as RollbarProvider,
Expand Down Expand Up @@ -72,7 +73,9 @@ root.render(
>
<RollbarErrorBoundary>
<RegionInfoProvider>
<App />
<Tooltip.Provider>
<App />
</Tooltip.Provider>
</RegionInfoProvider>
</RollbarErrorBoundary>
</RollbarProvider>
Expand Down
30 changes: 14 additions & 16 deletions apps/hyperdrive-trading/src/ui/markets/PoolRow/PoolStat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,20 @@ export function PoolStat({

if (overlay) {
return (
<Tooltip.Provider>
<Tooltip.Root>
<Tooltip.Trigger className="flex w-full items-center whitespace-nowrap">
{poolStat}
</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content
className="z-20 h-fit w-72 rounded-[0.6rem] bg-base-200 px-3 py-2 shadow-2xl"
sideOffset={5}
collisionPadding={12}
>
{overlay}
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
</Tooltip.Provider>
<Tooltip.Root>
<Tooltip.Trigger className="flex w-full items-center whitespace-nowrap">
{poolStat}
</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content
className="z-20 h-fit w-72 rounded-[0.6rem] bg-base-200 px-3 py-2 shadow-2xl"
sideOffset={5}
collisionPadding={12}
>
{overlay}
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
);
}

Expand Down
42 changes: 20 additions & 22 deletions apps/hyperdrive-trading/src/ui/rewards/RewardsTooltip/RewardsTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,25 @@ export function RewardsTooltip({
}

return (
<Tooltip.Provider>
<Tooltip.Root>
<Tooltip.Trigger className="flex items-center whitespace-nowrap">
{children}
</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content
className="z-20 h-fit w-72 rounded-box bg-base-200 px-3 py-2 shadow-2xl"
sideOffset={5}
collisionPadding={12}
>
<RewardsTooltipContent
chainId={chainId}
position={position}
hyperdriveAddress={hyperdriveAddress}
baseRate={baseRate}
netRate={netRate}
/>
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
</Tooltip.Provider>
<Tooltip.Root>
<Tooltip.Trigger className="flex items-center whitespace-nowrap">
{children}
</Tooltip.Trigger>
<Tooltip.Portal>
<Tooltip.Content
className="z-20 h-fit w-72 rounded-box bg-base-200 px-3 py-2 shadow-2xl"
sideOffset={5}
collisionPadding={12}
>
<RewardsTooltipContent
chainId={chainId}
position={position}
hyperdriveAddress={hyperdriveAddress}
baseRate={baseRate}
netRate={netRate}
/>
</Tooltip.Content>
</Tooltip.Portal>
</Tooltip.Root>
);
}
26 changes: 24 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17581,14 +17581,22 @@ react-dev-utils@^12.0.1:
strip-ansi "^6.0.1"
text-table "^0.2.0"

react-dom@^18.0.0, react-dom@^18.2.0:
react-dom@^18.0.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
dependencies:
loose-envify "^1.1.0"
scheduler "^0.23.0"

react-dom@^18.3.1:
version "18.3.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
dependencies:
loose-envify "^1.1.0"
scheduler "^0.23.2"

react-error-overlay@^6.0.11:
version "6.0.11"
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
Expand Down Expand Up @@ -17774,13 +17782,20 @@ react-use@^17.4.2:
ts-easing "^0.2.0"
tslib "^2.1.0"

react@>=16, react@^18.0.0, react@^18.2.0:
react@>=16, react@^18.0.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"

react@^18.3.1:
version "18.3.1"
resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
dependencies:
loose-envify "^1.1.0"

read-cache@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
Expand Down Expand Up @@ -18524,6 +18539,13 @@ scheduler@^0.23.0:
dependencies:
loose-envify "^1.1.0"

scheduler@^0.23.2:
version "0.23.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
dependencies:
loose-envify "^1.1.0"

schema-utils@2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
Expand Down
Loading