Add button to clear the model

Author: adborbas

Source/Yasba/Views/Sieve Script Builder/SieveScriptBuilderView.swift

@@ -7,7 +7,7 @@ import AppKit
 // MARK: - Root
 
 struct SieveScriptBuilderView: View {
-    @State var model: SieveScriptViewModel
+    @StateObject var model: SieveScriptViewModel
     @State private var libraryWidth: CGFloat = 320
     @State private var shouldPresentSheet = false
     @State private var renderedScriptText: String = ""
@@ -18,13 +18,16 @@ struct SieveScriptBuilderView: View {
                 Color.primary.colorInvert()
                     .ignoresSafeArea()
 
-                Toolbar() {
-                    renderedScriptText = model.render()
-                    shouldPresentSheet = true
-                }
+                Toolbar(
+                    onRender: {
+                        renderedScriptText = model.render()
+                        shouldPresentSheet = true
+                    }, onNew: {
+                        model.clear()
+                    })
                 .ignoresSafeArea()
 
-                SieveScriptView(viewModel: $model)
+                SieveScriptView(viewModel: model)
                     .padding([.leading, .top], 24)
                     .frame(minWidth: 420,
                            maxWidth: .infinity,
@@ -53,26 +56,38 @@ struct SieveScriptBuilderView: View {
 }
 
 private struct Toolbar: View {
-    var onRender: (() -> Void)
+    var onRender: () -> Void
+    var onNew: () -> Void
 
     var body: some View {
-        HStack {
+        HStack(spacing: 32) {
             Spacer()
-            Button {
-                onRender()
-            } label: {
-                Image(systemName: "note.text")
-                    .resizable()
-                    .frame(width: 18, height: 18)
-            }
-            .buttonStyle(.plain)
-
+            ToolbarButton(icon: "document.badge.plus") { onNew() }
+            ToolbarButton(icon: "note.text") { onRender() }
         }
         .padding(.trailing, 24)
         .frame(height: 50)
     }
 }
 
+private struct ToolbarButton: View {
+    private let size: CGFloat = 22
+    
+    let icon: String
+    let action: () -> Void
+    
+    var body: some View {
+        Button {
+            action()
+        } label: {
+            Image(systemName: icon)
+                .resizable()
+                .frame(width: size, height: size)
+        }
+        .buttonStyle(.plain)
+    }
+}
+
 #Preview {
     SieveScriptBuilderView(model: SieveScriptViewModel())
         .frame(width: 1120, height: 720)

Source/Yasba/Views/Sieve Script/SieveScriptView.swift

@@ -2,7 +2,7 @@ import SwiftUI
 import UniformTypeIdentifiers
 
 struct SieveScriptView: View {
-    @Binding private var viewModel: SieveScriptViewModel
+    @ObservedObject private var viewModel: SieveScriptViewModel
     @State private var draggedRange: Range<Int>? = nil
     @State private var dropGapIndex: Int? = nil
     @State private var rowHeights: [Int: CGFloat] = [:]
@@ -12,6 +12,10 @@ struct SieveScriptView: View {
     var tokens: [RowToken] { viewModel.rowTokens }
     var indents: [Int] { viewModel.indentation(for: tokens) }
 
+    init(viewModel: SieveScriptViewModel) {
+        self.viewModel = viewModel
+    }
+    
     var filteredIndices: [Int] {
         if let span = draggedRange { return Array(tokens.indices).filter { !span.contains($0) } }
         return Array(tokens.indices)
@@ -29,10 +33,6 @@ struct SieveScriptView: View {
         return CGFloat(indents.last ?? 0) * 24
     }
 
-    init(viewModel: Binding<SieveScriptViewModel>) {
-        self._viewModel = viewModel
-    }
-
     var body: some View {
         ZStack(alignment: .center) {
             HStack {
@@ -207,10 +207,10 @@ struct SieveScriptView: View {
         AddFlagCommand(tag: "Tag 2"),
         StopCommand()
     ])
-    SieveScriptView(viewModel: $viewModel)
+    SieveScriptView(viewModel: viewModel)
 }
 
 #Preview("Empty") {
     @Previewable @State var viewModel = SieveScriptViewModel()
-    SieveScriptView(viewModel: $viewModel)
+    SieveScriptView(viewModel: viewModel)
 }

Source/Yasba/Views/Sieve Script/SieveScriptViewModel.swift

@@ -52,8 +52,15 @@ final class SieveScriptViewModel: ObservableObject {
     func render() -> String {
         return scriptRenderer.render(commands: script)
     }
+    
+    func clear() {
+        applyTokenEdit { tokens in
+            tokens = []
+        }
+    }
 
     private func applyTokenEdit(_ transform: (inout [RowToken]) -> Void) {
+        objectWillChange.send()
         var tokens = mapper.tokens(from: script)
         transform(&tokens)
         self.script = mapper.script(from: tokens)