From 0c7df04dbae189c609b8834cde76f9d5b8d76a69 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Fri, 5 Aug 2022 08:46:42 +0800
Subject: [PATCH] Repo // Patch marking states to conform previous update.

---
 Source/Modules/ControllerModules/InputState.swift    | 12 +++++++++---
 .../ControllerModules/KeyHandler_States.swift        |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/ControllerModules/InputState.swift b/Source/Modules/ControllerModules/InputState.swift
index 139cabf0..ccd4fb04 100644
--- a/Source/Modules/ControllerModules/InputState.swift
+++ b/Source/Modules/ControllerModules/InputState.swift
@@ -327,12 +327,16 @@ public enum InputState {
     var tooltipForInputting: String = ""
     private(set) var readings: [String]
 
-    init(composingBuffer: String, cursorIndex: Int, markerIndex: Int, readings: [String]) {
+    init(
+      composingBuffer: String, cursorIndex: Int, markerIndex: Int, readings: [String], nodeValuesArray: [String] = []
+    ) {
       let begin = min(cursorIndex, markerIndex)
       let end = max(cursorIndex, markerIndex)
       markedRange = begin..<end
       self.readings = readings
-      super.init(composingBuffer: composingBuffer, cursorIndex: cursorIndex)
+      super.init(
+        composingBuffer: composingBuffer, cursorIndex: cursorIndex, nodeValuesArray: nodeValuesArray
+      )
       defer { self.markerIndex = markerIndex }
     }
 
@@ -376,7 +380,9 @@ public enum InputState {
     }
 
     var convertedToInputting: Inputting {
-      let state = Inputting(composingBuffer: composingBuffer, cursorIndex: cursorIndex)
+      let state = Inputting(
+        composingBuffer: composingBuffer, cursorIndex: cursorIndex, reading: reading, nodeValuesArray: nodeValuesArray
+      )
       state.tooltip = tooltipForInputting
       return state
     }
diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift
index a710e2c7..35c24383 100644
--- a/Source/Modules/ControllerModules/KeyHandler_States.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_States.swift
@@ -195,7 +195,8 @@ extension KeyHandler {
           composingBuffer: state.composingBuffer,
           cursorIndex: state.cursorIndex,
           markerIndex: index,
-          readings: state.readings
+          readings: state.readings,
+          nodeValuesArray: walkedAnchors.map(\.node.currentPair.value)
         )
         marking.tooltipForInputting = state.tooltipForInputting
         stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking)
@@ -216,7 +217,8 @@ extension KeyHandler {
           composingBuffer: state.composingBuffer,
           cursorIndex: state.cursorIndex,
           markerIndex: index,
-          readings: state.readings
+          readings: state.readings,
+          nodeValuesArray: walkedAnchors.map(\.node.currentPair.value)
         )
         marking.tooltipForInputting = state.tooltipForInputting
         stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking)