Merge branch 'main' into update-react19

sjdemartini · Dec 22, 2024 · 4b92096 · 4b92096
2 parents 53705fe + edcdbb9
commit 4b92096
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/example/pnpm-lock.yaml b/example/pnpm-lock.yaml
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mui-tiptap",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "A Material-UI (MUI) styled WYSIWYG rich text editor, using Tiptap",
   "keywords": [
     "mui",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/controls/MenuSelect.tsx b/src/controls/MenuSelect.tsx
@@ -96,6 +96,13 @@ export default function MenuSelect<T>({
         setTooltipOpen(false);
         selectProps.onClick?.(...args);
       }}
+      onOpen={(...args) => {
+        // Close the tooltip when the dropdown is opened. This can ensure the
+        // tooltip doesn't block menu items, etc. (see
+        // https://github.com/sjdemartini/mui-tiptap/issues/308).
+        setTooltipOpen(false);
+        selectProps.onOpen?.(...args);
+      }}
       inputProps={{
         ...selectProps.inputProps,
         className: cx(classes.input, selectProps.inputProps?.className),