fixup! feat(menu): add search functionality

Lundalogik · Oct 6, 2023 · c8ca354 · c8ca354
1 parent 9f32f9d
commit c8ca354
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/components/menu/examples/menu-searchable.tsx b/src/components/menu/examples/menu-searchable.tsx
@@ -18,7 +18,7 @@ export class MenuSubItemsExample {
     private items: Array<MenuItem | ListSeparator> = [
         {
             text: 'Format',
-            subItems: [
+            items: [
                 {
                     text: 'Bold',
                     icon: 'bold',
@@ -30,7 +30,7 @@ export class MenuSubItemsExample {
                 {
                     text: 'Bullets and numbering',
                     icon: 'bulleted_list',
-                    subItems: [
+                    items: [
                         {
                             text: 'Numbered list',
                             icon: 'numbered_list',
@@ -49,7 +49,7 @@ export class MenuSubItemsExample {
         },
         {
             text: 'Edit',
-            subItems: [
+            items: [
                 {
                     text: 'Copy',
                     icon: 'copy',
@@ -67,7 +67,7 @@ export class MenuSubItemsExample {
         },
         {
             text: 'Long sub list',
-            subItems: Array.from(Array(50), (_value, index) => {
+            items: Array.from(Array(50), (_value, index) => {
                 return {
                     text: `Item ${index + 1}`,
                 };

diff --git a/src/components/menu/examples/subitems-search.ts b/src/components/menu/examples/subitems-search.ts
@@ -12,25 +12,32 @@ export function SearchMenuItems(
     const flattenedItems = flattenMenuItems(menuItems);
 
     return flattenedItems.filter(
-        (i) => !i.separator && i.text?.toLowerCase().includes(searchValue)
+        (i) =>
+            !('separator' in i) && i.text?.toLowerCase().includes(searchValue)
     );
 }
 
-function flattenMenuItems(menuItems: MenuItem[]): MenuItem[] {
+function flattenMenuItems(
+    menuItems: Array<MenuItem | ListSeparator>
+): MenuItem[] {
     const flattenedItems: MenuItem[] = [];
 
     function flatten(menuItem: MenuItem) {
         flattenedItems.push(menuItem);
 
-        if (menuItem.subItems) {
-            for (const subItem of menuItem.subItems) {
-                flatten(subItem);
+        if (Array.isArray(menuItem.items)) {
+            for (const subItem of menuItem.items) {
+                if (!('separator' in subItem)) {
+                    flatten(subItem as MenuItem);
+                }
             }
         }
     }
 
     for (const menuItem of menuItems) {
-        flatten(menuItem);
+        if (!('separator' in menuItem)) {
+            flatten(menuItem as MenuItem);
+        }
     }
 
     return flattenedItems;