Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1846 ノートのエラー時にツールチップ表示 #1893

Merged
merged 4 commits into from
Mar 16, 2024
Merged

#1846 ノートのエラー時にツールチップ表示 #1893

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ba9055
#1864 ノートのエラー時にツールチップを表示する
Mar 3, 2024
9f8b7b1
Update src/components/Sing/SequencerNote.vue
romot-co Mar 6, 2024
e9f724e
Update src/components/Sing/SequencerNote.vue
romot-co Mar 6, 2024
8c7c805
Update src/components/Sing/SequencerNote.vue
romot-co Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 63 additions & 11 deletions src/components/Sing/SequencerNote.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
class="note"
:class="{
selected: noteState === 'SELECTED',
overlapping: noteState === 'OVERLAPPING',
overlapping: hasOverlappingError,
'invalid-phrase': hasPhraseError,
'below-pitch': showPitch,
}"
:style="{
Expand Down Expand Up @@ -35,6 +36,29 @@
@keydown.stop="onLyricInputKeyDown"
@blur="onLyricInputBlur"
/>
<template v-else>
<!-- エラー内容を表示 -->
<QTooltip
v-if="hasOverlappingError"
anchor="bottom left"
self="top left"
:offset="[0, 8]"
transition-show=""
transition-hide=""
>
ノートが重なっています
</QTooltip>
<QTooltip
v-if="hasPhraseError"
anchor="bottom left"
self="top left"
:offset="[0, 8]"
transition-show=""
transition-hide=""
>
フレーズが生成できません。歌詞は日本語1文字までです。
</QTooltip>
</template>
</div>
</template>

Expand All @@ -50,7 +74,7 @@ import {
import ContextMenu from "@/components/Menu/ContextMenu.vue";
import { MenuItemButton } from "@/components/Menu/type";

type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
type NoteState = "NORMAL" | "SELECTED";

const vFocus = {
mounted(el: HTMLInputElement) {
Expand Down Expand Up @@ -102,11 +126,24 @@ const noteState = computed((): NoteState => {
if (props.isSelected) {
return "SELECTED";
}
if (state.overlappingNoteIds.has(props.note.id)) {
return "OVERLAPPING";
}
return "NORMAL";
});

// ノートの重なりエラー
const hasOverlappingError = computed(() => {
return state.overlappingNoteIds.has(props.note.id);
});

// フレーズ生成エラー
const hasPhraseError = computed(() => {
// エラーがあるフレーズに自身が含まれているか
return Array.from(state.phrases.values()).some(
(phrase) =>
phrase.state === "COULD_NOT_RENDER" &&
phrase.notes.some((note) => note.id === props.note.id)
);
});

const lyric = computed({
get() {
return props.note.lyric;
Expand Down Expand Up @@ -209,19 +246,32 @@ const onLyricInputBlur = () => {
&.selected {
// 色は仮
.note-bar {
background-color: hsl(33, 100%, 50%);
background-color: hsl(130, 35%, 90%);
border: 2px solid colors.$primary;
}

&.below-pitch {
.note-bar {
background-color: rgba(hsl(33, 100%, 50%), 0.18);
background-color: rgba(hsl(130, 100%, 50%), 0.18);
}
}
}

&.overlapping {
&.overlapping,
&.invalid-phrase {
.note-bar {
background-color: hsl(130, 35%, 85%);
background-color: rgba(colors.$warning-rgb, 0.5);
}

.note-lyric {
opacity: 0.6;
}

&.selected {
.note-bar {
background-color: rgba(colors.$warning-rgb, 0.5);
border-color: colors.$warning;
}
}
}
}
Expand Down Expand Up @@ -274,8 +324,10 @@ const onLyricInputBlur = () => {
position: absolute;
bottom: 0;
font-weight: 700;
width: 2rem;
border: 1px solid hsl(33, 100%, 73%);
min-width: 3rem;
max-width: 6rem;
border: 0;
outline: 2px solid colors.$primary;
border-radius: 0.25rem;
}
</style>
Loading