Fix MarseillRules

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

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index cebbff4..e50047d 100644 (file)
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -2,18 +2,46 @@
 // Component for moves list on the right
 export default {
   name: 'my-move-list',
-       props: ["moves","cursor"],
+       props: ["moves","cursor","score","message","firstNum"],
+  watch: {
+    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(Math.max(groupsCount,0)/2)].scrollIntoView({
+            behavior: "auto",
+            block: "nearest",
+          });
+        }
+      });
+    },
+  },
        render(h) {
                if (this.moves.length == 0)
                        return;
-               if (this.moves[0].color == "b")
-                       this.moves.unshift({color: "w", notation: "..."});
                let tableContent = [];
                let moveCounter = 0;
                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")
                        {
@@ -35,8 +63,13 @@ export default {
                                                { }
                                        );
                                        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 += ",";
@@ -48,7 +81,8 @@ export default {
                                                {
                                                        domProps: { innerHTML: curCellContent },
                                                        on: { click: () => this.gotoMove(i) },
-                                                       "class": { "highlight-lm": this.cursor == i },
+              "class": { "highlight-lm":
+                this.cursor >= firstIndex && this.cursor <= i },
                                                }
                                        )
                                );
@@ -67,21 +101,58 @@ export default {
                }
                tableRow.children = moveCells;
                tableContent.push(tableRow);
-               const movesTable = h(
+    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,
+          },
+        },
+        tableContent
+                 )
+    );
+               return h(
       "div",
       { },
-      [h(
-                         "table",
-                         { },
-                         tableContent
-                 )]
-    );
-               return movesTable;
+      rootElements);
        },
-       methods: {
+  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>