@tamagui/toast 1.8.2 → 1.8.4

package/src/ToastProvider.tsx

@@ -1,4 +1,3 @@
-
 import { createCollection } from '@tamagui/collection'
 import { TamaguiElement, useId } from '@tamagui/core'
 import type { Scope } from '@tamagui/create-context'
@@ -6,7 +5,6 @@ import { createContextScope } from '@tamagui/create-context'
 import { PortalProvider } from '@tamagui/portal'
 import * as React from 'react'
 
-
 /* -------------------------------------------------------------------------------------------------
  * ToastProvider
  * -----------------------------------------------------------------------------------------------*/
@@ -87,31 +85,29 @@ const ToastProvider: React.FC<ToastProviderProps> = (
   const isClosePausedRef = React.useRef(false)
 
   return (
-    <PortalProvider shouldAddRootHost={false} rootHostName="default">
-      <Collection.Provider scope={__scopeToast}>
-        <ToastProviderProvider
-          scope={__scopeToast}
-          id={id}
-          label={label}
-          duration={duration}
-          swipeDirection={swipeDirection}
-          swipeThreshold={swipeThreshold}
-          toastCount={toastCount}
-          viewport={viewport}
-          onViewportChange={setViewport}
-          onToastAdd={React.useCallback(() => {
-            setToastCount((prevCount) => prevCount + 1)
-          }, [])}
-          onToastRemove={React.useCallback(() => {
-            setToastCount((prevCount) => prevCount - 1)
-          }, [])}
-          isFocusedToastEscapeKeyDownRef={isFocusedToastEscapeKeyDownRef}
-          isClosePausedRef={isClosePausedRef}
-        >
-          {children}
-        </ToastProviderProvider>
-      </Collection.Provider>
-    </PortalProvider>
+    <Collection.Provider scope={__scopeToast}>
+      <ToastProviderProvider
+        scope={__scopeToast}
+        id={id}
+        label={label}
+        duration={duration}
+        swipeDirection={swipeDirection}
+        swipeThreshold={swipeThreshold}
+        toastCount={toastCount}
+        viewport={viewport}
+        onViewportChange={setViewport}
+        onToastAdd={React.useCallback(() => {
+          setToastCount((prevCount) => prevCount + 1)
+        }, [])}
+        onToastRemove={React.useCallback(() => {
+          setToastCount((prevCount) => prevCount - 1)
+        }, [])}
+        isFocusedToastEscapeKeyDownRef={isFocusedToastEscapeKeyDownRef}
+        isClosePausedRef={isClosePausedRef}
+      >
+        {children}
+      </ToastProviderProvider>
+    </Collection.Provider>
   )
 }
 
