From ba39d8aff636ed009ab3f4df812a911f829b65ac Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 1 Feb 2023 17:23:33 +0800 Subject: [PATCH] Revert some test iOS changes --- .../Views/WebReader/WebReaderContent.swift | 1 - .../Views/Article/OmnivoreWebView.swift | 21 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift index 0df5750b3..ab2cea59d 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift @@ -88,7 +88,6 @@ struct WebReaderContent { window.localStorage.setItem("theme", "\(themeKey)") window.prefersHighContrastFont = \(prefersHighContrastText) window.enableHighlightBar = \(isMacApp) - window.enableSelectToHighlight = true diff --git a/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift index a76c02c4b..7405e4777 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/OmnivoreWebView.swift @@ -196,17 +196,15 @@ public final class OmnivoreWebView: WKWebView { private func setDefaultMenu() { currentMenu = .defaultMenu - setHighlightMenu() + if #available(iOS 16.0, *) { + // on iOS16 we use menuBuilder to create these items + } else { + let annotate = UIMenuItem(title: "Annotate", action: #selector(annotateSelection)) + let highlight = UIMenuItem(title: LocalText.genericHighlight, action: #selector(highlightSelection)) + // let share = UIMenuItem(title: "Share", action: #selector(shareSelection)) -// if #available(iOS 16.0, *) { -// // on iOS16 we use menuBuilder to create these items -// } else { -// let annotate = UIMenuItem(title: "Annotate", action: #selector(annotateSelection)) -// let highlight = UIMenuItem(title: LocalText.genericHighlight, action: #selector(highlightSelection)) -// // let share = UIMenuItem(title: "Share", action: #selector(shareSelection)) -// -// UIMenuController.shared.menuItems = [highlight, /* share, */ annotate] -// } + UIMenuController.shared.menuItems = [highlight, /* share, */ annotate] + } } private func setHighlightMenu() { @@ -232,8 +230,7 @@ public final class OmnivoreWebView: WKWebView { } @objc func menuDidHide() { - // setDefaultMenu() - setHighlightMenu() + setDefaultMenu() } // swiftlint:disable:next line_length