X-Git-Url: https://git.r.bdr.sh/rbdr/map/blobdiff_plain/98f09799b699b453e2fc057c888ead447b319b11..144915635bdfc90445321189914929a911fe77d4:/Map/Presentation/MapEditor.swift?ds=sidebyside

diff --git a/Map/Presentation/MapEditor.swift b/Map/Presentation/MapEditor.swift
index 8c5ab22..d7c93dd 100644
--- a/Map/Presentation/MapEditor.swift
+++ b/Map/Presentation/MapEditor.swift
@@ -20,18 +20,75 @@ struct MapEditor: View {
   @Binding var document: MapDocument
   var url: URL?
   @State var selectedEvolution: StageType = .behavior
+  @State var isSearching: Bool = false
 
   @AppStorage("viewStyle") var viewStyle: ViewStyle = .horizontal
 
   let zoomRange = Constants.kMinZoom...Constants.kMaxZoom
   @AppStorage("zoom") var zoom = 1.0
   @State var lastZoom = 1.0
+  @State var searchTerm = ""
+  @State var selectedTerm = 0
+
+  var results: [Range<String.Index>] {
+    if !isSearching || searchTerm.isEmpty {
+      return []
+    }
+    let options: NSString.CompareOptions = [.caseInsensitive, .diacriticInsensitive]
+    var searchRange = document.text.startIndex..<document.text.endIndex
+    var ranges: [Range<String.Index>] = []
+
+    while let range = document.text.range(of: searchTerm, options: options, range: searchRange) {
+      ranges.append(range)
+      searchRange = range.upperBound..<document.text.endIndex
+    }
+
+    return ranges
+
+  }
 
   var body: some View {
     VStack(spacing: 0) {
+      if isSearching {
+        SearchBar(
+          term: $searchTerm,
+          onNext: {
+            withAnimation {
+              if results.count > 0 {
+                selectedTerm = (selectedTerm + 1) % results.count
+              }
+            }
+          },
+          onPrevious: {
+            withAnimation {
+              if results.count > 0 {
+                if selectedTerm == 0 {
+                  selectedTerm = results.count - 1
+                } else {
+                  selectedTerm = (selectedTerm - 1) % results.count
+                }
+              }
+            }
+          },
+          onSubmit: {
+
+          },
+          onDismiss: {
+            withAnimation {
+              isSearching = false
+            }
+          }
+        )
+        .onChange(
+          of: searchTerm,
+          {
+            selectedTerm = 0
+          })
+        Divider()
+      }
       adaptiveStack {
         ZStack(alignment: .topLeading) {
-          MapTextEditor(document: $document)
+          MapTextEditor(document: $document, highlightRanges: results, selectedRange: selectedTerm)
             .background(Color.ui.background)
             .foregroundColor(Color.ui.foreground)
             .frame(minHeight: 96.0)
@@ -81,14 +138,10 @@ struct MapEditor: View {
       }.padding(4.0)
     }.toolbar {
       HStack {
-        Button(action: saveImage) {
-          Image(systemName: "photo")
-        }
-        .help("Export Image (⌘E)")
-        .padding(.vertical, 4.0).padding(.leading, 4.0).padding(.trailing, 8.0)
+        EvolutionPicker(selectedEvolution: $selectedEvolution)
       }
-      EvolutionPicker(selectedEvolution: $selectedEvolution)
-    }
+    }.focusedSceneValue(\.isSearching, $isSearching)
+      .focusedSceneValue(\.selectedEvolution, $selectedEvolution)
   }
 
   @ViewBuilder
@@ -114,34 +167,6 @@ struct MapEditor: View {
 
   private func onDragVertex(vertex: Vertex, x: CGFloat, y: CGFloat) {
   }
-
-  private func saveImage() {
-    if let image = document.exportAsImage(withEvolution: selectedEvolution) {
-
-      let filename = url?.deletingPathExtension().lastPathComponent ?? "Untitled"
-
-      let savePanel = NSSavePanel()
-      savePanel.allowedContentTypes = [.png]
-      savePanel.canCreateDirectories = true
-      savePanel.isExtensionHidden = false
-      savePanel.title = "Save \(filename) as image"
-      savePanel.message = "Choose a location to save the image"
-      savePanel.nameFieldStringValue = "\(filename).png"
-      savePanel.begin { result in
-        if result == .OK, let url = savePanel.url {
-          if let tiffRepresentation = image.tiffRepresentation {
-            let bitmapImage = NSBitmapImageRep(data: tiffRepresentation)
-            let pngData = bitmapImage?.representation(using: .png, properties: [:])
-            do {
-              try pngData?.write(to: url)
-            } catch {
-              return
-            }
-          }
-        }
-      }
-    }
-  }
 }
 
 #Preview {