Better way to hack AppKitSearchField

Author: cyanzhong

MarkEditMac/Modules/Sources/AppKitControls/LabeledSearchField.swift

@@ -65,24 +65,13 @@ public final class LabeledSearchField: NSSearchField {
     }
 
     // To completely remove the unnecessary capsule-style border
-    if modernStyle {
-      #if DEBUG
-        var hasAppKitSearchField = false
-      #endif
-
-      enumerateDescendants { view in
-        if view.className.contains("AppKitSearchField") {
-          #if DEBUG
-            hasAppKitSearchField = true
-          #endif
-          renderCustomIcons(modernBezel: view)
-        }
-      }
-
-      #if DEBUG
-        assert(hasAppKitSearchField, "Missing AppKitSearchField in NSSearchField")
-      #endif
+    if modernStyle, let view = modernBezelView {
+      renderCustomIcons(modernBezel: view)
     }
+
+    #if DEBUG
+      assert(!modernStyle || modernBezelView != nil, "Missing AppKitSearchField in NSSearchField")
+    #endif
   }
 
   override public func draw(_ dirtyRect: NSRect) {

MarkEditMac/Modules/Sources/AppKitExtensions/UI/NSSearchField+Extension.swift

@@ -12,6 +12,12 @@ public extension NSSearchField {
     subviews.first { $0.className.hasSuffix("FocusClipView") }
   }
 
+  var modernBezelView: NSView? {
+    firstDescendant {
+      $0.className.contains("AppKitSearchField")
+    }
+  }
+
   var searchButtonCell: NSButtonCell? {
     (cell as? NSSearchFieldCell)?.searchButtonCell
   }

MarkEditMac/Modules/Tests/RuntimeTests.swift

@@ -63,6 +63,22 @@ final class RuntimeTests: XCTestCase {
     testExistenceOfSelector(object: NSImage(), selector: "_setTintColor:")
   }
 
+  func testExistenceOfAppKitSearchField() {
+    let window = NSWindow()
+    window.makeKeyAndOrderFront(nil)
+
+    let searchField = NSSearchField()
+    window.contentView?.addSubview(searchField)
+
+    let expectation = XCTestExpectation()
+    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+      expectation.fulfill()
+    }
+
+    wait(for: [expectation])
+    XCTAssertNotNil(searchField.modernBezelView)
+  }
+
   func testRetrievingPopover() {
     class ContentViewController: NSViewController {
       override func loadView() {