@tamagui/toast 1.70.0 → 1.72.0

package/dist/jsx/ToastAnnounce.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ToastAnnounce.tsx"],
-  "mappings": "AAAA;AAAA,EAEE;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAS,kBAAkB;AAC3B,SAAsB,+BAA+B;AAErD,MAAM,4BAA4B,OAAO,OAAO;AAAA,EAC9C,MAAM;AACR,CAAC,GAMK,uBAAuB,MAAM;AAAA,EACjC,CAAC,OAA+C,iBAAiB;AAC/D,UAAM,EAAE,cAAc,SAAS,GAAG,qBAAqB,IAAI;AAE3D,WACE,CAAC;AAAA,MACC,4BAA4B;AAAA,MAC5B,yBAAyB,WAAW;AAAA,UAChC;AAAA,MACJ,KAAK;AAAA,IACP;AAAA,EAEJ;AACF,GAQM,gBAA8C,CAClD,UACG;AACH,QAAM,EAAE,cAAc,UAAU,GAAG,cAAc,IAAI,OAC/C,UAAU,wBAAwB,YAAY,YAAY,GAC1D,CAAC,oBAAoB,qBAAqB,IAAI,MAAM,SAAS,EAAK,GAClE,CAAC,aAAa,cAAc,IAAI,MAAM,SAAS,EAAK;AAG1D,sBAAa,MAAM,sBAAsB,EAAI,CAAC,GAG9C,MAAM,UAAU,MAAM;AACpB,UAAM,QAAQ,WAAW,MAAM,eAAe,EAAI,GAAG,GAAI;AACzD,WAAO,MAAM,aAAa,KAAK;AAAA,EACjC,GAAG,CAAC,CAAC,GAEE,cAAc,OACnB,CAAC,OAAO,QACN,CAAC,mBAAmB,gBACjB,sBACC,CAAC;AAAA,KACE,QAAQ;AAAA,KAAM;AAAA,KAAE;AAAA,EACnB,EAFC,MAIL,EANC,eAOH,EARC;AAUL;AAIA,SAAS,aAAa,WAAW,MAAM;AAAC,GAAG;AACzC,QAAM,KAAK,SAAS,QAAQ;AAC5B,4BAA0B,MAAM;AAC9B,QAAI,OAAO,GACP,OAAO;AACX,kBAAO,sBAAsB,MAAM;AACjC,aAAO,sBAAsB,EAAE;AAAA,IACjC,CAAC,GACM,MAAM;AACX,2BAAqB,IAAI,GACzB,qBAAqB,IAAI;AAAA,IAC3B;AAAA,EACF,GAAG,CAAC,EAAE,CAAC;AACT;",
+  "mappings": "AAAA;AAAA,EAEE;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,sBAAsB;AAC/B,YAAY,WAAW;AAEvB,SAAsB,+BAA+B;AAErD,MAAM,4BAA4B,OAAO,OAAO;AAAA,EAC9C,MAAM;AACR,CAAC,GAMK,uBAAuB,MAAM,WAGjC,CAAC,OAA+C,iBAAiB;AACjE,QAAM,EAAE,SAAS,GAAG,qBAAqB,IAAI;AAE7C,SACE,CAAC;AAAA,IACC,4BAA4B;AAAA,IAC5B,yBAAyB,WAAW;AAAA,QAChC;AAAA,IACJ,KAAK;AAAA,EACP;AAEJ,CAAC,GAQK,gBAA2D,CAC/D,UACG;AACH,QAAM,EAAE,cAAc,UAAU,GAAG,cAAc,IAAI,OAC/C,UAAU,wBAAwB,YAAY,GAC9C,CAAC,oBAAoB,qBAAqB,IAAI,MAAM,SAAS,EAAK,GAClE,CAAC,aAAa,cAAc,IAAI,MAAM,SAAS,EAAK;AAG1D,sBAAa,MAAM,sBAAsB,EAAI,CAAC,GAG9C,MAAM,UAAU,MAAM;AACpB,UAAM,QAAQ,WAAW,MAAM,eAAe,EAAI,GAAG,GAAI;AACzD,WAAO,MAAM,aAAa,KAAK;AAAA,EACjC,GAAG,CAAC,CAAC,GAEE,cAAc,OACnB,CAAC,OAAO,QACN,CAAC,mBAAmB,gBACjB,sBACC,CAAC;AAAA,KACE,QAAQ;AAAA,KAAM;AAAA,KAAE;AAAA,EACnB,EAFC,MAIL,EANC,eAOH,EARC;AAUL;AAIA,SAAS,aAAa,WAAW,MAAM;AAAC,GAAG;AACzC,QAAM,KAAK,SAAS,QAAQ;AAC5B,4BAA0B,MAAM;AAC9B,QAAI,OAAO,GACP,OAAO;AACX,kBAAO,sBAAsB,MAAM;AACjC,aAAO,sBAAsB,EAAE;AAAA,IACjC,CAAC,GACM,MAAM;AACX,2BAAqB,IAAI,GACzB,qBAAqB,IAAI;AAAA,IAC3B;AAAA,EACF,GAAG,CAAC,EAAE,CAAC;AACT;",
   "names": []
 }

