feat: update notation chord entry workflow

CHANGELOG.md

@@ -8,6 +8,7 @@ development artifact builds use `vMAJOR.MINOR.PATCH-dev.N`.
 
 ## Unreleased
 
+- Changed notation harmony entry so beat slashes are selectable and Cmd+K opens chord input for the selected beat.
 - Added notation measure range selection with Shift-click, Cmd+C/Cmd+V measure copy and replace-paste for harmony contents, and Esc to clear the selection.
 - Improved notation measure range selection so adjacent selected measures draw as one continuous frame.
 - Added boxed Region start labels to Notation in the timeline track and Notation window.

JammLab/ContentView.swift

@@ -185,6 +185,9 @@ struct ContentView: View {
         if !viewModel.hasSelectedNotationMeasures {
             hotkeys.remove(.clearNotationMeasureSelection)
         }
+        if !viewModel.canEditSelectedNotationBeat {
+            hotkeys.remove(.editHarmonyAtSelectedBeat)
+        }
         return hotkeys
     }
 
@@ -234,6 +237,8 @@ struct ContentView: View {
         case .clearNotationMeasureSelection:
             viewModel.clearNotationMeasureSelection()
             return true
+        case .editHarmonyAtSelectedBeat:
+            return viewModel.requestEditSelectedNotationBeat()
         }
     }
 

JammLab/DesignSystem/AppTheme.swift

@@ -275,6 +275,8 @@ enum AppTheme {
         static let notationHarmonyAnchorLeadingOffset: CGFloat = AppTheme.Spacing.md
         static let notationHarmonySymbolWidth: CGFloat = 84
         static let notationHarmonyEditorWidth: CGFloat = 64
+        static let notationHarmonyEditorMinWidth: CGFloat = 38
+        static let notationHarmonyEditorMaxWidth: CGFloat = 104
         static let notationRegionLabelMaxWidth: CGFloat = 88
         static let notationRegionLabelHeight: CGFloat = 16
         static let notationRegionLabelFontSize: CGFloat = 10

JammLab/Models/NotationScoreModels.swift

@@ -79,6 +79,34 @@ struct NotationMeasureSelection: Equatable, Identifiable {
     }
 }
 
+struct NotationBeatSelection: Equatable, Identifiable {
+    var measureNumber: Int
+    var measureStartTime: TimeInterval
+    var measureEndTime: TimeInterval
+    var attributes: MeasureAttributes
+    var offsetInQuarterNotes: Double
+
+    init(measure: ScoreMeasure, offsetInQuarterNotes: Double) {
+        self.measureNumber = measure.number
+        self.measureStartTime = measure.startTime
+        self.measureEndTime = measure.endTime
+        self.attributes = measure.attributes
+        self.offsetInQuarterNotes = offsetInQuarterNotes
+    }
+
+    var id: String {
+        "\(measureNumber)-\(measureStartTime)-\(measureEndTime)-\(offsetInQuarterNotes)"
+    }
+
+    func matches(_ measure: ScoreMeasure, offsetInQuarterNotes offset: Double) -> Bool {
+        measureNumber == measure.number
+            && abs(measureStartTime - measure.startTime) < NotationMeasureTiming.timelineTolerance
+            && abs(measureEndTime - measure.endTime) < NotationMeasureTiming.timelineTolerance
+            && attributes == measure.attributes
+            && abs(offsetInQuarterNotes - offset) < NotationMeasureTiming.timelineTolerance
+    }
+}
+
 struct NotationMeasureClipboard: Equatable {
     var measures: [NotationMeasureClipboardMeasure]
 }

JammLab/Utilities/AppHotkey.swift

@@ -16,6 +16,7 @@ enum AppHotkey: CaseIterable, Hashable {
     case copyMeasure
     case pasteMeasure
     case clearNotationMeasureSelection
+    case editHarmonyAtSelectedBeat
 
     // Keep this enum as the single source of truth for keyboard shortcuts.
     // When adding a new handled hotkey, add a case here with its help metadata
@@ -30,6 +31,8 @@ enum AppHotkey: CaseIterable, Hashable {
             self = .copyMeasure
         case (9, [.command]):
             self = .pasteMeasure
+        case (40, [.command]):
+            self = .editHarmonyAtSelectedBeat
         case (1, [.option]):
             self = .toggleSnap
         case (9, [.option]):
@@ -100,6 +103,8 @@ enum AppHotkey: CaseIterable, Hashable {
             return "Cmd+V"
         case .clearNotationMeasureSelection:
             return "Esc"
+        case .editHarmonyAtSelectedBeat:
+            return "Cmd+K"
         }
     }
 
@@ -133,6 +138,8 @@ enum AppHotkey: CaseIterable, Hashable {
             return "Paste Measure"
         case .clearNotationMeasureSelection:
             return "Clear Measure Selection"
+        case .editHarmonyAtSelectedBeat:
+            return "Edit Harmony"
         }
     }
 
