typing fixes

Author: fa-sharp

packages/core/src/listeners/mouse.ts

@@ -339,19 +339,22 @@ function getCursorIcon({
           return getIcon("natural");
       }
     })();
-    const accidentalDiv = document.createElement("div");
-    accidentalDiv.innerHTML = accidentalSvg;
-    const svgEl = accidentalDiv.querySelector("svg");
-    if (svgEl)
-      Object.assign(svgEl.style, {
-        position: "absolute",
-        right: `${size * 0.65}px`,
-        top: `${size * 0.35}px`,
-        height: `${size * 0.7}px`,
-        width: `${size * 0.7}px`,
-        color: cursorIconColor,
-      });
-    div.appendChild(accidentalDiv);
+    // TODO add other accidental icons and remove if statement
+    if (accidentalSvg) {
+      const accidentalDiv = document.createElement("div");
+      accidentalDiv.innerHTML = accidentalSvg;
+      const svgEl = accidentalDiv.querySelector("svg");
+      if (svgEl)
+        Object.assign(svgEl.style, {
+          position: "absolute",
+          right: `${size * 0.65}px`,
+          top: `${size * 0.35}px`,
+          height: `${size * 0.7}px`,
+          width: `${size * 0.7}px`,
+          color: cursorIconColor,
+        });
+      div.appendChild(accidentalDiv);
+    }
   }
   if (dotted) {
     const dotDiv = document.createElement("div");

packages/core/src/state/index.ts

@@ -4,6 +4,7 @@ import {
   editorCommandReducer,
 } from "./EditorCommand";
 import EditorState from "./EditorState";
+import type { SelectionState } from "./SelectionManager";
 
 export { EditorState, editorCommandReducer };
-export type { EditorCommandAction, EditorCommandState };
+export type { EditorCommandAction, EditorCommandState, SelectionState };

packages/react/src/context/EditorContext.ts

@@ -1,23 +1,24 @@
 import {
-  Accidental,
-  EditorCommandState,
-  EditorState,
-  Rhythm,
-  editorCommandReducer,
-  setupKeyboardListener,
-  setupMIDIListener,
-  setupStaffMouseListeners,
+    Accidental,
+    EditorCommandState,
+    EditorState,
+    Rhythm,
+    type SelectionState,
+    editorCommandReducer,
+    setupKeyboardListener,
+    setupMIDIListener,
+    setupStaffMouseListeners,
 } from "@abc-editor/core";
 import type { AbcVisualParams, TuneObject } from "abcjs";
 import { renderAbc } from "abcjs";
 import { createProvider } from "puro";
 import {
-  useCallback,
-  useContext,
-  useEffect,
-  useReducer,
-  useRef,
-  useState,
+    useCallback,
+    useContext,
+    useEffect,
+    useReducer,
+    useRef,
+    useState,
 } from "react";
 import { EditorProps } from "../components/editor/Editor";
 
@@ -46,10 +47,9 @@ const useEditor = ({
   onChange = () => {},
   onNote,
 }: EditorProviderProps) => {
-  const [selectedNote, setSelectedNote] =
-    useState<EditorState["selected"]>(null);
+  const [selectedNote, setSelectedNote] = useState<SelectionState | null>(null);
 
-  const onSelected = useCallback((selected: EditorState["selected"]) => {
+  const onSelected = useCallback((selected: SelectionState | null) => {
     if (selected?.data?.note && selected.data.rhythm) {
       setSelectedNote(selected);
     } else setSelectedNote(null);