@react-md/core 1.0.0-next.0 → 1.0.0-next.10

package/src/snackbar/ToastManager.tsx

@@ -15,7 +15,8 @@ export const DEFAULT_TOAST_VISIBLE_TIME = 5000;
  * - `"replace"` - if there is a currently visible toast, it will start the
  *   leave transition and display the newly added toast instead.
  * - `"immediate"` - the same behavior as `"replace"` except that if there was a
- *   currently visible toast, it will be shown once the newly added toast again.
+ *   currently visible toast, the toast will be shown again once the `"immediate"`
+ *   toast is hidden.
  *
  * @remarks \@since 6.0.0 Renamed from `MessagePriority` to `ToastPriority`
  */
@@ -304,7 +305,7 @@ export class ToastManager {
     const {
       toastId = nanoid(),
       visibleTime = DEFAULT_TOAST_VISIBLE_TIME,
-      role = visibleTime === null ? "alert" : undefined,
+      role = visibleTime === null ? "alert" : "status",
       priority = "normal",
       duplicates = "restart",
     } = toast;

package/src/snackbar/__tests__/Snackbar.tsx

@@ -16,12 +16,13 @@ const render = (
   ui: ReactElement,
   options?: ReactMDRenderOptions
 ): RenderResult => {
+  const manager = new ToastManager();
+  manager.addToast({ children: "Toast" });
+
   return rmdRender(ui, {
     ...options,
     wrapper: ({ children }) => (
-      <ToastManagerProvider manager={new ToastManager()}>
-        {children}
-      </ToastManagerProvider>
+      <ToastManagerProvider manager={manager}>{children}</ToastManagerProvider>
     ),
   });
 };
@@ -30,12 +31,12 @@ describe("Snackbar", () => {
   it("should apply the correct styling, HTML attributes, and allow a ref", () => {
     const ref = createRef<HTMLDivElement>();
     const props = {
-      "aria-label": "Notifications",
+      "data-testid": "snackbar",
       ref,
     } as const;
-    const { getByRole, rerender } = render(<Snackbar {...props} />);
+    const { rerender } = render(<Snackbar {...props} />);
 
-    const snackbar = getByRole("status", { name: "Notifications" });
+    const snackbar = screen.getByTestId("snackbar");
     expect(ref.current).toBeInstanceOf(HTMLDivElement);
     expect(ref.current).toBe(snackbar);
     expect(snackbar).toMatchSnapshot();
@@ -60,8 +61,8 @@ describe("Snackbar", () => {
       "top-right",
     ];
 
-    const { rerender } = render(<Snackbar />);
-    const snackbar = screen.getByRole("status");
+    const { rerender } = render(<Snackbar data-testid="snackbar" />);
+    const snackbar = screen.getByTestId("snackbar");
     expect(snackbar).toMatchSnapshot();
 
     positions.forEach((position) => {
@@ -72,13 +73,13 @@ describe("Snackbar", () => {
   });
 
   it("should allow the portal behavior to be disabled", () => {
-    const { container, rerender } = render(<Snackbar />);
-    let snackbar = screen.getByRole("status");
+    const { container, rerender } = render(<Snackbar data-testid="snackbar" />);
+    let snackbar = screen.getByTestId("snackbar");
     expect(container).not.toContainElement(snackbar);
     expect(snackbar).toBeInTheDocument();
 
-    rerender(<Snackbar disablePortal />);
-    snackbar = screen.getByRole("status");
+    rerender(<Snackbar data-testid="snackbar" disablePortal />);
+    snackbar = screen.getByTestId("snackbar");
     expect(container).toContainElement(snackbar);
   });
 });

package/src/snackbar/__tests__/Toast.tsx

@@ -1,4 +1,4 @@
-import { describe, expect, it, jest } from "@jest/globals";
+import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { createRef, type ReactElement } from "react";
 import {
   rmdRender as baseRender,
@@ -8,6 +8,7 @@ import {
 } from "../../test-utils/index.js";
 
 import { FontIcon } from "../../icon/FontIcon.js";
+import { TRANSITION_CONFIG } from "../../transition/config.js";
 import { Typography } from "../../typography/Typography.js";
 import { Toast } from "../Toast.js";
 import { CurrentToastActionsProvider } from "../useCurrentToastActions.js";
@@ -30,6 +31,10 @@ const render = (ui: ReactElement): RenderResult =>
   });
 
 describe("Toast", () => {
+  beforeEach(() => {
+    TRANSITION_CONFIG.disabled = false;
+  });
+
   it("should apply the correct styling, HTML attributes, and allow a ref", () => {
     const ref = createRef<HTMLDivElement>();
     const props = {
@@ -89,12 +94,12 @@ describe("Toast", () => {
   });
 
   it("should not be in the dom while not visible", () => {
-    const { getByTestId } = render(
+    render(
       <Toast data-testid="toast" visible={false}>
         Hello
       </Toast>
     );
 
-    expect(() => getByTestId("toast")).toThrow();
+    expect(() => screen.getByTestId("toast")).toThrow();
   });
 });

package/src/snackbar/__tests__/ToastActionButton.tsx

@@ -27,13 +27,13 @@ describe("ToastActionButton", () => {
       startRemoveTimeout: jest.fn(),
       resumeRemoveTimeout: jest.fn(),
     };
-    const { getByRole, rerender } = render(
+    const { rerender } = render(
       <CurrentToastActionsProvider value={actions}>
         <ToastActionButton {...props} />
       </CurrentToastActionsProvider>
     );
 
-    const button = getByRole("button", { name: "Button" });
+    const button = screen.getByRole("button", { name: "Button" });
     expect(ref.current).toBeInstanceOf(HTMLButtonElement);
     expect(ref.current).toBe(button);
     expect(button).toMatchSnapshot();

package/src/snackbar/__tests__/ToastCloseButton.tsx

@@ -26,13 +26,13 @@ describe("ToastCloseButton", () => {
       startRemoveTimeout: jest.fn(),
       resumeRemoveTimeout: jest.fn(),
     };
-    const { getByRole, rerender } = render(
+    const { rerender } = render(
       <CurrentToastActionsProvider value={actions}>
         <ToastCloseButton {...props} />
       </CurrentToastActionsProvider>
     );
 
-    const button = getByRole("button", { name: "Close" });
+    const button = screen.getByRole("button", { name: "Close" });
     expect(ref.current).toBeInstanceOf(HTMLButtonElement);
     expect(ref.current).toBe(button);
     expect(button).toMatchSnapshot();

package/src/snackbar/__tests__/ToastManagerProvider.tsx

@@ -18,6 +18,7 @@ import {
 
 import { type ReactElement, type ReactNode } from "react";
 import { Button } from "../../button/Button.js";
+import { TRANSITION_CONFIG } from "../../transition/config.js";
 import { Snackbar, type SnackbarProps } from "../Snackbar.js";
 import {
   ToastManager,
@@ -77,13 +78,17 @@ function SimpleTest(props: SimpleTestProps): ReactElement {
         Button
       </Button>
       {children}
-      <Snackbar {...snackbar} />
+      <Snackbar data-testid="snackbar" {...snackbar} />
     </>
   );
 }
 
 describe("ToastManagerProvider", () => {
   describe("default toast manager", () => {
+    beforeEach(() => {
+      TRANSITION_CONFIG.disabled = false;
+    });
+
     afterEach(() => {
       toastManager.clearToasts(true);
     });
@@ -96,21 +101,18 @@ describe("ToastManagerProvider", () => {
             <Button onClick={() => addToast({ children: "Hello, world!" })}>
               Button
             </Button>
-            <Snackbar />
+            <Snackbar data-testid="snackbar" />
           </>
         );
       }
 
       rmdRender(<Test />);
       const button = screen.getByRole("button", { name: "Button" });
-      const snackbar = screen.getByRole("status");
-      expect(snackbar).toBeInTheDocument();
+      expect(() => screen.getByTestId("snackbar")).toThrow();
 
       await user.click(button);
-      const message = snackbar.firstElementChild;
-      if (!message) {
-        throw new Error();
-      }
+      const snackbar = await screen.findByTestId("snackbar");
+      const message = await screen.findByRole("status");
 
       expect(snackbar).toMatchSnapshot();
 
@@ -121,20 +123,14 @@ describe("ToastManagerProvider", () => {
     });
 
     it("should allow toasts to be added outside of a react component (like redux)", async () => {
-      rmdRender(<Snackbar />);
-      const snackbar = screen.getByRole("status");
-      expect(snackbar).toBeInTheDocument();
-      expect(snackbar).toBeEmptyDOMElement();
+      rmdRender(<Snackbar data-testid="snackbar" />);
 
       act(() => {
         addToast({ toastId: "toast-id", children: "Fired outside of react!" });
       });
 
-      let toast = screen.getByText("Fired outside of react!");
+      let toast = await screen.findByRole("status");
       expect(toast).toBeInTheDocument();
-      await waitFor(() => {
-        expect(toast.parentElement).not.toHaveClass(ENTER_CLASS_NAME);
-      });
 
       act(() => {
         popToast();
@@ -145,8 +141,7 @@ describe("ToastManagerProvider", () => {
         addToast({ toastId: "toast-id", children: "Fired outside of react!" });
         addToast({ toastId: "toast-id-2", children: "Second toast" });
       });
-      toast = screen.getByText("Fired outside of react!");
-      expect(toast).toBeInTheDocument();
+      toast = await screen.findByRole("status");
 
       act(() => {
         removeToast("invalid-toast-id", false);
@@ -165,7 +160,7 @@ describe("ToastManagerProvider", () => {
         addToast({ children: "Toast" });
         clearToasts();
       });
-      expect(snackbar).toBeEmptyDOMElement();
+      expect(() => screen.getByTestId("snackbar")).toThrow();
     });
 
     it("should not add a toast to another toast manager", async () => {
@@ -180,21 +175,20 @@ describe("ToastManagerProvider", () => {
             <Button onClick={() => addToast({ children: "Global" })}>
               Global
             </Button>
-            <Snackbar />
+            <Snackbar data-testid="snackbar" />
           </>
         );
       }
 
       renderWithManager(<Test />);
-      const snackbar = screen.getByRole("status");
       const scopedAdd = screen.getByRole("button", { name: "Scoped" });
       const globalAdd = screen.getByRole("button", { name: "Global" });
 
       await user.click(globalAdd);
-      expect(snackbar).toBeEmptyDOMElement();
+      expect(() => screen.getByTestId("snackbar")).toThrow();
 
       await user.click(scopedAdd);
-      expect(snackbar).not.toBeEmptyDOMElement();
+      const snackbar = await screen.findByTestId("snackbar");
       expect(within(snackbar).getByText("Scoped")).toBeInTheDocument();
     });
   });
@@ -202,6 +196,7 @@ describe("ToastManagerProvider", () => {
   describe("toast queue", () => {
     beforeEach(() => {
       jest.useFakeTimers();
+      TRANSITION_CONFIG.disabled = false;
     });
 
     afterEach(() => {
@@ -210,18 +205,15 @@ describe("ToastManagerProvider", () => {
     });
 
     const init = async (props?: SimpleTestProps) => {
+      // eslint-disable-next-line testing-library/await-async-events
       const user = userEvent.setup({ delay: null });
+      // eslint-disable-next-line testing-library/render-result-naming-convention
       const result = renderWithManager(<SimpleTest {...props} />);
       const button = screen.getByRole("button", { name: "Button" });
-      const snackbar = screen.getByRole("status");
-      expect(snackbar).toBeEmptyDOMElement();
 
       await user.click(button);
-      expect(snackbar).not.toBeEmptyDOMElement();
-      const message = snackbar.firstElementChild;
-      if (!message) {
-        throw new Error();
-      }
+      const snackbar = await screen.findByTestId("snackbar");
+      const message = await screen.findByRole("status");
 
       act(() => {
         jest.runOnlyPendingTimers();
@@ -323,15 +315,9 @@ describe("ToastManagerProvider", () => {
       const user = userEvent.setup({ delay: null });
       renderWithManager(<SimpleTest toast={{ toastId: "same-toast-id" }} />);
       const button = screen.getByRole("button", { name: "Button" });
-      const snackbar = screen.getByRole("status");
-      expect(snackbar).toBeEmptyDOMElement();
 
       await user.click(button);
-      expect(snackbar).not.toBeEmptyDOMElement();
-      const message = snackbar.firstElementChild;
-      if (!message) {
-        throw new Error();
-      }
+      const message = await screen.findByRole("status");
 
       act(() => {
         jest.runOnlyPendingTimers();
@@ -448,7 +434,7 @@ describe("ToastManagerProvider", () => {
           </>
         );
       }
-      const { user, message, snackbar } = await init({
+      const { user, message } = await init({
         children: <Children />,
       });
       act(() => {
@@ -466,8 +452,8 @@ describe("ToastManagerProvider", () => {
 
       const testFullFlow = async (button: HTMLElement): Promise<void> => {
         await user.click(button);
-        expect(snackbar).not.toBeEmptyDOMElement();
-        const nextMessage = snackbar.firstElementChild;
+        const snackbar = await screen.findByTestId("snackbar");
+        const nextMessage = within(snackbar).getByRole("status");
         expect(nextMessage).toHaveClass(ENTER_CLASS_NAME);
         act(() => {
           jest.runOnlyPendingTimers();
@@ -738,17 +724,17 @@ describe("ToastManagerProvider", () => {
             >
               Alert
             </Button>
-            <Snackbar />
+            <Snackbar data-testid="snackbar" />
           </>
         );
       }
 
       renderWithManager(<Test />);
-      const snackbar = screen.getByRole("status");
       const button = screen.getByRole("button", { name: "Alert" });
 
       await user.click(button);
 
+      const snackbar = screen.getByTestId("snackbar");
       const alert = screen.getByRole("alert");
       expect(snackbar).toMatchSnapshot();
 

package/src/snackbar/__tests__/__snapshots__/Snackbar.tsx.snap

@@ -2,75 +2,175 @@
 
 exports[`Snackbar should apply the correct styling, HTML attributes, and allow a ref 1`] = `
 <div
-  aria-label="Notifications"
   class="rmd-snackbar rmd-snackbar--bottom"
+  data-testid="snackbar"
   id="snackbar-:r0:"
-  role="status"
-/>
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r1:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should apply the correct styling, HTML attributes, and allow a ref 2`] = `
 <div
-  aria-label="Notifications"
   class="rmd-snackbar rmd-snackbar--bottom custom-class-name"
+  data-testid="snackbar"
   id="snackbar-:r0:"
-  role="status"
   style="color: white;"
-/>
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r1:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 1`] = `
 <div
   class="rmd-snackbar rmd-snackbar--bottom"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  data-testid="snackbar"
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 2`] = `
 <div
   class="rmd-snackbar rmd-snackbar--bottom"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 3`] = `
 <div
   class="rmd-snackbar rmd-snackbar--bottom rmd-snackbar--start"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 4`] = `
 <div
   class="rmd-snackbar rmd-snackbar--bottom rmd-snackbar--end"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 5`] = `
 <div
   class="rmd-snackbar rmd-snackbar--top"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 6`] = `
 <div
   class="rmd-snackbar rmd-snackbar--top rmd-snackbar--start"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;
 
 exports[`Snackbar should support different positions within the viewport 7`] = `
 <div
   class="rmd-snackbar rmd-snackbar--top rmd-snackbar--end"
-  id="snackbar-:r1:"
-  role="status"
-/>
+  id="snackbar-:r2:"
+>
+  <div
+    class="rmd-toast"
+    id="toast-:r3:"
+    role="status"
+  >
+    <div
+      class="rmd-toast-content"
+    >
+      Toast
+    </div>
+  </div>
+</div>
 `;