Wire up search UI to JavaScript API

Author: dteoh

devdocs-macos/DocumentationViewController.swift

@@ -15,6 +15,7 @@ class DocumentationViewController:
     }
 
     private var webView: WKWebView!
+    private var searchCVC: SearchControlViewController!
 
     @objc dynamic var documentTitle: String?
     @objc dynamic var documentURL: URL?
@@ -46,6 +47,11 @@ class DocumentationViewController:
             userContentController.addUserScript(pageObserver)
         }
 
+        if let pageSearchScript = readUserScript("page-search") {
+            let pageSearch = WKUserScript(source: pageSearchScript, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
+            userContentController.addUserScript(pageSearch)
+        }
+
         if let uiSettingsScript = readUserScript("ui-settings") {
             let uiSettings = WKUserScript(source: uiSettingsScript, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
             userContentController.addUserScript(uiSettings)
@@ -67,9 +73,11 @@ class DocumentationViewController:
     }
 
     private func setupSearchControlView() {
-        let searchVC = SearchControlViewController()
+        // Need to store strong ref to the VC, or IBActions don't work
+        searchCVC = SearchControlViewController()
+        searchCVC.delegate = self
 
-        let searchView = searchVC.view
+        let searchView = searchCVC.view
         searchView.translatesAutoresizingMaskIntoConstraints = false
 
         webView.addSubview(searchView);
@@ -189,5 +197,17 @@ class DocumentationViewController:
         }
         self.documentURL = URL(string: location)
     }
+}
+
+// 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();")
+    }
 }

devdocs-macos/SearchControlView.xib

@@ -7,7 +7,6 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="SearchControlViewController" customModule="DevDocs" customModuleProvider="target">
             <connections>
-                <outlet property="searchField" destination="Sob-7j-rmS" id="63N-X7-5xX"/>
                 <outlet property="view" destination="c22-O7-iKe" id="8CF-Bz-17c"/>
             </connections>
         </customObject>
@@ -22,16 +21,13 @@
                     <subviews>
                         <searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sob-7j-rmS">
                             <rect key="frame" x="0.0" y="0.0" width="200" height="19"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="200" id="Zms-uK-vwr"/>
-                            </constraints>
                             <searchFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES" sendsWholeSearchString="YES" id="p9W-s3-2vm">
                                 <font key="font" metaFont="smallSystem"/>
                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </searchFieldCell>
                             <connections>
-                                <action selector="performSearch:" target="-2" id="C7J-uG-P9I"/>
+                                <action selector="performSearch:" target="-2" id="i8X-0A-USs"/>
                             </connections>
                         </searchField>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NIJ-J2-h3b">
@@ -44,7 +40,7 @@
                                 <font key="font" metaFont="smallSystem"/>
                             </buttonCell>
                             <connections>
-                                <action selector="dismissSearch:" target="-2" id="uF4-ir-bYe"/>
+                                <action selector="dismissSearch:" target="-2" id="qfV-XO-2d2"/>
                             </connections>
                         </button>
                     </subviews>

devdocs-macos/SearchControlViewController.swift

@@ -1,7 +1,6 @@
 import Cocoa
 
 class SearchControlViewController: NSViewController {
-    @IBOutlet weak var searchField: NSSearchField?
     weak var delegate: SearchControlDelegate?
 
     init() {
@@ -19,8 +18,8 @@ class SearchControlViewController: NSViewController {
         view.layer?.backgroundColor = NSColor.windowBackgroundColor.cgColor
     }
 
-    @IBAction func performSearch(_ sender: Any) {
-        let searchTerm = (searchField?.stringValue ?? "")
+    @IBAction func performSearch(_ searchField: NSSearchField) {
+        let searchTerm = searchField.stringValue
             .trimmingCharacters(in: .whitespacesAndNewlines)
         if (searchTerm.isEmpty) {
             return