@react-md/core 1.0.0-next.1 → 1.0.0-next.2

package/src/progress/_progress.scss

@@ -206,45 +206,27 @@ $linear-vertical-reverse-short-styles: (
   ),
 ) !default;
 
-$var-lookup: (
-  background-color: (
-    var: --rmd-progress-background-color,
-    value: $background-color,
-  ),
-  color: (
-    var: --rmd-progress-color,
-    value: $color,
-  ),
-  circular-size: (
-    var: --rmd-progress-circular-size,
-    value: $circular-size,
-  ),
-  circular-stroke-width: (
-    var: --rmd-progress-circular-width,
-    value: $circular-stroke-width,
-  ),
-  linear-size: (
-    var: --rmd-progress-linear-size,
-    value: $linear-size,
-  ),
+$variables: (
+  background-color,
+  color,
+  circular-size,
+  circular-stroke-width,
+  linear-size
 );
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "progress var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "progress");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "progress var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "progress")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -566,6 +548,19 @@ $var-lookup: (
   }
 }
 
+@mixin variables {
+  @if not $disable-circular {
+    @include set-var(circular-size, $circular-size);
+    @include set-var(circular-stroke-width, $circular-stroke-width);
+  }
+
+  @if not $disable-linear {
+    @include set-var(background-color, $background-color);
+    @include set-var(color, $color);
+    @include set-var(linear-size, $linear-size);
+  }
+}
+
 @mixin styles {
   @if not $disable-circular {
     @include _circular-progress;

package/src/segmented-button/_segmented-button.scss

@@ -59,29 +59,33 @@ $selected-background-color: theme.get-default-color(
 
 $typography-styles: typography.$button-styles !default;
 
-$var-lookup: (
-  outline-width: (
-    var: --rmd-segmented-button-outline-width,
-    value: $outline-width,
-  ),
-  outline-color: (
-    var: --rmd-segmented-button-outline-color,
-    value: $outline-color,
-  ),
-  color: (
-    var: --rmd-segmented-button-color,
-    value: currentcolor,
-  ),
-  selected-background-color: (
-    var: --rmd-segmented-button-selected-background-color,
-    value: $selected-background-color,
-  ),
-  selected-color: (
-    var: --rmd-segmented-button-selected-color,
-    value: $selected-color,
-  ),
+$variables: (
+  outline-width,
+  outline-color,
+  color,
+  selected-background-color,
+  selected-color
 );
 
+@function get-var($name, $fallback: null) {
+  $var: utils.get-var-name($variables, $name, "segmented-button");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
+  }
+
+  @return var(#{$var});
+}
+
+@mixin set-var($name, $value) {
+  @if $value {
+    #{utils.get-var-name($variables, $name, "segmented-button")}: #{$value};
+  }
+}
+
+@mixin use-var($property, $name: $property, $fallback: null) {
+  #{$property}: get-var($name, $fallback);
+}
+
 @mixin use-light-theme {
   @if not $disable-everything {
     @if $light-theme-outline-color != $dark-theme-outline-color {
@@ -124,29 +128,14 @@ $var-lookup: (
   }
 }
 
-@function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "segmented button var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(outline-width, $outline-width);
+    @include set-var(outline-color, $outline-color);
+    @include set-var(color, currentcolor);
+    @include set-var(selected-background-color, $selected-background-color);
+    @include set-var(selected-color, $selected-color);
   }
-
-  @return var(#{$var});
-}
-
-@mixin set-var($name, $value) {
-  $var: map.get(
-    utils.validate($var-lookup, $name, "segmented button var"),
-    var
-  );
-
-  #{$var}: #{$value};
-}
-
-@mixin use-var($property, $name: $property, $fallback: null) {
-  #{$property}: get-var($name, $fallback);
 }
 
 @mixin styles {

package/src/sheet/_sheet.scss

@@ -30,63 +30,45 @@ $touch-max-height: calc(100% - #{$touch-margin}) !default;
 $recommended-min-height: 3.5rem !default;
 $recommended-max-height: 50% !default;
 
-$var-lookup: (
-  height: (
-    var: --rmd-sheet-height,
-    value: null,
-  ),
-  width: (
-    var: --rmd-sheet-width,
-    value: null,
-  ),
-  max-height: (
-    var: --rmd-sheet-max-height,
-    value: null,
-  ),
-  touch-width: (
-    var: --rmd-sheet-touch-width,
-    value: $touch-width,
-  ),
-  touch-max-height: (
-    var: --rmd-sheet-touch-max-height,
-    value: $touch-max-height,
-  ),
-  static-width: (
-    var: --rmd-sheet-static-width,
-    value: $static-width,
-  ),
-  transform-offscreen: (
-    var: --rmd-sheet-transform-offscreen,
-    value: null,
-  ),
-  z-index: (
-    var: --rmd-sheet-z-index,
-    value: $z-index,
-  ),
+$variables: (
+  height,
+  width,
+  max-height,
+  touch-width,
+  touch-max-height,
+  static-width,
+  transform-offscreen,
+  z-index
 );
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "sheet var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "sheet");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "sheet var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "sheet")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
   #{$property}: get-var($name, $fallback);
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(touch-width, $touch-width);
+    @include set-var(touch-max-height, $touch-max-height);
+    @include set-var(static-width, $static-width);
+    @include set-var(z-index, $z-index);
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     .rmd-sheet {

package/src/snackbar/DefaultToastRenderer.tsx

@@ -61,7 +61,7 @@ export function DefaultToastRenderer(props: ToastRendererProps): ReactElement {
   } = props;
   const {
     closeButtonProps,
-    closeButton = !!closeButtonProps,
+    closeButton = !!closeButtonProps || !!remaining.closeButtonProps,
     onEntered: defaultEntered = noop,
     onExited: defaultExited = noop,
     onMouseEnter: defaultMouseEnter = noop,

package/src/snackbar/Snackbar.tsx

@@ -1,10 +1,5 @@
 "use client";
-import {
-  forwardRef,
-  type AriaRole,
-  type ComponentType,
-  type HTMLAttributes,
-} from "react";
+import { forwardRef, type ComponentType, type HTMLAttributes } from "react";
 import { Portal } from "../portal/Portal.js";
 import { useEnsuredId } from "../useEnsuredId.js";
 import {
@@ -24,9 +19,6 @@ export interface SnackbarProps extends HTMLAttributes<HTMLDivElement> {
    */
   id?: string;
 
-  /** @defaultValue `"status"` */
-  role?: AriaRole;
-
   /**
    * Set this to the number of toasts that can be visible within the snackbar at
    * the same time. Any toasts added after this value will be added into the
@@ -154,7 +146,6 @@ export const Snackbar = forwardRef<HTMLDivElement, SnackbarProps>(
   function Snackbar(props, ref) {
     const {
       id: propId,
-      role = "status",
       className,
       limit = 1,
       position = "bottom",
@@ -168,21 +159,22 @@ export const Snackbar = forwardRef<HTMLDivElement, SnackbarProps>(
 
     return (
       <Portal disabled={disablePortal}>
-        <div
-          {...remaining}
-          id={id}
-          ref={ref}
-          role={role}
-          className={snackbar({ position, className })}
-        >
-          {queue.map((toast) => (
-            <RenderToast
-              {...toast}
-              key={toast.toastId}
-              toastDefaults={toastDefaults}
-            />
-          ))}
-        </div>
+        {queue.length > 0 && (
+          <div
+            {...remaining}
+            id={id}
+            ref={ref}
+            className={snackbar({ position, className })}
+          >
+            {queue.map((toast) => (
+              <RenderToast
+                {...toast}
+                key={toast.toastId}
+                toastDefaults={toastDefaults}
+              />
+            ))}
+          </div>
+        )}
       </Portal>
     );
   }

package/src/snackbar/Toast.tsx

@@ -38,7 +38,7 @@ export interface ConfigurableToastProps
   /**
    * Note: This is set while creating the toast.
    *
-   * @defaultValue `visibleTime === null ? "alert" : undefined`
+   * @defaultValue `visibleTime === null ? "alert" : "status"`
    */
   role?: AriaRole;
 
@@ -149,7 +149,7 @@ export const Toast = forwardRef<HTMLDivElement, ToastProps>(
       actionButton: propActionButton,
       paused,
       visible,
-      closeIcon,
+      closeIcon: propCloseIcon,
       closeButtonProps,
       closeButton = !!closeButtonProps,
       contentProps,
@@ -190,6 +190,11 @@ export const Toast = forwardRef<HTMLDivElement, ToastProps>(
       );
     }
 
+    let closeIcon = propCloseIcon;
+    if (typeof closeButtonProps?.children !== "undefined") {
+      closeIcon = closeButtonProps.children;
+    }
+
     const action = !!actionButton;
     const reordered = stacked && action && closeButton;
     const { elementProps, rendered } = useScaleTransition({

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 { rerender } = render(<Snackbar {...props} />);
 
-    const snackbar = screen.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__/ToastManagerProvider.tsx

@@ -78,7 +78,7 @@ function SimpleTest(props: SimpleTestProps): ReactElement {
         Button
       </Button>
       {children}
-      <Snackbar {...snackbar} />
+      <Snackbar data-testid="snackbar" {...snackbar} />
     </>
   );
 }
@@ -101,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();
 
@@ -126,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();
@@ -150,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);
@@ -170,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 () => {
@@ -185,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();
     });
   });
@@ -221,15 +210,10 @@ describe("ToastManagerProvider", () => {
       // 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();
@@ -331,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();
@@ -456,7 +434,7 @@ describe("ToastManagerProvider", () => {
           </>
         );
       }
-      const { user, message, snackbar } = await init({
+      const { user, message } = await init({
         children: <Children />,
       });
       act(() => {
@@ -474,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();
@@ -746,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();