From 2a27b61e355f67c9f98fcf75fe66fa22df626c91 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 13:04:03 -0700
Subject: [PATCH 01/15] Add setDuration to context. Add screenreader check in
 .show()

---
 .../components/Snackbar/SnackbarProvider.tsx  | 11 ++++++++--
 .../src/components/Snackbar/useSnackbar.tsx   | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/components/src/components/Snackbar/SnackbarProvider.tsx b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
index 96b47262..70bafec2 100644
--- a/packages/components/src/components/Snackbar/SnackbarProvider.tsx
+++ b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
@@ -8,6 +8,12 @@ import { useSnackbarDefaultOffset } from './useSnackbarDefaultOffset'
 type SnackbarContextType = {
   offset: number
   setOffset: (newOffset: number) => void
+  setDuration: (newDuration: number) => void
+}
+
+export const SNACKBAR_DURATIONS = {
+  DEFAULT: 1000000000000,
+  SCREEN_READER: 5000
 }
 
 export const SnackbarContext = createContext<SnackbarContextType | undefined>(
@@ -20,12 +26,13 @@ export const SnackbarProvider: React.FC<{ children: ReactNode }> = ({
   // TODO: Check global default setting
   const defaultOffset = useSnackbarDefaultOffset()
   const [offset, setOffset] = useState(defaultOffset)
+  const [duration, setDuration] = useState(SNACKBAR_DURATIONS.DEFAULT)
 
   return (
-    <SnackbarContext.Provider value={{ offset, setOffset }}>
+    <SnackbarContext.Provider value={{ offset, setOffset, setDuration }}>
       <ToastProvider
         animationDuration={100}
-        duration={1000000000000} // Essentially indefinite until dismissed
+        duration={duration} // Essentially indefinite until dismissed
         offset={offset}
         placement="bottom"
         renderToast={(toast) => <Snackbar {...(toast as SnackbarProps)} />}
diff --git a/packages/components/src/components/Snackbar/useSnackbar.tsx b/packages/components/src/components/Snackbar/useSnackbar.tsx
index 0697e0ed..b17cc503 100644
--- a/packages/components/src/components/Snackbar/useSnackbar.tsx
+++ b/packages/components/src/components/Snackbar/useSnackbar.tsx
@@ -2,8 +2,9 @@ import { useContext } from 'react'
 
 import * as Toast from 'react-native-toast-notifications'
 
-import { SnackbarContext } from './SnackbarProvider'
+import { SNACKBAR_DURATIONS, SnackbarContext } from './SnackbarProvider'
 import { SnackbarOptions } from './Snackbar'
+import { useIsScreenReaderEnabled } from '../../utils'
 import { useSnackbarDefaultOffset } from './useSnackbarDefaultOffset'
 
 /**
@@ -15,23 +16,26 @@ export function useSnackbar() {
   const toast = Toast.useToast()
   const context = useContext(SnackbarContext)
   const defaultOffset = useSnackbarDefaultOffset()
+  const screenReaderEnabled = useIsScreenReaderEnabled()
 
   if (!context) {
     throw new Error('useSnackbar must be used within a SnackbarProvider')
   }
 
-  const { offset, setOffset } = context
+  const { setOffset, setDuration } = context
 
   const show = (message: string, snackbarOptions?: SnackbarOptions) => {
     toast.hideAll()
 
-    if (snackbarOptions?.offset) {
-      setOffset(snackbarOptions.offset)
-    } else if (offset !== defaultOffset) {
-      setOffset(defaultOffset)
-    }
+    setOffset(snackbarOptions?.offset ? snackbarOptions.offset : defaultOffset)
 
-    return toast.show(message, { data: snackbarOptions })
+    if (screenReaderEnabled) {
+      setDuration(
+        screenReaderEnabled
+          ? SNACKBAR_DURATIONS.SCREEN_READER
+          : SNACKBAR_DURATIONS.DEFAULT,
+      )
+    } else return toast.show(message, { data: snackbarOptions })
   }
 
   return {

From 63fa112a56e7258d792c06a142cb856f4ea41acb Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:20:28 -0700
Subject: [PATCH 02/15] Add "With Action" variant to stories

---
 .../src/components/Snackbar/Snackbar.stories.tsx    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.stories.tsx b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
index 50856511..3111d513 100644
--- a/packages/components/src/components/Snackbar/Snackbar.stories.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
@@ -49,7 +49,18 @@ const mobileComponentRenderer = (props: storyArgs) => {
   return <Button label="Press for Snackbar" onPress={onPressSnackbar} />
 }
 
-export const _Snackbar: Story = {
+export const _Default: Story = {
+  render: Platform.OS !== 'web' ? mobileComponentRenderer : undefined, // Render Snackbar flat in web
+  args: {
+    message: 'Message moved to Test Folder',
+    data: {
+      isError: false,
+      messageA11y: 'Message sent',
+    },
+  },
+}
+
+export const _WithAction: Story = {
   render: Platform.OS !== 'web' ? mobileComponentRenderer : undefined, // Render Snackbar flat in web
   args: {
     message: 'Message moved to Test Folder',

From 7e49e3c3b9f9fbaee74b47caa3057b9802c5448b Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:21:02 -0700
Subject: [PATCH 03/15] Add SNACKBAR_DURATIONS consts. Add duration and
 setDuration to context

---
 .../components/Snackbar/SnackbarProvider.tsx    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/components/src/components/Snackbar/SnackbarProvider.tsx b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
index 99c275c7..a50f136f 100644
--- a/packages/components/src/components/Snackbar/SnackbarProvider.tsx
+++ b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
@@ -8,13 +8,14 @@ import { useSnackbarDefaultOffset } from './useSnackbarDefaultOffset'
 
 type SnackbarContextType = {
   offset: number
-  setOffset: (newOffset: number) => void
+  duration: number
   setDuration: (newDuration: number) => void
+  setOffset: (newOffset: number) => void
 }
 
 export const SNACKBAR_DURATIONS = {
-  DEFAULT: 1000000000000,
-  SCREEN_READER: 5000
+  DEFAULT: 1000000000000, // Essentially indefinite until dismissed
+  SCREEN_READER: 5000,
 }
 
 export const SnackbarContext = createContext<SnackbarContextType | undefined>(
@@ -25,18 +26,18 @@ export const SnackbarProvider: React.FC<{ children: ReactNode }> = ({
   children,
 }) => {
   // TODO: Check global default setting
-  const defaultOffset = useSnackbarDefaultOffset()
-  const [offset, setOffset] = useState(defaultOffset)
+  const [offset, setOffset] = useState(useSnackbarDefaultOffset())
   const [duration, setDuration] = useState(SNACKBAR_DURATIONS.DEFAULT)
 
   return (
-    <SnackbarContext.Provider value={{ offset, setOffset, setDuration }}>
+    <SnackbarContext.Provider
+      value={{ offset, duration, setDuration, setOffset }}>
       <ToastProvider
         animationDuration={100}
-        duration={duration} // Essentially indefinite until dismissed
+        duration={duration}
         offset={offset}
         placement="bottom"
-        renderToast={(toast) => <Snackbar {...toast as SnackbarProps} />}
+        renderToast={(toast) => <Snackbar {...(toast as SnackbarProps)} />}
         swipeEnabled={false}>
         {children}
       </ToastProvider>

From 6f2242ada94cbcad951db7e5a22ee6df471e78bf Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:21:32 -0700
Subject: [PATCH 04/15] Clean up. Add auto-dismiss logic for screenreader

---
 .../src/components/Snackbar/useSnackbar.tsx   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/components/Snackbar/useSnackbar.tsx b/packages/components/src/components/Snackbar/useSnackbar.tsx
index b17cc503..1721ebbd 100644
--- a/packages/components/src/components/Snackbar/useSnackbar.tsx
+++ b/packages/components/src/components/Snackbar/useSnackbar.tsx
@@ -22,20 +22,22 @@ export function useSnackbar() {
     throw new Error('useSnackbar must be used within a SnackbarProvider')
   }
 
-  const { setOffset, setDuration } = context
-
   const show = (message: string, snackbarOptions?: SnackbarOptions) => {
-    toast.hideAll()
+    const { offset, onActionPressed } = snackbarOptions || {}
+    const { setOffset, setDuration } = context
 
-    setOffset(snackbarOptions?.offset ? snackbarOptions.offset : defaultOffset)
+    // Adjust offset if provided, otherwise set to default
+    setOffset(offset ? offset : defaultOffset)
 
-    if (screenReaderEnabled) {
-      setDuration(
-        screenReaderEnabled
-          ? SNACKBAR_DURATIONS.SCREEN_READER
-          : SNACKBAR_DURATIONS.DEFAULT,
-      )
-    } else return toast.show(message, { data: snackbarOptions })
+    // Auto-dismiss if screen reader is on and there is no action button
+    setDuration(
+      screenReaderEnabled && !onActionPressed
+        ? SNACKBAR_DURATIONS.SCREEN_READER
+        : SNACKBAR_DURATIONS.DEFAULT,
+    )
+
+    toast.hideAll()
+    toast.show(message, { data: snackbarOptions })
   }
 
   return {

From 7ecfbdf59103c5311e2d3f3f03aac2f3a6a0dfe8 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:25:43 -0700
Subject: [PATCH 05/15] Clean up OS specific screen reader props for clarity

---
 .../components/src/components/Snackbar/Snackbar.tsx    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.tsx b/packages/components/src/components/Snackbar/Snackbar.tsx
index 50d92b57..7a83c9df 100644
--- a/packages/components/src/components/Snackbar/Snackbar.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.tsx
@@ -16,7 +16,7 @@ import React, { FC, useEffect } from 'react'
 
 import { Icon, IconProps } from '../Icon/Icon'
 import { Spacer } from '../Spacer/Spacer'
-import { isAndroid } from '../../utils/OSfunctions'
+import { isAndroid, isIOS } from '../../utils/OSfunctions'
 import { useTheme } from '../../utils'
 
 type SnackbarButtonProps = {
@@ -157,7 +157,6 @@ export const Snackbar: FC<SnackbarProps> = (toast) => {
   const contentColor = theme.vadsColorForegroundInverse
 
   const containerProps: ViewProps = {
-    accessibilityViewIsModal: true, // Prevents screen reader from tap focusing elements behind the Snackbar on iOS
     style: {
       alignItems: 'center',
       backgroundColor: theme.vadsColorSurfaceInverse,
@@ -171,8 +170,13 @@ export const Snackbar: FC<SnackbarProps> = (toast) => {
     },
   }
 
+  // Prevents screen reader from tap focusing elements behind the Snackbar on iOS
+  if (isIOS()) {
+    containerProps.accessibilityViewIsModal = true
+  }
+
+  // Prevents screen reader from tap focusing elements behind the Snackbar on Android
   if (isAndroid()) {
-    // Prevents screen reader from tap focusing elements behind the Snackbar on Android
     containerProps.tabIndex = 0
   }
 

From 2c001e54228f363768324a1882083caf0df1ac54 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:37:09 -0700
Subject: [PATCH 06/15] Clean up story render logic

---
 .../src/components/Snackbar/Snackbar.stories.tsx           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.stories.tsx b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
index 3111d513..2abec7b3 100644
--- a/packages/components/src/components/Snackbar/Snackbar.stories.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
@@ -49,8 +49,11 @@ const mobileComponentRenderer = (props: storyArgs) => {
   return <Button label="Press for Snackbar" onPress={onPressSnackbar} />
 }
 
+// Render Snackbar flat in web
+const render = Platform.OS !== 'web' ? mobileComponentRenderer : undefined
+
 export const _Default: Story = {
-  render: Platform.OS !== 'web' ? mobileComponentRenderer : undefined, // Render Snackbar flat in web
+  render,
   args: {
     message: 'Message moved to Test Folder',
     data: {
@@ -61,7 +64,7 @@ export const _Default: Story = {
 }
 
 export const _WithAction: Story = {
-  render: Platform.OS !== 'web' ? mobileComponentRenderer : undefined, // Render Snackbar flat in web
+  render,
   args: {
     message: 'Message moved to Test Folder',
     data: {

From 07452fc5c8daa0d4c61c5403cae194af4001b4c1 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:38:16 -0700
Subject: [PATCH 07/15] Sort context props alphabetically

---
 .../components/src/components/Snackbar/SnackbarProvider.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/Snackbar/SnackbarProvider.tsx b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
index a50f136f..9af39ea2 100644
--- a/packages/components/src/components/Snackbar/SnackbarProvider.tsx
+++ b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
@@ -7,8 +7,8 @@ import { Snackbar, SnackbarProps } from './Snackbar'
 import { useSnackbarDefaultOffset } from './useSnackbarDefaultOffset'
 
 type SnackbarContextType = {
-  offset: number
   duration: number
+  offset: number
   setDuration: (newDuration: number) => void
   setOffset: (newOffset: number) => void
 }
@@ -26,8 +26,8 @@ export const SnackbarProvider: React.FC<{ children: ReactNode }> = ({
   children,
 }) => {
   // TODO: Check global default setting
-  const [offset, setOffset] = useState(useSnackbarDefaultOffset())
   const [duration, setDuration] = useState(SNACKBAR_DURATIONS.DEFAULT)
+  const [offset, setOffset] = useState(useSnackbarDefaultOffset())
 
   return (
     <SnackbarContext.Provider

From 786208a09b7ae768327d4de221290d265b2ff245 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Thu, 15 Aug 2024 22:39:53 -0700
Subject: [PATCH 08/15] Cleanup logic

---
 packages/components/src/components/Snackbar/Snackbar.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.tsx b/packages/components/src/components/Snackbar/Snackbar.tsx
index 7a83c9df..777786c1 100644
--- a/packages/components/src/components/Snackbar/Snackbar.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.tsx
@@ -170,13 +170,10 @@ export const Snackbar: FC<SnackbarProps> = (toast) => {
     },
   }
 
-  // Prevents screen reader from tap focusing elements behind the Snackbar on iOS
+  // Prevents screen reader from tap focusing elements behind the Snackbar
   if (isIOS()) {
     containerProps.accessibilityViewIsModal = true
-  }
-
-  // Prevents screen reader from tap focusing elements behind the Snackbar on Android
-  if (isAndroid()) {
+  } else if (isAndroid()) {
     containerProps.tabIndex = 0
   }
 

From 544506a29ccf16b92de5d5122d56cb5d33af3aaa Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Fri, 16 Aug 2024 09:44:14 -0700
Subject: [PATCH 09/15] Add logic to avoid unnecessary re-render

---
 .../src/components/Snackbar/useSnackbar.tsx   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/components/src/components/Snackbar/useSnackbar.tsx b/packages/components/src/components/Snackbar/useSnackbar.tsx
index 1721ebbd..6e90bde4 100644
--- a/packages/components/src/components/Snackbar/useSnackbar.tsx
+++ b/packages/components/src/components/Snackbar/useSnackbar.tsx
@@ -23,18 +23,26 @@ export function useSnackbar() {
   }
 
   const show = (message: string, snackbarOptions?: SnackbarOptions) => {
-    const { offset, onActionPressed } = snackbarOptions || {}
-    const { setOffset, setDuration } = context
+    const { offset, setOffset, duration, setDuration } = context
 
-    // Adjust offset if provided, otherwise set to default
-    setOffset(offset ? offset : defaultOffset)
+    // Adjust offset if provided or reset to default
+    const newOffset = snackbarOptions?.offset || defaultOffset
+
+    // Only call setOffset if different from current to avoid re-render
+    if (newOffset !== offset) {
+      setOffset(newOffset)
+    }
 
     // Auto-dismiss if screen reader is on and there is no action button
-    setDuration(
-      screenReaderEnabled && !onActionPressed
+    const newDuration =
+      screenReaderEnabled && !snackbarOptions?.onActionPressed
         ? SNACKBAR_DURATIONS.SCREEN_READER
-        : SNACKBAR_DURATIONS.DEFAULT,
-    )
+        : SNACKBAR_DURATIONS.DEFAULT
+
+    // Only call setDuration if different from current to avoid re-render
+    if (newDuration !== duration) {
+      setDuration(newDuration)
+    }
 
     toast.hideAll()
     toast.show(message, { data: snackbarOptions })

From 01dc154d10aa0450ffd04db01017fbf982e9a16c Mon Sep 17 00:00:00 2001
From: VA Automation Bot <va-mobileapp@adhocteam.us>
Date: Fri, 16 Aug 2024 16:46:39 +0000
Subject: [PATCH 10/15] Version bump: components-v0.21.1-alpha.20

---
 packages/components/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/package.json b/packages/components/package.json
index 092e842d..e9ac0aa1 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-component-library",
-  "version": "0.21.1-alpha.19",
+  "version": "0.21.1-alpha.20",
   "description": "VA Design System Mobile Component Library",
   "main": "src/index.tsx",
   "scripts": {

From d687c1f2a16c1a04cabe4a47c49f559680579519 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Fri, 16 Aug 2024 10:23:14 -0700
Subject: [PATCH 11/15] Revert snackbar.tsx accessibility focus

---
 packages/components/src/components/Snackbar/Snackbar.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.tsx b/packages/components/src/components/Snackbar/Snackbar.tsx
index 777786c1..a3a5486c 100644
--- a/packages/components/src/components/Snackbar/Snackbar.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.tsx
@@ -157,6 +157,7 @@ export const Snackbar: FC<SnackbarProps> = (toast) => {
   const contentColor = theme.vadsColorForegroundInverse
 
   const containerProps: ViewProps = {
+    accessibilityViewIsModal: true, // Prevents screen reader from tap focusing elements behind the Snackbar on iOS
     style: {
       alignItems: 'center',
       backgroundColor: theme.vadsColorSurfaceInverse,
@@ -170,10 +171,8 @@ export const Snackbar: FC<SnackbarProps> = (toast) => {
     },
   }
 
-  // Prevents screen reader from tap focusing elements behind the Snackbar
-  if (isIOS()) {
-    containerProps.accessibilityViewIsModal = true
-  } else if (isAndroid()) {
+  if (isAndroid()) {
+    // Prevents screen reader from tap focusing elements behind the Snackbar on Android
     containerProps.tabIndex = 0
   }
 

From bff83c56bcb0e8caaac2a2d69cc3c8c1aea5ede4 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Fri, 16 Aug 2024 10:23:53 -0700
Subject: [PATCH 12/15] Revert snackbar.tsx accessibility focus

---
 packages/components/src/components/Snackbar/Snackbar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.tsx b/packages/components/src/components/Snackbar/Snackbar.tsx
index a3a5486c..50d92b57 100644
--- a/packages/components/src/components/Snackbar/Snackbar.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.tsx
@@ -16,7 +16,7 @@ import React, { FC, useEffect } from 'react'
 
 import { Icon, IconProps } from '../Icon/Icon'
 import { Spacer } from '../Spacer/Spacer'
-import { isAndroid, isIOS } from '../../utils/OSfunctions'
+import { isAndroid } from '../../utils/OSfunctions'
 import { useTheme } from '../../utils'
 
 type SnackbarButtonProps = {

From 57f250d81717d98ab77fa7cd9a817e913224e25d Mon Sep 17 00:00:00 2001
From: VA Automation Bot <va-mobileapp@adhocteam.us>
Date: Fri, 16 Aug 2024 17:26:00 +0000
Subject: [PATCH 13/15] Version bump: components-v0.21.1-alpha.21

---
 packages/components/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/package.json b/packages/components/package.json
index e9ac0aa1..fe8aa157 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-component-library",
-  "version": "0.21.1-alpha.20",
+  "version": "0.21.1-alpha.21",
   "description": "VA Design System Mobile Component Library",
   "main": "src/index.tsx",
   "scripts": {

From a3c4693f42aa3114d3661e34136dc5447d620ea5 Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Tue, 20 Aug 2024 10:44:54 -0700
Subject: [PATCH 14/15] Remove to use built in `duration` in show options
 instead of context

---
 .../src/components/Snackbar/Snackbar.stories.tsx         | 6 +++---
 .../src/components/Snackbar/SnackbarProvider.tsx         | 8 ++------
 .../components/src/components/Snackbar/useSnackbar.tsx   | 9 ++-------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/components/src/components/Snackbar/Snackbar.stories.tsx b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
index 2abec7b3..5cf88544 100644
--- a/packages/components/src/components/Snackbar/Snackbar.stories.tsx
+++ b/packages/components/src/components/Snackbar/Snackbar.stories.tsx
@@ -58,7 +58,7 @@ export const _Default: Story = {
     message: 'Message moved to Test Folder',
     data: {
       isError: false,
-      messageA11y: 'Message sent',
+      messageA11y: 'Message moved to Test Folder with accessibility override',
     },
   },
 }
@@ -66,10 +66,10 @@ export const _Default: Story = {
 export const _WithAction: Story = {
   render,
   args: {
-    message: 'Message moved to Test Folder',
+    message: 'Message sent',
     data: {
       isError: false,
-      messageA11y: 'Message moved to Test Folder with accessibility override',
+      messageA11y: 'Message sent with accessibility override',
       onActionPressed: () => console.log('Action pressed'),
     },
   },
diff --git a/packages/components/src/components/Snackbar/SnackbarProvider.tsx b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
index 9af39ea2..9b2ec588 100644
--- a/packages/components/src/components/Snackbar/SnackbarProvider.tsx
+++ b/packages/components/src/components/Snackbar/SnackbarProvider.tsx
@@ -7,9 +7,7 @@ import { Snackbar, SnackbarProps } from './Snackbar'
 import { useSnackbarDefaultOffset } from './useSnackbarDefaultOffset'
 
 type SnackbarContextType = {
-  duration: number
   offset: number
-  setDuration: (newDuration: number) => void
   setOffset: (newOffset: number) => void
 }
 
@@ -26,15 +24,13 @@ export const SnackbarProvider: React.FC<{ children: ReactNode }> = ({
   children,
 }) => {
   // TODO: Check global default setting
-  const [duration, setDuration] = useState(SNACKBAR_DURATIONS.DEFAULT)
   const [offset, setOffset] = useState(useSnackbarDefaultOffset())
 
   return (
-    <SnackbarContext.Provider
-      value={{ offset, duration, setDuration, setOffset }}>
+    <SnackbarContext.Provider value={{ offset, setOffset }}>
       <ToastProvider
         animationDuration={100}
-        duration={duration}
+        duration={SNACKBAR_DURATIONS.DEFAULT}
         offset={offset}
         placement="bottom"
         renderToast={(toast) => <Snackbar {...(toast as SnackbarProps)} />}
diff --git a/packages/components/src/components/Snackbar/useSnackbar.tsx b/packages/components/src/components/Snackbar/useSnackbar.tsx
index 6e90bde4..6451bab6 100644
--- a/packages/components/src/components/Snackbar/useSnackbar.tsx
+++ b/packages/components/src/components/Snackbar/useSnackbar.tsx
@@ -23,7 +23,7 @@ export function useSnackbar() {
   }
 
   const show = (message: string, snackbarOptions?: SnackbarOptions) => {
-    const { offset, setOffset, duration, setDuration } = context
+    const { offset, setOffset } = context
 
     // Adjust offset if provided or reset to default
     const newOffset = snackbarOptions?.offset || defaultOffset
@@ -39,13 +39,8 @@ export function useSnackbar() {
         ? SNACKBAR_DURATIONS.SCREEN_READER
         : SNACKBAR_DURATIONS.DEFAULT
 
-    // Only call setDuration if different from current to avoid re-render
-    if (newDuration !== duration) {
-      setDuration(newDuration)
-    }
-
     toast.hideAll()
-    toast.show(message, { data: snackbarOptions })
+    toast.show(message, { data: snackbarOptions, duration: newDuration })
   }
 
   return {

From e3fd4939741ea70a64c27ae61232ec8ad309371c Mon Sep 17 00:00:00 2001
From: Narin Ratana <narin@adhocteam.us>
Date: Tue, 20 Aug 2024 10:47:50 -0700
Subject: [PATCH 15/15] Rename newDuration

---
 packages/components/src/components/Snackbar/useSnackbar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/Snackbar/useSnackbar.tsx b/packages/components/src/components/Snackbar/useSnackbar.tsx
index 6451bab6..96526570 100644
--- a/packages/components/src/components/Snackbar/useSnackbar.tsx
+++ b/packages/components/src/components/Snackbar/useSnackbar.tsx
@@ -34,13 +34,13 @@ export function useSnackbar() {
     }
 
     // Auto-dismiss if screen reader is on and there is no action button
-    const newDuration =
+    const duration =
       screenReaderEnabled && !snackbarOptions?.onActionPressed
         ? SNACKBAR_DURATIONS.SCREEN_READER
         : SNACKBAR_DURATIONS.DEFAULT
 
     toast.hideAll()
-    toast.show(message, { data: snackbarOptions, duration: newDuration })
+    toast.show(message, { data: snackbarOptions, duration })
   }
 
   return {