@tamagui/tooltip 1.30.8 → 1.30.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/cjs/Tooltip.js +14 -28
  2. package/dist/cjs/Tooltip.js.map +1 -1
  3. package/dist/esm/Tooltip.js +16 -31
  4. package/dist/esm/Tooltip.js.map +1 -1
  5. package/dist/jsx/Tooltip.js +5 -16
  6. package/dist/jsx/Tooltip.js.map +1 -1
  7. package/dist/jsx/Tooltip.mjs +5 -16
  8. package/dist/jsx/Tooltip.mjs.map +1 -1
  9. package/package.json +14 -14
  10. package/src/Tooltip.tsx +6 -17
  11. package/types/Tooltip.d.ts +2 -2
  12. package/types/Tooltip.d.ts.map +1 -1
package/dist/cjs/Tooltip.js CHANGED
@@ -44,8 +44,7 @@ var React = __toESM(require("react"));
44
44
  const TooltipContent = import_popper.PopperContentFrame.extractable(
45
45
  React.forwardRef(
46
46
  ({ __scopePopover, ...props }, ref) => {
47
- const popperScope = (0, import_popover.usePopoverScope)(__scopePopover);
48
- const popper = (0, import_popper.usePopperContext)("PopperContent", popperScope["__scopePopper"]);
47
+ const popper = (0, import_popper.usePopperContext)();
49
48
  const padding = props.size || popper.size || (0, import_get_token.getSize)("$true", {
50
49
  shift: -2
51
50
  });
@@ -80,7 +79,6 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
80
79
  focus,
81
80
  ...restProps
82
81
  } = props;
83
- const popperScope = (0, import_popover.usePopoverScope)(__scopePopover);
84
82
  const triggerRef = React.useRef(null);
85
83
  const [hasCustomAnchor, setHasCustomAnchor] = React.useState(false);
86
84
  const { delay: delayGroup, setCurrentId } = (0, import_react.useDelayGroupContext)();
@@ -121,33 +119,21 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
121
119
  shift: -2,
122
120
  bounds: [0]
123
121
  });
124
- return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_floating.FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
125
- import_popper.Popper,
122
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_floating.FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_popper.Popper, { size: smallerSize.key, allowFlip: true, ...restProps, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
123
+ import_popover.PopoverContext.Provider,
126
124
  {
127
- size: smallerSize.key,
128
- allowFlip: true,
129
- ...popperScope,
130
- ...restProps,
131
- children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
132
- import_popover.__PopoverProviderInternal,
133
- {
134
- scope: __scopePopover,
135
- popperScope: popperScope.__scopePopper,
136
- contentId,
137
- triggerRef,
138
- sheetBreakpoint: false,
139
- scopeKey: "",
140
- open,
141
- onOpenChange: setOpen,
142
- onOpenToggle: voidFn,
143
- hasCustomAnchor,
144
- onCustomAnchorAdd,
145
- onCustomAnchorRemove,
146
- children
147
- }
148
- )
125
+ contentId,
126
+ triggerRef,
127
+ sheetBreakpoint: false,
128
+ open,
129
+ onOpenChange: setOpen,
130
+ onOpenToggle: voidFn,
131
+ hasCustomAnchor,
132
+ onCustomAnchorAdd,
133
+ onCustomAnchorRemove,
134
+ children
149
135
  }
150
- ) });
136
+ ) }) });
151
137
  });