@@ -166,6 +173,8 @@ enum AppHotkey: CaseIterable, Hashable {
             return "Replace the selected notation measure with the copied measure contents."
         case .clearNotationMeasureSelection:
             return "Clear the selected notation measure or measure range."
+        case .editHarmonyAtSelectedBeat:
+            return "Open harmony entry for the selected notation beat."
         }
     }
 }

JammLab/ViewModels/AudioPlayerViewModel+Notes.swift

@@ -49,10 +49,49 @@ extension AudioPlayerViewModel {
         pendingHarmonyEditorRequest = HarmonyEditorRequest(time: placement.time)
     }
 
+    @discardableResult
+    func requestEditSelectedNotationBeat() -> Bool {
+        guard duration > 0,
+              let selection = selectedNotationBeat,
+              let placement = harmonyPlacement(for: selection)
+        else {
+            clearNotationBeatSelection()
+            return false
+        }
+
+        selectedNotationBeat = NotationBeatSelection(
+            measure: placement.measure,
+            offsetInQuarterNotes: placement.harmonyPlacement.offsetInQuarterNotes
+        )
+        selectedHarmonySymbolID = harmonySymbolID(at: placement.harmonyPlacement.time)
+        pendingHarmonyEditorRequest = HarmonyEditorRequest(time: placement.harmonyPlacement.time)
+        return true
+    }
+
     func selectHarmonySymbol(id: HarmonySymbol.ID?) {
         selectedHarmonySymbolID = availableHarmonySymbolID(id)
     }
 
+    func selectNotationBeat(_ selection: NotationBeatSelection?) {
+        guard let selection else {
+            clearNotationBeatSelection()
+            return
+        }
+
+        selectedNotationBeat = selection
+        selectedNotationMeasures = []
+        notationMeasureSelectionAnchor = nil
+        if let placement = harmonyPlacement(for: selection) {
+            selectedHarmonySymbolID = harmonySymbolID(at: placement.harmonyPlacement.time)
+        } else {
+            selectedHarmonySymbolID = nil
+        }
+    }
+
+    func clearNotationBeatSelection() {
+        selectedNotationBeat = nil
+    }
+
     var canCopySelectedNotationMeasure: Bool {
         !currentSelectedNotationMeasures().isEmpty
     }
@@ -66,6 +105,10 @@ extension AudioPlayerViewModel {
         !selectedNotationMeasures.isEmpty
     }
 
