Skip to content

Commit d67381a

Browse files
authored
Merge pull request #285 from gluestack/patch
hotfix: tooltip tip build issue.
2 parents cc7e1a1 + 6adc1a1 commit d67381a

File tree

2 files changed

+55
-51
lines changed

2 files changed

+55
-51
lines changed

packages/tooltip/src/TooltipContent.tsx

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,56 +9,47 @@ export function TooltipContent<StyledTooltipContentProps>(
99
StyledTooltipContent: React.ComponentType<StyledTooltipContentProps>,
1010
AnimatePresence?: React.ComponentType<any>
1111
) {
12-
return forwardRef(
13-
(
14-
{
15-
children,
16-
style,
17-
...props
18-
}: StyledTooltipContentProps & { children?: any; style?: any },
19-
ref: any
20-
) => {
21-
const { value } = useTooltipContext('TooltipContext');
22-
const {
23-
isOpen,
24-
targetRef,
25-
placement,
26-
crossOffset,
27-
offset,
28-
shouldFlip,
29-
shouldOverlapWithTrigger,
30-
} = value;
31-
const overlayRef = React.useRef(null);
32-
const { overlayProps } = useOverlayPosition({
33-
placement,
34-
targetRef,
35-
overlayRef,
36-
crossOffset,
37-
offset,
38-
shouldOverlapWithTrigger,
39-
shouldFlip,
40-
});
41-
const mergedRef = mergeRefs([ref, overlayRef]);
12+
return forwardRef(({ children, style, ...props }: any, ref: any) => {
13+
const { value } = useTooltipContext('TooltipContext');
14+
const {
15+
isOpen,
16+
targetRef,
17+
placement,
18+
crossOffset,
19+
offset,
20+
shouldFlip,
21+
shouldOverlapWithTrigger,
22+
} = value;
23+
const overlayRef = React.useRef(null);
24+
const { overlayProps } = useOverlayPosition({
25+
placement,
26+
targetRef,
27+
overlayRef,
28+
crossOffset,
29+
offset,
30+
shouldOverlapWithTrigger,
31+
shouldFlip,
32+
});
33+
const mergedRef = mergeRefs([ref, overlayRef]);
4234

43-
return (
44-
<OverlayAnimatePresence
45-
visible={isOpen}
46-
AnimatePresence={AnimatePresence}
35+
return (
36+
<OverlayAnimatePresence
37+
visible={isOpen}
38+
AnimatePresence={AnimatePresence}
39+
>
40+
<StyledTooltipContent
41+
{...props}
42+
ref={mergedRef}
43+
accessibilityRole={Platform.OS === 'web' ? 'tooltip' : undefined}
44+
style={{
45+
...overlayProps.style,
46+
position: 'absolute',
47+
...style,
48+
}}
4749
>
48-
<StyledTooltipContent
49-
{...props}
50-
ref={mergedRef}
51-
accessibilityRole={Platform.OS === 'web' ? 'tooltip' : undefined}
52-
style={{
53-
...overlayProps.style,
54-
position: 'absolute',
55-
...style,
56-
}}
57-
>
58-
{children}
59-
</StyledTooltipContent>
60-
</OverlayAnimatePresence>
61-
);
62-
}
63-
);
50+
{children}
51+
</StyledTooltipContent>
52+
</OverlayAnimatePresence>
53+
);
54+
});
6455
}

yarn.lock

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,11 @@
22712271
"@react-native-aria/focus" "^0.2.7"
22722272
react-native-svg "13.4.0"
22732273

2274+
"@gluestack-ui/[email protected]":
2275+
version "0.1.0"
2276+
resolved "https://registry.yarnpkg.com/@gluestack-ui/divider/-/divider-0.1.0.tgz#5ea56a80127790835f771b11830a592022942e4e"
2277+
integrity sha512-xwQSb/gwrqK34urU2d/5rfEG5trIHmz0x9cfkc4+ehMDI3gcMy+TyYludUvdbUq4nTf4ElSmTTNAfDnbHU/tmQ==
2278+
22742279
"@gluestack-ui/[email protected]":
22752280
version "0.1.0"
22762281
resolved "https://registry.yarnpkg.com/@gluestack-ui/fab/-/fab-0.1.0.tgz#528cb56d082eb3b7178d2ecf60f9e2d6b53259b3"
@@ -2382,6 +2387,14 @@
23822387
"@react-stately/slider" "^3.2.4"
23832388
react-native-svg "13.4.0"
23842389

2390+
"@gluestack-ui/[email protected]":
2391+
version "0.1.1"
2392+
resolved "https://registry.yarnpkg.com/@gluestack-ui/spinner/-/spinner-0.1.1.tgz#589feecef3da4754de5cfb4c9373028319b78f9f"
2393+
integrity sha512-68gNRebN26tr3jHJYETx8m7sQ1Nh5VjHRPb+orqtCIyyqFyvlvN+BATxYAD6n2y26sGspS+dQEaFvHSWdaUf6g==
2394+
dependencies:
2395+
"@react-native-aria/focus" "^0.2.7"
2396+
react-native-svg "13.4.0"
2397+
23852398
"@gluestack-ui/[email protected]":
23862399
version "0.1.3"
23872400
resolved "https://registry.yarnpkg.com/@gluestack-ui/switch/-/switch-0.1.3.tgz#472e5735160499d309220a49db4402e33f91b27f"
@@ -3160,7 +3173,7 @@
31603173
"@react-native-aria/utils" "^0.2.6"
31613174
"@react-stately/toggle" "^3.2.1"
31623175

3163-
"@react-native-aria/[email protected]":
3176+
"@react-native-aria/[email protected]", "@react-native-aria/dialog@latest":
31643177
version "0.1.1"
31653178
resolved "https://registry.yarnpkg.com/@react-native-aria/dialog/-/dialog-0.1.1.tgz#705315f2bd37130af0ba1ecb542227ebb2611c4e"
31663179
integrity sha512-/f2Coy6C1GkedoA+EaOTX0KqnT0+kdb6kvTKCVRcdAtiaxPKpkmfGVBeRqRh2ui47uw5yVD0JKENhxHkym9RAg==

0 commit comments

Comments
 (0)