Skip to content

Commit abfeea2

Browse files
ht-rndorozg5
andauthored
Feature/RND-1794 - Tooltip fix (#13)
Co-authored-by: Gabriela Oroz <gabriela.oroz.external@t.ht.hr>
1 parent f8cd9c5 commit abfeea2

3 files changed

Lines changed: 987 additions & 45 deletions

File tree

components/ui/json-schema-form.tsx

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
import { Button } from "./button";
2020
import { Input } from "./input";
2121
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./select";
22-
import { Tooltip, TooltipContent, TooltipTrigger } from "./tooltip";
22+
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./tooltip";
2323

2424
export interface DefinitionItem {
2525
id: string;
@@ -221,25 +221,27 @@ const FieldRow = React.forwardRef<HTMLDivElement, FieldRowProps>(
221221
control={control}
222222
name={`${fieldPath}.isRequired`}
223223
render={({ field }) => (
224-
<Tooltip>
225-
<TooltipTrigger asChild>
226-
<Button
227-
type="button"
228-
data-testid="required"
229-
disabled={readOnly}
230-
size="icon"
231-
variant={field.value ? "default" : "outline"}
232-
onClick={() => {
233-
field.onChange(!field.value);
234-
}}
235-
>
236-
<TriangleAlert />
237-
</Button>
238-
</TooltipTrigger>
239-
<TooltipContent>
240-
<p>Required</p>
241-
</TooltipContent>
242-
</Tooltip>
224+
<TooltipProvider>
225+
<Tooltip>
226+
<TooltipTrigger asChild>
227+
<Button
228+
type="button"
229+
data-testid="required"
230+
disabled={readOnly}
231+
size="icon"
232+
variant={field.value ? "default" : "outline"}
233+
onClick={() => {
234+
field.onChange(!field.value);
235+
}}
236+
>
237+
<TriangleAlert />
238+
</Button>
239+
</TooltipTrigger>
240+
<TooltipContent>
241+
<p>Required</p>
242+
</TooltipContent>
243+
</Tooltip>
244+
</TooltipProvider>
243245
)}
244246
/>
245247
<div className="border-l-2 border-input"></div>
@@ -460,16 +462,18 @@ const Root = React.forwardRef<HTMLDivElement, RootProps>(
460462
)}
461463
/>
462464

463-
<Tooltip>
464-
<TooltipTrigger asChild>
465-
<Button type="button" disabled size="icon">
466-
<TriangleAlert />
467-
</Button>
468-
</TooltipTrigger>
469-
<TooltipContent>
470-
<p>Required</p>
471-
</TooltipContent>
472-
</Tooltip>
465+
<TooltipProvider>
466+
<Tooltip>
467+
<TooltipTrigger asChild>
468+
<Button type="button" disabled size="icon">
469+
<TriangleAlert />
470+
</Button>
471+
</TooltipTrigger>
472+
<TooltipContent>
473+
<p>Required</p>
474+
</TooltipContent>
475+
</Tooltip>
476+
</TooltipProvider>
473477

474478
<div className="border-l-2 border-input"></div>
475479

0 commit comments

Comments
 (0)