+    var canEditSelectedNotationBeat: Bool {
+        duration > 0 && selectedNotationBeat != nil
+    }
+
     func selectNotationMeasure(_ measure: ScoreMeasure?, extendingSelection: Bool = false) {
         guard let measure else {
             clearNotationMeasureSelection()
@@ -87,12 +130,14 @@ extension AudioPlayerViewModel {
             notationMeasureSelectionAnchor = NotationMeasureSelection(measure: measure)
         }
         selectedHarmonySymbolID = nil
+        selectedNotationBeat = nil
     }
 
     func clearNotationMeasureSelection() {
         selectedNotationMeasures = []
         notationMeasureSelectionAnchor = nil
         selectedHarmonySymbolID = nil
+        selectedNotationBeat = nil
     }
 
     func clearNotationMeasureSelectionAndClipboard() {
@@ -136,6 +181,7 @@ extension AudioPlayerViewModel {
 
         guard currentItemsByMeasure != pastedItemsByMeasure else {
             selectedHarmonySymbolID = nil
+            selectedNotationBeat = nil
             selectedNotationMeasures = targetMeasures.map(NotationMeasureSelection.init)
             notationMeasureSelectionAnchor = selectedNotationMeasures.first
             return true
@@ -164,6 +210,7 @@ extension AudioPlayerViewModel {
 
             harmonySymbols = ProjectStateNormalizer.normalizedHarmonySymbols(harmonySymbols, duration: duration)
             selectedHarmonySymbolID = nil
+            selectedNotationBeat = nil
             selectedNotationMeasures = targetMeasures.map(NotationMeasureSelection.init)
             notationMeasureSelectionAnchor = selectedNotationMeasures.first
         }
@@ -515,6 +562,32 @@ extension AudioPlayerViewModel {
         )
     }
 
+    private func harmonyPlacement(
+        for selection: NotationBeatSelection
+    ) -> (measure: ScoreMeasure, harmonyPlacement: HarmonyPlacement)? {
+        guard let measure = currentNotationScoreMeasures().first(where: { measure in
+            selection.matches(measure, offsetInQuarterNotes: selection.offsetInQuarterNotes)
+        }) else {
+            return nil
+        }
+        guard NotationMeasureTiming.isValidHarmonyOffset(
+            selection.offsetInQuarterNotes,
+            in: measure.attributes.timeSignature
+        ) else {
+            return nil
+        }
+
+        let time = NotationMeasureTiming.time(forQuarterOffset: selection.offsetInQuarterNotes, in: measure)
+        return (
+            measure,
+            HarmonyPlacement(
+                time: max(0, min(time, max(0, duration.nextDown))),
+                measureNumber: measure.number,
+                offsetInQuarterNotes: selection.offsetInQuarterNotes
+            )
+        )
+    }
+
     private func harmonySymbolID(at time: TimeInterval) -> HarmonySymbol.ID? {
         harmonySymbols.first { sameHarmonyPosition($0.time, time) }?.id
     }

JammLab/ViewModels/AudioPlayerViewModel+Project.swift

@@ -501,6 +501,7 @@ extension AudioPlayerViewModel {
                     beatGridSettings.firstBeatTime = 0
                     beatGridSettings.alignmentSource = .automatic
                     beatGridSettings.lastChangedAt = Date()
+                    clearNotationMeasureSelection()
                     applyTempoMapToPlaybackEngine()
                     playbackEngine.setClickEnabled(isClickEnabled && beatGridSettings.bpm != nil)
                     if !isProjectModified {

JammLab/ViewModels/AudioPlayerViewModel+UndoDirty.swift

@@ -76,6 +76,7 @@ extension AudioPlayerViewModel {
         projectKeySelection = state.projectKeySelection
         selectedRegionID = availableRegionID(state.selectedRegionID)
         selectedHarmonySymbolID = availableHarmonySymbolID(state.selectedHarmonySymbolID)
+        selectedNotationBeat = nil
         activeLoopRegionID = availableRegionID(state.activeLoopRegionID)
         loopRegion = state.loopRegion.clamped(to: duration, minimumLength: activeRangeMinimumLength)
         stemMixState = state.stemMixState

JammLab/ViewModels/AudioPlayerViewModel.swift

@@ -41,6 +41,7 @@ final class AudioPlayerViewModel: ObservableObject {
     @Published var selectedRegionID: TimecodedNote.ID?
     @Published var selectedHarmonySymbolID: HarmonySymbol.ID?
     @Published var selectedNotationMeasures: [NotationMeasureSelection] = []
+    @Published var selectedNotationBeat: NotationBeatSelection?
     @Published var notationMeasureClipboard: NotationMeasureClipboard?
     @Published var harmonyInputResolutionDenominator = HarmonyInputResolution.defaultDenominator
     @Published var pendingHarmonyEditorRequest: HarmonyEditorRequest?

JammLab/Views/MainWorkspacePanels.swift

@@ -131,6 +131,7 @@ extension ContentView {
             notes: viewModel.notes,
             selectedHarmonySymbolID: viewModel.selectedHarmonySymbolID,
             selectedNotationMeasures: viewModel.selectedNotationMeasures,
+            selectedNotationBeat: viewModel.selectedNotationBeat,
             harmonyInputResolutionDenominator: viewModel.harmonyInputResolutionDenominator,
             pendingHarmonyEditorRequest: viewModel.pendingHarmonyEditorRequest,
             selectedRegionID: viewModel.selectedRegionID,
@@ -186,6 +187,7 @@ extension ContentView {
             harmonyInputResolutionChanged: { viewModel.setHarmonyInputResolutionDenominator($0) },
             selectHarmony: { viewModel.selectHarmonySymbol(id: $0) },
             selectNotationMeasure: { viewModel.selectNotationMeasure($0, extendingSelection: $1) },
+            selectNotationBeat: { viewModel.selectNotationBeat($0) },
             saveHarmony: { viewModel.saveHarmonySymbol($0) },
             deleteHarmony: { viewModel.deleteHarmonySymbol(id: $0) },
             adjacentHarmonyPlacement: { viewModel.adjacentHarmonyPlacement(from: $0, direction: $1) },

JammLab/Views/NotationHarmonyInlineTextField.swift

@@ -9,12 +9,16 @@ struct HarmonyInlineTextField: NSViewRepresentable {
 
     func makeNSView(context: Context) -> HarmonyInlineNSTextField {
         let textField = HarmonyInlineNSTextField(string: text)
-        textField.isBordered = true
-        textField.isBezeled = true
-        textField.bezelStyle = .roundedBezel
-        textField.focusRingType = .default
+        textField.isBordered = false
+        textField.isBezeled = false
+        textField.drawsBackground = false
+        textField.backgroundColor = .clear
+        textField.focusRingType = .none
         textField.delegate = context.coordinator
         textField.font = .systemFont(ofSize: 13, weight: .semibold)
+        textField.textColor = .controlAccentColor
+        textField.lineBreakMode = .byClipping
+        textField.cell?.isScrollable = true
         textField.onWindowAttached = { [weak coordinator = context.coordinator, weak textField] in
             guard let textField else { return }
             coordinator?.focusAndSelectIfNeeded(textField)
@@ -27,6 +31,7 @@ struct HarmonyInlineTextField: NSViewRepresentable {
         if nsView.stringValue != text {
             nsView.stringValue = text
         }
+        nsView.invalidateIntrinsicContentSize()
         context.coordinator.focusAndSelectIfNeeded(nsView)
     }