chore(Modal): added ariaHidden to Modal component Props. (#456)

daisyui · Aug 28, 2024 · 9e5064d · 9e5064d
1 parent 9f583d2
commit 9e5064d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Modal/Modal.tsx b/src/Modal/Modal.tsx
@@ -14,11 +14,21 @@ export type ModalProps = React.HTMLAttributes<HTMLDialogElement> &
     open?: boolean
     responsive?: boolean
     backdrop?: boolean
+    ariaHidden?: boolean
   }
 
 const Modal = forwardRef<HTMLDialogElement, ModalProps>(
   (
-    { children, open, responsive, backdrop, dataTheme, className, ...props },
+    {
+      children,
+      open,
+      responsive,
+      backdrop,
+      ariaHidden,
+      dataTheme,
+      className,
+      ...props
+    },
     ref
   ): JSX.Element => {
     const containerClasses = twMerge(
@@ -29,13 +39,14 @@ const Modal = forwardRef<HTMLDialogElement, ModalProps>(
       })
     )
 
+    ariaHidden = ariaHidden ?? !open
     const bodyClasses = twMerge('modal-box', className)
 
     return (
       <dialog
         {...props}
         aria-label="Modal"
-        aria-hidden={!open}
+        aria-hidden={ariaHidden}
         open={open}
         aria-modal={open}
         data-theme={dataTheme}

diff --git a/src/Range/Range.tsx b/src/Range/Range.tsx
@@ -41,7 +41,7 @@ const Range = forwardRef<HTMLInputElement, RangeProps>(
 
     const calculatedDisplayTicks = displayTicks ?? (step !== undefined);
     const calculatedStep = step !== undefined ? Number(step) : 1; // default value per HTML standard
-    const calculatedTicksStep = ticksStep ?? calculatedStep;
+    const calculatedTicksStep = !!ticksStep ? ticksStep : calculatedStep;
     const min = props.min !== undefined ? Number(props.min) : 0; // default value per HTML standard
     const max = props.max !== undefined ? Number(props.max) : 100; // default value per HTML standard