Add options to number moves from variation or hotspot

src/components/App.js

@@ -342,6 +342,7 @@ class App extends Component {
         showCoordinates: state.showCoordinates,
         coordinatesType: state.coordinatesType,
         showMoveNumbers: state.showMoveNumbers,
+        moveNumbersType: state.moveNumbersType,
         showMoveColorization: state.showMoveColorization,
         showNextMoves: state.showNextMoves,
         showSiblings: state.showSiblings,

src/components/Goban.js

@@ -227,6 +227,7 @@ export default class Goban extends Component {
       showCoordinates = false,
       showMoveColorization = true,
       showMoveNumbers = false,
+      moveNumbersType,
       showNextMoves = true,
       showSiblings = true,
       fuzzyStonePlacement = true,
@@ -357,9 +358,31 @@ export default class Goban extends Component {
     if (showMoveNumbers) {
       markerMap = markerMap.map(row => row.map(_ => null))
 
-      let history = [
-        ...gameTree.listNodesVertically(treePosition, -1, {})
-      ].reverse()
+      let variation = false
+      let hotspot = false
+      let history = [gameTree.get(treePosition)]
+      for (const node of gameTree.listNodesVertically(treePosition, -1, {})) {
+        if (node.id === treePosition) continue // already added
+        if (node.parentId == null) break // omit root node
+        if (moveNumbersType === 'variation' && node.children.length > 1) {
+          variation = true
+          break
+        }
+        if (moveNumbersType === 'hotspot' && node.data.HO != null) {
+          hotspot = true
+          break
+        }
+        history.push(node)
+      }
+      if (
+        (moveNumbersType === 'variation' &&
+          gameTree.onMainLine(treePosition)) ||
+        (moveNumbersType === 'variation' && !variation) ||
+        (moveNumbersType === 'hotspot' && !hotspot)
+      ) {
+        history = []
+      }
+      history.reverse()
 
       for (let i = 0; i < history.length; i++) {
         let node = history[i]
@@ -371,7 +394,7 @@ export default class Goban extends Component {
         let [x, y] = vertex
 
         if (markerMap[y] != null && x < markerMap[y].length) {
-          markerMap[y][x] = {type: 'label', label: i.toString()}
+          markerMap[y][x] = {type: 'label', label: (i + 1).toString()}
         }
       }
     }

src/components/MainView.js

@@ -95,6 +95,7 @@ export default class MainView extends Component {
       showCoordinates,
       showMoveColorization,
       showMoveNumbers,
+      moveNumbersType,
       showNextMoves,
       showSiblings,
       fuzzyStonePlacement,
@@ -153,6 +154,7 @@ export default class MainView extends Component {
           showCoordinates,
           showMoveColorization,
           showMoveNumbers: mode !== 'edit' && showMoveNumbers,
+          moveNumbersType,
           showNextMoves: mode !== 'guess' && showNextMoves,
           showSiblings: mode !== 'guess' && showSiblings,
           fuzzyStonePlacement,

src/menu.js

@@ -29,6 +29,7 @@ exports.get = function(props = {}) {
     showCoordinates,
     coordinatesType,
     showMoveNumbers,
+    moveNumbersType,
     showMoveColorization,
     showNextMoves,
     showSiblings,
@@ -605,9 +606,42 @@ exports.get = function(props = {}) {
         },
         {
           label: i18n.t('menu.view', 'Show Move N&umbers'),
-          type: 'checkbox',
-          checked: !!showMoveNumbers,
-          click: () => toggleSetting('view.show_move_numbers')
+          submenu: [
+            {
+              label: i18n.t('menu.view', '&Don’t Show'),
+              type: 'checkbox',
+              checked: !showMoveNumbers,
+              click: () => toggleSetting('view.show_move_numbers')
+            },
+            {type: 'separator'},
+            {
+              label: i18n.t('menu.view', 'From Game Start'),
+              type: 'checkbox',
+              checked: !!showMoveNumbers && moveNumbersType === 'start',
+              click: () => {
+                setting.set('view.show_move_numbers', true)
+                setting.set('view.move_numbers_type', 'start')
+              }
+            },
+            {
+              label: i18n.t('menu.view', 'From Variation Start'),
+              type: 'checkbox',
+              checked: !!showMoveNumbers && moveNumbersType === 'variation',
+              click: () => {
+                setting.set('view.show_move_numbers', true)
+                setting.set('view.move_numbers_type', 'variation')
+              }
+            },
+            {
+              label: i18n.t('menu.view', 'From Hotspot'),
+              type: 'checkbox',
+              checked: !!showMoveNumbers && moveNumbersType === 'hotspot',
+              click: () => {
+                setting.set('view.show_move_numbers', true)
+                setting.set('view.move_numbers_type', 'hotspot')
+              }
+            }
+          ]
         },
         {
           label: i18n.t('menu.view', 'Show Move Colori&zation'),

src/modules/sabaki.js

@@ -64,6 +64,7 @@ class Sabaki extends EventEmitter {
       showCoordinates: null,
       showMoveColorization: null,
       showMoveNumbers: null,
+      moveNumbersType: null,
       showNextMoves: null,
       showSiblings: null,
       fuzzyStonePlacement: null,
@@ -214,6 +215,7 @@ class Sabaki extends EventEmitter {
       'view.show_coordinates': 'showCoordinates',
       'view.show_move_colorization': 'showMoveColorization',
       'view.show_move_numbers': 'showMoveNumbers',
+      'view.move_numbers_type': 'moveNumbersType',
       'view.show_next_moves': 'showNextMoves',
       'view.show_siblings': 'showSiblings',
       'view.coordinates_type': 'coordinatesType',

src/setting.js

@@ -188,6 +188,7 @@ let defaults = {
   'view.fuzzy_stone_placement': true,
   'view.leftsidebar_width': 250,
   'view.leftsidebar_minwidth': 100,
+  'view.move_numbers_type': 'start',
   'view.peerlist_height': 130,
   'view.peerlist_minheight': 58,
   'view.properties_height': 50,