@momo-kits/calculator-keyboard 0.150.1-rn80.9 → 0.150.2-beta.12

package/android/src/main/java/com/calculatorkeyboard/RCTInputCalculator.kt

@@ -40,7 +40,20 @@ class RCTInputCalculator : ReactTextInputManager() {
 
   @ReactProp(name = "value")
   fun setValue(view: ReactEditText, value: String?) {
-//    view.setText(value)
+    UiThreadUtil.runOnUiThread {
+      val e = view.editableText ?: run { view.setText(value ?: ""); return@runOnUiThread }
+      val newText = value ?: ""
+      if (e.toString() == newText) return@runOnUiThread
+
+      val wasFocused = view.hasFocus()
+      val atEnd = wasFocused && view.selectionStart == e.length && view.selectionEnd == e.length
+
+      e.replace(0, e.length, newText)
+
+      if (!wasFocused || atEnd) {
+        view.setSelection(newText.length)
+      }
+    }
   }
 
   @ReactProp(name = "keyboardColor")

package/ios/InputCalculator.m

@@ -53,6 +53,9 @@ RCT_EXPORT_VIEW_PROPERTY(mostRecentEventCount, NSInteger)
 RCT_EXPORT_SHADOW_PROPERTY(text, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(placeholder, NSString)
 RCT_EXPORT_SHADOW_PROPERTY(onContentSizeChange, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(value, NSString)
+RCT_EXPORT_VIEW_PROPERTY(onFocus, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onBlur, RCTBubblingEventBlock)
 
 RCT_EXPORT_METHOD(focus : (nonnull NSNumber *)viewTag)
 {

package/ios/InputCalculator.swift

@@ -6,34 +6,69 @@ class RCTInputCalculator: RCTBaseTextInputViewManager {
   override func view() -> UIView! {
     return InputCalculator(bridge: bridge)
   }
-  
+
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
-  
+
 }
 
 class InputCalculator: RCTSinglelineTextInputView {
   var bridge: RCTBridge?
   var keyboardView: CalculatorKeyboardView?
-  
-  @objc var value: String = ""
-  
+
+  @objc var onFocus: RCTBubblingEventBlock?
+  @objc var onBlur:  RCTBubblingEventBlock?
+
+  @objc func beginEditingInput(_ note: Notification) { onFocus?([:]) }
+  @objc func endEditingInput(_ note: Notification)   { onBlur?([:])  }
+
+  @objc var value: String = "" {
+    didSet {
+        guard let tf = backedTextInputView as? UITextField else { return }
+        let old = tf.text ?? ""
+        if old == value { return }
+
+        let isFirstResponder = tf.isFirstResponder
+        let atEnd = isFirstResponder && tf.offset(from: tf.beginningOfDocument, to: tf.selectedTextRange?.start ?? tf.endOfDocument) == old.count
+        tf.text = value
+        if !isFirstResponder || atEnd,
+           let end = tf.position(from: tf.beginningOfDocument, offset: value.count) {
+            tf.selectedTextRange = tf.textRange(from: end, to: end)
+        }
+    }
+  }
+
   @objc var keyboardColor: UIColor = UIColor(hex: "#d9d9d9") {
     didSet {
       self.keyboardView?.setKeyboardColor(keyboardColor)
     }
   }
-  
+
+
   override init(bridge: RCTBridge) {
     super.init(bridge: bridge)
     self.bridge = bridge
     self.keyboardView = CalculatorKeyboardView()
     self.keyboardView!.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: 290 + getbottomInset())
     self.keyboardView!.input = self
-    
+
     backedTextInputView.inputView = self.keyboardView
     backedTextInputView.inputView?.reloadInputViews()
+
+    NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(beginEditingInput(_:)),
+        name: UITextField.textDidBeginEditingNotification,
+        object: backedTextInputView
+    )
+    NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(endEditingInput(_:)),
+        name: UITextField.textDidEndEditingNotification,
+        object: backedTextInputView
+    )
+
   }
     func getbottomInset() -> CGFloat {
       let window = UIApplication.shared.windows.first?.rootViewController?.view
@@ -48,7 +83,7 @@ class InputCalculator: RCTSinglelineTextInputView {
       bridge.eventDispatcher().sendTextEvent(with: .change, reactTag: reactTag, text: value, key: "\(key)", eventCount: 1)
     }
   }
-  
+
   func clearText() {
     value = ""
     (backedTextInputView as? UITextField)?.text = ""
@@ -56,7 +91,7 @@ class InputCalculator: RCTSinglelineTextInputView {
       bridge.eventDispatcher().sendTextEvent(with: .change, reactTag: reactTag, text: value, key: "clear", eventCount: 1)
     }
   }
-  
+
   func onBackSpace() {
     value = value.dropLast().description
     DispatchQueue.main.async {
@@ -67,23 +102,23 @@ class InputCalculator: RCTSinglelineTextInputView {
         self.backedTextInputView.replace(newRange, withText: "")
       }
     }
-    
+
     if let bridge = bridge {
       bridge.eventDispatcher().sendTextEvent(with: .change, reactTag: reactTag, text: value, key: "back", eventCount: 1)
     }
   }
-  
+
   func calculateResult() {
     guard let textField = backedTextInputView as? UITextField,
           let text = textField.text?.replacingOccurrences(of: "×", with: "*").replacingOccurrences(of: "÷", with: "/")
     else {
       return
     }
-    
+
     let pattern = "^\\s*(-?\\d+(\\.\\d+)?\\s*[-+*/]\\s*)*-?\\d+(\\.\\d+)?\\s*$"
     let regex = try? NSRegularExpression(pattern: pattern)
     let range = NSRange(location: 0, length: text.utf16.count)
-    
+
     if regex?.firstMatch(in: text, options: [], range: range) != nil {
       let expression = NSExpression(format: text)
       if let result = expression.expressionValue(with: nil, context: nil) as? NSNumber {
@@ -98,6 +133,6 @@ class InputCalculator: RCTSinglelineTextInputView {
       print("Invalid expression")
     }
   }
-  
+
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calculator-keyboard",
-    "version": "0.150.1-rn80.9",
+    "version": "0.150.2-beta.12",
     "description": "react native calculator keyboard",
     "source": "./src/index.tsx",
     "main": "./lib/commonjs/index.js",