@momo-kits/calculator-keyboard 0.165.1-phuc.2 → 0.165.2-beta.2

package/README.md

@@ -1,77 +1,75 @@
-# @momo-kits/calculator-keyboard
+# react-native-calculator-keyboard
 
-Native amount input with a built-in calculator keyboard (`+ − × ÷ =`) for
-React Native **0.80+ / Fabric only**.
+react native calculator keyboard
 
-```tsx
-import InputCalculator, { Mode, CustomKeyState } from '@momo-kits/calculator-keyboard';
+## Installation
 
-const [value, setValue] = useState('');
+```sh
+npm install react-native-calculator-keyboard
+```
+
+## Usage
+
+```js
+import InputCalculator from '@momo-kits/calculator-keyboard';
+
+// ...
 
 <InputCalculator
-  value={value}
-  onChangeText={setValue}
-  onResult={e => console.log(e.nativeEvent.result, e.nativeEvent.valid)}
-  mode={Mode.NumWithCTA}
-  customKeyText="Tiếp"
-  customKeyBackground="primary"
-  customKeyState={CustomKeyState.Default}
-  onCustomKeyEvent={() => submit()}
-  placeholder="đ"
-  placeholderTextColor="#cfcfcf"
-  selectionColor="#a50064"
-  style={{ fontSize: 36, fontWeight: '700', color: '#000' }}
-/>
+  mode="NumDefault"
+  customKeyText="Next"
+  onCustomKeyEvent={() => console.log('Custom key pressed')}
+/>;
+```
+
+## Requirements
+
+**React Native 0.80+** with **Fabric (New Architecture) enabled**.
+
+This library is **pure Fabric** implementation with:
+
+- ✅ Zero RCTBridge dependencies
+- ✅ Native C++ ComponentView on iOS
+- ✅ Fabric ViewManager with codegen delegates on Android
+- ✅ All Props, Events, Commands auto-generated by codegen
+- ❌ No Paper (old architecture) support
+
+### Android Setup
+
+Add to your `gradle.properties`:
+
+```properties
+newArchEnabled=true
 ```
 
-## Behaviour
-
-- The field always shows the formatted expression (`1.000.000 + 5`). `onChangeText`
-  receives that text; `onResult` receives the evaluated integer (`result`) and
-  whether the expression is currently valid.
-- Sizing works like `<TextInput>`: width and height are measured from the
-  content/placeholder when the style does not set them and are clamped by the
-  parent and by `minWidth`/`maxWidth`.
-- `Keyboard.dismiss()`, `ScrollView keyboardShouldPersistTaps` and `ref.blur()`
-  all close the keyboard; focusing another input hands focus over.
-- `onKeyboardShow({ height })` / `onKeyboardHide` fire on both platforms.
-- Keyboard avoidance: iOS uses the system input view, so `KeyboardAvoidingView`
-  and `UIScrollView` behave as with `<TextInput>`. Android has no per-app IME, so
-  the keyboard is an overlay: the library pans the window content up just
-  enough to keep the focused field visible (like `adjustPan`), and
-  `onKeyboardShow` lets a screen add bottom padding for scrolling.
-
-All editing, formatting and evaluation logic lives in `shared/calculator`
-(C++) and is used by both platforms, so behaviour is identical. Run its tests
-with `yarn test:core`.
-
-## Props
-
-| Prop | Type | Notes |
-|---|---|---|
-| `value` / `defaultValue` | `string` | Controlled / initial value. |
-| `mode` | `Mode.NumDefault` \| `Mode.NumWithCTA` | `NumWithCTA` replaces `AC` with a custom CTA key. |
-| `customKeyText` | `string` | CTA label (default `Tiếp`). |
-| `customKeyBackground` | `'default'` \| `'primary'` | CTA colour (theme primary). |
-| `customKeyState` | `CustomKeyState` | `Disable` greys out and disables the CTA. |
-| `placeholder`, `placeholderTextColor`, `selectionColor` | | Same as `<TextInput>`. |
-| `style` | `TextStyle` | `color`, `fontSize`, `fontWeight`, `fontFamily` style the text; the rest styles the container. |
-| `onChangeText`, `onChange`, `onResult`, `onKeyPress`, `onFocus`, `onBlur`, `onCustomKeyEvent`, `onKeyboardShow`, `onKeyboardHide` | | Events. |
-
-Ref: `focus()`, `blur()`, `isFocused()`.
-
-## Layout of the package
+Then rebuild:
 
+```bash
+cd android && ./gradlew clean && cd ..
+npx react-native run-android
 ```
-src/                     JS component + codegen spec
-shared/calculator/       platform-independent C++ core (+ __tests__)
-shared/react/            custom Fabric ShadowNode/State (measureContent)
-ios/                     RCTViewComponentView + UIKit keyboard (inputView)
-android/src/main/cpp/    JNI bridge to the core (libmomocalculator.so)
-android/src/main/java/   native/ (Android views)  reactnative/ (ViewManager)
+
+### iOS Setup
+
+**Required**: Set the environment variable before installing pods:
+
+```bash
+cd ios
+RCT_NEW_ARCH_ENABLED=1 pod install
+cd ..
+npx react-native run-ios
 ```
 
-## Requirements
+**Note**: This library uses Fabric ComponentView (`.mm` files) and will not work without `RCT_NEW_ARCH_ENABLED=1`.
+
+## Contributing
+
+See the [contributing guide](CONTRIBUTING.md) to learn how to contribute to the repository and the development workflow.
+
+## License
+
+MIT
+
+---
 
-- `newArchEnabled=true` (Android) / `RCT_NEW_ARCH_ENABLED=1` (iOS).
-- Android: NDK + CMake (already required by React Native 0.80).
+Made with [create-react-native-library](https://github.com/callstack/react-native-builder-bob)

package/android/CMakeLists.txt

@@ -1,24 +1,21 @@
-# React Native codegen library (consumed by RN autolinking through
-# react-native.config.js). Compiles the generated JNI sources plus our custom
-# shadow node from ../shared/react. The calculator core is built separately
-# (src/main/cpp) so it has no React dependency.
 cmake_minimum_required(VERSION 3.13)
-project(InputCalculatorSpec)
+project(InputCalculator)
 
+set(CMAKE_VERBOSE_MAKEFILE on)
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-file(GLOB_RECURSE input_calculator_shadow_SRCS CONFIGURE_DEPENDS ../shared/react/*.cpp)
+file(GLOB_RECURSE input_calculator_SRCS CONFIGURE_DEPENDS ../shared/*.cpp)
 file(GLOB_RECURSE input_calculator_codegen_SRCS CONFIGURE_DEPENDS ./build/generated/source/codegen/jni/*.cpp)
 
 add_library(
   react_codegen_InputCalculatorSpec
   SHARED
-  ${input_calculator_shadow_SRCS}
+  ${input_calculator_SRCS}
   ${input_calculator_codegen_SRCS}
 )
 
-# ../shared first so its ComponentDescriptors.h shadows the generated one.
+message(PROJECT_SOURCE_DIR="${input_calculator_SRCS}")
+
 target_include_directories(react_codegen_InputCalculatorSpec PUBLIC ../shared)
 target_include_directories(react_codegen_InputCalculatorSpec PUBLIC ./build/generated/source/codegen/jni)
 
@@ -26,7 +23,7 @@ target_link_libraries(
   react_codegen_InputCalculatorSpec
   fbjni
   jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
   reactnative
 )
-
-target_compile_options(react_codegen_InputCalculatorSpec PRIVATE -Wall -fexceptions -frtti -std=c++20 -DLOG_TAG=\"ReactNative\")

package/android/build.gradle

@@ -1,4 +1,5 @@
 buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["CalculatorKeyboard_kotlinVersion"]
 
   repositories {
@@ -7,12 +8,17 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.6.0"
+    classpath "com.android.tools.build:gradle:7.2.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
 def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
@@ -32,38 +38,32 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["CalculatorKeyboard_" + name]).toInteger()
 }
 
-android {
-  namespace "com.momokits.calculatorkeyboard"
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
 
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
 
-  defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+android {
+  if (supportsNamespace()) {
+    namespace "com.momokits.calculatorkeyboard"
 
-    externalNativeBuild {
-      cmake {
-        cppFlags "-std=c++20"
-        arguments "-DANDROID_STL=c++_shared"
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
       }
     }
   }
 
-  // JNI bridge to the shared calculator core (shared/calculator).
-  externalNativeBuild {
-    cmake {
-      path "src/main/cpp/CMakeLists.txt"
-    }
-  }
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
-  buildFeatures {
-    prefab false
-    buildConfig false
-  }
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-  packagingOptions {
-    // The app already ships libc++_shared.so through React Native.
-    excludes = ["**/libc++_shared.so"]
   }
 
   buildTypes {
@@ -77,12 +77,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_17
-    targetCompatibility JavaVersion.VERSION_17
-  }
-
-  kotlinOptions {
-    jvmTarget = "17"
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
   }
 }
 
@@ -94,8 +90,12 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  implementation "com.facebook.react:react-android"
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "androidx.appcompat:appcompat:1.7.0"
-  implementation "androidx.activity:activity:1.9.3"
+  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+  implementation("org.mariuszgromada.math:MathParser.org-mXparser:5.2.1")
 }
+

package/android/gradle.properties

@@ -1,4 +1,5 @@
-CalculatorKeyboard_kotlinVersion=2.0.21
-CalculatorKeyboard_minSdkVersion=24
-CalculatorKeyboard_targetSdkVersion=35
-CalculatorKeyboard_compileSdkVersion=35
+CalculatorKeyboard_kotlinVersion=1.7.0
+CalculatorKeyboard_minSdkVersion=21
+CalculatorKeyboard_targetSdkVersion=31
+CalculatorKeyboard_compileSdkVersion=31
+CalculatorKeyboard_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.momokits.calculatorkeyboard">
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/java/com/momokits/calculatorkeyboard/CalculatorKeyboardPackage.kt

@@ -6,9 +6,13 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 import com.momokits.calculatorkeyboard.reactnative.InputCalculatorViewManager
 
+
 class CalculatorKeyboardPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> = emptyList()
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return emptyList()
+  }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
-    listOf(InputCalculatorViewManager())
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return listOf(InputCalculatorViewManager())
+  }
 }