@momo-kits/calculator-keyboard 0.151.2-beta.2 → 0.152.1-beta.2

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

@@ -6,6 +6,7 @@ import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.text.Editable
 import android.view.Gravity
+import android.view.MotionEvent
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageButton
@@ -130,6 +131,7 @@ class CustomKeyboardView(
       translationX = xOffset.toInt().toFloat()
       translationY = yOffset.toInt().toFloat()
       setOnClickListener { onKeyPress(key, isMainCTAKey) }
+      applyTextPressedOpacity()
     }
   }
 
@@ -161,9 +163,56 @@ class CustomKeyboardView(
 
       translationX = xOffset
       translationY = yOffset
-      setImageResource(android.R.drawable.ic_input_delete)
+      setImageResource(R.drawable.ic_back)
       setImageTintList(ColorStateList.valueOf(Color.BLACK))
       setOnClickListener { onKeyPress(key, false) }
+      applyImagePressedOpacity()
+    }
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  private fun Button.applyTextPressedOpacity(
+    pressedAlpha: Float = 0.2f,
+    disabledAlpha: Float = 0.2f
+  ) {
+    fun updateColorAlpha(alpha: Float) {
+      val color = textColors.defaultColor
+      val a = (alpha * 255).toInt().coerceIn(0, 255)
+      val rgb = color and 0x00FFFFFF
+      setTextColor((a shl 24) or rgb)
+    }
+
+    updateColorAlpha(if (isEnabled) 1f else disabledAlpha)
+
+    setOnTouchListener { v, ev ->
+      when (ev.actionMasked) {
+        MotionEvent.ACTION_DOWN -> if (isEnabled) updateColorAlpha(pressedAlpha)
+        MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL ->
+          updateColorAlpha(if (isEnabled) 1f else disabledAlpha)
+      }
+      false
+    }
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  fun ImageButton.applyImagePressedOpacity(
+    pressedAlpha: Float = 0.2f,
+    disabledAlpha: Float = 0.2f
+  ) {
+    fun updateImageAlpha(alpha: Float) {
+      drawable?.mutate()?.alpha = (alpha * 255).toInt().coerceIn(0, 255)
+      invalidate()
+    }
+
+    updateImageAlpha(if (isEnabled) 1f else disabledAlpha)
+
+    setOnTouchListener { _, ev ->
+      when (ev.actionMasked) {
+        MotionEvent.ACTION_DOWN -> if (isEnabled) updateImageAlpha(pressedAlpha)
+        MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL ->
+          updateImageAlpha(if (isEnabled) 1f else disabledAlpha)
+      }
+      false
     }
   }
 
@@ -183,11 +232,14 @@ class CustomKeyboardView(
     Event.emitKeyPress(context, editText.id, key)
 
     val text = editText.text ?: return
+    val cursorPos = editText.selectionStart
     val plain = text.toString()
-    val isEmpty = plain.isEmpty()
+    val isStartPosition = cursorPos == 72 || cursorPos == 0
     val isJustZero = plain == "0"
     val endsWithOperator = plain.endsWithAny(" + ", " - ", " × ", " ÷ ")
     val endsWithSingleZeroAfterOp = plain.endsWith(" 0")
+    val posBeforeOperator = text.substring(0, cursorPos).endsWithAny(" + ", " - ", " × ", " ÷ ")
+      && editText.length() > cursorPos
 
     when (key) {
       "AC" -> clearText()
@@ -196,7 +248,7 @@ class CustomKeyboardView(
       "×", "+", "-", "÷" -> if (!text.isEmpty()) keyDidPress(" $key ")
       "0", "000" -> {
         when {
-          isEmpty -> {}
+          isStartPosition || posBeforeOperator -> {}
           key == "000" && endsWithOperator -> text.insertAtCaret(editText, "0")
           endsWithSingleZeroAfterOp || isJustZero -> {}
           else -> text.insertAtCaret(editText, key)

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

@@ -9,6 +9,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.KeyEvent
 import android.view.inputmethod.InputMethodManager
+import androidx.annotation.RequiresApi
 import androidx.core.graphics.toColorInt
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -112,6 +113,16 @@ class InputCalculatorViewManager : SimpleViewManager<ReactEditText>(), NativeInp
     keyboardView?.setMode(mode ?: "NumDefault")
   }
 
+  @RequiresApi(Build.VERSION_CODES.Q)
+  override fun setSelectionColor(
+    view: ReactEditText?,
+    value: String?
+  ) {
+    if (value == null) return
+    view?.highlightColor = value.toColorInt()
+    view?.textCursorDrawable?.setTint(value.toColorInt())
+  }
+
   @ReactProp(name = "customKeyText")
   override fun setCustomKeyText(view: ReactEditText, text: String?) {
     keyboardView?.setCustomKeyText(text ?: "Tiếp")

package/android/src/main/res/drawable/ic_back.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m456,640 l104,-104 104,104 56,-56 -104,-104 104,-104 -56,-56 -104,104 -104,-104 -56,56 104,104 -104,104 56,56ZM360,800q-19,0 -36,-8.5T296,768L80,480l216,-288q11,-15 28,-23.5t36,-8.5h440q33,0 56.5,23.5T880,240v480q0,33 -23.5,56.5T800,800L360,800ZM180,480l180,240h440v-480L360,240L180,480ZM580,480Z"
+      android:fillColor="#1f1f1f"/>
+</vector>

package/ios/CalculatorKeyboardView.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)calculateResult;
 - (void)emitCustomKey;
 - (void)emitKeyPress:(NSString *)key;
+- (NSInteger)getCursorPosition;
 
 @end
 

package/ios/CalculatorKeyboardView.mm

@@ -198,23 +198,24 @@
   
   [self.input emitKeyPress:key];
 
-  NSString *text = self.input.getText ?: @"";
-  BOOL isEmpty = (text.length == 0);
+  NSString *text = [self.input getText] ?: @"";
+  NSInteger cursorPos = [self.input getCursorPosition];
   BOOL isJustZero = [text isEqualToString:@"0"];
 
-  BOOL endsWithPlus  = [text hasSuffix:@" + "];
-  BOOL endsWithMinus = [text hasSuffix:@" - "];
-  BOOL endsWithMul   = [text hasSuffix:@" × "];
-  BOOL endsWithDiv   = [text hasSuffix:@" ÷ "];
-  BOOL endsWithOperator = (endsWithPlus || endsWithMinus || endsWithMul || endsWithDiv);
-
+  NSArray<NSString *> *ops = @[ @" + ", @" - ", @" × ", @" ÷ " ];
+  BOOL endsWithOperator = endsWithAny(text, ops);
   BOOL endsWithSingleZeroAfterOp = [text hasSuffix:@" 0"];
 
+  BOOL isStartPosition = (cursorPos == 72 || cursorPos == 0);
+  NSString *prefix = (cursorPos > 0 && cursorPos <= (NSInteger)text.length)
+                    ? [text substringToIndex:cursorPos] : @"";
+  BOOL posBeforeOperator = endsWithAny(prefix, ops) && (text.length > (NSUInteger)cursorPos);
+
   BOOL (^isOpKey)(NSString *) = ^BOOL(NSString *k) {
     return [k isEqualToString:@"+"] || [k isEqualToString:@"-"] ||
            [k isEqualToString:@"×"] || [k isEqualToString:@"÷"];
   };
-  void (^insert)(NSString *) = ^(NSString *s) { [self.input keyDidPress:s]; };
+  void (^insertAtCaret)(NSString *) = ^(NSString *s) { [self.input keyDidPress:s]; };
   void (^replaceTrailingZeroWith)(NSString *) = ^(NSString *s) {
     [self.input onBackSpace];
     [self.input keyDidPress:s];
@@ -224,39 +225,28 @@
     [self.input keyDidPress:s];
   };
 
-  if ([key isEqualToString:@"AC"]) {
-    [self.input clearText];
-    return;
-  }
-
-  if ([key isEqualToString:@"back"]) {
-    [self.input onBackSpace];
-    return;
-  }
-
-  if ([key isEqualToString:@"="]) {
-    [self.input calculateResult];
-    return;
-  }
+  if ([key isEqualToString:@"AC"]) { [self.input clearText]; return; }
+  if ([key isEqualToString:@"back"]) { [self.input onBackSpace]; return; }
+  if ([key isEqualToString:@"="]) { [self.input calculateResult]; return; }
 
   if (isOpKey(key)) {
-    if (!isEmpty) {
-      insert([NSString stringWithFormat:@" %@ ", key]);
+    if (text.length > 0) {
+      insertAtCaret([NSString stringWithFormat:@" %@ ", key]);
     }
     return;
   }
 
   if ([key isEqualToString:@"0"] || [key isEqualToString:@"000"]) {
-    if (isEmpty) return;
+    if (isStartPosition || posBeforeOperator) return;
 
     if ([key isEqualToString:@"000"] && endsWithOperator) {
-      insert(@"0");
+      insertAtCaret(@"0");
       return;
     }
 
     if (endsWithSingleZeroAfterOp || isJustZero) return;
 
-    insert(key);
+    insertAtCaret(key);
     return;
   }
 
@@ -265,10 +255,15 @@
   } else if (endsWithSingleZeroAfterOp) {
     replaceTrailingZeroWith(key);
   } else {
-    insert(key);
+    insertAtCaret(key);
   }
 }
 
 
+static BOOL endsWithAny(NSString *text, NSArray<NSString *> *suffixes) {
+  for (NSString *s in suffixes) { if ([text hasSuffix:s]) return YES; }
+  return NO;
+}
+
 @end
 

package/ios/NativeInputCalculator.mm

@@ -140,6 +140,10 @@ using namespace facebook::react;
     }];
   }
 
+  if (oldViewProps.selectionColor != newViewProps.selectionColor) {
+    _textField.tintColor = [Utils colorFromHex:RCTNSStringFromString(newViewProps.selectionColor)];
+  }
+  
   [super updateProps:props oldProps:oldProps];
 }
 
