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

Commitf835cb1

Browse files
committed
fix: add TooltipProvider to PublishTemplateVersionDialog
1 parent303222b commitf835cb1

File tree

3 files changed

+36
-24
lines changed

3 files changed

+36
-24
lines changed

‎site/src/components/HelpTooltip/HelpTooltip.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import {
55
typeTheme,
66
}from"@emotion/react";
77
importLinkfrom"@mui/material/Link";
8-
import{TooltipContentProps,TooltipProps}from"@radix-ui/react-tooltip";
8+
import{TooltipProps}from"@radix-ui/react-tooltip";
99
import{Stack}from"components/Stack/Stack";
1010
import{
1111
Tooltip,
1212
TooltipContent,
13+
typeTooltipContentProps,
1314
TooltipTrigger,
1415
}from"components/Tooltip/Tooltip";
1516
import{CircleHelpIcon,ExternalLinkIcon}from"lucide-react";

‎site/src/components/Tooltip/Tooltip.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ export const Tooltip = TooltipPrimitive.Root;
1212

1313
exportconstTooltipTrigger=TooltipPrimitive.Trigger;
1414

15+
exporttypeTooltipContentProps=React.ComponentPropsWithoutRef<
16+
typeofTooltipPrimitive.Content
17+
>&{
18+
disablePortal?:boolean;
19+
};
20+
1521
exportconstTooltipContent=React.forwardRef<
1622
React.ElementRef<typeofTooltipPrimitive.Content>,
17-
React.ComponentPropsWithoutRef<typeofTooltipPrimitive.Content>&{
18-
disablePortal?:boolean;
19-
}
23+
TooltipContentProps
2024
>(({ className, sideOffset=4, disablePortal, ...props},ref)=>{
2125
constcontent=(
2226
<TooltipPrimitive.Content

‎site/src/pages/TemplateVersionEditorPage/PublishTemplateVersionDialog.tsx‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
HelpTooltipTrigger,
2121
}from"../../components/HelpTooltip/HelpTooltip";
2222
import{docs}from"../../utils/docs";
23+
import{TooltipProvider}from"components/Tooltip/Tooltip";
2324

2425
exportconstLanguage={
2526
versionNameLabel:"Version name",
@@ -120,27 +121,33 @@ export const PublishTemplateVersionDialog: FC<
120121
}
121122
/>
122123

123-
<HelpTooltip>
124-
<HelpTooltipTrigger/>
124+
<TooltipProvider>
125+
<HelpTooltip>
126+
<HelpTooltipTrigger/>
125127

126-
<HelpTooltipContent>
127-
<HelpTooltipTitle>
128-
{Language.activeVersionHelpTitle}
129-
</HelpTooltipTitle>
130-
<HelpTooltipText>
131-
{Language.activeVersionHelpText}
132-
</HelpTooltipText>
133-
<HelpTooltipLinksGroup>
134-
<HelpTooltipLink
135-
href={docs(
136-
"/admin/templates/managing-templates#template-update-policies",
137-
)}
138-
>
139-
{Language.activeVersionHelpBody}
140-
</HelpTooltipLink>
141-
</HelpTooltipLinksGroup>
142-
</HelpTooltipContent>
143-
</HelpTooltip>
128+
{/**
129+
* Without disablePortal, the tooltip will render under the dialog;
130+
* this prop may not need to be set when we switch away from MuiDialog
131+
*/}
132+
<HelpTooltipContentdisablePortal>
133+
<HelpTooltipTitle>
134+
{Language.activeVersionHelpTitle}
135+
</HelpTooltipTitle>
136+
<HelpTooltipText>
137+
{Language.activeVersionHelpText}
138+
</HelpTooltipText>
139+
<HelpTooltipLinksGroup>
140+
<HelpTooltipLink
141+
href={docs(
142+
"/admin/templates/managing-templates#template-update-policies",
143+
)}
144+
>
145+
{Language.activeVersionHelpBody}
146+
</HelpTooltipLink>
147+
</HelpTooltipLinksGroup>
148+
</HelpTooltipContent>
149+
</HelpTooltip>
150+
</TooltipProvider>
144151
</Stack>
145152
</FormFields>
146153
</Stack>

0 commit comments

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