Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10d41b3

Browse files
aqandrewaslilac
andauthored
refactor: replace other deprecated Popovers which open on hover (#19753)
closes#19397 dependency:#19709#19635 covered a large chunk of deprecated `Popover`s which open onhover, specifically the ones which instantiated `HelpTooltip`. This PRreplaces all of the non-`HelpTooltip` hover-triggered popovers, andremoves the deprecated popover component :)---------Co-authored-by: ケイラ <mckayla@hey.com>
1 parentd29a524 commit10d41b3

File tree

17 files changed

+432
-744
lines changed

17 files changed

+432
-744
lines changed

‎site/src/components/deprecated/Popover/Popover.stories.tsx‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎site/src/components/deprecated/Popover/Popover.tsx‎

Lines changed: 0 additions & 245 deletions
This file was deleted.

‎site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ const Example: Story = {
3030

3131
awaitstep("click to open",async()=>{
3232
awaituserEvent.click(canvas.getByRole("button"));
33-
awaitwaitFor(()=>
34-
expect(screen.getByText(/v2\.\d+\.\d+/i)).toBeInTheDocument(),
33+
awaitwaitFor(async()=>
34+
expect(awaitscreen.findByText(/v2\.\d+\.\d+/i)).toBeInTheDocument(),
3535
);
3636
});
3737
},

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AppearanceSettingsPageView.tsx‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ import {
77
PremiumBadge,
88
}from"components/Badges/Badges";
99
import{Button}from"components/Button/Button";
10-
import{
11-
Popover,
12-
PopoverContent,
13-
PopoverTrigger,
14-
}from"components/deprecated/Popover/Popover";
1510
import{PopoverPaywall}from"components/Paywall/PopoverPaywall";
1611
import{
1712
SettingsHeader,
1813
SettingsHeaderDescription,
1914
SettingsHeaderTitle,
2015
}from"components/SettingsHeader/SettingsHeader";
16+
import{
17+
Tooltip,
18+
TooltipContent,
19+
TooltipProvider,
20+
TooltipTrigger,
21+
}from"components/Tooltip/Tooltip";
2122
import{useFormik}from"formik";
2223
importtype{FC}from"react";
2324
import{getFormHelpers}from"utils/formUtils";
@@ -66,25 +67,31 @@ export const AppearanceSettingsPageView: FC<
6667
</SettingsHeader>
6768

6869
<Badges>
69-
<Popovermode="hover">
70-
{isEntitled&&!isPremium ?(
71-
<EnterpriseBadge/>
72-
) :(
73-
<PopoverTrigger>
74-
<span>
75-
<PremiumBadge/>
76-
</span>
77-
</PopoverTrigger>
78-
)}
70+
<TooltipProvider>
71+
<TooltipdelayDuration={0}>
72+
{isEntitled&&!isPremium ?(
73+
<EnterpriseBadge/>
74+
) :(
75+
<TooltipTriggerasChild>
76+
<span>
77+
<PremiumBadge/>
78+
</span>
79+
</TooltipTrigger>
80+
)}
7981

80-
<PopoverContentcss={{transform:"translateY(-28px)"}}>
81-
<PopoverPaywall
82-
message="Appearance"
83-
description="With a Premium license, you can customize the appearance and branding of your deployment."
84-
documentationLink="https://coder.com/docs/admin/appearance"
85-
/>
86-
</PopoverContent>
87-
</Popover>
82+
<TooltipContent
83+
sideOffset={-28}
84+
collisionPadding={16}
85+
className="p-0"
86+
>
87+
<PopoverPaywall
88+
message="Appearance"
89+
description="With a Premium license, you can customize the appearance and branding of your deployment."
90+
documentationLink="https://coder.com/docs/admin/appearance"
91+
/>
92+
</TooltipContent>
93+
</Tooltip>
94+
</TooltipProvider>
8895
</Badges>
8996

9097
<Fieldset

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp