refactor: clean code

bsorrentino · Sep 20, 2022 · 2e7952e · 2e7952e
1 parent c3f63a5
commit 2e7952e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 80 deletions.
diff --git a/PlantUML/PlantUMLEditorView.swift b/PlantUML/PlantUMLEditorView.swift
@@ -20,8 +20,6 @@ struct PlantUMLEditorView: View {
     @Environment(\.openURL) private var openURL
 
     @EnvironmentObject private var diagram: PlantUMLDiagramObject
-
-    @ObservedObject var customKeyboard = CustomKeyboardObject()
 
     @Binding var document: PlantUMLDocument
 
@@ -35,10 +33,9 @@ struct PlantUMLEditorView: View {
             GeometryReader { _ in
                 HStack {
                     EditorView()
-                        .onReceive( customKeyboard.$itemsToAdd ) { items in
-                            // print( "\(items)")
-                            appendBelow(values: items)
-                        }
+//                        .onReceive( customKeyboard.$itemsToAdd ) { items in
+//                            appendBelow(values: items)
+//                        }
                     if !isPreviewVisible {
                         PlantUMLDiagramView( url: diagram.buildURL() )
                     }
@@ -137,7 +134,7 @@ struct PlantUMLEditorView: View {
                             }
                     }
 
-                    PlantUMLTextFieldWithCustomKeyboard( value: item.rawValue, onChange: updateItem )
+                    PlantUMLTextFieldWithCustomKeyboard( item: item, onChange: updateItem )
                         .focused($focusedItem, equals: .row(id: item.id))
                 }
 

diff --git a/PlantUMLKeyboard/Sources/PlantUMLKeyboard/CustomKeyboardObject.swift b/PlantUMLKeyboard/Sources/PlantUMLKeyboard/CustomKeyboardObject.swift
diff --git a/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLTextField+Representable.swift b/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLTextField+Representable.swift
@@ -7,18 +7,19 @@
 
 import UIKit
 import SwiftUI
+import PlantUMLFramework
 
 public struct PlantUMLTextFieldWithCustomKeyboard : UIViewRepresentable {
     public typealias ChangeHandler =  ( String ) -> Void
     public typealias UIViewType = UITextField
     private let textField = UITextField()
 
 
-    public var value:String
+    public var item:SyntaxStructure
     public var onChange:ChangeHandler
 
-    public init( value:String, onChange:@escaping ChangeHandler ) {
-        self.value = value
+    public init( item:SyntaxStructure, onChange:@escaping ChangeHandler ) {
+        self.item = item
         self.onChange = onChange
     }
 
@@ -33,7 +34,7 @@ public struct PlantUMLTextFieldWithCustomKeyboard : UIViewRepresentable {
         textField.autocapitalizationType = .none
         textField.font = UIFont.monospacedSystemFont(ofSize: 15, weight: .regular)
         textField.returnKeyType = .done
-        textField.text = value
+        textField.text = item.rawValue
         return textField
     }