Merge pull request #16700 from schlawg/ui-learn-z-index-3d

set z-index on 3d pieces in learn
lichess-org · Dec 30, 2024 · deef7e1 · deef7e1
2 parents 5694d21 + 129d188
commit deef7e1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/modules/web/src/main/ui/LearnUi.scala b/modules/web/src/main/ui/LearnUi.scala
@@ -20,7 +20,8 @@ final class LearnUi(helpers: Helpers):
             "data" -> data,
             "pref" -> Json.obj(
               "coords"      -> ctx.pref.coords,
-              "destination" -> ctx.pref.destination
+              "destination" -> ctx.pref.destination,
+              "is3d"        -> ctx.pref.is3d
             )
           )
         )

diff --git a/ui/analyse/src/ctrl.ts b/ui/analyse/src/ctrl.ts
@@ -193,7 +193,11 @@ export default class AnalyseCtrl {
       this.jumpToIndex(index);
       this.redraw();
     });
-    pubsub.on('board.change', redraw);
+    pubsub.on('board.change', (is3d: boolean) => {
+      this.chessground.state.addPieceZIndex = is3d;
+      this.chessground.redrawAll();
+      redraw();
+    });
     this.persistence?.merge();
     (window as any).lichess.analysis = api(this);
   }
@@ -375,10 +379,6 @@ export default class AnalyseCtrl {
     this.setAutoShapes();
     if (this.node.shapes) this.chessground.setShapes(this.node.shapes as DrawShape[]);
     this.cgVersion.dom = this.cgVersion.js;
-    pubsub.on('board.change', (is3d: boolean) => {
-      this.chessground.state.addPieceZIndex = is3d;
-      this.chessground.redrawAll();
-    });
   };
 
   private onChange: () => void = throttle(300, () => {

diff --git a/ui/learn/src/chessground.ts b/ui/learn/src/chessground.ts
@@ -36,4 +36,5 @@ const makeConfig = (ctrl: RunCtrl): CgConfig => ({
   drawable: { enabled: false },
   draggable: { enabled: true },
   selectable: { enabled: true },
+  addPieceZIndex: ctrl.pref.is3d,
 });
diff --git a/ui/learn/src/learn.ts b/ui/learn/src/learn.ts
@@ -35,6 +35,7 @@ export interface LearnOpts {
 export interface LearnPrefs {
   coords: Coords;
   destination: boolean;
+  is3d: boolean;
 }
 
 interface LearnServerOpts {

diff --git a/ui/learn/src/run/runCtrl.ts b/ui/learn/src/run/runCtrl.ts
@@ -6,6 +6,7 @@ import { clearTimeouts } from '../timeouts';
 import { LevelCtrl } from '../levelCtrl';
 import { hashNavigate } from '../hashRouting';
 import type { WithGround } from '../util';
+import { pubsub } from 'common/pubsub';
 
 export class RunCtrl {
   data: LearnProgress = this.opts.storage.data;
@@ -30,6 +31,10 @@ export class RunCtrl {
 
     // Helpful for debugging:
     // site.mousetrap.bind(['shift+enter'], this.levelCtrl.complete);
+    pubsub.on('board.change', (is3d: boolean) => {
+      this.chessground!.state.addPieceZIndex = is3d;
+      this.chessground!.redrawAll();
+    });
   }
 
   initializeLevel = (restarting = false) => {