Merge branch 'master' into chapter-scroll-other-users

Author: ornicar

ui/analyse/src/study/studyChapters.ts

@@ -230,17 +230,15 @@ export function view(ctrl: StudyCtrl): VNode {
 }
 
 export class StudyChapterScroller {
-  constructor(
-    public request: ScrollBehavior | undefined = 'instant',
-    public rafId?: number,
-  ) {}
+  request: Prop<ScrollBehavior | null> = prop('instant');
+  private rafId?: number;
 
   scrollIfNeeded(list: HTMLElement) {
-    if (!this.request) return;
+    const request = this.request();
+    if (!request) return;
     const active = list.querySelector('.active');
     if (!active) return;
-    const request = this.request;
-    this.request = undefined;
+    this.request(null);
     const [c, l] = [list.getBoundingClientRect(), active.getBoundingClientRect()];
     if (c.top < l.top || c.bottom > l.bottom) {
       cancelAnimationFrame(this.rafId ?? 0);

ui/analyse/src/study/studyCtrl.ts

@@ -269,7 +269,7 @@ export default class StudyCtrl {
   };
 
   setTab = (tab: Tab) => {
-    if (tab === 'chapters') this.chapters.scroller.request = 'instant';
+    if (tab === 'chapters') this.chapters.scroller.request('instant');
     this.vm.tab(tab);
     this.redraw();
   };
@@ -492,6 +492,7 @@ export default class StudyCtrl {
       this.redraw();
       return true;
     }
+    this.chapters.scroller.request('smooth');
     this.vm.nextChapterId = id;
     this.vm.justSetChapterId = id;
     if (this.vm.mode.sticky && this.makeChange('setChapter', id)) {
@@ -505,7 +506,7 @@ export default class StudyCtrl {
       this.vm.mode.sticky = false;
       if (!this.vm.behind) this.vm.behind = 1;
       this.vm.chapterId = id;
-      this.chapters.scroller.request = 'smooth'; // sticky scroll request is set in `changeChapter`
+      this.chapters.scroller.request('smooth'); // sticky scroll request is set in `changeChapter`
       this.relay?.liveboardPlugin?.reset();
       await this.xhrReload(false, () => componentCallbacks(id));
     }
@@ -741,7 +742,7 @@ export default class StudyCtrl {
       this.setMemberActive(d.w);
       this.data.position = d.p;
       if (this.vm.mode.sticky) {
-        this.chapters.scroller.request = 'smooth'; // non-sticky scroll request is set in `setChapter`
+        this.chapters.scroller.request('smooth'); // non-sticky scroll request is set in `setChapter`
         this.xhrReload();
       } else {
         this.vm.behind++;
@@ -781,8 +782,8 @@ export default class StudyCtrl {
         this.vm.mode.write = this.relay ? this.relayRecProp() : this.nonRelayRecMapProp(this.data.id);
         this.vm.chapterId = d.p.chapterId;
         this.vm.nextChapterId = d.p.chapterId;
-        this.chapters.scroller.request = 'instant';
-      } else this.chapters.scroller.request = 'smooth';
+        this.chapters.scroller.request('instant');
+      } else this.chapters.scroller.request('smooth');
       this.xhrReload(true);
     },
     members: d => {