More cleanup

- More functions -> classes.
- Filesystem changes.

Author: mike-lischke

src/components/ui/GuideRail/TimingViewer.tsx

@@ -5,9 +5,9 @@
 
 import type { ComponentChild } from "preact";
 
-import { ArrangementPlayerContext } from "../arrangement/ArrangementViewer.js";
+import { ArrangementPlayerContext } from "../Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentProperties } from "../ComponentBase/ComponentBase.js";
-import { NoteViewer } from "../note/NoteViewer.js";
+import { NoteViewer } from "../Note/NoteViewer.js";
 import { BarDivisibilityContext, type BarDivisibility } from "./GuideRail.js";
 import type { ITimeParamsView, ITiming } from "../../../core/types/general.js";
 

src/components/ui/InstrumentChooser.tsx

@@ -7,7 +7,7 @@ import type { ComponentChild, ContextType } from "preact";
 
 import { getLibrary } from "../../core/Library.js";
 import type { IArrangementView, IInstrumentMeta } from "../../core/types/general.js";
-import { ArrangementPlayerContext } from "./arrangement/ArrangementViewer.js";
+import { ArrangementPlayerContext } from "./Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentProperties } from "./ComponentBase/ComponentBase.js";
 import { AnimadaScoreBookContext } from "./ScoreBookViewer.js";
 

src/components/ui/Overlay.tsx

@@ -5,14 +5,11 @@
 
 import { createContext, type ComponentChild } from "preact";
 
-import { createPublisher } from "../../core/Publisher.js";
-import type { ISubscribable } from "../../core/types/general.js";
 import { ComponentBase, type IComponentProperties, type IComponentState } from "./ComponentBase/ComponentBase.js";
+import { OverlayState } from "./OverlayState.js";
 
 export const OverlayStateContext = createContext<OverlayState | null>(null);
 
-type OverlayState = ISubscribable & { visible: boolean; };
-
 export interface IOverlayProps extends IComponentProperties {
     name: string;
 }
