@tamagui/tooltip 1.68.5 → 1.69.0

package/dist/cjs/Tooltip.js

@@ -27,15 +27,16 @@ __export(Tooltip_exports, {
 });
 module.exports = __toCommonJS(Tooltip_exports);
 var import_polyfill_dev = require("@tamagui/polyfill-dev"), import_react = require("@floating-ui/react"), import_core = require("@tamagui/core"), import_floating = require("@tamagui/floating"), import_get_token = require("@tamagui/get-token"), import_popover = require("@tamagui/popover"), import_popper = require("@tamagui/popper"), import_use_controllable_state = require("@tamagui/use-controllable-state"), React = __toESM(require("react")), import_jsx_runtime = require("react/jsx-runtime");
-const TooltipContent = import_popper.PopperContentFrame.extractable(
+const TOOLTIP_SCOPE = "tooltip", TooltipContent = import_popper.PopperContentFrame.extractable(
   React.forwardRef(
-    ({ __scopePopover, ...props }, ref) => {
-      const popper = (0, import_popper.usePopperContext)(), padding = props.padding ?? props.size ?? popper.size ?? (0, import_get_token.getSize)("$true", {
+    ({ __scopeTooltip, ...props }, ref) => {
+      const popper = (0, import_popper.usePopperContext)(__scopeTooltip || TOOLTIP_SCOPE), padding = props.padding ?? props.size ?? popper.size ?? (0, import_get_token.getSize)("$true", {
         shift: -2
       });
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
         import_popover.PopoverContent,
         {
+          __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
           componentName: "Tooltip",
           disableRemoveScroll: !0,
           disableFocusScope: !0,
@@ -48,15 +49,28 @@ const TooltipContent = import_popper.PopperContentFrame.extractable(
       );
     }
   )
-), TooltipArrow = React.forwardRef((props, ref) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_popover.PopoverArrow, { componentName: "Tooltip", ref, ...props })), TooltipGroup = ({ children, delay }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.FloatingDelayGroup, { delay: React.useMemo(() => delay, [JSON.stringify(delay)]), children }), TooltipComponent = React.forwardRef(function(props, ref) {
+), TooltipArrow = React.forwardRef(
+  (props, ref) => {
+    const { __scopeTooltip, ...rest } = props;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_popover.PopoverArrow,
+      {
+        __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
+        componentName: "Tooltip",
+        ref,
+        ...rest
+      }
+    );
+  }
+), TooltipGroup = ({ children, delay }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.FloatingDelayGroup, { delay: React.useMemo(() => delay, [JSON.stringify(delay)]), children }), TooltipComponent = React.forwardRef(function(props, ref) {
   const {
-    __scopePopover,
     children,
     delay: delayProp,
     restMs = typeof delayProp > "u" ? 500 : typeof delayProp == "number" ? delayProp : 0,
     onOpenChange: onOpenChangeProp,
     focus,
     open: openProp,
+    __scopeTooltip,
     ...restProps
   } = props, triggerRef = React.useRef(null), [hasCustomAnchor, setHasCustomAnchor] = React.useState(!1), { delay: delayGroup, setCurrentId } = (0, import_react.useDelayGroupContext)(), delay = delayProp ?? delayGroup, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
     prop: openProp,
@@ -86,26 +100,53 @@ const TooltipContent = import_popper.PopperContentFrame.extractable(
     shift: -2,
     bounds: [0]
   });
-  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 == null ? void 0 : smallerSize.key, allowFlip: !0, stayInFrame: !0, ...restProps, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    import_popover.PopoverContext.Provider,
+  return (
+    // TODO: FloatingOverrideContext might also need to be scoped
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_floating.FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_popper.Popper,
+      {
+        __scopePopper: __scopeTooltip || TOOLTIP_SCOPE,
+        size: smallerSize == null ? void 0 : smallerSize.key,
+        allowFlip: !0,
+        stayInFrame: !0,
+        ...restProps,
+        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          import_popover.PopoverContext.Provider,
+          {
+            contentId,
+            triggerRef,
+            sheetBreakpoint: !1,
+            open,
+            scope: __scopeTooltip || TOOLTIP_SCOPE,
+            onOpenChange: setOpen,
+            onOpenToggle: voidFn,
+            hasCustomAnchor,
+            onCustomAnchorAdd,
+            onCustomAnchorRemove,
+            children
+          }
+        )
+      }
+    ) })
+  );
+}), TooltipTrigger = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_popover.PopoverTrigger,
     {
-      contentId,
-      triggerRef,
-      sheetBreakpoint: !1,
-      open,
-      onOpenChange: setOpen,
-      onOpenToggle: voidFn,
-      hasCustomAnchor,
-      onCustomAnchorAdd,
-      onCustomAnchorRemove,
-      children
+      ...rest,
+      __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
+      ref
     }
-  ) }) });
+  );
+}), TooltipAnchor = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_popover.PopoverAnchor, { ...rest, __scopePopover: __scopeTooltip || TOOLTIP_SCOPE, ref });
 }), Tooltip2 = (0, import_core.withStaticProperties)(TooltipComponent, {
-  Anchor: import_popover.PopoverAnchor,
+  Anchor: TooltipAnchor,
   Arrow: TooltipArrow,
   Content: TooltipContent,
-  Trigger: import_popover.PopoverTrigger
+  Trigger: TooltipTrigger
 }), voidFn = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/Tooltip.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Tooltip.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["Tooltip", "open", "props"]
 }