152
138
  const Tooltip2 = (0, import_core.withStaticProperties)(TooltipComponent, {
153
139
  Anchor: import_popover.PopoverAnchor,
package/dist/cjs/Tooltip.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Tooltip.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["Tooltip", "open", "props"]
6
6
  }
package/dist/esm/Tooltip.js CHANGED
@@ -18,9 +18,8 @@ import {
18
18
  PopoverAnchor,
19
19
  PopoverArrow,
20
20
  PopoverContent,
21
- PopoverTrigger,
22
- __PopoverProviderInternal,
23
- usePopoverScope
21
+ PopoverContext,
22
+ PopoverTrigger
24
23
  } from "@tamagui/popover";
25
24
  import {
26
25
  Popper,
@@ -31,8 +30,7 @@ import * as React from "react";
31
30
  const TooltipContent = PopperContentFrame.extractable(
32
31
  React.forwardRef(
33
32
  ({ __scopePopover, ...props }, ref) => {
34
- const popperScope = usePopoverScope(__scopePopover);
35
- const popper = usePopperContext("PopperContent", popperScope["__scopePopper"]);
33
+ const popper = usePopperContext();
36
34
  const padding = props.size || popper.size || getSize("$true", {
37
35
  shift: -2
38
36
  });
@@ -67,7 +65,6 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
67
65
  focus,
68
66
  ...restProps
69
67
  } = props;
70
- const popperScope = usePopoverScope(__scopePopover);
71
68
  const triggerRef = React.useRef(null);
72
69
  const [hasCustomAnchor, setHasCustomAnchor] = React.useState(false);
73
70
  const { delay: delayGroup, setCurrentId } = useDelayGroupContext();
@@ -108,33 +105,21 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
108
105
  shift: -2,
109
106
  bounds: [0]
110
107
  });
111
- return /* @__PURE__ */ jsx(FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ jsx(
112
- Popper,
108
+ return /* @__PURE__ */ jsx(FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ jsx(Popper, { size: smallerSize.key, allowFlip: true, ...restProps, children: /* @__PURE__ */ jsx(
109
+ PopoverContext.Provider,
113
110
  {
114
- size: smallerSize.key,
115
- allowFlip: true,
116
- ...popperScope,
117
- ...restProps,
118
- children: /* @__PURE__ */ jsx(
119
- __PopoverProviderInternal,
120
- {
121
- scope: __scopePopover,
122
- popperScope: popperScope.__scopePopper,
123
- contentId,
124
- triggerRef,
125
- sheetBreakpoint: false,
126
- scopeKey: "",
127
- open,
128
- onOpenChange: setOpen,
129
- onOpenToggle: voidFn,
130
- hasCustomAnchor,
131
- onCustomAnchorAdd,
132
- onCustomAnchorRemove,
133
- children
134
- }
135
- )
111
+ contentId,
112
+ triggerRef,
113
+ sheetBreakpoint: false,
114
+ open,
115
+ onOpenChange: setOpen,
116
+ onOpenToggle: voidFn,
117
+ hasCustomAnchor,
118
+ onCustomAnchorAdd,
119
+ onCustomAnchorRemove,
120
+ children
136
121
  }
137
- ) });
122
+ ) }) });
138
123
  });
