feat: onContentChange event returns the modified text.

Author: jaywcjlove

Example/Example/ContentView.swift

@@ -50,8 +50,8 @@ struct ContentView: View {
                 .onLoadFailed { error in
                     print("@@@2 \(#function) \(error)")
                 }
-                .onContentChange {
-                    print("@@@3 Content Did Change")
+                .onContentChange { value in
+                    print("@@@3 Content Did Change", value)
                 }
                 .focused($input, equals: .text)
                 .frame(maxWidth: .infinity, maxHeight: .infinity)

README.md

@@ -82,7 +82,7 @@ struct ContentView: View {
             .onLoadFailed { error in
                 print("@@@2 \(#function) \(error)")
             }
-            .onContentChange {
+            .onContentChange { value in
                 print("@@@3 Content Did Change")
             }
     }
@@ -299,7 +299,7 @@ ToolbarItem {
     onLoadFailed: { error in
         print("@@@2 \(#function) \(error)")
     },
-    onContentChange: {
+    onContentChange: { value in
         print("@@@3 Content Did Change")
     }
 )

Sources/CodeMirror/CodeMirror.swift

@@ -67,7 +67,7 @@ public struct CodeMirror: View {
         vm.onLoadFailed = action
         return self as CodeMirror
     }
-    public func onContentChange(perform action: (() -> Void)? = nil) -> CodeMirror {
+    public func onContentChange(perform action: ((_ value: String) -> Void)? = nil) -> CodeMirror {
         vm.onContentChange = action
         return self as CodeMirror
     }

Sources/CodeMirror/CodeMirrorVM.swift

@@ -96,7 +96,7 @@ public class CodeMirrorVM: ObservableObject {
 
     public var onLoadSuccess: (() -> Void)?
     public var onLoadFailed: ((Error) -> Void)?
-    public var onContentChange: (() -> Void)?
+    public var onContentChange: ((_ value: String) -> Void)?
 
     internal var executeJS: ((JavascriptFunction, JavascriptCallback?) -> Void)!
 

Sources/CodeMirror/CodeMirrorView.swift

@@ -16,7 +16,6 @@ import WebKit
 public struct CodeMirrorView: NativeView {
     @ObservedObject public var vm: CodeMirrorVM
     @Binding var value: String
-    var prevValue: String = ""
     public init(
         _ viewModel: CodeMirrorVM,
         value: Binding<String>
@@ -124,14 +123,12 @@ public struct CodeMirrorView: NativeView {
                 args: [:]
             )
         )
-        if prevValue != value {
-            context.coordinator.queueJavascriptFunction(
-                JavascriptFunction(
-                    functionString: "CodeMirror.setContent(value)",
-                    args: ["value": value]
-                )
+        context.coordinator.queueJavascriptFunction(
+            JavascriptFunction(
+                functionString: "CodeMirror.setContent(value)",
+                args: ["value": value]
             )
-        }
+        )
     }
     public func makeCoordinator() -> Coordinator {
         let coordinator = Coordinator(parent: self, viewModel: vm)
@@ -218,10 +215,9 @@ extension Coordinator: WKScriptMessageHandler {
             pageLoaded = true
             callPendingFunctions()
         case ScriptMessageName.codeMirrorContentDidChange:
-            parent.vm.onContentChange?()
             if let messageBody = message.body as? String {
                 parent.value = messageBody
-                parent.prevValue = messageBody
+                parent.vm.onContentChange?(messageBody)
             }
         default:
             print("CodeMirrorWebView receive \(message.name) \(message.body)")