add more cases

mui · Sep 16, 2023 · 9866ffc · 9866ffc
1 parent ffa82dc
commit 9866ffc
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/docs/data/joy/components/menu/MenuListComposition.js b/docs/data/joy/components/menu/MenuListComposition.js
@@ -22,9 +22,7 @@ export default function MenuListComposition() {
     if (event.key === 'Tab') {
       setOpen(false);
     } else if (event.key === 'Escape') {
-      if (buttonRef.current) {
-        buttonRef.current?.focus();
-      }
+      buttonRef.current.focus();
       setOpen(false);
     }
   };

diff --git a/docs/data/joy/components/menu/MenuListComposition.tsx b/docs/data/joy/components/menu/MenuListComposition.tsx
@@ -10,8 +10,8 @@ const Popup = styled(Popper)({
   zIndex: 1000,
 });
 
-export default function MenuListComposition(): JSX.Element {
-  const buttonRef = React.useRef<HTMLButtonElement | null>(null);
+export default function MenuListComposition() {
+  const buttonRef = React.useRef<HTMLButtonElement>(null);
   const [open, setOpen] = React.useState(false);
 
   const handleClose = () => {
@@ -22,9 +22,7 @@ export default function MenuListComposition(): JSX.Element {
     if (event.key === 'Tab') {
       setOpen(false);
     } else if (event.key === 'Escape') {
-      if (buttonRef.current) {
-        buttonRef.current?.focus();
-      }
+      buttonRef.current!.focus();
       setOpen(false);
     }
   };

diff --git a/docs/src/components/header/HeaderNavBar.tsx b/docs/src/components/header/HeaderNavBar.tsx
@@ -151,8 +151,8 @@ export default function HeaderNavBar() {
   const [subMenuOpen, setSubMenuOpen] = React.useState<null | 'products' | 'docs'>(null);
   const [subMenuIndex, setSubMenuIndex] = React.useState<number | null>(null);
   const navRef = React.useRef<HTMLUListElement | null>(null);
-  const productsMenuRef = React.useRef<HTMLButtonElement | null>(null);
-  const docsMenuRef = React.useRef<HTMLButtonElement | null>(null);
+  const productsMenuRef = React.useRef<HTMLButtonElement>(null);
+  const docsMenuRef = React.useRef<HTMLButtonElement>(null);
   React.useEffect(() => {
     if (typeof subMenuIndex === 'number') {
       document.getElementById(PRODUCT_IDS[subMenuIndex])?.focus();

diff --git a/docs/src/components/header/HeaderNavDropdown.tsx b/docs/src/components/header/HeaderNavDropdown.tsx
@@ -121,7 +121,7 @@ export default function HeaderNavDropdown() {
   const [open, setOpen] = React.useState(false);
   const [productsOpen, setProductsOpen] = React.useState(true);
   const [docsOpen, setDocsOpen] = React.useState(false);
-  const hambugerRef = React.useRef<HTMLButtonElement | null>(null);
+  const hambugerRef = React.useRef<HTMLButtonElement>(null);
   return (
     <React.Fragment>
       <IconButton
@@ -150,7 +150,7 @@ export default function HeaderNavDropdown() {
       </IconButton>
       <ClickAwayListener
         onClickAway={(event) => {
-          if (hambugerRef.current && !hambugerRef.current.contains(event.target as Node)) {
+          if (hambugerRef.current!.contains(event.target as Node)) {
             setOpen(false);
           }
         }}

diff --git a/examples/joy-ui-vite-ts/src/main.tsx b/examples/joy-ui-vite-ts/src/main.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom/client';
 import App from './App';
 
-ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
+ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,

diff --git a/examples/material-ui-vite-ts/src/main.tsx b/examples/material-ui-vite-ts/src/main.tsx
@@ -5,7 +5,7 @@ import { CssBaseline } from '@mui/material';
 import theme from './theme';
 import App from './App';
 
-ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
+ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <ThemeProvider theme={theme}>
       <CssBaseline />

diff --git a/packages/mui-base/src/useSelect/useSelect.ts b/packages/mui-base/src/useSelect/useSelect.ts
@@ -320,7 +320,7 @@ function useSelect<OptionValue, Multiple extends boolean = false>(
         return;
       }
 
-      const listboxClientRect = (listboxRef.current as HTMLElement).getBoundingClientRect();
+      const listboxClientRect = listboxRef.current.getBoundingClientRect();
       const optionClientRect = optionRef.current.getBoundingClientRect();
 
       if (optionClientRect.top < listboxClientRect.top) {