@@ -490,6 +494,13 @@ static UIFontWeight _UIFontWeightFromString(std::string_view s) {
   }
 }
 
+- (NSInteger)getCursorPosition
+{
+  UITextRange *sel = _textField.selectedTextRange;
+  if (!sel) return 0;
+  return [_textField offsetFromPosition:_textField.beginningOfDocument
+                             toPosition:sel.start];
+}
 
 @end
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/calculator-keyboard",
-    "version": "0.151.2-beta.2",
+    "version": "0.152.1-beta.2",
     "description": "react native calculator keyboard",
     "main": "./src/index.tsx",
     "files": [

package/src/InputCalculatorNativeComponent.ts

@@ -41,6 +41,7 @@ export interface NativeInputCalculatorProps extends ViewProps {
   value?: string;
   textAttributes?: TextAttributes;
   mode?: string;
+  selectionColor?: string;
   customKeyText?: string;
   customKeyBackground?: string;
   customKeyTextColor?: string;

package/src/index.tsx

@@ -21,6 +21,7 @@ type KeyPressEvent = { nativeEvent: { key: string } };
 interface InputCalculatorProps extends TextInputProps {
   text?: string | undefined;
   mode?: Mode;
+  selectionColor?: string | undefined;
   onBlur?: () => void;
   onFocus?: () => void;
   onResult?: (e: OnResultEvent) => void;
@@ -83,6 +84,7 @@ const InputCalculator = React.forwardRef<
     {
       customKeyBackground = 'default',
       mode = Mode.NumDefault,
+      selectionColor,
       customKeyText,
       onBlur,
       onFocus,
@@ -147,6 +149,7 @@ const InputCalculator = React.forwardRef<
         onKeyPress={onKeyPress}
         value={text}
         mode={mode}
+        selectionColor={selectionColor}
         customKeyText={customKeyText}
         customKeyBackground={keyBackground}
         customKeyTextColor={textKeyColor}