X-Git-Url: https://git.auder.net/images/pieces/Cwda/bt.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=90b76b43531a33d56434568911d08c4dd5689046;hb=f44fd3bf754c113aa6b9ab241cbf24933877ae31;hp=63e985f2879549ff36af82d5b4494a43b7e0ca40;hpb=6855163c1b62ddbc83fa86a17d6d99bf0638060c;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 63e985f2..90b76b43 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,98 +1,158 @@
-<!-- TODO: merge Game.vue and MoveList.vue (one logic entity, no ?) -->
 <script>
 // Component for moves list on the right
 export default {
   name: 'my-move-list',
-	props: ["moves","cursor"], //TODO: other props for e.g. players names + connected indicator
-	// --> we could also add turn indicator here
-	data: function() {
-		return {
-			something: "", //TODO?
-		};
-	},
-	// TODO: extend rendering for more than 2 colors: would be a parameter
-	// in that case some moves for some colors could be just skipped (if a player lost)
-	render(h) {
-		if (this.moves.length == 0)
-			return;
-		const nbColors = 2;
-		// TODO: name colors "white", "black", "red", "yellow" ?
-		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++)
-		{
-			if (this.moves[i].color == "w")
-			{
-				if (i == 0 || i>0 && this.moves[i-1].color=="b")
-				{
-					if (!!tableRow)
-					{
-						tableRow.children = moveCells;
-						tableContent.push(tableRow);
-					}
-					moveCells = [
-						h(
-							"td",
-							{ domProps: { innerHTML: (++moveCounter) + "." } }
-						)
-					];
-					tableRow = h(
-						"tr",
-						{ }
-					);
-					curCellContent = "";
-				}
-			}
-			curCellContent += this.moves[i].notation;
-			if (i < this.moves.length-1 && this.moves[i+1].color == this.moves[i].color)
-				curCellContent += ",";
-			else //color change
-			{
-				moveCells.push(
-					h(
-						"td",
-						{
-							domProps: { innerHTML: curCellContent },
-							on: { click: () => this.gotoMove(i) },
-							"class": { "highlight-lm": this.cursor == i },
-						}
-					)
-				);
-				curCellContent = "";
-			}
-		}
-		// Complete last row, which might not be full:
-		if (moveCells.length-1 < nbColors)
-		{
-			const delta = nbColors - (moveCells.length-1);
-			for (let i=0; i<delta; i++)
-			{
-				moveCells.push(
-					h(
-						"td",
-						{ domProps: { innerHTML: "" } }
-					)
-				);
-			}
-		}
-		tableRow.children = moveCells;
-		tableContent.push(tableRow);
-		const movesTable = h(
-			"table",
-			{ },
-			tableContent
-		);
-		return movesTable;
-	},
-	methods: {
-		gotoMove: function(index) {
-			this.$emit("goto-move", index);
-		},
-	},
+  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;
+    let tableContent = [];
+    let moveCounter = 0;
+    let tableRow = undefined;
+    let moveCells = undefined;
+    let curCellContent = "";
+    let firstIndex = 0;
+    for (let i=0; i<this.moves.length; i++)
+    {
+      if (this.moves[i].color == "w")
+      {
+        if (i == 0 || i>0 && this.moves[i-1].color=="b")
+        {
+          if (!!tableRow)
+          {
+            tableRow.children = moveCells;
+            tableContent.push(tableRow);
+          }
+          moveCells = [
+            h(
+              "td",
+              { domProps: { innerHTML: (++moveCounter) + "." } }
+            )
+          ];
+          tableRow = h(
+            "tr",
+            { }
+          );
+          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 += ",";
+      else //color change
+      {
+        moveCells.push(
+          h(
+            "td",
+            {
+              domProps: { innerHTML: curCellContent },
+              on: { click: () => this.gotoMove(i) },
+              "class": { "highlight-lm":
+                this.cursor >= firstIndex && this.cursor <= i },
+            }
+          )
+        );
+        curCellContent = "";
+      }
+    }
+    // Complete last row, which might not be full:
+    if (moveCells.length-1 == 1)
+    {
+      moveCells.push(
+        h(
+          "td",
+          { domProps: { innerHTML: "" } }
+        )
+      );
+    }
+    tableRow.children = moveCells;
+    tableContent.push(tableRow);
+    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",
+      { },
+      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>