package/dist/jsx/ToastImpl.js

@@ -3,6 +3,7 @@ import { useComposedRefs } from "@tamagui/compose-refs";
 import {
   Theme,
   composeEventHandlers,
+  createStyledContext,
   isWeb,
   styled,
   useAnimationDriver,
@@ -17,10 +18,10 @@ import {
   PanResponder
 } from "react-native";
 import { TOAST_NAME } from "./constants";
+import { TOAST_CONTEXT } from "./Toast";
 import { ToastAnnounce } from "./ToastAnnounce";
 import {
   Collection,
-  createToastContext,
   useToastProviderContext
 } from "./ToastProvider";
 import { VIEWPORT_PAUSE, VIEWPORT_RESUME } from "./ToastViewport";
@@ -47,13 +48,13 @@ const ToastImplFrame = styled(ThemeableStack, {
   defaultVariants: {
     unstyled: !1
   }
-}), [ToastInteractiveProvider, useToastInteractiveContext] = createToastContext(
-  TOAST_NAME,
-  {
-    onClose() {
-    }
+}), {
+  Provider: ToastInteractiveProvider,
+  useStyledContext: useToastInteractiveContext
+} = createStyledContext({
+  onClose() {
   }
-), ToastImpl = React.forwardRef(
+}), ToastImpl = React.forwardRef(
   (props, forwardedRef) => {
     const {
       __scopeToast,
@@ -70,7 +71,7 @@ const ToastImplFrame = styled(ThemeableStack, {
       onSwipeEnd,
       viewportName = "default",
       ...toastProps
-    } = props, isPresent = useIsPresent(), context = useToastProviderContext(TOAST_NAME, __scopeToast), [node, setNode] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node2) => setNode(node2)), duration = durationProp || context.duration, closeTimerStartTimeRef = React.useRef(0), closeTimerRemainingTimeRef = React.useRef(duration), closeTimerRef = React.useRef(0), { onToastAdd, onToastRemove } = context, viewport = React.useMemo(() => context.viewports[viewportName], [context.viewports, viewportName]), handleClose = useEvent(() => {
+    } = props, isPresent = useIsPresent(), context = useToastProviderContext(__scopeToast), [node, setNode] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node2) => setNode(node2)), duration = durationProp || context.duration, closeTimerStartTimeRef = React.useRef(0), closeTimerRemainingTimeRef = React.useRef(duration), closeTimerRef = React.useRef(0), { onToastAdd, onToastRemove } = context, viewport = React.useMemo(() => context.viewports[viewportName], [context.viewports, viewportName]), handleClose = useEvent(() => {
       isPresent && (isWeb && node?.contains(document.activeElement) && viewport?.focus(), onClose());
     }), startTimer = React.useCallback(
       (duration2) => {
@@ -138,7 +139,7 @@ const ToastImplFrame = styled(ThemeableStack, {
       ><Theme forceClassName name={themeName}><AnimatedView
         {...panResponder?.panHandlers}
         style={[{ margin: "auto" }, animatedStyles]}
-      ><Collection.ItemSlot scope={__scopeToast}><ToastImplFrame
+      ><Collection.ItemSlot __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastImplFrame
         role="status"
         aria-live="off"
         aria-atomic

package/dist/jsx/ToastImpl.js.map

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

package/dist/jsx/ToastImpl.native.js

@@ -3,6 +3,7 @@ import { useComposedRefs } from "@tamagui/compose-refs";
 import {
   Theme,
   composeEventHandlers,
+  createStyledContext,
   isWeb,
   styled,
   useAnimationDriver,
@@ -17,10 +18,10 @@ import {
   PanResponder
 } from "react-native";
 import { TOAST_NAME } from "./constants";
+import { TOAST_CONTEXT } from "./Toast";
 import { ToastAnnounce } from "./ToastAnnounce";
 import {
   Collection,
-  createToastContext,
   useToastProviderContext
 } from "./ToastProvider";
 import { VIEWPORT_PAUSE, VIEWPORT_RESUME } from "./ToastViewport";
@@ -47,13 +48,13 @@ const ToastImplFrame = styled(ThemeableStack, {
   defaultVariants: {
     unstyled: !1
   }
-}), [ToastInteractiveProvider, useToastInteractiveContext] = createToastContext(
-  TOAST_NAME,
-  {
-    onClose() {
-    }
+}), {
+  Provider: ToastInteractiveProvider,
+  useStyledContext: useToastInteractiveContext
+} = createStyledContext({
+  onClose() {
   }
-), ToastImpl = React.forwardRef(
+}), ToastImpl = React.forwardRef(
   (props, forwardedRef) => {
     const {
       __scopeToast,
@@ -70,7 +71,7 @@ const ToastImplFrame = styled(ThemeableStack, {
       onSwipeEnd,
       viewportName = "default",
       ...toastProps
-    } = props, isPresent = useIsPresent(), context = useToastProviderContext(TOAST_NAME, __scopeToast), [node, setNode] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node2) => setNode(node2)), duration = durationProp || context.duration, closeTimerStartTimeRef = React.useRef(0), closeTimerRemainingTimeRef = React.useRef(duration), closeTimerRef = React.useRef(0), { onToastAdd, onToastRemove } = context, viewport = React.useMemo(() => context.viewports[viewportName], [context.viewports, viewportName]), handleClose = useEvent(() => {
+    } = props, isPresent = useIsPresent(), context = useToastProviderContext(__scopeToast), [node, setNode] = React.useState(null), composedRefs = useComposedRefs(forwardedRef, (node2) => setNode(node2)), duration = durationProp || context.duration, closeTimerStartTimeRef = React.useRef(0), closeTimerRemainingTimeRef = React.useRef(duration), closeTimerRef = React.useRef(0), { onToastAdd, onToastRemove } = context, viewport = React.useMemo(() => context.viewports[viewportName], [context.viewports, viewportName]), handleClose = useEvent(() => {
       isPresent && (isWeb && (node != null && node.contains(document.activeElement)) && (viewport == null || viewport.focus()), onClose());
     }), startTimer = React.useCallback(
       (duration2) => {
@@ -138,7 +139,7 @@ const ToastImplFrame = styled(ThemeableStack, {
       ><Theme forceClassName name={themeName}><AnimatedView
         {...panResponder == null ? void 0 : panResponder.panHandlers}
         style={[{ margin: "auto" }, animatedStyles]}
-      ><Collection.ItemSlot scope={__scopeToast}><ToastImplFrame
+      ><Collection.ItemSlot __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastImplFrame
         role="status"
         aria-live="off"
         aria-atomic

package/dist/jsx/ToastImpl.native.js.map

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

package/dist/jsx/ToastProvider.js

@@ -1,10 +1,9 @@
 import { createCollection } from "@tamagui/collection";
-import { createContextScope } from "@tamagui/create-context";
+import { createStyledContext } from "@tamagui/core";
 import * as React from "react";
+import { TOAST_CONTEXT } from "./Toast";
 import { ToastImperativeProvider } from "./ToastImperative";
-const PROVIDER_NAME = "ToastProvider", [Collection, useCollection, createCollectionScope] = createCollection("Toast"), [createToastContext, createToastScope] = createContextScope("Toast", [
-  createCollectionScope
-]), [ToastProviderProvider, useToastProviderContext] = createToastContext(PROVIDER_NAME), ToastProvider = (props) => {
+const PROVIDER_NAME = "ToastProvider", [Collection, useCollection] = createCollection("Toast"), { Provider: ToastProviderProvider, useStyledContext: useToastProviderContext } = createStyledContext(), ToastProvider = (props) => {
   const {
     __scopeToast,
     id: providedId,
@@ -27,7 +26,7 @@ const PROVIDER_NAME = "ToastProvider", [Collection, useCollection, createCollect
     native,
     notificationOptions
   }), [JSON.stringify([duration, burntOptions, native, notificationOptions])]);
-  return <Collection.Provider scope={__scopeToast}><ToastProviderProvider
+  return <Collection.Provider __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastProviderProvider
     scope={__scopeToast}
     id={id}
     label={label}
@@ -60,8 +59,6 @@ ToastProvider.displayName = PROVIDER_NAME;
 export {
   Collection,
   ToastProvider,
-  createToastContext,
-  createToastScope,
   useCollection,
   useToastProviderContext
 };

package/dist/jsx/ToastProvider.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ToastProvider.tsx"],
-  "mappings": "AAAA,SAAS,wBAAwB;AAGjC,SAAS,0BAA0B;AACnC,YAAY,WAAW;AAEvB,SAAS,+BAA+B;AAOxC,MAAM,gBAAgB,iBAEhB,CAAC,YAAY,eAAe,qBAAqB,IACrD,iBAAiC,OAAO,GAoBpC,CAAC,oBAAoB,gBAAgB,IAAI,mBAAmB,SAAS;AAAA,EACzE;AACF,CAAC,GACK,CAAC,uBAAuB,uBAAuB,IACnD,mBAA8C,aAAa,GA4CvD,gBAA8C,CAClD,UACG;AACH,QAAM;AAAA,IACJ;AAAA,IACA,IAAI;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB;AAAA,EACF,IAAI,OACE,KAAK,cAAc,MAAM,MAAM,GAC/B,CAAC,WAAW,YAAY,IAAI,MAAM,SAEtC,CAAC,CAAC,GACE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAC9C,iCAAiC,MAAM,OAAO,EAAK,GACnD,mBAAmB,MAAM,OAAO,EAAK,GAErC,uBAAuB,MAAM;AAAA,IACjC,CAAC,MAAc,aAAoC;AACjD,mBAAa,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE;AAAA,IACxD;AAAA,IACA,CAAC;AAAA,EACH,GAGM,UAAU,MAAM,QAAQ,OACrB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAEC,CAAC,KAAK,UAAU,CAAC,UAAU,cAAc,QAAQ,mBAAmB,CAAC,CAAC,CAAC;AAE1E,SACE,CAAC,WAAW,SAAS,OAAO,cAC1B,CAAC;AAAA,IACC,OAAO;AAAA,IACP,IAAI;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,kBAAkB;AAAA,IAClB,YAAY,MAAM,YAAY,MAAM;AAClC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,eAAe,MAAM,YAAY,MAAM;AACrC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,gCAAgC;AAAA,IAChC,kBAAkB;AAAA,GAElB,CAAC,wBAAwB,SAAS,UAAU,SAAS,EAApD,wBACH,EApBC,sBAqBH,EAtBC,WAAW;AAwBhB;AAEA,cAAc,YAAY;AAAA,EACxB,MAAM,OAAO;AACX,QAAI,MAAM,SAAS,OAAO,MAAM,SAAU,YAAY,CAAC,MAAM,MAAM,KAAK,GAAG;AACzE,YAAM,QAAQ,wCAAwC,aAAa;AACnE,aAAO,IAAI,MAAM,KAAK;AAAA,IACxB;AACA,WAAO;AAAA,EACT;AACF;AAEA,cAAc,cAAc;",
+  "mappings": "AAAA,SAAS,wBAAwB;AACjC,SAAsC,2BAA2B;AACjE,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AAOxC,MAAM,gBAAgB,iBAEhB,CAAC,YAAY,aAAa,IAAI,iBAAiC,OAAO,GA0BtE,EAAE,UAAU,uBAAuB,kBAAkB,wBAAwB,IACjF,oBAA+C,GA2C3C,gBAA8C,CAClD,UACG;AACH,QAAM;AAAA,IACJ;AAAA,IACA,IAAI;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB;AAAA,EACF,IAAI,OACE,KAAK,cAAc,MAAM,MAAM,GAC/B,CAAC,WAAW,YAAY,IAAI,MAAM,SAEtC,CAAC,CAAC,GACE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAC9C,iCAAiC,MAAM,OAAO,EAAK,GACnD,mBAAmB,MAAM,OAAO,EAAK,GAErC,uBAAuB,MAAM;AAAA,IACjC,CAAC,MAAc,aAAoC;AACjD,mBAAa,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE;AAAA,IACxD;AAAA,IACA,CAAC;AAAA,EACH,GAGM,UAAU,MAAM,QAAQ,OACrB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAEC,CAAC,KAAK,UAAU,CAAC,UAAU,cAAc,QAAQ,mBAAmB,CAAC,CAAC,CAAC;AAE1E,SACE,CAAC,WAAW,SAAS,mBAAmB,gBAAgB,eACtD,CAAC;AAAA,IACC,OAAO;AAAA,IACP,IAAI;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,kBAAkB;AAAA,IAClB,YAAY,MAAM,YAAY,MAAM;AAClC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,eAAe,MAAM,YAAY,MAAM;AACrC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,gCAAgC;AAAA,IAChC,kBAAkB;AAAA,GAElB,CAAC,wBAAwB,SAAS,UAAU,SAAS,EAApD,wBACH,EApBC,sBAqBH,EAtBC,WAAW;AAwBhB;AAEA,cAAc,YAAY;AAAA,EACxB,MAAM,OAAO;AACX,QAAI,MAAM,SAAS,OAAO,MAAM,SAAU,YAAY,CAAC,MAAM,MAAM,KAAK,GAAG;AACzE,YAAM,QAAQ,wCAAwC,aAAa;AACnE,aAAO,IAAI,MAAM,KAAK;AAAA,IACxB;AACA,WAAO;AAAA,EACT;AACF;AAEA,cAAc,cAAc;",
   "names": []
 }

package/dist/jsx/ToastProvider.native.js

@@ -1,10 +1,9 @@
 import { createCollection } from "@tamagui/collection";
-import { createContextScope } from "@tamagui/create-context";
+import { createStyledContext } from "@tamagui/core";
 import * as React from "react";
+import { TOAST_CONTEXT } from "./Toast";
 import { ToastImperativeProvider } from "./ToastImperative";
-const PROVIDER_NAME = "ToastProvider", [Collection, useCollection, createCollectionScope] = createCollection("Toast"), [createToastContext, createToastScope] = createContextScope("Toast", [
-  createCollectionScope
-]), [ToastProviderProvider, useToastProviderContext] = createToastContext(PROVIDER_NAME), ToastProvider = (props) => {
+const PROVIDER_NAME = "ToastProvider", [Collection, useCollection] = createCollection("Toast"), { Provider: ToastProviderProvider, useStyledContext: useToastProviderContext } = createStyledContext(), ToastProvider = (props) => {
   const {
     __scopeToast,
     id: providedId,
@@ -27,7 +26,7 @@ const PROVIDER_NAME = "ToastProvider", [Collection, useCollection, createCollect
     native,
     notificationOptions
   }), [JSON.stringify([duration, burntOptions, native, notificationOptions])]);
-  return <Collection.Provider scope={__scopeToast}><ToastProviderProvider
+  return <Collection.Provider __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastProviderProvider
     scope={__scopeToast}
     id={id}
     label={label}
@@ -60,8 +59,6 @@ ToastProvider.displayName = PROVIDER_NAME;
 export {
   Collection,
   ToastProvider,
-  createToastContext,
-  createToastScope,
   useCollection,
   useToastProviderContext
 };

package/dist/jsx/ToastProvider.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/ToastProvider.tsx"],
-  "mappings": "AAAA,SAAS,wBAAwB;AAGjC,SAAS,0BAA0B;AACnC,YAAY,WAAW;AAEvB,SAAS,+BAA+B;AAOxC,MAAM,gBAAgB,iBAEhB,CAAC,YAAY,eAAe,qBAAqB,IACrD,iBAAiC,OAAO,GAoBpC,CAAC,oBAAoB,gBAAgB,IAAI,mBAAmB,SAAS;AAAA,EACzE;AACF,CAAC,GACK,CAAC,uBAAuB,uBAAuB,IACnD,mBAA8C,aAAa,GA4CvD,gBAA8C,CAClD,UACG;AACH,QAAM;AAAA,IACJ;AAAA,IACA,IAAI;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB;AAAA,EACF,IAAI,OACE,KAAK,cAAc,MAAM,MAAM,GAC/B,CAAC,WAAW,YAAY,IAAI,MAAM,SAEtC,CAAC,CAAC,GACE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAC9C,iCAAiC,MAAM,OAAO,EAAK,GACnD,mBAAmB,MAAM,OAAO,EAAK,GAErC,uBAAuB,MAAM;AAAA,IACjC,CAAC,MAAc,aAAoC;AACjD,mBAAa,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE;AAAA,IACxD;AAAA,IACA,CAAC;AAAA,EACH,GAGM,UAAU,MAAM,QAAQ,OACrB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAEC,CAAC,KAAK,UAAU,CAAC,UAAU,cAAc,QAAQ,mBAAmB,CAAC,CAAC,CAAC;AAE1E,SACE,CAAC,WAAW,SAAS,OAAO,cAC1B,CAAC;AAAA,IACC,OAAO;AAAA,IACP,IAAI;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,kBAAkB;AAAA,IAClB,YAAY,MAAM,YAAY,MAAM;AAClC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,eAAe,MAAM,YAAY,MAAM;AACrC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,gCAAgC;AAAA,IAChC,kBAAkB;AAAA,GAElB,CAAC,wBAAwB,SAAS,UAAU,SAAS,EAApD,wBACH,EApBC,sBAqBH,EAtBC,WAAW;AAwBhB;AAEA,cAAc,YAAY;AAAA,EACxB,MAAM,OAAO;AACX,QAAI,MAAM,SAAS,OAAO,MAAM,SAAU,YAAY,CAAC,MAAM,MAAM,KAAK,GAAG;AACzE,YAAM,QAAQ,wCAAwC,aAAa;AACnE,aAAO,IAAI,MAAM,KAAK;AAAA,IACxB;AACA,WAAO;AAAA,EACT;AACF;AAEA,cAAc,cAAc;",
+  "mappings": "AAAA,SAAS,wBAAwB;AACjC,SAAsC,2BAA2B;AACjE,YAAY,WAAW;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AAOxC,MAAM,gBAAgB,iBAEhB,CAAC,YAAY,aAAa,IAAI,iBAAiC,OAAO,GA0BtE,EAAE,UAAU,uBAAuB,kBAAkB,wBAAwB,IACjF,oBAA+C,GA2C3C,gBAA8C,CAClD,UACG;AACH,QAAM;AAAA,IACJ;AAAA,IACA,IAAI;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR,WAAW;AAAA,IACX,iBAAiB;AAAA,IACjB,iBAAiB;AAAA,IACjB;AAAA,EACF,IAAI,OACE,KAAK,cAAc,MAAM,MAAM,GAC/B,CAAC,WAAW,YAAY,IAAI,MAAM,SAEtC,CAAC,CAAC,GACE,CAAC,YAAY,aAAa,IAAI,MAAM,SAAS,CAAC,GAC9C,iCAAiC,MAAM,OAAO,EAAK,GACnD,mBAAmB,MAAM,OAAO,EAAK,GAErC,uBAAuB,MAAM;AAAA,IACjC,CAAC,MAAc,aAAoC;AACjD,mBAAa,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,GAAG,SAAS,EAAE;AAAA,IACxD;AAAA,IACA,CAAC;AAAA,EACH,GAGM,UAAU,MAAM,QAAQ,OACrB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAEC,CAAC,KAAK,UAAU,CAAC,UAAU,cAAc,QAAQ,mBAAmB,CAAC,CAAC,CAAC;AAE1E,SACE,CAAC,WAAW,SAAS,mBAAmB,gBAAgB,eACtD,CAAC;AAAA,IACC,OAAO;AAAA,IACP,IAAI;AAAA,IACJ,OAAO;AAAA,IACP,UAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,gBAAgB;AAAA,IAChB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,kBAAkB;AAAA,IAClB,YAAY,MAAM,YAAY,MAAM;AAClC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,eAAe,MAAM,YAAY,MAAM;AACrC,oBAAc,CAAC,cAAc,YAAY,CAAC;AAAA,IAC5C,GAAG,CAAC,CAAC;AAAA,IACL,gCAAgC;AAAA,IAChC,kBAAkB;AAAA,GAElB,CAAC,wBAAwB,SAAS,UAAU,SAAS,EAApD,wBACH,EApBC,sBAqBH,EAtBC,WAAW;AAwBhB;AAEA,cAAc,YAAY;AAAA,EACxB,MAAM,OAAO;AACX,QAAI,MAAM,SAAS,OAAO,MAAM,SAAU,YAAY,CAAC,MAAM,MAAM,KAAK,GAAG;AACzE,YAAM,QAAQ,wCAAwC,aAAa;AACnE,aAAO,IAAI,MAAM,KAAK;AAAA,IACxB;AACA,WAAO;AAAA,EACT;AACF;AAEA,cAAc,cAAc;",
   "names": []
 }

package/dist/jsx/ToastViewport.js

@@ -5,6 +5,7 @@ import { PortalHost } from "@tamagui/portal";
 import { YStack } from "@tamagui/stacks";
 import { VisuallyHidden } from "@tamagui/visually-hidden";
 import * as React from "react";
+import { TOAST_CONTEXT } from "./Toast";
 import {
   Collection,
   useCollection,
@@ -53,7 +54,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
       name = "default",
       multipleToasts,
       ...viewportProps
-    } = props, context = useToastProviderContext(VIEWPORT_NAME, __scopeToast), getItems = useCollection(__scopeToast), headFocusProxyRef = React.useRef(null), tailFocusProxyRef = React.useRef(null), wrapperRef = React.useRef(null), ref = React.useRef(null), onViewportChange = React.useCallback(
+    } = props, context = useToastProviderContext(__scopeToast), getItems = useCollection(__scopeToast || TOAST_CONTEXT), headFocusProxyRef = React.useRef(null), tailFocusProxyRef = React.useRef(null), wrapperRef = React.useRef(null), ref = React.useRef(null), onViewportChange = React.useCallback(
       (el) => {
         context.viewports[name] !== el && context.onViewportChange(name, el);
       },
@@ -141,6 +142,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
       tabIndex={-1}
     >
       {hasToasts && <FocusProxy
+        __scopeToast={__scopeToast}
         viewportName={name}
         ref={headFocusProxyRef}
         onFocusFromOutsideViewport={() => {
@@ -156,7 +158,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
         * the list instead of the viewport so it announces number of items remaining.
         */
       }
-      <Collection.Slot scope={__scopeToast}><ToastViewportFrame
+      <Collection.Slot __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastViewportFrame
         focusable={context.toastCount > 0}
         ref={composedRefs}
         {...viewportProps}
@@ -165,6 +167,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
         name={name ?? "default"}
       /></ToastViewportFrame></Collection.Slot>
       {hasToasts && <FocusProxy
+        __scopeToast={__scopeToast}
         viewportName={name}
         ref={tailFocusProxyRef}
         onFocusFromOutsideViewport={() => {
@@ -180,7 +183,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
 ToastViewport.displayName = VIEWPORT_NAME;
 const FOCUS_PROXY_NAME = "ToastFocusProxy", FocusProxy = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeToast, onFocusFromOutsideViewport, viewportName, ...proxyProps } = props, viewport = useToastProviderContext(FOCUS_PROXY_NAME, __scopeToast).viewports[viewportName];
+    const { __scopeToast, onFocusFromOutsideViewport, viewportName, ...proxyProps } = props, viewport = useToastProviderContext(__scopeToast).viewports[viewportName];
     return <VisuallyHidden
       aria-hidden
       tabIndex={0}

package/dist/jsx/ToastViewport.js.map

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

package/dist/jsx/ToastViewport.native.js

@@ -5,6 +5,7 @@ import { PortalHost } from "@tamagui/portal";
 import { YStack } from "@tamagui/stacks";
 import { VisuallyHidden } from "@tamagui/visually-hidden";
 import * as React from "react";
+import { TOAST_CONTEXT } from "./Toast";
 import {
   Collection,
   useCollection,
@@ -53,7 +54,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
       name = "default",
       multipleToasts,
       ...viewportProps
-    } = props, context = useToastProviderContext(VIEWPORT_NAME, __scopeToast), getItems = useCollection(__scopeToast), headFocusProxyRef = React.useRef(null), tailFocusProxyRef = React.useRef(null), wrapperRef = React.useRef(null), ref = React.useRef(null), onViewportChange = React.useCallback(
+    } = props, context = useToastProviderContext(__scopeToast), getItems = useCollection(__scopeToast || TOAST_CONTEXT), headFocusProxyRef = React.useRef(null), tailFocusProxyRef = React.useRef(null), wrapperRef = React.useRef(null), ref = React.useRef(null), onViewportChange = React.useCallback(
       (el) => {
         context.viewports[name] !== el && context.onViewportChange(name, el);
       },
@@ -143,6 +144,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
       tabIndex={-1}
     >
       {hasToasts && <FocusProxy
+        __scopeToast={__scopeToast}
         viewportName={name}
         ref={headFocusProxyRef}
         onFocusFromOutsideViewport={() => {
@@ -158,7 +160,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
         * the list instead of the viewport so it announces number of items remaining.
         */
       }
-      <Collection.Slot scope={__scopeToast}><ToastViewportFrame
+      <Collection.Slot __scopeCollection={__scopeToast || TOAST_CONTEXT}><ToastViewportFrame
         focusable={context.toastCount > 0}
         ref={composedRefs}
         {...viewportProps}
@@ -167,6 +169,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
         name={name ?? "default"}
       /></ToastViewportFrame></Collection.Slot>
       {hasToasts && <FocusProxy
+        __scopeToast={__scopeToast}
         viewportName={name}
         ref={tailFocusProxyRef}
         onFocusFromOutsideViewport={() => {
@@ -182,7 +185,7 @@ const VIEWPORT_NAME = "ToastViewport", VIEWPORT_DEFAULT_HOTKEY = ["F8"], VIEWPOR
 ToastViewport.displayName = VIEWPORT_NAME;
 const FOCUS_PROXY_NAME = "ToastFocusProxy", FocusProxy = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeToast, onFocusFromOutsideViewport, viewportName, ...proxyProps } = props, viewport = useToastProviderContext(FOCUS_PROXY_NAME, __scopeToast).viewports[viewportName];
+    const { __scopeToast, onFocusFromOutsideViewport, viewportName, ...proxyProps } = props, viewport = useToastProviderContext(__scopeToast).viewports[viewportName];
     return <VisuallyHidden
       aria-hidden
       tabIndex={0}

package/dist/jsx/ToastViewport.native.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/toast",
-  "version": "1.70.0",
+  "version": "1.72.0",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -31,24 +31,24 @@
     }
   },
   "dependencies": {
-    "@tamagui/animate-presence": "1.70.0",
-    "@tamagui/compose-refs": "1.70.0",
-    "@tamagui/core": "1.70.0",
-    "@tamagui/create-context": "1.70.0",
-    "@tamagui/dismissable": "1.70.0",
-    "@tamagui/polyfill-dev": "1.70.0",
-    "@tamagui/portal": "1.70.0",
-    "@tamagui/stacks": "1.70.0",
-    "@tamagui/text": "1.70.0",
-    "@tamagui/use-controllable-state": "1.70.0",
-    "@tamagui/visually-hidden": "1.70.0"
+    "@tamagui/animate-presence": "1.72.0",
+    "@tamagui/compose-refs": "1.72.0",
+    "@tamagui/core": "1.72.0",
+    "@tamagui/create-context": "1.72.0",
+    "@tamagui/dismissable": "1.72.0",
+    "@tamagui/polyfill-dev": "1.72.0",
+    "@tamagui/portal": "1.72.0",
+    "@tamagui/stacks": "1.72.0",
+    "@tamagui/text": "1.72.0",
+    "@tamagui/use-controllable-state": "1.72.0",
+    "@tamagui/visually-hidden": "1.72.0"
   },
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.70.0",
+    "@tamagui/build": "1.72.0",
     "burnt": "^0.11.0",
     "react": "^18.2.0",
     "react-native": "^0.72.1"

package/src/Toast.tsx

@@ -28,14 +28,10 @@ import {
   ToastProps,
   useToastInteractiveContext,
 } from './ToastImpl'
-import {
-  ScopedProps,
-  ToastProvider,
-  ToastProviderProps,
-  createToastScope,
-} from './ToastProvider'
+import { ScopedProps, ToastProvider, ToastProviderProps } from './ToastProvider'
 import { ToastViewport, ToastViewportProps } from './ToastViewport'
 
+export const TOAST_CONTEXT = 'Toast'
 /* -------------------------------------------------------------------------------------------------
  * ToastTitle
  * -----------------------------------------------------------------------------------------------*/
@@ -104,7 +100,7 @@ type ToastActionProps = ToastCloseProps & {
   altText: string
 }
 
-const ToastAction = React.forwardRef<TamaguiElement, ToastActionProps>(
+const ToastAction = React.forwardRef<TamaguiElement, ScopedProps<ToastActionProps>>(
   (props: ScopedProps<ToastActionProps>, forwardedRef) => {
     const { altText, ...actionProps } = props
     if (!altText) return null
@@ -143,7 +139,7 @@ type ToastCloseProps = ToastCloseFrameProps & {}
 const ToastClose = React.forwardRef<TamaguiElement, ToastCloseProps>(
   (props: ScopedProps<ToastCloseProps>, forwardedRef) => {
     const { __scopeToast, ...closeProps } = props
-    const interactiveContext = useToastInteractiveContext(CLOSE_NAME, __scopeToast)
+    const interactiveContext = useToastInteractiveContext(__scopeToast)
 
     return (
       <ToastAnnounceExclude asChild>
@@ -164,7 +160,7 @@ ToastClose.displayName = CLOSE_NAME
  * Toast
  * -----------------------------------------------------------------------------------------------*/
 
-const ToastComponent = React.forwardRef<TamaguiElement, ToastProps>(
+const ToastComponent = React.forwardRef<TamaguiElement, ScopedProps<ToastProps>>(
   ToastImplFrame.extractable((props: ScopedProps<ToastProps>, forwardedRef) => {
     const { forceMount, open: openProp, defaultOpen, onOpenChange, ...toastProps } = props
     const [open, setOpen] = useControllableState({
@@ -217,7 +213,6 @@ export {
   ToastProvider,
   ToastViewport,
   //
-  createToastScope,
   // imperative
   useToast,
   useToastController,

package/src/ToastAnnounce.tsx

@@ -11,7 +11,6 @@ import { Portal } from '@tamagui/portal'
 import { VisuallyHidden } from '@tamagui/visually-hidden'
 import * as React from 'react'
 
-import { TOAST_NAME } from './constants'
 import { ScopedProps, useToastProviderContext } from './ToastProvider'
 
 const ToastAnnounceExcludeFrame = styled(Stack, {
@@ -22,20 +21,21 @@ type ToastAnnounceExcludeProps = ToastAnnounceExcludeFrameProps & {
   altText?: string
 }
 
-const ToastAnnounceExclude = React.forwardRef<TamaguiElement, ToastAnnounceExcludeProps>(
-  (props: ScopedProps<ToastAnnounceExcludeProps>, forwardedRef) => {
-    const { __scopeToast, altText, ...announceExcludeProps } = props
+const ToastAnnounceExclude = React.forwardRef<
+  TamaguiElement,
+  ScopedProps<ToastAnnounceExcludeProps>
+>((props: ScopedProps<ToastAnnounceExcludeProps>, forwardedRef) => {
+  const { altText, ...announceExcludeProps } = props
 
-    return (
-      <ToastAnnounceExcludeFrame
-        data-toast-announce-exclude=""
-        data-toast-announce-alt={altText || undefined}
-        {...announceExcludeProps}
-        ref={forwardedRef}
-      />
-    )
-  }
-)
+  return (
+    <ToastAnnounceExcludeFrame
+      data-toast-announce-exclude=""
+      data-toast-announce-alt={altText || undefined}
+      {...announceExcludeProps}
+      ref={forwardedRef}
+    />
+  )
+})
 
 /* -----------------------------------------------------------------------------------------------*/
 
@@ -43,11 +43,11 @@ interface ToastAnnounceProps
   extends Omit<GetProps<typeof VisuallyHidden>, 'children'>,
     ScopedProps<{ children: string[] }> {}
 
-const ToastAnnounce: React.FC<ToastAnnounceProps> = (
+const ToastAnnounce: React.FC<ScopedProps<ToastAnnounceProps>> = (
   props: ScopedProps<ToastAnnounceProps>
 ) => {
   const { __scopeToast, children, ...announceProps } = props
-  const context = useToastProviderContext(TOAST_NAME, __scopeToast)
+  const context = useToastProviderContext(__scopeToast)
   const [renderAnnounceText, setRenderAnnounceText] = React.useState(false)
   const [isAnnounced, setIsAnnounced] = React.useState(false)