Remove SearchControlView

Author: dteoh

DevDocs.xcodeproj/project.pbxproj

@@ -21,8 +21,6 @@
 		06B5A73621D36637007823B2 /* DefaultsKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 06B5A73421D36637007823B2 /* DefaultsKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		06B5A73921D3665C007823B2 /* DefaultsKit.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 06B5A73821D3665C007823B2 /* DefaultsKit.framework.dSYM */; };
 		06B5A73B21D36680007823B2 /* Storage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B5A73A21D36680007823B2 /* Storage.swift */; };
-		06CAA19D230D11EA00BBC1DE /* SearchControlView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 06CAA19C230D11EA00BBC1DE /* SearchControlView.xib */; };
-		06CAA19F230D15B800BBC1DE /* SearchControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CAA19E230D15B800BBC1DE /* SearchControlViewController.swift */; };
 		06CAA897223E6ACB00B296AC /* URLEventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06CAA896223E6ACB00B296AC /* URLEventHandler.swift */; };
 		06EAE7ED21D0CB3D00F7C921 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06EAE7EC21D0CB3D00F7C921 /* AppDelegate.swift */; };
 		06EAE7EF21D0CB3E00F7C921 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 06EAE7EE21D0CB3E00F7C921 /* Assets.xcassets */; };
@@ -72,8 +70,6 @@
 		06B5A73421D36637007823B2 /* DefaultsKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DefaultsKit.framework; path = Carthage/Build/Mac/DefaultsKit.framework; sourceTree = "<group>"; };
 		06B5A73821D3665C007823B2 /* DefaultsKit.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = DefaultsKit.framework.dSYM; path = Carthage/Build/Mac/DefaultsKit.framework.dSYM; sourceTree = "<group>"; };
 		06B5A73A21D36680007823B2 /* Storage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storage.swift; sourceTree = "<group>"; };
-		06CAA19C230D11EA00BBC1DE /* SearchControlView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchControlView.xib; sourceTree = "<group>"; };
-		06CAA19E230D15B800BBC1DE /* SearchControlViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchControlViewController.swift; sourceTree = "<group>"; };
 		06CAA896223E6ACB00B296AC /* URLEventHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLEventHandler.swift; sourceTree = "<group>"; };
 		06EAE7E921D0CB3D00F7C921 /* DevDocs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DevDocs.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		06EAE7EC21D0CB3D00F7C921 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -144,8 +140,6 @@
 				06EAE7F021D0CB3E00F7C921 /* MainMenu.xib */,
 				06996D3A223DEF54001507AD /* PreferencesWindowController.swift */,
 				06996D3B223DEF54001507AD /* PreferencesWindowController.xib */,
-				06CAA19C230D11EA00BBC1DE /* SearchControlView.xib */,
-				06CAA19E230D15B800BBC1DE /* SearchControlViewController.swift */,
 				06B5A73A21D36680007823B2 /* Storage.swift */,
 				06996D2C223DDBEB001507AD /* Summoner.swift */,
 				06CAA896223E6ACB00B296AC /* URLEventHandler.swift */,
@@ -222,7 +216,6 @@
 				6F4E7DD5223DBDB70074E6F1 /* MASShortcut.framework.dSYM in Resources */,
 				06B5A71A21D2013D007823B2 /* user-scripts in Resources */,
 				06EAE7F221D0CB3E00F7C921 /* MainMenu.xib in Resources */,
-				06CAA19D230D11EA00BBC1DE /* SearchControlView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -233,7 +226,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06CAA19F230D15B800BBC1DE /* SearchControlViewController.swift in Sources */,
 				06996D2D223DDBEB001507AD /* Summoner.swift in Sources */,
 				06EAE7FF21D0FA4000F7C921 /* DocumentationViewController.swift in Sources */,
 				06996D3C223DEF54001507AD /* PreferencesWindowController.swift in Sources */,

devdocs-macos/DocumentationViewController.swift

@@ -20,7 +20,6 @@ class DocumentationViewController: NSViewController {
 
     weak var delegate: DocumentationViewDelegate?
     private var webView: WKWebView!
-    private var searchCVC: SearchControlViewController?
 
     private(set) var documentTitle: String? {
         didSet {
@@ -42,7 +41,6 @@ class DocumentationViewController: NSViewController {
         super.viewDidLoad()
         self.viewerState = .initializing
         setupWebView()
-        setupSearchControlView()
         loadWebsite()
     }
 
@@ -85,24 +83,6 @@ class DocumentationViewController: NSViewController {
         ])
     }
 
-    private func setupSearchControlView() {
-        // Need to store strong ref to the VC, or IBActions don't work
-        let searchCVC = SearchControlViewController()
-        searchCVC.delegate = self
-
-        let searchView = searchCVC.view
-        searchView.translatesAutoresizingMaskIntoConstraints = false
-        searchView.isHidden = true
-
-        webView.addSubview(searchView);
-        NSLayoutConstraint.activate([
-            searchView.widthAnchor.constraint(equalToConstant: 270),
-            searchView.rightAnchor.constraint(equalTo: webView.rightAnchor)
-        ])
-
-        self.searchCVC = searchCVC
-    }
-
     private func loadWebsite() {
         let request = URLRequest(url: documentURL!)
         webView.load(request)
@@ -116,19 +96,6 @@ class DocumentationViewController: NSViewController {
         webView.evaluateJavaScript("search( (\(args))[\"term\"] );")
     }
 
-    func showSearchControl() {
-        if viewerState != .ready {
-            return
-        }
-        guard let vc = searchCVC else { return }
-        vc.activate()
-    }
-
-    func hideSearchControl() {
-        guard let vc = searchCVC else { return }
-        vc.dismissSearch(self)
-    }
-
     // MARK:- JS integration
 
     func useNativeScrollbars(_ using: Bool) {
@@ -198,7 +165,7 @@ class DocumentationViewController: NSViewController {
             return
         }
         self.documentURL = URL(string: location)
-        hideSearchControl()
+        // TODO: reset search
     }
 
     private func handleAppReboot() {
@@ -298,19 +265,6 @@ extension DocumentationViewController: WKScriptMessageHandler {
     }
 }
 
-// MARK:- SearchControlDelegate
-extension DocumentationViewController: SearchControlDelegate {
-    func search(term: String) {
-        let argsBytes = try! JSONSerialization.data(withJSONObject: ["term": term])
-        let args = NSString(data: argsBytes, encoding: String.Encoding.utf8.rawValue)! as String
-        webView.evaluateJavaScript("search( (\(args))[\"term\"] );")
-    }
-
-    func dismiss() {
-        webView.evaluateJavaScript("resetSearch();")
-    }
-}
-
 // MARK:- NSSearchFieldDelegate
 extension DocumentationViewController: NSSearchFieldDelegate {
     func searchFieldDidEndSearching(_ sender: NSSearchField) {

devdocs-macos/DocumentationWindowController.swift

@@ -75,8 +75,7 @@ class DocumentationWindowController: NSWindowController {
             return
         }
 
-        guard let dvc = documentationViewController else { return }
-        dvc.showSearchControl()
+        // TODO: focus search field
     }
 }