139
124
  const Tooltip2 = withStaticProperties(TooltipComponent, {
140
125
  Anchor: PopoverAnchor,
package/dist/esm/Tooltip.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Tooltip.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["open", "props", "Tooltip"]
6
6
  }
package/dist/jsx/Tooltip.js CHANGED
@@ -17,9 +17,8 @@ import {
17
17
  PopoverAnchor,
18
18
  PopoverArrow,
19
19
  PopoverContent,
20
- PopoverTrigger,
21
- __PopoverProviderInternal,
22
- usePopoverScope
20
+ PopoverContext,
21
+ PopoverTrigger
23
22
  } from "@tamagui/popover";
24
23
  import {
25
24
  Popper,
@@ -30,8 +29,7 @@ import * as React from "react";
30
29
  const TooltipContent = PopperContentFrame.extractable(
31
30
  React.forwardRef(
32
31
  ({ __scopePopover, ...props }, ref) => {
33
- const popperScope = usePopoverScope(__scopePopover);
34
- const popper = usePopperContext("PopperContent", popperScope["__scopePopper"]);
32
+ const popper = usePopperContext();
35
33
  const padding = props.size || popper.size || getSize("$true", {
36
34
  shift: -2
37
35
  });
@@ -63,7 +61,6 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
63
61
  focus,
64
62
  ...restProps
65
63
  } = props;
66
- const popperScope = usePopoverScope(__scopePopover);
67
64
  const triggerRef = React.useRef(null);
68
65
  const [hasCustomAnchor, setHasCustomAnchor] = React.useState(false);
69
66
  const { delay: delayGroup, setCurrentId } = useDelayGroupContext();
@@ -108,25 +105,17 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
108
105
  {
109
106
  /* default tooltip to a smaller size */
110
107
  }
111
- <Popper
112
- size={smallerSize.key}
113
- allowFlip
114
- {...popperScope}
115
- {...restProps}
116
- ><__PopoverProviderInternal
117
- scope={__scopePopover}
118
- popperScope={popperScope.__scopePopper}
108
+ <Popper size={smallerSize.key} allowFlip {...restProps}><PopoverContext.Provider
119
109
  contentId={contentId}
120
110
  triggerRef={triggerRef}
121
111
  sheetBreakpoint={false}
122
- scopeKey=""
123
112
  open={open}
124
113
  onOpenChange={setOpen}
125
114
  onOpenToggle={voidFn}
126
115
  hasCustomAnchor={hasCustomAnchor}
127
116
  onCustomAnchorAdd={onCustomAnchorAdd}
128
117
  onCustomAnchorRemove={onCustomAnchorRemove}
129
- >{children}</__PopoverProviderInternal></Popper>
118
+ >{children}</PopoverContext.Provider></Popper>
130
119
  </FloatingOverrideContext.Provider>;
131
120
  });
132
121
  const Tooltip2 = withStaticProperties(TooltipComponent, {
package/dist/jsx/Tooltip.js.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Tooltip.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["open", "props", "Tooltip"]
6
6
  }
package/dist/jsx/Tooltip.mjs CHANGED
@@ -17,9 +17,8 @@ import {
17
17
  PopoverAnchor,
18
18
  PopoverArrow,
19
19
  PopoverContent,
20
- PopoverTrigger,
21
- __PopoverProviderInternal,
22
- usePopoverScope
20
+ PopoverContext,
21
+ PopoverTrigger
23
22
  } from "@tamagui/popover";
24
23
  import {
25
24
  Popper,
@@ -30,8 +29,7 @@ import * as React from "react";
30
29
  const TooltipContent = PopperContentFrame.extractable(
31
30
  React.forwardRef(
32
31
  ({ __scopePopover, ...props }, ref) => {
33
- const popperScope = usePopoverScope(__scopePopover);
34
- const popper = usePopperContext("PopperContent", popperScope["__scopePopper"]);
32
+ const popper = usePopperContext();
35
33
  const padding = props.size || popper.size || getSize("$true", {
36
34
  shift: -2
37
35
  });
@@ -63,7 +61,6 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
63
61
  focus,
64
62
  ...restProps
65
63
  } = props;
66
- const popperScope = usePopoverScope(__scopePopover);
67
64
  const triggerRef = React.useRef(null);
68
65
  const [hasCustomAnchor, setHasCustomAnchor] = React.useState(false);
69
66
  const { delay: delayGroup, setCurrentId } = useDelayGroupContext();
@@ -108,25 +105,17 @@ const TooltipComponent = React.forwardRef(function Tooltip(props, ref) {
108
105
  {
109
106
  /* default tooltip to a smaller size */
110
107
  }
111
- <Popper
112
- size={smallerSize.key}
113
- allowFlip
114
- {...popperScope}
115
- {...restProps}
116
- ><__PopoverProviderInternal
117
- scope={__scopePopover}
118
- popperScope={popperScope.__scopePopper}
108
+ <Popper size={smallerSize.key} allowFlip {...restProps}><PopoverContext.Provider
119
109
  contentId={contentId}
120
110
  triggerRef={triggerRef}
121
111
  sheetBreakpoint={false}
122
- scopeKey=""
123
112
  open={open}
124
113
  onOpenChange={setOpen}
125
114
  onOpenToggle={voidFn}
126
115
  hasCustomAnchor={hasCustomAnchor}
127
116
  onCustomAnchorAdd={onCustomAnchorAdd}
128
117
  onCustomAnchorRemove={onCustomAnchorRemove}
129
- >{children}</__PopoverProviderInternal></Popper>
118
+ >{children}</PopoverContext.Provider></Popper>
130
119
  </FloatingOverrideContext.Provider>;
131
120
  });
132
121
  const Tooltip2 = withStaticProperties(TooltipComponent, {
package/dist/jsx/Tooltip.mjs.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Tooltip.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["open", "props", "Tooltip"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/tooltip",
3
- "version": "1.30.8",
3
+ "version": "1.30.10",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -31,25 +31,25 @@
31
31
  }
32
32
  },
33
33
  "dependencies": {
34
- "@floating-ui/react": "^0.24.2",
35
- "@tamagui/compose-refs": "1.30.8",
36
- "@tamagui/core": "1.30.8",
37
- "@tamagui/create-context": "1.30.8",
38
- "@tamagui/floating": "1.30.8",
39
- "@tamagui/get-token": "1.30.8",
40
- "@tamagui/polyfill-dev": "1.30.8",
41
- "@tamagui/popover": "1.30.8",
42
- "@tamagui/popper": "1.30.8",
43
- "@tamagui/stacks": "1.30.8",
44
- "@tamagui/text": "1.30.8",
45
- "@tamagui/use-controllable-state": "1.30.8"
34
+ "@floating-ui/react": "^0.19.1",
35
+ "@tamagui/compose-refs": "1.30.10",
36
+ "@tamagui/core": "1.30.10",
37
+ "@tamagui/create-context": "1.30.10",
38
+ "@tamagui/floating": "1.30.10",
39
+ "@tamagui/get-token": "1.30.10",
40
+ "@tamagui/polyfill-dev": "1.30.10",
41
+ "@tamagui/popover": "1.30.10",
42
+ "@tamagui/popper": "1.30.10",
43
+ "@tamagui/stacks": "1.30.10",
44
+ "@tamagui/text": "1.30.10",
45
+ "@tamagui/use-controllable-state": "1.30.10"
46
46
  },
47
47
  "peerDependencies": {
48
48
  "react": "*",
49
49
  "react-native": "*"
50
50
  },
51
51
  "devDependencies": {
52
- "@tamagui/build": "1.30.8",
52
+ "@tamagui/build": "1.30.10",
53
53
  "react": "^18.2.0",
54
54
  "react-native": "^0.71.7"
55
55
  },
package/src/Tooltip.tsx CHANGED
@@ -14,16 +14,15 @@ import {
14
14
  import { SizeTokens, useEvent, withStaticProperties } from '@tamagui/core'
15
15
  import { ScopedProps } from '@tamagui/create-context'
16
16
  import { FloatingOverrideContext, UseFloatingFn } from '@tamagui/floating'
17
- import { getSize, stepTokenUpOrDown } from '@tamagui/get-token'
17
+ import { getSize } from '@tamagui/get-token'
18
18
  import {
19
19
  PopoverAnchor,
20
20
  PopoverArrow,
21
21
  PopoverArrowProps,
22
22
  PopoverContent,
23
23
  PopoverContentProps,
24
+ PopoverContext,
24
25
  PopoverTrigger,
25
- __PopoverProviderInternal,
26
- usePopoverScope,
27
26
  } from '@tamagui/popover'
28
27
  import {
29
28
  Popper,
@@ -39,8 +38,7 @@ const TooltipContent = PopperContentFrame.extractable(
39
38
  { __scopePopover, ...props }: ScopedProps<PopoverContentProps, 'Popover'>,
40
39
  ref: any
41
40
  ) => {
42
- const popperScope = usePopoverScope(__scopePopover)
43
- const popper = usePopperContext('PopperContent', popperScope['__scopePopper'])
41
+ const popper = usePopperContext()
44
42
  const padding =
45
43
  props.size ||
46
44
  popper.size ||
@@ -116,7 +114,6 @@ const TooltipComponent = React.forwardRef(function Tooltip(
116
114
  focus,
117
115
  ...restProps
118
116
  } = props
119
- const popperScope = usePopoverScope(__scopePopover)
120
117
  const triggerRef = React.useRef<HTMLButtonElement>(null)
121
118
  const [hasCustomAnchor, setHasCustomAnchor] = React.useState(false)
122
119
  const { delay: delayGroup, setCurrentId } = useDelayGroupContext()
@@ -165,19 +162,11 @@ const TooltipComponent = React.forwardRef(function Tooltip(
165
162
  return (
166
163
  <FloatingOverrideContext.Provider value={useFloatingContext}>
167
164
  {/* default tooltip to a smaller size */}
168
- <Popper
169
- size={smallerSize.key as SizeTokens}
170
- allowFlip
171
- {...popperScope}
172
- {...restProps}
173
- >
174
- <__PopoverProviderInternal
175
- scope={__scopePopover}
176
- popperScope={popperScope.__scopePopper}
165
+ <Popper size={smallerSize.key as SizeTokens} allowFlip {...restProps}>
166
+ <PopoverContext.Provider
177
167
  contentId={contentId}
178
168
  triggerRef={triggerRef}
179
169
  sheetBreakpoint={false}
180
- scopeKey=""
181
170
  open={open}
182
171
  onOpenChange={setOpen}
183
172
  onOpenToggle={voidFn}
@@ -186,7 +175,7 @@ const TooltipComponent = React.forwardRef(function Tooltip(
186
175
  onCustomAnchorRemove={onCustomAnchorRemove}
187
176
  >
188
177
  {children}
189
- </__PopoverProviderInternal>
178
+ </PopoverContext.Provider>
190
179
  </Popper>
191
180
  </FloatingOverrideContext.Provider>
192
181
  )
package/types/Tooltip.d.ts CHANGED
@@ -49,7 +49,7 @@ export declare const Tooltip: React.ForwardRefExoticComponent<PopperProps & {
49
49
  }>> & import("@tamagui/core").PseudoProps<Partial<Omit<import("react-native/types").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{}, "elevation" | "fullscreen"> & {
50
50
  readonly fullscreen?: boolean | undefined;
51
51
  readonly elevation?: SizeTokens | undefined;
52
- }>> & React.RefAttributes<HTMLElement | import("react-native/types").View>>;
52
+ }>> & React.RefAttributes<import("@tamagui/core").TamaguiElement>>;
53
53
  Arrow: React.ForwardRefExoticComponent<Omit<import("react-native/types").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{}, "elevation" | "fullscreen"> & {
54
54
  readonly fullscreen?: boolean | undefined;
55
55
  readonly elevation?: SizeTokens | undefined;
@@ -75,7 +75,7 @@ export declare const Tooltip: React.ForwardRefExoticComponent<PopperProps & {
75
75
  }>> & import("@tamagui/core").PseudoProps<Partial<Omit<import("react-native/types").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{}, "elevation" | "fullscreen"> & {
76
76
  readonly fullscreen?: boolean | undefined;
77
77
  readonly elevation?: SizeTokens | undefined;
78
- }>> & React.RefAttributes<HTMLElement | import("react-native/types").View>>;
78
+ }>> & React.RefAttributes<import("@tamagui/core").TamaguiElement>>;
79
79
  };
80
80
  export {};
81
81
  //# sourceMappingURL=Tooltip.d.ts.map
package/types/Tooltip.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Tooltip.d.ts","sourceRoot":"","sources":["../src/Tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAA;AAa9B,OAAO,EAAE,UAAU,EAAkC,MAAM,eAAe,CAAA;AAc1E,OAAO,EAGL,WAAW,EAEZ,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAmC9B,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,KAAK,CAAC,EAAE;QACN,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,YAAY,CAAC,EAAE,OAAO,CAAA;KACvB,CAAA;IACD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EACF,MAAM,GACN;QACE,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACN,CAAA;AAED,KAAK,KAAK,GACN,MAAM,GACN,OAAO,CAAC;IACN,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAC,CAAA;AAEN,eAAO,MAAM,YAAY;eAAsC,GAAG;WAAS,KAAK;iBAM/E,CAAA;AAgGD,eAAO,MAAM,OAAO;eA7HP,MAAM,SAAS;2BACJ,OAAO,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiItC,CAAA"}
1
+ {"version":3,"file":"Tooltip.d.ts","sourceRoot":"","sources":["../src/Tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAA;AAa9B,OAAO,EAAE,UAAU,EAAkC,MAAM,eAAe,CAAA;AAa1E,OAAO,EAGL,WAAW,EAEZ,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAkC9B,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,KAAK,CAAC,EAAE;QACN,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,YAAY,CAAC,EAAE,OAAO,CAAA;KACvB,CAAA;IACD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EACF,MAAM,GACN;QACE,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACN,CAAA;AAED,KAAK,KAAK,GACN,MAAM,GACN,OAAO,CAAC;IACN,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAC,CAAA;AAEN,eAAO,MAAM,YAAY;eAAsC,GAAG;WAAS,KAAK;iBAM/E,CAAA;AAuFD,eAAO,MAAM,OAAO;eApHP,MAAM,SAAS;2BACJ,OAAO,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwHtC,CAAA"}