@react-native-ohos/react-native-text-input-mask 3.1.6-rc.3 → 3.1.6-rc.4

package/harmony/text_input_mask/oh-package.json5

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-text-input-mask",
-  "version": "3.1.6-rc.3",
+  "version": "3.1.6-rc.4",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "author": "",

package/harmony/text_input_mask/src/main/cpp/RNTextInputMask.cpp

@@ -47,7 +47,7 @@ void myEventReceiver(ArkUI_NodeEvent *event) {
     bool useAutoskip = isDelete ? userData->maskOptions.autoskip.value() : false;
 
     // onChange 事件
-    if (eventId == 110) {
+    if (eventId == userData->node) {
         std::shared_ptr<CaretString::CaretGravity> caretGravity = nullptr;
         if (isDelete) {
             caretGravity = std::make_shared<CaretString::Backward>(useAutoskip);
@@ -199,7 +199,7 @@ void RNTextInputMask::setMask(int reactNode, std::string primaryFormat, MaskOpti
                                            .node = reactNode,
                                            .instance = this});
         NativeNodeApi::getInstance()->registerNodeEvent(textInputNode->getArkUINodeHandle(), NODE_TEXT_INPUT_ON_CHANGE,
-                                                        110, textInputNode);
+                                                        reactNode, textInputNode);
         NativeNodeApi::getInstance()->registerNodeEvent(textInputNode->getArkUINodeHandle(), NODE_ON_FOCUS, 111,
                                                         textInputNode);
         this->m_userDatas.insert(userData);

package/harmony/text_input_mask/src/main/cpp/common/Mask.h

@@ -42,6 +42,9 @@ public:
         this->initialState = Compiler(this->customNotations).compile(this->format);
     }
 
+   bool hasSameCustomNotations(const std::vector<Notation>& targetNotations) const {
+        return this->customNotations == targetNotations;
+    }
 
     class MaskFactory {
     public:
@@ -60,7 +63,7 @@ public:
         static std::shared_ptr<Mask> getOrCreate(const std::string &format,
                                                  const std::vector<Notation> &customNotations) {
             auto cachedMask = maskCache.find(format);
-            if (cachedMask == maskCache.end()) {
+            if (cachedMask == maskCache.end() || !cachedMask->second->hasSameCustomNotations(customNotations)) {
                 auto newMask = std::make_shared<Mask>(format, customNotations);
                 maskCache[format] = newMask;
                 return newMask;

package/harmony/text_input_mask/src/main/cpp/common/model/Notation.h

@@ -21,5 +21,10 @@ public:
     bool isOptional;          // 是否可选
 
     // 其他方法和成员可以根据需要添加
+     bool operator==(const Notation& other) const {
+        return (this->character == other.character) &&
+               (this->characterSet == other.characterSet) &&
+               (this->isOptional == other.isOptional);
+    }
 };
 } // namespace TinpMask

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-text-input-mask",
-  "version": "3.1.6-rc.3",
+  "version": "3.1.6-rc.4",
   "description": "Text input mask for React Native.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",