Skip to content

reuse existing (if non-obvious) UI to hide puzzle arrows #17304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2025
Merged

reuse existing (if non-obvious) UI to hide puzzle arrows #17304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ui/puzzle/src/autoShape.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ interface Opts {
node: Tree.Node;
nodeList: Tree.Node[];
showComputer(): boolean;
showArrows(): boolean;
ceval: CevalCtrl;
nextNodeBest(): Uci | undefined;
threatMode(): boolean;
Expand Down Expand Up @@ -38,7 +37,7 @@ export default function (opts: Opts): DrawShape[] {
let shapes: DrawShape[] = [];
if (hovering && hovering.fen === n.fen)
shapes = shapes.concat(makeAutoShapesFromUci(color, hovering.uci, 'paleBlue'));
if (opts.showComputer() && opts.showArrows()) {
if (opts.showComputer() && opts.ceval.storedPv() > 0) {
if (n.eval) shapes = shapes.concat(makeAutoShapesFromUci(color, n.eval.best!, 'paleGreen'));
if (!hovering) {
let nextBest: Uci | undefined = opts.nextNodeBest();
Expand Down
13 changes: 1 addition & 12 deletions ui/puzzle/src/ctrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@ import { chessgroundDests, scalachessCharPair } from 'chessops/compat';
import { CevalCtrl } from 'lib/ceval/ceval';
import { makeVoiceMove, type VoiceMove } from 'voice';
import { ctrl as makeKeyboardMove, type KeyboardMove, type KeyboardMoveRootCtrl } from 'keyboardMove';
import {
defined,
prop,
type Prop,
propWithEffect,
type Toggle,
toggle,
requestIdleCallback,
myUserId,
} from 'lib';
import { defined, prop, type Prop, propWithEffect, type Toggle, toggle, requestIdleCallback } from 'lib';
import { makeSanAndPlay } from 'chessops/san';
import { parseFen, makeFen } from 'chessops/fen';
import { parseSquare, parseUci, makeSquare, makeUci, opposite } from 'chessops/util';
Expand All @@ -52,7 +43,6 @@ export default class PuzzleCtrl implements ParentCtrl {
next: Deferred<PuzzleData | ReplayEnd> = defer<PuzzleData>();
tree: TreeWrapper;
ceval: CevalCtrl;
showArrows: StoredProp<boolean>;
autoNext: StoredProp<boolean>;
rated: StoredProp<boolean>;
ground: Prop<CgApi> = prop<CgApi | undefined>(undefined) as Prop<CgApi>;
Expand Down Expand Up @@ -94,7 +84,6 @@ export default class PuzzleCtrl implements ParentCtrl {
readonly redraw: Redraw,
readonly nvui?: NvuiPlugin,
) {
this.showArrows = storedBooleanProp(`puzzle.show-arrows.${myUserId()}`, true);
this.rated = storedBooleanPropWithEffect('puzzle.rated', true, this.redraw);
this.autoNext = storedBooleanProp(
`puzzle.autoNext${opts.data.streak ? '.streak' : ''}`,
Expand Down
11 changes: 1 addition & 10 deletions ui/puzzle/src/view/boardMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'snabbdom';
import { toggle } from 'lib';
import { boardMenu as menuDropdown } from 'lib/boardMenu';
import { boolPrefXhrToggle, toggle as cmnToggle } from 'lib/controls';
import { boolPrefXhrToggle } from 'lib/controls';
import type PuzzleCtrl from '../ctrl';

export default function (ctrl: PuzzleCtrl) {
Expand All @@ -18,15 +18,6 @@ export default function (ctrl: PuzzleCtrl) {
toggle(ctrl.blindfold(), v => ctrl.blindfold(v)),
true,
),
cmnToggle(
{
name: i18n.site.bestMoveArrow,
id: 'showArrows',
checked: ctrl.showArrows(),
change: ctrl.showArrows,
},
ctrl.redraw,
),
menu.voiceInput(boolPrefXhrToggle('voice', !!ctrl.voiceMove), true),
menu.keyboardInput(boolPrefXhrToggle('keyboardMove', !!ctrl.keyboardMove), true),
]),
Expand Down