From d1cc258cdb20a594bc1a20a1fbd340848274595d Mon Sep 17 00:00:00 2001 From: Alex Rodionov Date: Wed, 24 Jul 2024 21:08:52 -0700 Subject: [PATCH] Prevent copied links from being clickable --- Maccy/Views/FooterItemView.swift | 9 +++------ Maccy/Views/HistoryItemView.swift | 5 +++-- Maccy/Views/ListItemTitleView.swift | 7 +++---- Maccy/Views/ListItemView.swift | 10 +++------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Maccy/Views/FooterItemView.swift b/Maccy/Views/FooterItemView.swift index 9c83d191..dbec6985 100644 --- a/Maccy/Views/FooterItemView.swift +++ b/Maccy/Views/FooterItemView.swift @@ -8,12 +8,9 @@ struct FooterItemView: View { var body: some View { ConfirmationView(item: item) { - ListItemView( - id: item.id, - title: item.title, - shortcuts: item.shortcuts, - isSelected: item.isSelected - ) + ListItemView(id: item.id, shortcuts: item.shortcuts, isSelected: item.isSelected) { + Text(LocalizedStringKey(item.title)) + } } } } diff --git a/Maccy/Views/HistoryItemView.swift b/Maccy/Views/HistoryItemView.swift index 4d465a26..587aa284 100644 --- a/Maccy/Views/HistoryItemView.swift +++ b/Maccy/Views/HistoryItemView.swift @@ -12,10 +12,11 @@ struct HistoryItemView: View { id: item.id, image: item.thumbnailImage ?? ColorImage.from(item.title), attributedTitle: item.attributedTitle, - title: item.title, shortcuts: item.shortcuts, isSelected: item.isSelected - ) + ) { + Text(verbatim: item.title) + } .onTapGesture { appState.history.select(item) } diff --git a/Maccy/Views/ListItemTitleView.swift b/Maccy/Views/ListItemTitleView.swift index 22510952..d99d724b 100644 --- a/Maccy/Views/ListItemTitleView.swift +++ b/Maccy/Views/ListItemTitleView.swift @@ -1,9 +1,9 @@ import SwiftUI -struct ListItemTitleView: View { +struct ListItemTitleView: View { var attributedTitle: AttributedString? = nil - var title: String var isSelected: Bool + @ViewBuilder var title: () -> Title var body: some View { if let attributedTitle { @@ -12,11 +12,10 @@ struct ListItemTitleView: View { .truncationMode(.middle) .padding(.leading, 10) } else { - Text(LocalizedStringKey(title)) + title() .lineLimit(1) .truncationMode(.middle) .padding(.leading, 10) - .tint(isSelected ? .white : .primary) } } } diff --git a/Maccy/Views/ListItemView.swift b/Maccy/Views/ListItemView.swift index 0c5d3e9b..26016087 100644 --- a/Maccy/Views/ListItemView.swift +++ b/Maccy/Views/ListItemView.swift @@ -1,14 +1,14 @@ import Defaults import SwiftUI -struct ListItemView: View { +struct ListItemView: View { var id: UUID var image: NSImage? = nil var attributedTitle: AttributedString? = nil - var title: String var shortcuts: [KeyShortcut] var isSelected: Bool var help: LocalizedStringKey? = nil + @ViewBuilder var title: () -> Title @Environment(AppState.self) private var appState @Environment(ModifierFlags.self) private var modifierFlags @@ -21,11 +21,7 @@ struct ListItemView: View { .padding(.leading, 10) .padding(.vertical, 5) } else { - ListItemTitleView( - attributedTitle: attributedTitle, - title: title, - isSelected: isSelected - ) + ListItemTitleView(attributedTitle: attributedTitle, isSelected: isSelected, title: title) } Spacer() if !shortcuts.isEmpty {