feature: aleman: nemo: submenu

Author: coderaiser

nemo/state/parse-state.js

@@ -15,11 +15,13 @@ export const parseState = (source) => {
         items,
     };
 
-    for (const [index, line] of lines.entries()) {
+    for (let index = 0; index < lines.length; index++) {
+        const line = lines[index];
         const {
             mark,
             name,
             hasSubmenu,
+            show,
         } = parseLine(line);
 
         const selected = mark === '+';
@@ -33,13 +35,33 @@ export const parseState = (source) => {
             path: name,
         };
 
-        if (hasSubmenu)
+        if (hasSubmenu) {
             assign(current, {
                 submenu: {
-                    show: false,
+                    show,
                     items: [],
                 },
             });
+            
+            for (;index < lines.length; index++) {
+                const line = lines[index];
+                const {
+                    mark,
+                    name: submenuName,
+                } = parseLine(line);
+                
+                const selected = mark === '+';
+                
+                if (selected)
+                    state.index = index;
+                
+                current.submenu.items.push({
+                    selected,
+                    name,
+                    path: `${name}.${submenuName}`,
+                });
+            }
+        }
 
         items.push(current);
     }
@@ -49,10 +71,15 @@ export const parseState = (source) => {
 
 function parseLine(line) {
     let hasSubmenu = false;
+    let show = false;
 
     if (line.endsWith('*')) {
         line = line.slice(0, -1);
         hasSubmenu = true;
+    } else if (line.endsWith('>')) {
+        line = line.slice(0, -1);
+        hasSubmenu = true;
+        show = true;
     }
 
     const [mark, ...nameChars] = line;
@@ -62,5 +89,7 @@ function parseLine(line) {
         mark,
         name,
         hasSubmenu,
+        show,
     };
 }
+

nemo/state/print-state.js

@@ -3,7 +3,7 @@ export const printState = ({items}) => {
 
     for (const {selected, name, submenu} of items) {
         const selectionMark = selected ? '+' : '-';
-        const submenuMark = submenu ? '*' : '';
+        const submenuMark = submenu ? submenu.show ? '>' : '*' : '';
 
         const current = `${selectionMark}${name}${submenuMark}`;
 

nemo/state/state.js

@@ -65,15 +65,21 @@ export const updateState = (command, state, options = {}) => {
 
 function down(state, {infiniteScroll}) {
     let {index, items} = state;
+    const current = items[index];
 
     if (index === -1) {
         const [first] = items;
         ++index;
         first.selected = true;
     } else if (index < items.length - 1) {
-        items[index].selected = false;
+        current.selected = false;
         ++index;
-        items[index].selected = true;
+        const next = items[index];
+        
+        next.selected = true;
+        
+        if (next.submenu)
+            next.submenu.show = true;
     }
 
     if (infiniteScroll && index === items.length - 1) {
@@ -89,9 +95,14 @@ function down(state, {infiniteScroll}) {
 
 function up(state, {infiniteScroll}) {
     let {index, items} = state;
+    const current = items[index];
 
     if (index > 0) {
-        items[index].selected = false;
+        current.selected = false;
+        
+        if (current.submenu)
+            current.submenu.show = false;
+        
         --index;
         items[index].selected = true;
 

nemo/state/state.spec.js

@@ -219,3 +219,39 @@ test('state: updateState: up: infiniteScroll', (t) => {
     });
     t.end();
 });
+
+test.only('state: updateState: up: submenu', (t) => {
+    const from = montag`
+        -Hello
+        -World
+        +ABC>
+            -A
+            -B
+    `;
+    
+    const to = montag`
+        -Hello
+        +World
+        -ABC*
+    `;
+    
+    t.updateState('up', from, to);
+    t.end();
+});
+
+test.only('state: updateState: down: submenu', (t) => {
+    const from = montag`
+        -Hello
+        +World
+        -ABC*
+    `;
+    
+    const to = montag`
+        -Hello
+        -World
+        +ABC>
+    `;
+    
+    t.updateState('down', from, to);
+    t.end();
+});