@@ -128,7 +124,11 @@ ToastProvider.propTypes = {
 ToastProvider.displayName = PROVIDER_NAME
 
 export {
-  Collection, ToastProvider, createToastContext, createToastScope, useCollection, useToastProviderContext
+  Collection,
+  ToastProvider,
+  createToastContext,
+  createToastScope,
+  useCollection,
+  useToastProviderContext,
 }
 export type { ScopedProps, SwipeDirection, ToastProviderProps }
-

package/src/ToastViewport.tsx

@@ -79,6 +79,7 @@ const ToastViewport = React.forwardRef<HTMLDivElement, ToastViewportProps>(
 
     React.useEffect(() => {
       if (!isWeb) return
+      if (context.toastCount === 0) return
       const handleKeyDown = (event: KeyboardEvent) => {
         // we use `event.code` as it is consistent regardless of meta keys that were pressed.
         // for example, `event.key` for `Control+Alt+t` is `†` and `t !== †`
@@ -86,16 +87,16 @@ const ToastViewport = React.forwardRef<HTMLDivElement, ToastViewportProps>(
           (key) => (event as any)[key] || event.code === key
         )
         if (isHotkeyPressed) ref.current?.focus()
-        console.log(isHotkeyPressed)
       }
       document.addEventListener('keydown', handleKeyDown)
       return () => {
         document.removeEventListener('keydown', handleKeyDown)
       }
-    }, [hotkey])
+    }, [hotkey, context.toastCount])
 
     React.useEffect(() => {
       if (!isWeb) return
+      if (context.toastCount === 0) return
       const wrapper = wrapperRef.current
       const viewport = ref.current
       if (hasToasts && wrapper && viewport) {
@@ -143,7 +144,7 @@ const ToastViewport = React.forwardRef<HTMLDivElement, ToastViewportProps>(
           window.removeEventListener('focus', handleResume)
         }
       }
-    }, [hasToasts, context.isClosePausedRef])
+    }, [hasToasts, context.isClosePausedRef, context.toastCount])
 
     const getSortedTabbableCandidates = React.useCallback(
       ({ tabbingDirection }: { tabbingDirection: 'forwards' | 'backwards' }) => {
@@ -166,6 +167,8 @@ const ToastViewport = React.forwardRef<HTMLDivElement, ToastViewportProps>(
 
     React.useEffect(() => {
       if (!isWeb) return
+      if (context.toastCount === 0) return
+
       const viewport = ref.current
       // We programmatically manage tabbing as we are unable to influence
       // the source order with portals, this allows us to reverse the
@@ -209,7 +212,7 @@ const ToastViewport = React.forwardRef<HTMLDivElement, ToastViewportProps>(
         viewport.addEventListener('keydown', handleKeyDown)
         return () => viewport.removeEventListener('keydown', handleKeyDown)
       }
-    }, [getItems, getSortedTabbableCandidates])
+    }, [getItems, getSortedTabbableCandidates, context.toastCount])
 
     return (
       <ToastViewportWrapperFrame

package/types/ToastProvider.d.ts

@@ -75,6 +75,6 @@ interface ToastProviderProps {
     id?: string;
 }
 declare const ToastProvider: React.FC<ToastProviderProps>;
-export { Collection, ToastProvider, createToastContext, createToastScope, useCollection, useToastProviderContext };
+export { Collection, ToastProvider, createToastContext, createToastScope, useCollection, useToastProviderContext, };
 export type { ScopedProps, SwipeDirection, ToastProviderProps };
 //# sourceMappingURL=ToastProvider.d.ts.map

package/types/ToastProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToastProvider.d.ts","sourceRoot":"","sources":["../src/ToastProvider.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAS,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGpD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,QAAA,MAAO,UAAU;;;;;;;;;;GAAE,aAAa;;GACW,CAAA;AAE3C,KAAK,cAAc,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,GAAG,YAAY,GAAG,MAAM,GAAG,OAAO,CAAA;AAClF,KAAK,yBAAyB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAA;IAC/B,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAA;IAChD,UAAU,IAAI,IAAI,CAAA;IAClB,aAAa,IAAI,IAAI,CAAA;IACrB,8BAA8B,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC/D,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;CAClD,CAAA;AAED,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,YAAY,CAAC,EAAE,KAAK,CAAA;CAAE,CAAA;AAClD,QAAA,MAAO,kBAAkB;;;;;;;;;qCAAE,gBAAgB,+CAEzC,CAAA;AACF,QAAA,MAA8B,uBAAuB;;;2CACS,CAAA;AAE9D,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA6C/C,CAAA;AAcD,OAAO,EACL,UAAU,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,uBAAuB,EACxG,CAAA;AACD,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAA"}
+{"version":3,"file":"ToastProvider.d.ts","sourceRoot":"","sources":["../src/ToastProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAS,MAAM,eAAe,CAAA;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGpD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,QAAA,MAAO,UAAU;;;;;;;;;;GAAE,aAAa;;GACW,CAAA;AAE3C,KAAK,cAAc,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,GAAG,YAAY,GAAG,MAAM,GAAG,OAAO,CAAA;AAClF,KAAK,yBAAyB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,cAAc,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAA;IAC/B,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAA;IAChD,UAAU,IAAI,IAAI,CAAA;IAClB,aAAa,IAAI,IAAI,CAAA;IACrB,8BAA8B,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC/D,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;CAClD,CAAA;AAED,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,YAAY,CAAC,EAAE,KAAK,CAAA;CAAE,CAAA;AAClD,QAAA,MAAO,kBAAkB;;;;;;;;;qCAAE,gBAAgB,+CAEzC,CAAA;AACF,QAAA,MAA8B,uBAAuB;;;2CACS,CAAA;AAE9D,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA2C/C,CAAA;AAcD,OAAO,EACL,UAAU,EACV,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,uBAAuB,GACxB,CAAA;AACD,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAA"}

package/types/ToastViewport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToastViewport.d.ts","sourceRoot":"","sources":["../src/ToastViewport.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAiB,MAAM,eAAe,CAAA;AAIvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAU9B,QAAA,MAAM,uBAAuB,UAAS,CAAA;AACtC,QAAA,MAAM,cAAc,wBAAwB,CAAA;AAC5C,QAAA,MAAM,eAAe,yBAAyB,CAAA;AAgB9C,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAMtB,CAAA;AACF,KAAK,uBAAuB,GAAG,QAAQ,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAClE,KAAK,kBAAkB,GAAG,uBAAuB,GAAG;IAClD;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,QAAA,MAAM,aAAa;;;;;;;;;;IAjBjB;;;OAGG;;IAEH;;;;OAIG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAbH;;;OAGG;;IAEH;;;;OAIG;;IAEH;;OAEG;;iDA8MJ,CAAA;AAqFD,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,eAAe,GAChB,CAAA"}
+{"version":3,"file":"ToastViewport.d.ts","sourceRoot":"","sources":["../src/ToastViewport.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAiB,MAAM,eAAe,CAAA;AAIvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAU9B,QAAA,MAAM,uBAAuB,UAAS,CAAA;AACtC,QAAA,MAAM,cAAc,wBAAwB,CAAA;AAC5C,QAAA,MAAM,eAAe,yBAAyB,CAAA;AAgB9C,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAMtB,CAAA;AACF,KAAK,uBAAuB,GAAG,QAAQ,CAAC,OAAO,kBAAkB,CAAC,CAAA;AAClE,KAAK,kBAAkB,GAAG,uBAAuB,GAAG;IAClD;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,QAAA,MAAM,aAAa;;;;;;;;;;IAjBjB;;;OAGG;;IAEH;;;;OAIG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;IAbH;;;OAGG;;IAEH;;;;OAIG;;IAEH;;OAEG;;iDAiNJ,CAAA;AAqFD,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,eAAe,GAChB,CAAA"}