feat : improve logic for checking common selection

udecode · Jun 4, 2024 · 04fad5a · 04fad5a
1 parent 445d8d7
commit 04fad5a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/apps/www/src/components/plate-ui/playground-turn-into-dropdown-menu.tsx b/apps/www/src/components/plate-ui/playground-turn-into-dropdown-menu.tsx
@@ -8,7 +8,6 @@ import {
   focusEditor,
   getNodeEntries,
   isBlock,
-  isDefined,
   toggleNodeType,
   useEditorRef,
   useEditorSelector,
@@ -109,17 +108,23 @@ const defaultItem = items.find((item) => item.value === ELEMENT_PARAGRAPH)!;
 export function PlaygroundTurnIntoDropdownMenu(props: DropdownMenuProps) {
   const value: string = useEditorSelector((editor) => {
     let commonSelection: string | undefined;
+    let uniqueTypeFound = false;
     const codeBlockEntries = getNodeEntries(editor, {
       match: (n) => isBlock(editor, n),
     });
+
     const nodes = Array.from(codeBlockEntries);
     nodes.forEach(([node]) => {
       const type: string = (node?.type as string) || ELEMENT_PARAGRAPH;
 
-      if (!isDefined(commonSelection)) {
+      if (uniqueTypeFound) {
+        if (commonSelection !== type) {
+          commonSelection = undefined;
+          uniqueTypeFound = false;
+        }
+      } else {
         commonSelection = type;
-      } else if (commonSelection !== type) {
-        commonSelection = undefined;
+        uniqueTypeFound = true;
       }
     });
 

diff --git a/apps/www/src/registry/default/plate-ui/turn-into-dropdown-menu.tsx b/apps/www/src/registry/default/plate-ui/turn-into-dropdown-menu.tsx
@@ -8,7 +8,6 @@ import {
   focusEditor,
   getNodeEntries,
   isBlock,
-  isDefined,
   toggleNodeType,
   useEditorRef,
   useEditorSelector,
@@ -79,17 +78,23 @@ const defaultItem = items.find((item) => item.value === ELEMENT_PARAGRAPH)!;
 export function TurnIntoDropdownMenu(props: DropdownMenuProps) {
   const value: string = useEditorSelector((editor) => {
     let commonSelection: string | undefined;
+    let uniqueTypeFound = false;
     const codeBlockEntries = getNodeEntries(editor, {
       match: (n) => isBlock(editor, n),
     });
+
     const nodes = Array.from(codeBlockEntries);
     nodes.forEach(([node]) => {
       const type: string = (node?.type as string) || ELEMENT_PARAGRAPH;
 
-      if (!isDefined(commonSelection)) {
+      if (uniqueTypeFound) {
+        if (commonSelection !== type) {
+          commonSelection = undefined;
+          uniqueTypeFound = false;
+        }
+      } else {
         commonSelection = type;
-      } else if (commonSelection !== type) {
-        commonSelection = undefined;
+        uniqueTypeFound = true;
       }
     });
 

diff --git a/templates/plate-playground-template/src/components/plate-ui/turn-into-dropdown-menu.tsx b/templates/plate-playground-template/src/components/plate-ui/turn-into-dropdown-menu.tsx
@@ -6,7 +6,6 @@ import {
   focusEditor,
   getNodeEntries,
   isBlock,
-  isDefined,
   toggleNodeType,
   useEditorRef,
   useEditorSelector,
@@ -77,17 +76,23 @@ const defaultItem = items.find((item) => item.value === ELEMENT_PARAGRAPH)!;
 export function TurnIntoDropdownMenu(props: DropdownMenuProps) {
   const value: string = useEditorSelector((editor) => {
     let commonSelection: string | undefined;
+    let uniqueTypeFound = false;
     const codeBlockEntries = getNodeEntries(editor, {
       match: (n) => isBlock(editor, n),
     });
+
     const nodes = Array.from(codeBlockEntries);
     nodes.forEach(([node]) => {
       const type: string = (node?.type as string) || ELEMENT_PARAGRAPH;
 
-      if (!isDefined(commonSelection)) {
+      if (uniqueTypeFound) {
+        if (commonSelection !== type) {
+          commonSelection = undefined;
+          uniqueTypeFound = false;
+        }
+      } else {
         commonSelection = type;
-      } else if (commonSelection !== type) {
-        commonSelection = undefined;
+        uniqueTypeFound = true;
       }
     });