Fix MarseillRules

[vchess.git] / client / src / components / MoveList.vue

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 91607c2..e50047d 100644 (file)
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,36 +1,30 @@
-<template lang="pug">
-div
-  #scoreInfo(v-if="score!='*'")
-    p {{ score }}
-    p {{ message }}
-  table#movesList
-    tbody
-      tr(v-for="moveIdx in evenNumbers")
-        td {{ moveIdx / 2 + 1 }}
-        td(:class="{'highlight-lm': cursor == moveIdx}"
-            data-label="White move" @click="() => gotoMove(moveIdx)")
-          | {{ moves[moveIdx].notation }}
-        td(v-if="moveIdx < moves.length-1"
-            :class="{'highlight-lm': cursor == moveIdx+1}"
-            data-label="Black move" @click="() => gotoMove(moveIdx+1)")
-          | {{ moves[moveIdx+1].notation }}
-        // Else: just add an empty cell
-        td(v-else)
-</template>
-
 <script>
 // Component for moves list on the right
 export default {
   name: 'my-move-list',
-       props: ["moves","cursor","score","message"],
+       props: ["moves","cursor","score","message","firstNum"],
   watch: {
-    cursor: function(newValue) {
+    cursor: function(newCursor) {
+      if (window.innerWidth <= 767)
+        return; //moves list is below: scrolling would hide chessboard
+      // Count grouped moves until the cursor (if multi-moves):
+      let groupsCount = -1;
+      let curCol = undefined;
+      for (let i=0; i<newCursor; i++)
+      {
+        const m = this.moves[i];
+        if (m.color != curCol)
+        {
+          groupsCount++;
+          curCol = m.color;
+        }
+      }
       // $nextTick to wait for table > tr to be rendered
       this.$nextTick( () => {
         let rows = document.querySelectorAll('#movesList tr');
         if (rows.length > 0)
         {
-          rows[Math.floor(newValue/2)].scrollIntoView({
+          rows[Math.floor(Math.max(groupsCount,0)/2)].scrollIntoView({
             behavior: "auto",
             block: "nearest",
           });
@@ -38,28 +32,7 @@ export default {
       });
     },
   },
-  computed: {
-    evenNumbers: function() {
-      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
-    },
-  },
-  methods: {
-               gotoMove: function(index) {
-                       this.$emit("goto-move", index);
-               },
-       },
-};
-</script>
-
-<style lang="sass" scoped>
-.moves-list
-  min-width: 250px
-td.highlight-lm
-  background-color: plum
-</style>
-
-<!-- Old render method:
-  render(h) {
+       render(h) {
                if (this.moves.length == 0)
                        return;
                let tableContent = [];
@@ -67,7 +40,8 @@ td.highlight-lm
                let tableRow = undefined;
                let moveCells = undefined;
                let curCellContent = "";
-               for (let i=0; i<this.moves.length; i++)
+               let firstIndex = 0;
+    for (let i=0; i<this.moves.length; i++)
                {
                        if (this.moves[i].color == "w")
                        {
@@ -89,8 +63,13 @@ td.highlight-lm
                                                { }
                                        );
                                        curCellContent = "";
+          firstIndex = i;
                                }
                        }
+      // Next condition is fine because even if the first move is black,
+      // there will be the "..." which count as white move.
+      else if (this.moves[i].color == "b" && this.moves[i-1].color == "w")
+        firstIndex = i;
                        curCellContent += this.moves[i].notation;
                        if (i < this.moves.length-1 && this.moves[i+1].color == this.moves[i].color)
                                curCellContent += ",";
@@ -102,7 +81,8 @@ td.highlight-lm
                                                {
                                                        domProps: { innerHTML: curCellContent },
                                                        on: { click: () => this.gotoMove(i) },
-                                                       "class": { "highlight-lm": this.cursor == i },
+              "class": { "highlight-lm":
+                this.cursor >= firstIndex && this.cursor <= i },
                                                }
                                        )
                                );
@@ -121,34 +101,58 @@ td.highlight-lm
                }
                tableRow.children = moveCells;
                tableContent.push(tableRow);
-    const scoreDiv = h("div",
-      {
-        id: "scoreInfo",
-        style: {
-          display: this.score!="*" ? "block" : "none",
+    let rootElements = [];
+    if (this.score != "*")
+    {
+      const scoreDiv = h("div",
+        {
+          id: "scoreInfo",
+          style: {
+            display: this.score!="*" ? "block" : "none",
+          },
+        },
+        [
+          h("p", this.score),
+          h("p", this.message),
+        ]
+      );
+      rootElements.push(scoreDiv);
+    }
+    rootElements.push(
+      h(
+        "table",
+        {
+          "class": {
+            "moves-list": true,
+          },
         },
-      },
-      [
-        h("p", this.score),
-        h("p", this.message),
-      ]
+        tableContent
+                 )
     );
-               const movesTable = h(
+               return h(
       "div",
       { },
-      [
-        scoreDiv,
-        h(
-          "table",
-          {
-            "class": {
-              "moves-list": true,
-            },
-          },
-          tableContent
-                   )
-      ]
-    );
-               return movesTable;
+      rootElements);
+       },
+  methods: {
+               gotoMove: function(index) {
+                       this.$emit("goto-move", index);
+               },
        },
--->
+};
+</script>
+
+<style lang="sass" scoped>
+.moves-list
+  min-width: 250px
+@media screen and (max-width: 767px)
+  .moves-list
+    tr
+      display: flex
+      margin: 0
+      padding: 0
+      td
+        text-align: left
+td.highlight-lm
+  background-color: plum
+</style>