also fix NVUI in puzzles and analysis - for #13077

lichess-org · Jun 23, 2023 · 450dd8e · 450dd8e
1 parent 684bfce
commit 450dd8e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/ui/analyse/src/plugins/nvui.ts b/ui/analyse/src/plugins/nvui.ts
@@ -51,7 +51,7 @@ const borderSound = throttled('outOfBound');
 const errorSound = throttled('error');
 
 export function initModule(ctrl: AnalyseController) {
-  const notify = new Notify(ctrl.redraw),
+  const notify = new Notify(),
     moveStyle = styleSetting(),
     pieceStyle = pieceSetting(),
     prefixStyle = prefixSetting(),
@@ -67,6 +67,7 @@ export function initModule(ctrl: AnalyseController) {
 
   return {
     render(): VNode {
+      notify.redraw = ctrl.redraw;
       const d = ctrl.data,
         style = moveStyle.get();
       if (!ctrl.chessground)

diff --git a/ui/puzzle/src/plugins/nvui.ts b/ui/puzzle/src/plugins/nvui.ts
@@ -29,7 +29,7 @@ import { renderSetting } from 'nvui/setting';
 import { Notify } from 'nvui/notify';
 import { commands } from 'nvui/command';
 import * as control from '../control';
-import { bind, onInsert, Redraw } from 'common/snabbdom';
+import { bind, onInsert } from 'common/snabbdom';
 import { Api } from 'chessground/api';
 import throttle from 'common/throttle';
 
@@ -38,8 +38,8 @@ const selectSound = throttled('select');
 const borderSound = throttled('outOfBound');
 const errorSound = throttled('error');
 
-export function initModule(redraw: Redraw) {
-  const notify = new Notify(redraw),
+export function initModule() {
+  const notify = new Notify(),
     moveStyle = styleSetting(),
     prefixStyle = prefixSetting(),
     pieceStyle = pieceSetting(),
@@ -48,6 +48,7 @@ export function initModule(redraw: Redraw) {
 
   return {
     render(ctrl: Controller): VNode {
+      notify.redraw = ctrl.redraw;
       const ground = ctrl.ground() || createGround(ctrl);
 
       return h(

diff --git a/ui/round/src/ctrl.ts b/ui/round/src/ctrl.ts
@@ -109,7 +109,6 @@ export default class RoundController {
     }, 3000);
 
     this.socket = makeSocket(opts.socketSend, this);
-    this.nvui?.setRedraw(redraw);
 
     if (d.clock)
       this.clock = new ClockController(d, {

diff --git a/ui/round/src/interfaces.ts b/ui/round/src/interfaces.ts
@@ -6,7 +6,6 @@ import RoundController from './ctrl';
 import { ChatCtrl, ChatPlugin } from 'chat';
 import * as cg from 'chessground/types';
 import * as Prefs from 'common/prefs';
-import { Redraw } from 'common/snabbdom';
 
 export interface Untyped {
   [key: string]: any;
@@ -17,7 +16,6 @@ export interface NvuiPlugin {
   playPremove: (ctrl: RoundController) => void;
   premoveInput: string;
   render(ctrl: RoundController): VNode;
-  setRedraw(redraw: Redraw): void;
 }
 
 export interface SocketOpts {

diff --git a/ui/round/src/plugins/nvui.ts b/ui/round/src/plugins/nvui.ts
@@ -55,9 +55,6 @@ export function initModule(): NvuiPlugin {
   lichess.pubsub.on('round.suggestion', notify.set);
 
   return {
-    setRedraw(redraw) {
-      notify.redraw = redraw;
-    },
     premoveInput: '',
     playPremove(ctrl: RoundController) {
       const nvui = ctrl.nvui!;
@@ -66,6 +63,7 @@ export function initModule(): NvuiPlugin {
     },
     submitMove: undefined,
     render(ctrl: RoundController): VNode {
+      notify.redraw = ctrl.redraw;
       const d = ctrl.data,
         nvui = ctrl.nvui!,
         step = plyStep(d, ctrl.ply),