Merge pull request #16904 from johndoknjas/have-f-change-editor-orien…

…tation Make 'f' correctly toggle the orientation in a new chapter form
lichess-org · Feb 2, 2025 · 905f1d0 · 905f1d0
2 parents 73f711b + bce7ff1
commit 905f1d0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/ui/analyse/src/ctrl.ts b/ui/analyse/src/ctrl.ts
@@ -265,8 +265,8 @@ export default class AnalyseCtrl {
   };
 
   flip = () => {
+    if (this.study?.onFlip() === false) return;
     this.flipped = !this.flipped;
-    this.study?.onFlip();
     this.chessground?.set({
       orientation: this.bottomColor(),
     });

diff --git a/ui/analyse/src/study/chapterNewForm.ts b/ui/analyse/src/study/chapterNewForm.ts
@@ -210,6 +210,7 @@ export function view(ctrl: StudyChapterNewForm): VNode {
                         orientation: ctrl.orientation,
                         onChange: ctrl.editorFen,
                         coordinates: true,
+                        bindHotkeys: false,
                       };
                       ctrl.editor = await site.asset.loadEsm<LichessEditor>('editor', { init: data });
                       ctrl.editorFen(ctrl.editor.getFen());

diff --git a/ui/analyse/src/study/studyCtrl.ts b/ui/analyse/src/study/studyCtrl.ts
@@ -534,7 +534,11 @@ export default class StudyCtrl {
     else this.chapters.localPaths[this.vm.chapterId] = this.ctrl.path; // don't remember position on gamebook
     this.practice?.onJump();
   };
-  onFlip = () => this.chapterFlipMapProp(this.data.chapter.id, this.ctrl.flipped);
+  onFlip = () => {
+    if (this.chapters.newForm.isOpen()) return false;
+    this.chapterFlipMapProp(this.data.chapter.id, this.ctrl.flipped);
+    return true;
+  };
 
   isClockTicking = (path: Tree.Path) =>
     path !== '' && this.data.chapter.relayPath === path && !isFinished(this.data.chapter);

diff --git a/ui/editor/src/ctrl.ts b/ui/editor/src/ctrl.ts
@@ -18,6 +18,7 @@ import { makeFen, parseFen, parseCastlingFen, INITIAL_FEN, EMPTY_FEN } from 'che
 import { lichessVariant, lichessRules } from 'chessops/compat';
 import { defined, prop, type Prop } from 'common';
 import { prompt } from 'common/dialog';
+import { opposite } from 'chessground/util';
 
 export default class EditorCtrl {
   options: Options;
@@ -49,10 +50,14 @@ export default class EditorCtrl {
     if (cfg.endgamePositions)
       cfg.endgamePositions.forEach(p => (p.epd = p.fen.split(' ').splice(0, 4).join(' ')));
 
-    site.mousetrap.bind('f', () => {
-      if (this.chessground) this.chessground.toggleOrientation();
-      this.onChange();
-    });
+    if (this.options.bindHotkeys !== false)
+      site.mousetrap.bind('f', () => {
+        if (this.chessground) {
+          this.chessground.toggleOrientation();
+          if (this.options.orientation) this.setOrientation(opposite(this.options.orientation));
+        }
+        this.onChange();
+      });
 
     this.castlingToggles = { K: false, Q: false, k: false, q: false };
     const params = new URLSearchParams(location.search);

diff --git a/ui/editor/src/interfaces.ts b/ui/editor/src/interfaces.ts
@@ -40,6 +40,7 @@ export interface Options {
   onChange?: (fen: string) => void;
   inlineCastling?: boolean;
   coordinates?: boolean;
+  bindHotkeys?: boolean; // defaults to true
 }
 
 export interface OpeningPosition {