Rocky
cdf833935a
Fix cold-start overlay recursion that overflowed the main-thread stack when recording began while the ready overlay was still up; also remove temporary on-screen Flow DEBUG panels after the orange-mic investigation, and land the macOS overlay/catalog/layout polish plus related Flow recovery hardening.
268 lines
10 KiB
Swift
268 lines
10 KiB
Swift
// MacDictionaryView.swift
|
||
// OSGKeyboard · Mac
|
||
//
|
||
// Personal dictionary synced via iCloud KVS. ScrollView is full-bleed
|
||
// (scrollbar on the window edge); title + cards share `pageHorizontalInset`.
|
||
|
||
import SwiftUI
|
||
|
||
struct MacDictionaryView: View {
|
||
@ObservedObject var viewModel: MacDictationViewModel
|
||
@Environment(\.themePalette) private var palette
|
||
@State private var query = ""
|
||
@State private var entryPendingDeletion: PersonalDictionary.Entry?
|
||
|
||
private var lang: AppUILanguage { viewModel.config.uiLanguage }
|
||
|
||
private var entries: [PersonalDictionary.Entry] {
|
||
_ = viewModel.dictionaryRevision
|
||
return AppGroupStore(defaults: viewModel.defaults).personalDictionary.entries
|
||
}
|
||
|
||
/// Entries filtered by the search field, grouped by category and sorted
|
||
/// (most-used first) — mirrors the iOS Personal Dictionary tab.
|
||
private var sections: [(category: PersonalDictionary.Entry.Category, items: [PersonalDictionary.Entry])] {
|
||
let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
|
||
let filtered: [PersonalDictionary.Entry]
|
||
if trimmed.isEmpty {
|
||
filtered = entries
|
||
} else {
|
||
filtered = entries.filter { entry in
|
||
entry.term.lowercased().contains(trimmed)
|
||
|| entry.aliases.contains { $0.lowercased().contains(trimmed) }
|
||
}
|
||
}
|
||
let grouped = Dictionary(grouping: filtered, by: { $0.category })
|
||
return PersonalDictionary.Entry.Category.allCases.compactMap { category in
|
||
guard let bucket = grouped[category], !bucket.isEmpty else { return nil }
|
||
let sorted = bucket.sorted {
|
||
if $0.usageCount != $1.usageCount { return $0.usageCount > $1.usageCount }
|
||
return $0.term.localizedCaseInsensitiveCompare($1.term) == .orderedAscending
|
||
}
|
||
return (category, sorted)
|
||
}
|
||
}
|
||
|
||
var body: some View {
|
||
VStack(spacing: 0) {
|
||
MacPageHeader(
|
||
title: MacL10n.string("mac.section.dictionary", language: lang),
|
||
subtitle: MacL10n.string("mac.page.dictionary.subtitle", language: lang)
|
||
) {
|
||
if !entries.isEmpty {
|
||
searchField
|
||
}
|
||
}
|
||
|
||
Group {
|
||
if entries.isEmpty {
|
||
emptyState
|
||
.transition(.opacity)
|
||
} else {
|
||
list
|
||
.transition(.opacity)
|
||
}
|
||
}
|
||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||
}
|
||
.background(palette.background)
|
||
.animation(Motion.soft, value: entries.isEmpty)
|
||
.task {
|
||
await MacICloudSyncBootstrap.dictionarySync.pullAndMergeIfEnabled()
|
||
viewModel.refreshDictionaryFromCloud()
|
||
}
|
||
.onReceive(NotificationCenter.default.publisher(for: .personalDictionaryDidSyncFromCloud)) { _ in
|
||
viewModel.refreshDictionaryFromCloud()
|
||
}
|
||
.confirmationDialog(
|
||
MacL10n.string("mac.dict.deleteTitle", language: lang),
|
||
isPresented: deletionDialogBinding,
|
||
titleVisibility: .visible
|
||
) {
|
||
Button(MacL10n.string("mac.delete", language: lang), role: .destructive) {
|
||
if let entry = entryPendingDeletion {
|
||
withAnimation(Motion.soft) { delete(entry) }
|
||
}
|
||
entryPendingDeletion = nil
|
||
}
|
||
Button(MacL10n.string("mac.cancel", language: lang), role: .cancel) {
|
||
entryPendingDeletion = nil
|
||
}
|
||
} message: {
|
||
Text(MacL10n.string("mac.dict.deleteMessage", language: lang))
|
||
}
|
||
}
|
||
|
||
// MARK: - List
|
||
|
||
private var list: some View {
|
||
// Full-bleed ScrollView → scrollbar on the detail pane's right edge.
|
||
ScrollView {
|
||
LazyVStack(alignment: .leading, spacing: Spacing.md) {
|
||
if sections.isEmpty {
|
||
MacCard {
|
||
Text(MacL10n.string("mac.dict.noMatch", language: lang))
|
||
.foregroundStyle(palette.textTertiary)
|
||
.frame(maxWidth: .infinity, alignment: .center)
|
||
}
|
||
} else {
|
||
ForEach(sections, id: \.category) { section in
|
||
categorySection(section)
|
||
}
|
||
}
|
||
}
|
||
.padding(.horizontal, MacMetrics.pageHorizontalInset)
|
||
.padding(.bottom, Spacing.md)
|
||
.animation(Motion.soft, value: query)
|
||
}
|
||
}
|
||
|
||
private func categorySection(
|
||
_ section: (category: PersonalDictionary.Entry.Category, items: [PersonalDictionary.Entry])
|
||
) -> some View {
|
||
VStack(alignment: .leading, spacing: Spacing.xs) {
|
||
Text(MacL10n.string(section.category.labelKey, language: lang))
|
||
.font(TypeStyle.caption)
|
||
.foregroundStyle(palette.textTertiary)
|
||
|
||
MacCard(padding: 0) {
|
||
VStack(spacing: 0) {
|
||
ForEach(Array(section.items.enumerated()), id: \.element.id) { index, entry in
|
||
row(entry)
|
||
.padding(.horizontal, Spacing.md)
|
||
.padding(.vertical, Spacing.sm)
|
||
if index < section.items.count - 1 {
|
||
// Full-bleed like macOS list rows (not iOS inset separators).
|
||
Divider()
|
||
.overlay(palette.divider)
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
private var deletionDialogBinding: Binding<Bool> {
|
||
Binding(
|
||
get: { entryPendingDeletion != nil },
|
||
set: { if !$0 { entryPendingDeletion = nil } }
|
||
)
|
||
}
|
||
|
||
private var searchField: some View {
|
||
HStack(spacing: Spacing.xs) {
|
||
Image(systemName: "magnifyingglass")
|
||
.foregroundStyle(palette.textTertiary)
|
||
TextField(MacL10n.string("mac.dict.search", language: lang), text: $query)
|
||
.textFieldStyle(.plain)
|
||
.font(TypeStyle.footnote)
|
||
}
|
||
.padding(.horizontal, Spacing.sm)
|
||
.padding(.vertical, 6)
|
||
.frame(width: 220)
|
||
.background(palette.surface, in: Capsule())
|
||
.overlay(Capsule().stroke(palette.divider, lineWidth: 0.5))
|
||
}
|
||
|
||
private func row(_ entry: PersonalDictionary.Entry) -> some View {
|
||
MacDictionaryRow(
|
||
entry: entry,
|
||
subtitle: subtitle(for: entry),
|
||
language: lang,
|
||
copy: { viewModel.copyToClipboard(entry.term) },
|
||
delete: { entryPendingDeletion = entry }
|
||
)
|
||
}
|
||
|
||
/// "Manual · ×3 · k8s / kube" — same metadata line as iOS.
|
||
private func subtitle(for entry: PersonalDictionary.Entry) -> String? {
|
||
var parts: [String] = [MacL10n.string(entry.source.labelKey, language: lang)]
|
||
if entry.usageCount > 1 {
|
||
parts.append("×\(entry.usageCount)")
|
||
}
|
||
if !entry.aliases.isEmpty {
|
||
parts.append(entry.aliases.joined(separator: " / "))
|
||
}
|
||
return parts.isEmpty ? nil : parts.joined(separator: " · ")
|
||
}
|
||
|
||
// MARK: - Empty state
|
||
|
||
private var emptyState: some View {
|
||
VStack(spacing: Spacing.sm) {
|
||
Image(systemName: "character.book.closed")
|
||
.font(.system(size: 34, weight: .light))
|
||
.foregroundStyle(palette.textTertiary.opacity(0.55))
|
||
.symbolRenderingMode(.hierarchical)
|
||
Text(MacL10n.string("mac.dict.empty", language: lang))
|
||
.font(TypeStyle.headline)
|
||
.foregroundStyle(palette.textSecondary)
|
||
Text(MacL10n.string("mac.dict.emptyBody", language: lang))
|
||
.font(TypeStyle.footnote)
|
||
.foregroundStyle(palette.textTertiary)
|
||
.multilineTextAlignment(.center)
|
||
.frame(maxWidth: 320)
|
||
}
|
||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||
}
|
||
|
||
private func delete(_ entry: PersonalDictionary.Entry) {
|
||
let store = AppGroupStore(defaults: viewModel.defaults)
|
||
store.deletePersonalDictionaryEntry(id: entry.id)
|
||
viewModel.refreshDictionaryFromCloud()
|
||
Task {
|
||
try? await MacICloudSyncBootstrap.dictionarySync.pushLocalIfEnabled(store.personalDictionary)
|
||
}
|
||
}
|
||
}
|
||
|
||
private struct MacDictionaryRow: View {
|
||
let entry: PersonalDictionary.Entry
|
||
let subtitle: String?
|
||
let language: AppUILanguage
|
||
let copy: () -> Void
|
||
let delete: () -> Void
|
||
|
||
@Environment(\.themePalette) private var palette
|
||
@State private var isHovering = false
|
||
|
||
var body: some View {
|
||
HStack(alignment: .top, spacing: Spacing.sm) {
|
||
VStack(alignment: .leading, spacing: 2) {
|
||
Text(entry.term)
|
||
.font(TypeStyle.body)
|
||
.foregroundStyle(palette.textPrimary)
|
||
.lineLimit(1)
|
||
if let subtitle {
|
||
Text(subtitle)
|
||
.font(TypeStyle.caption)
|
||
.foregroundStyle(palette.textTertiary)
|
||
.lineLimit(1)
|
||
}
|
||
}
|
||
Spacer(minLength: Spacing.sm)
|
||
Button(action: delete) {
|
||
Image(systemName: "trash")
|
||
.font(.system(size: 13, weight: .medium))
|
||
.frame(width: 24, height: 24)
|
||
}
|
||
.buttonStyle(.borderless)
|
||
.foregroundStyle(isHovering ? palette.danger : palette.textTertiary)
|
||
.opacity(isHovering ? 1 : 0)
|
||
.accessibilityLabel(MacL10n.string("mac.delete", language: language))
|
||
}
|
||
.frame(maxWidth: .infinity, alignment: .leading)
|
||
.contentShape(Rectangle())
|
||
.animation(Motion.quick, value: isHovering)
|
||
.onHover { isHovering = $0 }
|
||
.contextMenu {
|
||
Button(action: copy) {
|
||
Label(MacL10n.string("mac.copy", language: language), systemImage: "doc.on.doc")
|
||
}
|
||
Button(role: .destructive, action: delete) {
|
||
Label(MacL10n.string("mac.delete", language: language), systemImage: "trash")
|
||
}
|
||
}
|
||
}
|
||
}
|