package/dist/cjs/TooltipSimple.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/TooltipSimple.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAqC,+BAGrC,cAA0B,0BAG1B,iBAAoD,sBAwB9C;AAhBC,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,kBAAU,mCAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,6CAAC,0BAAQ,QAAQ,IAAK,GAAG,cACvB;AAAA,gDAAC,uBAAQ,SAAR,EAAgB,SAAO,IAAE,UAAS;AAAA,IACnC;AAAA,MAAC,uBAAQ;AAAA,MAAR;AAAA,QACC,QAAQ;AAAA,QACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QAClD,GAAG;AAAA,QACH,OAAO;AAAA,QACP,GAAG;AAAA,QACH,WAAU;AAAA,QACV,SAAS;AAAA,QACT,aAAa,CAAC,aAAa,SAAS;AAAA,QACpC,WAAW;AAAA,UACT;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QACC,GAAG;AAAA,QAEJ;AAAA,sDAAC,uBAAQ,OAAR,EAAc;AAAA,UACf,4CAAC,yBAAU,MAAK,MAAM,iBAAM;AAAA;AAAA;AAAA,IAC9B;AAAA,KACF;AAGF,SAAK,UAIE,WAHE,4CAAC,+BAAa,OAAO,qBAAsB,oBAAS;AAI/D,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAqC,+BAErC,cAA0B,0BAG1B,iBAAoD,sBAwB9C;AAhBC,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,kBAAU,mCAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,6CAAC,0BAAQ,QAAQ,IAAK,GAAG,cACvB;AAAA,gDAAC,uBAAQ,SAAR,EAAgB,SAAO,IAAE,UAAS;AAAA,IACnC;AAAA,MAAC,uBAAQ;AAAA,MAAR;AAAA,QACC,QAAQ;AAAA,QACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QAClD,GAAG;AAAA,QACH,OAAO;AAAA,QACP,GAAG;AAAA,QACH,WAAU;AAAA,QACV,SAAS;AAAA,QACT,aAAa,CAAC,aAAa,SAAS;AAAA,QACpC,WAAW;AAAA,UACT;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QACC,GAAG;AAAA,QAEJ;AAAA,sDAAC,uBAAQ,OAAR,EAAc;AAAA,UACf,4CAAC,yBAAU,MAAK,MAAM,iBAAM;AAAA;AAAA;AAAA,IAC9B;AAAA,KACF;AAGF,SAAK,UAIE,WAHE,4CAAC,+BAAa,OAAO,qBAAsB,oBAAS;AAI/D,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
   "names": []
 }

package/dist/esm/Tooltip.js

