fixed strToKey issue when discarding the accidental part of the string

This commit is contained in:
Clément Le Bihan
2023-03-29 18:55:06 +02:00
parent 885c819ab5
commit d094c81418
3 changed files with 6 additions and 9 deletions
+1
View File
@@ -99,6 +99,7 @@ const Octave = (props: OctaveProps) => {
const isHighlighted = highlightedKey !== undefined;
const highlightColor =
highlightedKey?.bgColor ?? defaultHighlightColor;
console.log(key, highlightedNotes, highlightedKey, isHighlighted, highlightColor);
return (
<PianoKeyComp
key={i}
@@ -7,6 +7,8 @@ import {
NoteNameBehavior,
KeyPressStyle,
keyToStr,
strToKey,
HighlightedKey,
} from "../../models/Piano";
type VirtualPianoProps = Parameters<typeof Row>[0] & {
@@ -17,10 +19,8 @@ type VirtualPianoProps = Parameters<typeof Row>[0] & {
endOctave: number;
endNote: Note;
showNoteNames: NoteNameBehavior; // default "onpress"
highlightedNotes: Array<PianoKey | string>;
highlightedNotes: Array<HighlightedKey>;
highlightColor: string;
specialHighlightedNotes: Array<PianoKey | string>;
specialHighlightColor: string;
showOctaveNumbers: boolean;
keyPressStyle: KeyPressStyle;
vividKeyPressColor: string;
@@ -36,8 +36,6 @@ const VirtualPiano = ({
showNoteNames,
highlightedNotes,
highlightColor,
specialHighlightedNotes,
specialHighlightColor,
showOctaveNumbers,
keyPressStyle,
vividKeyPressColor,
@@ -94,10 +92,8 @@ VirtualPiano.defaultProps = {
endOctave: 2,
endNote: Note.B,
showNoteNames: NoteNameBehavior.onpress,
highlightedNotes: [{ key: Note.D }, { key: Note.G, bgColor: "blue" }],
highlightedNotes: [{ key: strToKey("D") }, { key: strToKey("A#"), bgColor: "#00FF00" }],
highlightColor: "red",
specialHighlightedNotes: [Note.D, Note.G],
specialHighlightColor: "blue",
showOctaveNumbers: true,
keyPressStyle: "subtle",
vividKeyPressColor: "red",
+1 -1
View File
@@ -46,7 +46,7 @@ export class PianoKey {
export const strToKey = (str: string): PianoKey => {
let note: Note;
switch (str[0]) {
switch (str.substring(0, 2)) {
case "C":
note = Note.C;
break;