@@ -25,7 +22,7 @@ interface IOverlayState extends IComponentState {
 export class Overlay extends ComponentBase<IOverlayProps, IOverlayState> {
     private static overlayStates: Record<string, OverlayState> = {};
 
-    private overlayState = this.createOverlayState();
+    private overlayState = new OverlayState();
 
     public constructor(props: IOverlayProps) {
         super(props);
@@ -87,25 +84,6 @@ export class Overlay extends ComponentBase<IOverlayProps, IOverlayState> {
         );
     }
 
-    private createOverlayState(): OverlayState {
-        const publisher = createPublisher();
-        let visible = false;
-
-        return {
-            get visible() {
-                return visible;
-            },
-            set visible(newVisible) {
-                if (visible !== newVisible) {
-                    visible = newVisible;
-                    publisher.publish();
-                }
-            },
-            subscribe: publisher.subscribe,
-            unsubscribe: publisher.unsubscribe
-        };
-    }
-
     private handleTransitionEnd = (event: TransitionEvent) => {
         const { visibilityClass } = this.state;
 

src/components/ui/OverlayState.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Mike Lischke. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+import { Publisher } from "../../core/Publisher.js";
+
+export class OverlayState extends Publisher {
+    private isVisible = false;
+
+    public get visible(): boolean {
+        return this.isVisible;
+    }
+
+    public set visible(value: boolean) {
+        if (this.isVisible !== value) {
+            this.isVisible = value;
+            this.publish();
+        }
+    }
+}

src/components/ui/PolyrhythmViewer.tsx

@@ -7,7 +7,7 @@ import type { ComponentChild, ContextType } from "preact";
 
 import type { IPolyrhythmView } from "../../core/types/general.js";
 import { ComponentBase, type IComponentProperties, type IComponentState } from "./ComponentBase/ComponentBase.js";
-import { NoteViewer } from "./note/NoteViewer.js";
+import { NoteViewer } from "./Note/NoteViewer.js";
 import { AnimadaScoreBookContext, ServicesContext } from "./ScoreBookViewer.js";
 
 export interface IPolyrhythmViewerProps extends IComponentProperties {

src/components/ui/ScoreBookViewer.tsx

@@ -9,7 +9,7 @@ import type { IAnimadaScoreBook } from "../../core/types/general.js";
 import type { ScoreBookPlayer } from "../../player/types.js";
 import type { ScoreBookUiServices } from "../../ui/AnimadaScoreBookUi.js";
 import { About } from "./About.js";
-import { ArrangementViewer } from "./arrangement/ArrangementViewer.js";
+import { ArrangementViewer } from "./Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentProperties } from "./ComponentBase/ComponentBase.js";
 import { Popup } from "./Popup.js";
 

src/components/ui/SelectionControls.tsx

@@ -7,7 +7,7 @@ import { createRef, type ComponentChild, type ContextType } from "preact";
 
 import type { IArrangementView } from "../../core/types/general.js";
 import type { SelectionManager } from "../../ui/SelectionManager.js";
-import { ArrangementPlayerContext } from "./arrangement/ArrangementViewer.js";
+import { ArrangementPlayerContext } from "./Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentState } from "./ComponentBase/ComponentBase.js";
 import { ExpandingSpacer } from "./ExpandingSpacer.js";
 import { OverlayStateContext } from "./Overlay.js";

src/components/ui/Share.tsx

@@ -6,7 +6,7 @@
 import type { ComponentChild, ContextType } from "preact";
 
 import { getShareLink } from "../../core/serialisation/url.js";
-import { ArrangementPlayerContext } from "./arrangement/ArrangementViewer.js";
+import { ArrangementPlayerContext } from "./Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentState } from "./ComponentBase/ComponentBase.js";
 import { Overlay } from "./Overlay.js";
 import { AnimadaScoreBookContext } from "./ScoreBookViewer.js";

src/components/ui/arrangement/ArrangementViewer.tsx

@@ -6,9 +6,9 @@
 import { createContext, createRef, type JSX } from "preact";
 import type { MutableRefObject } from "preact/compat";
 
-import { createPublisher } from "../../../core/Publisher.js";
+import { Publisher } from "../../../core/Publisher.js";
 import type { ITimeParamsView, RealTime, Subscription } from "../../../core/types/general.js";
-import type { ArrangementPlayer } from "../../../player/types.js";
+import type { IArrangementPlayer } from "../../../player/types.js";
 import type { AnimationEngine } from "../../../ui/AnimationEngine.js";
 import { ComponentBase, type IComponentProperties, type IComponentState } from "../ComponentBase/ComponentBase.js";
 import { GuideRail } from "../GuideRail/GuideRail.js";
@@ -17,18 +17,18 @@ import { Overlay } from "../Overlay.js";
 import { ServicesContext } from "../ScoreBookViewer.js";
 import { Scrollbar } from "../Scrollbar.js";
 import { Share } from "../Share.js";
-import { TrackViewer } from "../track/TrackViewer.js";
+import { TrackViewer } from "../Track/TrackViewer.js";
 import { ArrangementControlsBottom } from "./ArrangementControlsBottom.js";
 import { ArrangementControlsTop } from "./ArrangementControlsTop.js";
 
 const baseNoteWidth = 55.5; // 54pt flex-basis + 1.5pt for border
 
-export const ArrangementPlayerContext = createContext<ArrangementPlayer | null>(null);
+export const ArrangementPlayerContext = createContext<IArrangementPlayer | null>(null);
 export const NoteWidthContext = createContext<number | null>(null);
 export const NoteLineMinWidth = createContext<number | null>(null);
 
 export interface IArrangementViewerProps extends IComponentProperties {
-    arrangementPlayer: ArrangementPlayer;
+    arrangementPlayer: IArrangementPlayer;
 }
 
 interface IArrangementViewerState extends IComponentState {
@@ -42,7 +42,7 @@ interface IArrangementViewerState extends IComponentState {
 
 export class ArrangementViewer extends ComponentBase<IArrangementViewerProps, IArrangementViewerState> {
     private viewerRef = createRef<HTMLDivElement>();
-    private contentWidthPublisher = createPublisher();
+    private contentWidthPublisher = new Publisher();
 
     private animationEngine?: AnimationEngine;
     private resizeObserver: ResizeObserver;

src/components/ui/note/NoteViewer.tsx

@@ -9,11 +9,11 @@ import type { INoteStyle, INoteView, ISubscribable } from "../../../core/types/g
 import { isSameTiming } from "../../../core/utils.js";
 import { createAudioBufferPlayer } from "../../../player/AudioBufferPlayer.js";
 import { getTrackColour } from "../../../ui/track-colour.js";
-import { ArrangementPlayerContext } from "../arrangement/ArrangementViewer.js";
+import { ArrangementPlayerContext } from "../Arrangement/ArrangementViewer.js";
 import { ComponentBase, type IComponentProperties, type IComponentState } from "../ComponentBase/ComponentBase.js";
 import { AnimadaScoreBookContext, ServicesContext } from "../ScoreBookViewer.js";
 import { TouchHoldDetector } from "../TouchHoldDetector.js";
-import { TrackPlayerContext } from "../track/TrackViewer.js";
+import { TrackPlayerContext } from "../Track/TrackViewer.js";
 import { NoteStyleSymbolViewer } from "./NoteStyleSymbolViewer.js";
 
 const audioContext = new AudioContext();