@@ -28,15 +28,16 @@ import {
 import { useControllableState } from "@tamagui/use-controllable-state";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
-const TooltipContent = PopperContentFrame.extractable(
+const TOOLTIP_SCOPE = "tooltip", TooltipContent = PopperContentFrame.extractable(
   React.forwardRef(
-    ({ __scopePopover, ...props }, ref) => {
-      const popper = usePopperContext(), padding = props.padding ?? props.size ?? popper.size ?? getSize("$true", {
+    ({ __scopeTooltip, ...props }, ref) => {
+      const popper = usePopperContext(__scopeTooltip || TOOLTIP_SCOPE), padding = props.padding ?? props.size ?? popper.size ?? getSize("$true", {
         shift: -2
       });
       return /* @__PURE__ */ jsx(
         PopoverContent,
         {
+          __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
           componentName: "Tooltip",
           disableRemoveScroll: !0,
           disableFocusScope: !0,
@@ -49,15 +50,28 @@ const TooltipContent = PopperContentFrame.extractable(
       );
     }
   )
-), TooltipArrow = React.forwardRef((props, ref) => /* @__PURE__ */ jsx(PopoverArrow, { componentName: "Tooltip", ref, ...props })), TooltipGroup = ({ children, delay }) => /* @__PURE__ */ jsx(FloatingDelayGroup, { delay: React.useMemo(() => delay, [JSON.stringify(delay)]), children }), TooltipComponent = React.forwardRef(function(props, ref) {
+), TooltipArrow = React.forwardRef(
+  (props, ref) => {
+    const { __scopeTooltip, ...rest } = props;
+    return /* @__PURE__ */ jsx(
+      PopoverArrow,
+      {
+        __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
+        componentName: "Tooltip",
+        ref,
+        ...rest
+      }
+    );
+  }
+), TooltipGroup = ({ children, delay }) => /* @__PURE__ */ jsx(FloatingDelayGroup, { delay: React.useMemo(() => delay, [JSON.stringify(delay)]), children }), TooltipComponent = React.forwardRef(function(props, ref) {
   const {
-    __scopePopover,
     children,
     delay: delayProp,
     restMs = typeof delayProp > "u" ? 500 : typeof delayProp == "number" ? delayProp : 0,
     onOpenChange: onOpenChangeProp,
     focus,
     open: openProp,
+    __scopeTooltip,
     ...restProps
   } = props, triggerRef = React.useRef(null), [hasCustomAnchor, setHasCustomAnchor] = React.useState(!1), { delay: delayGroup, setCurrentId } = useDelayGroupContext(), delay = delayProp ?? delayGroup, [open, setOpen] = useControllableState({
     prop: openProp,
@@ -87,26 +101,53 @@ const TooltipContent = PopperContentFrame.extractable(
     shift: -2,
     bounds: [0]
   });
-  return /* @__PURE__ */ jsx(FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ jsx(Popper, { size: smallerSize?.key, allowFlip: !0, stayInFrame: !0, ...restProps, children: /* @__PURE__ */ jsx(
-    PopoverContext.Provider,
+  return (
+    // TODO: FloatingOverrideContext might also need to be scoped
+    /* @__PURE__ */ jsx(FloatingOverrideContext.Provider, { value: useFloatingContext, children: /* @__PURE__ */ jsx(
+      Popper,
+      {
+        __scopePopper: __scopeTooltip || TOOLTIP_SCOPE,
+        size: smallerSize?.key,
+        allowFlip: !0,
+        stayInFrame: !0,
+        ...restProps,
+        children: /* @__PURE__ */ jsx(
+          PopoverContext.Provider,
+          {
+            contentId,
+            triggerRef,
+            sheetBreakpoint: !1,
+            open,
+            scope: __scopeTooltip || TOOLTIP_SCOPE,
+            onOpenChange: setOpen,
+            onOpenToggle: voidFn,
+            hasCustomAnchor,
+            onCustomAnchorAdd,
+            onCustomAnchorRemove,
+            children
+          }
+        )
+      }
+    ) })
+  );
+}), TooltipTrigger = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return /* @__PURE__ */ jsx(
+    PopoverTrigger,
     {
-      contentId,
-      triggerRef,
-      sheetBreakpoint: !1,
-      open,
-      onOpenChange: setOpen,
-      onOpenToggle: voidFn,
-      hasCustomAnchor,
-      onCustomAnchorAdd,
-      onCustomAnchorRemove,
-      children
+      ...rest,
+      __scopePopover: __scopeTooltip || TOOLTIP_SCOPE,
+      ref
     }
-  ) }) });
+  );
+}), TooltipAnchor = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return /* @__PURE__ */ jsx(PopoverAnchor, { ...rest, __scopePopover: __scopeTooltip || TOOLTIP_SCOPE, ref });
 }), Tooltip2 = withStaticProperties(TooltipComponent, {
-  Anchor: PopoverAnchor,
+  Anchor: TooltipAnchor,
   Arrow: TooltipArrow,
   Content: TooltipContent,
-  Trigger: PopoverTrigger
+  Trigger: TooltipTrigger
 }), voidFn = () => {
 };
 export {

package/dist/esm/Tooltip.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Tooltip.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["open", "props", "Tooltip"]
 }

package/dist/esm/TooltipSimple.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/TooltipSimple.tsx"],
-  "mappings": "AAAA,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAG1B,SAAS,SAAS,oBAAkC;AAwB9C,cACA,YADA;AAhBC,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,cAAU,qBAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,qBAAC,WAAQ,QAAQ,IAAK,GAAG,cACvB;AAAA,wBAAC,QAAQ,SAAR,EAAgB,SAAO,IAAE,UAAS;AAAA,IACnC;AAAA,MAAC,QAAQ;AAAA,MAAR;AAAA,QACC,QAAQ;AAAA,QACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QAClD,GAAG;AAAA,QACH,OAAO;AAAA,QACP,GAAG;AAAA,QACH,WAAU;AAAA,QACV,SAAS;AAAA,QACT,aAAa,CAAC,aAAa,SAAS;AAAA,QACpC,WAAW;AAAA,UACT;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QACC,GAAG;AAAA,QAEJ;AAAA,8BAAC,QAAQ,OAAR,EAAc;AAAA,UACf,oBAAC,aAAU,MAAK,MAAM,iBAAM;AAAA;AAAA;AAAA,IAC9B;AAAA,KACF;AAGF,SAAK,UAIE,WAHE,oBAAC,gBAAa,OAAO,qBAAsB,oBAAS;AAI/D,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
+  "mappings": "AAAA,SAAS,4BAA4B;AAErC,SAAS,iBAAiB;AAG1B,SAAS,SAAS,oBAAkC;AAwB9C,cACA,YADA;AAhBC,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,cAAU,qBAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,qBAAC,WAAQ,QAAQ,IAAK,GAAG,cACvB;AAAA,wBAAC,QAAQ,SAAR,EAAgB,SAAO,IAAE,UAAS;AAAA,IACnC;AAAA,MAAC,QAAQ;AAAA,MAAR;AAAA,QACC,QAAQ;AAAA,QACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,QAClD,GAAG;AAAA,QACH,OAAO;AAAA,QACP,GAAG;AAAA,QACH,WAAU;AAAA,QACV,SAAS;AAAA,QACT,aAAa,CAAC,aAAa,SAAS;AAAA,QACpC,WAAW;AAAA,UACT;AAAA,UACA;AAAA,YACE,SAAS;AAAA,cACP,mBAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,QACC,GAAG;AAAA,QAEJ;AAAA,8BAAC,QAAQ,OAAR,EAAc;AAAA,UACf,oBAAC,aAAU,MAAK,MAAM,iBAAM;AAAA;AAAA;AAAA,IAC9B;AAAA,KACF;AAGF,SAAK,UAIE,WAHE,oBAAC,gBAAa,OAAO,qBAAsB,oBAAS;AAI/D,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
   "names": []
 }

package/dist/jsx/Tooltip.js

@@ -27,13 +27,14 @@ import {
 } from "@tamagui/popper";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import * as React from "react";
-const TooltipContent = PopperContentFrame.extractable(
+const TOOLTIP_SCOPE = "tooltip", TooltipContent = PopperContentFrame.extractable(
   React.forwardRef(
-    ({ __scopePopover, ...props }, ref) => {
-      const popper = usePopperContext(), padding = props.padding ?? props.size ?? popper.size ?? getSize("$true", {
+    ({ __scopeTooltip, ...props }, ref) => {
+      const popper = usePopperContext(__scopeTooltip || TOOLTIP_SCOPE), padding = props.padding ?? props.size ?? popper.size ?? getSize("$true", {
         shift: -2
       });
       return <PopoverContent
+        __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
         componentName="Tooltip"
         disableRemoveScroll
         disableFocusScope
@@ -45,15 +46,25 @@ const TooltipContent = PopperContentFrame.extractable(
       />;
     }
   )
-), TooltipArrow = React.forwardRef((props, ref) => <PopoverArrow componentName="Tooltip" ref={ref} {...props} />), TooltipGroup = ({ children, delay }) => <FloatingDelayGroup delay={React.useMemo(() => delay, [JSON.stringify(delay)])}>{children}</FloatingDelayGroup>, TooltipComponent = React.forwardRef(function(props, ref) {
+), TooltipArrow = React.forwardRef(
+  (props, ref) => {
+    const { __scopeTooltip, ...rest } = props;
+    return <PopoverArrow
+      __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
+      componentName="Tooltip"
+      ref={ref}
+      {...rest}
+    />;
+  }
+), TooltipGroup = ({ children, delay }) => <FloatingDelayGroup delay={React.useMemo(() => delay, [JSON.stringify(delay)])}>{children}</FloatingDelayGroup>, TooltipComponent = React.forwardRef(function(props, ref) {
   const {
-    __scopePopover,
     children,
     delay: delayProp,
     restMs = typeof delayProp > "u" ? 500 : typeof delayProp == "number" ? delayProp : 0,
     onOpenChange: onOpenChangeProp,
     focus,
     open: openProp,
+    __scopeTooltip,
     ...restProps
   } = props, triggerRef = React.useRef(null), [hasCustomAnchor, setHasCustomAnchor] = React.useState(!1), { delay: delayGroup, setCurrentId } = useDelayGroupContext(), delay = delayProp ?? delayGroup, [open, setOpen] = useControllableState({
     prop: openProp,
@@ -83,27 +94,47 @@ const TooltipContent = PopperContentFrame.extractable(
     shift: -2,
     bounds: [0]
   });
-  return <FloatingOverrideContext.Provider value={useFloatingContext}>
-    {
-      /* default tooltip to a smaller size */
-    }
-    <Popper size={smallerSize?.key} allowFlip stayInFrame {...restProps}><PopoverContext.Provider
-      contentId={contentId}
-      triggerRef={triggerRef}
-      sheetBreakpoint={!1}
-      open={open}
-      onOpenChange={setOpen}
-      onOpenToggle={voidFn}
-      hasCustomAnchor={hasCustomAnchor}
-      onCustomAnchorAdd={onCustomAnchorAdd}
-      onCustomAnchorRemove={onCustomAnchorRemove}
-    >{children}</PopoverContext.Provider></Popper>
-  </FloatingOverrideContext.Provider>;
+  return (
+    // TODO: FloatingOverrideContext might also need to be scoped
+    <FloatingOverrideContext.Provider value={useFloatingContext}>
+      {
+        /* default tooltip to a smaller size */
+      }
+      <Popper
+        __scopePopper={__scopeTooltip || TOOLTIP_SCOPE}
+        size={smallerSize?.key}
+        allowFlip
+        stayInFrame
+        {...restProps}
+      ><PopoverContext.Provider
+        contentId={contentId}
+        triggerRef={triggerRef}
+        sheetBreakpoint={!1}
+        open={open}
+        scope={__scopeTooltip || TOOLTIP_SCOPE}
+        onOpenChange={setOpen}
+        onOpenToggle={voidFn}
+        hasCustomAnchor={hasCustomAnchor}
+        onCustomAnchorAdd={onCustomAnchorAdd}
+        onCustomAnchorRemove={onCustomAnchorRemove}
+      >{children}</PopoverContext.Provider></Popper>
+    </FloatingOverrideContext.Provider>
+  );
+}), TooltipTrigger = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return <PopoverTrigger
+    {...rest}
+    __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
+    ref={ref}
+  />;
+}), TooltipAnchor = React.forwardRef(function(props, ref) {
+  const { __scopeTooltip, ...rest } = props;
+  return <PopoverAnchor {...rest} __scopePopover={__scopeTooltip || TOOLTIP_SCOPE} ref={ref} />;
 }), Tooltip2 = withStaticProperties(TooltipComponent, {
-  Anchor: PopoverAnchor,
+  Anchor: TooltipAnchor,
   Arrow: TooltipArrow,
   Content: TooltipContent,
-  Trigger: PopoverTrigger
+  Trigger: TooltipTrigger
 }), voidFn = () => {
 };
 export {

package/dist/jsx/Tooltip.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Tooltip.tsx"],
-  "mappings": "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",
+  "mappings": "AAAA,OAAO;AAEP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAkC,UAAU,4BAA4B;AACxE,SAAS,+BAA8C;AACvD,SAAS,eAAe;AACxB;AAAA,EACE;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EACA;AAAA,OAEK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,OACK;AACP,SAAS,4BAA4B;AACrC,YAAY,WAAW;AAEvB,MAAM,gBAAgB,WAGhB,iBAAiB,mBAAmB;AAAA,EACxC,MAAM;AAAA,IACJ,CAAC,EAAE,gBAAgB,GAAG,MAAM,GAA4C,QAAa;AACnF,YAAM,SAAS,iBAAiB,kBAAkB,aAAa,GACzD,UACJ,MAAM,WACN,MAAM,QACN,OAAO,QACP,QAAQ,SAAS;AAAA,QACf,OAAO;AAAA,MACT,CAAC;AAEH,aACE,CAAC;AAAA,QACC,gBAAgB,kBAAkB;AAAA,QAClC,cAAc;AAAA,QACd;AAAA,QACA;AAAA,YACK,CAAC,MAAM,YAAY;AAAA,UACtB;AAAA,QACF;AAAA,QACA,KAAK;AAAA,YACD;AAAA,MACN;AAAA,IAEJ;AAAA,EACF;AACF,GAEM,eAAe,MAAM;AAAA,EACzB,CAAC,OAA8C,QAAa;AAC1D,UAAM,EAAE,gBAAgB,GAAG,KAAK,IAAI;AACpC,WACE,CAAC;AAAA,MACC,gBAAgB,kBAAkB;AAAA,MAClC,cAAc;AAAA,MACd,KAAK;AAAA,UACD;AAAA,IACN;AAAA,EAEJ;AACF,GA4Ba,eAAe,CAAC,EAAE,UAAU,MAAM,MAE3C,CAAC,mBAAmB,OAAO,MAAM,QAAQ,MAAM,OAAO,CAAC,KAAK,UAAU,KAAK,CAAC,CAAC,IAC1E,SACH,EAFC,qBAMC,mBAAmB,MAAM,WAAW,SACxC,OAEA,KACA;AACA,QAAM;AAAA,IACJ;AAAA,IACA,OAAO;AAAA,IACP,SAAS,OAAO,YAAc,MAC1B,MACA,OAAO,aAAc,WACrB,YACA;AAAA,IACJ,cAAc;AAAA,IACd;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA,GAAG;AAAA,EACL,IAAI,OACE,aAAa,MAAM,OAA0B,IAAI,GACjD,CAAC,iBAAiB,kBAAkB,IAAI,MAAM,SAAS,EAAK,GAC5D,EAAE,OAAO,YAAY,aAAa,IAAI,qBAAqB,GAC3D,QAAQ,aAAa,YACrB,CAAC,MAAM,OAAO,IAAI,qBAAqB;AAAA,IAC3C,MAAM;AAAA,IACN,aAAa;AAAA,IACb,UAAU;AAAA,EACZ,CAAC,GACK,KAAK,MAAM,SAEX,eAAe,SAAS,CAACA,UAAS;AACtC,IAAIA,SACF,aAAa,EAAE,GAEjB,QAAQA,KAAI;AAAA,EACd,CAAC,GAEK,gBAA+B,CAACC,WAAU;AAE9C,UAAM,WAAW,YAAY;AAAA,MAC3B,GAAGA;AAAA,MACH;AAAA,MACA;AAAA,IACF,CAAC,GACK,EAAE,mBAAmB,iBAAiB,IAAI,gBAAgB;AAAA,MAC9D,SAAS,SAAS,SAAS,EAAE,OAAO,OAAO,CAAC;AAAA,MAC5C,SAAS,SAAS,SAAS,KAAK;AAAA,MAChC,QAAQ,SAAS,SAAS,EAAE,MAAM,UAAU,CAAC;AAAA,MAC7C,WAAW,SAAS,OAAO;AAAA,MAC3B,cAAc,SAAS,SAAS,EAAE,GAAG,CAAC;AAAA,IACxC,CAAC;AACD,WAAO;AAAA,MACL,GAAG;AAAA,MACH;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF,GAEM,qBAAqB,MAAM,YAAY,eAAe,CAAC,IAAI,OAAO,IAAI,CAAC,GACvE,oBAAoB,MAAM,YAAY,MAAM,mBAAmB,EAAI,GAAG,CAAC,CAAC,GACxE,uBAAuB,MAAM,YAAY,MAAM,mBAAmB,EAAK,GAAG,CAAC,CAAC,GAC5E,YAAY,MAAM,MAAM,GACxB,cAAc,MAAM,WACtB,OACA,QAAQ,SAAS;AAAA,IACf,OAAO;AAAA,IACP,QAAQ,CAAC,CAAC;AAAA,EACZ,CAAC;AAEL;AAAA;AAAA,IAEE,CAAC,wBAAwB,SAAS,OAAO;AAAA;AAAA;AAAA;AAAA,MAEvC,CAAC;AAAA,QACC,eAAe,kBAAkB;AAAA,QACjC,MAAM,aAAa;AAAA,QACnB;AAAA,QACA;AAAA,YACI;AAAA,OAEJ,CAAC,eAAe;AAAA,QACd,WAAW;AAAA,QACX,YAAY;AAAA,QACZ,iBAAiB;AAAA,QACjB,MAAM;AAAA,QACN,OAAO,kBAAkB;AAAA,QACzB,cAAc;AAAA,QACd,cAAc;AAAA,QACd,iBAAiB;AAAA,QACjB,mBAAmB;AAAA,QACnB,sBAAsB;AAAA,QAErB,SACH,EAbC,eAAe,SAclB,EArBC;AAAA,IAsBH,EAxBC,wBAAwB;AAAA;AA0B7B,CAAC,GAEK,iBAAiB,MAAM,WAAW,SACtC,OACA,KACA;AACA,QAAM,EAAE,gBAAgB,GAAG,KAAK,IAAI;AACpC,SACE,CAAC;AAAA,QACK;AAAA,IACJ,gBAAgB,kBAAkB;AAAA,IAClC,KAAK;AAAA,EACP;AAEJ,CAAC,GAEK,gBAAgB,MAAM,WAAW,SACrC,OACA,KACA;AACA,QAAM,EAAE,gBAAgB,GAAG,KAAK,IAAI;AACpC,SACE,CAAC,kBAAkB,MAAM,gBAAgB,kBAAkB,eAAe,KAAK,KAAK;AAExF,CAAC,GAEYC,WAAU,qBAAqB,kBAAkB;AAAA,EAC5D,QAAQ;AAAA,EACR,OAAO;AAAA,EACP,SAAS;AAAA,EACT,SAAS;AACX,CAAC,GAEK,SAAS,MAAM;AAAC;",
   "names": ["open", "props", "Tooltip"]
 }

package/dist/jsx/TooltipSimple.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/TooltipSimple.tsx"],
-  "mappings": "AAAA,SAAS,4BAA4B;AAGrC,SAAS,iBAAiB;AAG1B,SAAS,SAAS,oBAAkC;AAQ7C,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,cAAU,qBAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,CAAC,QAAQ,QAAQ,QAAQ;AAAA,IACvB,CAAC,QAAQ,QAAQ,SAAS,SAAS,EAAlC,QAAQ;AAAA,IACT,CAAC,QAAQ;AAAA,MACP,QAAQ;AAAA,MACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,MACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,MAClD,GAAG;AAAA,MACH,OAAO;AAAA,MACP,GAAG;AAAA,MACH,UAAU;AAAA,MACV,SAAS;AAAA,MACT,aAAa,CAAC,aAAa,SAAS;AAAA,MACpC,WAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,UACI;AAAA;AAAA,MAEJ,CAAC,QAAQ,MAAM;AAAA,MACf,CAAC,UAAU,KAAK,MAAM,MAAM,EAA3B;AAAA,IACH,EAtBC,QAAQ;AAAA,EAuBX,EAzBC;AA4BH,SAAK,UAIE,WAHE,CAAC,aAAa,OAAO,sBAAsB,SAAS,EAAnD;AAIZ,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
+  "mappings": "AAAA,SAAS,4BAA4B;AAErC,SAAS,iBAAiB;AAG1B,SAAS,SAAS,oBAAkC;AAQ7C,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,MAAI;AACJ,MAAI;AAEF,cAAU,qBAAqB;AAAA,EACjC,QAAQ;AAAA,EAER;AAEA,QAAM,WACJ,CAAC,QAAQ,QAAQ,QAAQ;AAAA,IACvB,CAAC,QAAQ,QAAQ,SAAS,SAAS,EAAlC,QAAQ;AAAA,IACT,CAAC,QAAQ;AAAA,MACP,QAAQ;AAAA,MACR,YAAY,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,MACnD,WAAW,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,GAAG,OAAO,KAAK;AAAA,MAClD,GAAG;AAAA,MACH,OAAO;AAAA,MACP,GAAG;AAAA,MACH,UAAU;AAAA,MACV,SAAS;AAAA,MACT,aAAa,CAAC,aAAa,SAAS;AAAA,MACpC,WAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,SAAS;AAAA,YACP,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,UACI;AAAA;AAAA,MAEJ,CAAC,QAAQ,MAAM;AAAA,MACf,CAAC,UAAU,KAAK,MAAM,MAAM,EAA3B;AAAA,IACH,EAtBC,QAAQ;AAAA,EAuBX,EAzBC;AA4BH,SAAK,UAIE,WAHE,CAAC,aAAa,OAAO,sBAAsB,SAAS,EAAnD;AAIZ,GAEM,sBAAsB,EAAE,MAAM,KAAM,OAAO,IAAI;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/tooltip",
-  "version": "1.68.5",
+  "version": "1.69.0",
   "sideEffects": [
     "*.css"
   ],
@@ -32,24 +32,24 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.24.7",
-    "@tamagui/compose-refs": "1.68.5",
-    "@tamagui/core": "1.68.5",
-    "@tamagui/create-context": "1.68.5",
-    "@tamagui/floating": "1.68.5",
-    "@tamagui/get-token": "1.68.5",
-    "@tamagui/polyfill-dev": "1.68.5",
-    "@tamagui/popover": "1.68.5",
-    "@tamagui/popper": "1.68.5",
-    "@tamagui/stacks": "1.68.5",
-    "@tamagui/text": "1.68.5",
-    "@tamagui/use-controllable-state": "1.68.5"
+    "@tamagui/compose-refs": "1.69.0",
+    "@tamagui/core": "1.69.0",
+    "@tamagui/create-context": "1.69.0",
+    "@tamagui/floating": "1.69.0",
+    "@tamagui/get-token": "1.69.0",
+    "@tamagui/polyfill-dev": "1.69.0",
+    "@tamagui/popover": "1.69.0",
+    "@tamagui/popper": "1.69.0",
+    "@tamagui/stacks": "1.69.0",
+    "@tamagui/text": "1.69.0",
+    "@tamagui/use-controllable-state": "1.69.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.68.5",
+    "@tamagui/build": "1.69.0",
     "react": "^18.2.0",
     "react-native": "^0.72.1"
   },

package/src/Tooltip.tsx

@@ -11,18 +11,19 @@ import {
   useInteractions,
   useRole,
 } from '@floating-ui/react'
-import { SizeTokens, useEvent, withStaticProperties } from '@tamagui/core'
-import { ScopedProps } from '@tamagui/create-context'
+import { ScopedProps, SizeTokens, useEvent, withStaticProperties } from '@tamagui/core'
 import { FloatingOverrideContext, UseFloatingFn } from '@tamagui/floating'
 import { getSize } from '@tamagui/get-token'
 import {
   PopoverAnchor,
+  PopoverAnchorProps,
   PopoverArrow,
   PopoverArrowProps,
   PopoverContent,
   PopoverContentProps,
   PopoverContext,
   PopoverTrigger,
+  PopoverTriggerProps,
 } from '@tamagui/popover'
 import {
   Popper,
@@ -33,13 +34,13 @@ import {
 import { useControllableState } from '@tamagui/use-controllable-state'
 import * as React from 'react'
 
+const TOOLTIP_SCOPE = 'tooltip'
+type ScopedTooltipProps<P> = ScopedProps<P, 'Tooltip'>
+
 const TooltipContent = PopperContentFrame.extractable(
   React.forwardRef(
-    (
-      { __scopePopover, ...props }: ScopedProps<PopoverContentProps, 'Popover'>,
-      ref: any
-    ) => {
-      const popper = usePopperContext()
+    ({ __scopeTooltip, ...props }: ScopedTooltipProps<PopoverContentProps>, ref: any) => {
+      const popper = usePopperContext(__scopeTooltip || TOOLTIP_SCOPE)
       const padding =
         props.padding ??
         props.size ??
@@ -50,6 +51,7 @@ const TooltipContent = PopperContentFrame.extractable(
 
       return (
         <PopoverContent
+          __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
           componentName="Tooltip"
           disableRemoveScroll
           disableFocusScope
@@ -64,9 +66,19 @@ const TooltipContent = PopperContentFrame.extractable(
   )
 )
 
-const TooltipArrow = React.forwardRef((props: PopoverArrowProps, ref: any) => {
-  return <PopoverArrow componentName="Tooltip" ref={ref} {...props} />
-})
+const TooltipArrow = React.forwardRef(
+  (props: ScopedTooltipProps<PopoverArrowProps>, ref: any) => {
+    const { __scopeTooltip, ...rest } = props
+    return (
+      <PopoverArrow
+        __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
+        componentName="Tooltip"
+        ref={ref}
+        {...rest}
+      />
+    )
+  }
+)
 
 export type TooltipProps = PopperProps & {
   open?: boolean
@@ -103,12 +115,11 @@ export const TooltipGroup = ({ children, delay }: { children?: any; delay: Delay
 }
 
 const TooltipComponent = React.forwardRef(function Tooltip(
-  props: ScopedProps<TooltipProps, 'Popover'>,
+  props: ScopedTooltipProps<TooltipProps>,
   // theres no real ref here but React complaining need to see why see SandboxCustomStyledAnimatedTooltip.ts
   ref
 ) {
   const {
-    __scopePopover,
     children,
     delay: delayProp,
     restMs = typeof delayProp === 'undefined'
@@ -119,6 +130,7 @@ const TooltipComponent = React.forwardRef(function Tooltip(
     onOpenChange: onOpenChangeProp,
     focus,
     open: openProp,
+    __scopeTooltip,
     ...restProps
   } = props
   const triggerRef = React.useRef<HTMLButtonElement>(null)
@@ -173,14 +185,22 @@ const TooltipComponent = React.forwardRef(function Tooltip(
       })
 
   return (
+    // TODO: FloatingOverrideContext might also need to be scoped
     <FloatingOverrideContext.Provider value={useFloatingContext}>
       {/* default tooltip to a smaller size */}
-      <Popper size={smallerSize?.key as SizeTokens} allowFlip stayInFrame {...restProps}>
+      <Popper
+        __scopePopper={__scopeTooltip || TOOLTIP_SCOPE}
+        size={smallerSize?.key as SizeTokens}
+        allowFlip
+        stayInFrame
+        {...restProps}
+      >
         <PopoverContext.Provider
           contentId={contentId}
           triggerRef={triggerRef}
           sheetBreakpoint={false}
           open={open}
+          scope={__scopeTooltip || TOOLTIP_SCOPE}
           onOpenChange={setOpen}
           onOpenToggle={voidFn}
           hasCustomAnchor={hasCustomAnchor}
@@ -194,11 +214,35 @@ const TooltipComponent = React.forwardRef(function Tooltip(
   )
 })
 
+const TooltipTrigger = React.forwardRef(function TooltipTrigger(
+  props: ScopedTooltipProps<PopoverTriggerProps>,
+  ref: any
+) {
+  const { __scopeTooltip, ...rest } = props
+  return (
+    <PopoverTrigger
+      {...rest}
+      __scopePopover={__scopeTooltip || TOOLTIP_SCOPE}
+      ref={ref}
+    />
+  )
+})
+
+const TooltipAnchor = React.forwardRef(function TooltipAnchor(
+  props: ScopedTooltipProps<PopoverAnchorProps>,
+  ref: any
+) {
+  const { __scopeTooltip, ...rest } = props
+  return (
+    <PopoverAnchor {...rest} __scopePopover={__scopeTooltip || TOOLTIP_SCOPE} ref={ref} />
+  )
+})
+
 export const Tooltip = withStaticProperties(TooltipComponent, {
-  Anchor: PopoverAnchor,
+  Anchor: TooltipAnchor,
   Arrow: TooltipArrow,
   Content: TooltipContent,
-  Trigger: PopoverTrigger,
+  Trigger: TooltipTrigger,
 })
 
 const voidFn = () => {}

package/src/TooltipSimple.tsx

@@ -1,5 +1,4 @@
 import { useDelayGroupContext } from '@floating-ui/react'
-import { Theme } from '@tamagui/core'
 import { SizableStackProps } from '@tamagui/stacks'
 import { Paragraph } from '@tamagui/text'
 import * as React from 'react'

package/types/Tooltip.d.ts

@@ -42,7 +42,7 @@ export declare const Tooltip: React.ForwardRefExoticComponent<PopperProps & {
         close?: number | undefined;
     } | undefined;
 } & {
-    __scopePopover?: import("@tamagui/create-context").Scope<any>;
+    __scopeTooltip?: string | undefined;
 } & React.RefAttributes<unknown>> & {
     Anchor: React.ForwardRefExoticComponent<Omit<import("react-native").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
         style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | React.CSSProperties | (React.CSSProperties & import("react-native").ViewStyle)>;
@@ -59,7 +59,9 @@ export declare const Tooltip: React.ForwardRefExoticComponent<PopperProps & {
     } & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").RNViewProps & Omit<{}, "elevation" | "fullscreen"> & {
         readonly fullscreen?: boolean | undefined;
         readonly elevation?: SizeTokens | undefined;
-    }>> & React.RefAttributes<import("@tamagui/core").TamaguiElement>>;
+    }>> & {
+        __scopeTooltip?: string | undefined;
+    } & React.RefAttributes<unknown>>;
     Arrow: React.ForwardRefExoticComponent<Omit<import("react-native").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
         style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | React.CSSProperties | (React.CSSProperties & import("react-native").ViewStyle)>;
     } & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").RNViewProps & Omit<{}, "elevation" | "fullscreen"> & {
@@ -78,13 +80,17 @@ export declare const Tooltip: React.ForwardRefExoticComponent<PopperProps & {
     }>> & {
         offset?: number | undefined;
         size?: SizeTokens | undefined;
+    } & {
+        __scopeTooltip?: string | undefined;
     } & React.RefAttributes<unknown>>;
     Content: React.ForwardRefExoticComponent<import("@tamagui/popover").PopoverContentTypeProps & {
-        __scopePopover?: import("@tamagui/create-context").Scope<any>;
+        __scopeTooltip?: string | undefined;
     } & React.RefAttributes<unknown>>;
-    Trigger: React.ForwardRefExoticComponent<Omit<import("react-native").ViewProps, "children" | "display" | "onLayout" | keyof import("react-native").GestureResponderHandlers | "style"> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
+    Trigger: React.ForwardRefExoticComponent<Omit<import("react-native").ViewProps, "children" | "display" | "style" | ("onLayout" | keyof import("react-native").GestureResponderHandlers)> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & {
         style?: import("@tamagui/core").StyleProp<import("react-native").ViewStyle | React.CSSProperties | (React.CSSProperties & import("react-native").ViewStyle)>;
-    } & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").PseudoProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>>> & import("@tamagui/core").MediaProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").PseudoProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>>>> & React.RefAttributes<import("@tamagui/core").TamaguiElement>>;
+    } & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").PseudoProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>>> & import("@tamagui/core").MediaProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core").PseudoProps<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>>>> & {
+        __scopeTooltip?: string | undefined;
+    } & React.RefAttributes<unknown>>;
 };
 export {};
 //# sourceMappingURL=Tooltip.d.ts.map

package/types/Tooltip.d.ts.map

@@ -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;AAa1E,OAAO,EAGL,WAAW,EAEZ,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAqC9B,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,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;AA8FD,eAAO,MAAM,OAAO;;;eA3HP,MAAM,SAAS;2BACJ,OAAO,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+HtC,CAAA"}
+{"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;AAcvF,OAAO,EAGL,WAAW,EAEZ,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAgD9B,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,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;AA8HD,eAAO,MAAM,OAAO;;;eA3JP,MAAM,SAAS;2BACJ,OAAO,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+JtC,CAAA"}

package/types/TooltipSimple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TooltipSimple.d.ts","sourceRoot":"","sources":["../src/TooltipSimple.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAyB,YAAY,EAAE,MAAM,WAAW,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACvB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,YAAY,CAAC,EAAE,iBAAiB,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgDtD,CAAA"}
+{"version":3,"file":"TooltipSimple.d.ts","sourceRoot":"","sources":["../src/TooltipSimple.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAyB,YAAY,EAAE,MAAM,WAAW,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACvB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,YAAY,CAAC,EAAE,iBAAiB,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgDtD,CAAA"}