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

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

@@ -22,9 +22,13 @@ using namespace rnoh;
 using namespace react;
 using namespace TinpMask;
 static constexpr int AVOIDENCE = 1;
+static constexpr int EVENT_ID_ONCHANGE = 110;
+static constexpr int EVENT_ID_ONFOCUS = 111;
+static constexpr int EVENT_ID_ONSELECT_CHANGE = 112;
 std::unordered_map<std::string, std::shared_ptr<RTLMask>> TinpMask::RTLMask::cache;
 std::unordered_map<std::string, std::shared_ptr<Mask>> TinpMask::Mask::MaskFactory::maskCache;
-void maybeThrow(int32_t status) {
+void maybeThrow(int32_t status)
+{
     DLOG(INFO) << "=====text change maybeThrow status: " << status;
     if (status != 0) {
         auto message = std::string("ArkUINode operation failed with status: ") + std::to_string(status);
@@ -33,7 +37,8 @@ void maybeThrow(int32_t status) {
     }
 }
 
-void myEventReceiver(ArkUI_NodeEvent *event) {
+void myEventReceiver(ArkUI_NodeEvent *event)
+{
     int32_t eventId = OH_ArkUI_NodeEvent_GetTargetId(event);
     ArkUI_NodeHandle textNode = OH_ArkUI_NodeEvent_GetNodeHandle(event);
     void *data = NativeNodeApi::getInstance()->getUserData(textNode);
@@ -41,11 +46,20 @@ void myEventReceiver(ArkUI_NodeEvent *event) {
     std::string content = item->string;
     UserData *userData = reinterpret_cast<UserData *>(data);
     auto self = userData->instance;
-    if (self == nullptr) { return; };
+    if (self == nullptr) {
+        return;
+    };
     bool isDelete = userData->lastInputText.size() >= content.size();
     bool useAutocomplete = !isDelete ? userData->maskOptions.autocomplete.value() : false;
     bool useAutoskip = isDelete ? userData->maskOptions.autoskip.value() : false;
-
+    if (eventId == EVENT_ID_ONSELECT_CHANGE && self->lastStrPtr_) {
+        ArkUI_AttributeItem item{.string = self->lastStrPtr_.get()->c_str()};
+        userData->lastInputText = self->lastStrPtr_.get()->c_str();
+        maybeThrow(NativeNodeApi::getInstance()->setAttribute(userData->data, NODE_TEXT_INPUT_TEXT, &item));
+        if (self->lastStrPtr_->empty()) {
+            self->lastStrPtr_ = nullptr;
+        }
+    }
     // onChange 事件
     if (eventId == userData->node) {
         std::shared_ptr<CaretString::CaretGravity> caretGravity = nullptr;
@@ -65,26 +79,26 @@ void myEventReceiver(ArkUI_NodeEvent *event) {
                 content = resultString;
             }
             std::string finalString = isDelete ? content : resultString;
-            ArkUI_AttributeItem item{.string = finalString.c_str()};
-            userData->lastInputText = finalString;
-            maybeThrow(NativeNodeApi::getInstance()->setAttribute(userData->data, NODE_TEXT_INPUT_TEXT, &item));
-        } catch (FormatError e) {
+            self->lastStrPtr_ = std::make_shared<std::string>(finalString);
+        } catch (const FormatError &e) {
             DLOG(ERROR) << " mask complier error " << e.what();
         }
     }
     // onFocus 事件
-    if (eventId == 111) {
+    if (eventId == EVENT_ID_ONFOCUS) {
         if (userData->maskOptions.autocomplete.value()) {
             std::string text = "";
             text += content;
             try {
                 CaretString string(text, text.length(),
-                                   std::make_shared<CaretString::Forward>(userData->maskOptions.autocomplete.value()));
+                    std::make_shared<CaretString::Forward>(userData->maskOptions.autocomplete.value()));
                 auto maskObj = self->pickMask(string, userData->maskOptions, userData->primaryFormat);
                 std::string resultString = maskObj->apply(string).formattedText.string;
-                ArkUI_AttributeItem item{.string = resultString.c_str()};
+                ArkUI_AttributeItem item{
+                    .string = resultString.c_str()
+                };
                 maybeThrow(NativeNodeApi::getInstance()->setAttribute(userData->data, NODE_TEXT_INPUT_TEXT, &item));
-            } catch (FormatError e) {
+            } catch (const FormatError &e) {
                 DLOG(ERROR) << " mask complier error " << e.what();
             }
         }
@@ -92,7 +106,8 @@ void myEventReceiver(ArkUI_NodeEvent *event) {
 }
 
 // 计算亲和度
-int calculateAffinity(Mask mask, const CaretString &text, std::string affinityCalculationStrategy) {
+int calculateAffinity(Mask mask, const CaretString &text, std::string affinityCalculationStrategy)
+{
     AffinityCalculationStrategy strategy;
     if (affinityCalculationStrategy == "WHOLE_STRING") {
         strategy = AffinityCalculationStrategy::WHOLE_STRING;
@@ -109,7 +124,8 @@ int calculateAffinity(Mask mask, const CaretString &text, std::string affinityCa
 }
 // 获取或创建 Mask
 std::shared_ptr<Mask> maskGetOrCreate(const std::string &format, const std::vector<Notation> &customNotations,
-                                      bool rightToLeft) {
+    bool rightToLeft)
+{
     if (rightToLeft) {
         return RTLMask::getOrCreate(format, customNotations);
     } else {
@@ -118,13 +134,14 @@ std::shared_ptr<Mask> maskGetOrCreate(const std::string &format, const std::vect
 }
 
 std::shared_ptr<Mask> RNTextInputMask::pickMask(const CaretString &text, MaskOptions maskOptions,
-                                                std::string primaryMask) {
+    std::string primaryMask)
+{
     // 如果 affineFormats 为空，直接返回 primaryMask
     if (maskOptions.affineFormats->size() <= 0) {
         auto mask = maskGetOrCreate(primaryMask, maskOptions.customNotations.value(), maskOptions.rightToLeft.value());
         int affinity = calculateAffinity(*mask, text, maskOptions.affinityCalculationStrategy.value());
-        DLOG(INFO) << " ======= pickMask calculateAffinity value： " << affinity
-                   << "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
+        DLOG(INFO) << " ======= pickMask calculateAffinity value： " << affinity <<
+            "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
         return mask;
     }
     // 定义 MaskAffinity 结构体，用于存储 Mask 和相应的亲和度
@@ -136,8 +153,8 @@ std::shared_ptr<Mask> RNTextInputMask::pickMask(const CaretString &text, MaskOpt
 
     // 计算 primaryMask 的亲和度
     int primaryAffinity = calculateAffinity(primaryMask, text, maskOptions.affinityCalculationStrategy.value());
-    DLOG(INFO) << " ======= pickMask calculateAffinity value： " << primaryAffinity << " \n mask: " << primaryMask
-               << "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
+    DLOG(INFO) << " ======= pickMask calculateAffinity value： " << primaryAffinity << " \n mask: " << primaryMask <<
+        "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
     // 存储所有 mask 和亲和度的列表
     std::vector<MaskAffinity> masksAndAffinities;
 
@@ -146,14 +163,14 @@ std::shared_ptr<Mask> RNTextInputMask::pickMask(const CaretString &text, MaskOpt
         std::shared_ptr<Mask> mask =
             maskGetOrCreate(format, maskOptions.customNotations.value(), maskOptions.rightToLeft.value());
         int affinity = calculateAffinity(*mask, text, maskOptions.affinityCalculationStrategy.value());
-        DLOG(INFO) << " ======= pickMask calculateAffinity value： " << affinity << "\n affineFormat: " << format
-                   << "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
+        DLOG(INFO) << " ======= pickMask calculateAffinity value： " << affinity << "\n affineFormat: " << format <<
+            "\n affinityCalculationStrategy: " << maskOptions.affinityCalculationStrategy.value();
         masksAndAffinities.emplace_back(*mask, affinity);
     }
 
     // 按亲和度降序排序
     std::sort(masksAndAffinities.begin(), masksAndAffinities.end(),
-              [](const MaskAffinity &a, const MaskAffinity &b) { return a.affinity > b.affinity; });
+        [](const MaskAffinity &a, const MaskAffinity &b) { return a.affinity > b.affinity; });
 
     // 寻找插入位置
     int insertIndex = -1;
@@ -175,7 +192,8 @@ std::shared_ptr<Mask> RNTextInputMask::pickMask(const CaretString &text, MaskOpt
     return std::make_shared<Mask>(masksAndAffinities.front().mask);
 }
 
-void RNTextInputMask::setMask(int reactNode, std::string primaryFormat, MaskOptions maskOptions) {
+void RNTextInputMask::setMask(int reactNode, std::string primaryFormat, MaskOptions maskOptions)
+{
     auto task = [this, reactNode, primaryFormat, maskOptions] {
         auto weakInstance = m_ctx.instance;
         auto instance = weakInstance.lock();
@@ -193,24 +211,26 @@ void RNTextInputMask::setMask(int reactNode, std::string primaryFormat, MaskOpti
         }
         ArkUINode &node = input->getLocalRootArkUINode();
         TextInputNode *textInputNode = dynamic_cast<TextInputNode *>(&node);
-        UserData *userData = new UserData({.data = textInputNode->getArkUINodeHandle(),
-                                           .maskOptions = maskOptions,
-                                           .primaryFormat = primaryFormat,
-                                           .node = reactNode,
-                                           .instance = this});
+        UserData *userData = new UserData({
+            .data = textInputNode->getArkUINodeHandle(),
+            .maskOptions = maskOptions,
+            .primaryFormat = primaryFormat,
+            .node = reactNode,
+            .instance = this });
         NativeNodeApi::getInstance()->registerNodeEvent(textInputNode->getArkUINodeHandle(), NODE_TEXT_INPUT_ON_CHANGE,
                                                         reactNode, textInputNode);
+        NativeNodeApi::getInstance()->registerNodeEvent(textInputNode->getArkUINodeHandle(),
+                                                        NODE_TEXT_INPUT_ON_TEXT_SELECTION_CHANGE, EVENT_ID_ONSELECT_CHANGE, textInputNode);
         NativeNodeApi::getInstance()->registerNodeEvent(textInputNode->getArkUINodeHandle(), NODE_ON_FOCUS, 111,
-                                                        textInputNode);
+            textInputNode);
         this->m_userDatas.insert(userData);
         NativeNodeApi::getInstance()->setUserData(textInputNode->getArkUINodeHandle(), userData);
         NativeNodeApi::getInstance()->addNodeEventReceiver(textInputNode->getArkUINodeHandle(), myEventReceiver);
     };
     this->m_ctx.taskExecutor->runTask(TaskThread::MAIN, std::move(task));
 }
-
-std::string getString(std::string maskValue, std::string value, bool autocomplete, bool isMask) {
-
+std::string getString(std::string maskValue, std::string value, bool autocomplete, bool isMask)
+{
     auto maskObj = Mask::MaskFactory::getOrCreate(maskValue, {});
     CaretString text(value, value.length(), std::make_shared<CaretString::Forward>(autocomplete));
     auto r = maskObj->apply(text);
@@ -222,32 +242,14 @@ std::string getString(std::string maskValue, std::string value, bool autocomplet
     }
     return result;
 }
-
-std::string getString(std::string maskValue, std::string value, bool autocomplete, bool isMask, bool rightToLeft) {
-    std::shared_ptr<Mask> maskObj;
-    if (rightToLeft) {
-        maskObj = RTLMask::getOrCreate(maskValue, {});
-    } else {
-        maskObj = Mask::MaskFactory::getOrCreate(maskValue, {});
-    }
-    CaretString text(value, value.length(), std::make_shared<CaretString::Forward>(autocomplete));
-    auto r = maskObj->apply(text);
-    std::string result;
-    if (isMask) {
-        result = r.formattedText.string;
-    } else {
-        result = r.extractedValue;
-    }
-    return result;
-}
-
 static jsi::Value __hostFunction_RNTextInputMask_unmask(jsi::Runtime &rt, react::TurboModule &turboModule,
-                                                        const jsi::Value *args, size_t count) {
+    const jsi::Value *args, size_t count)
+{
     std::string maskValue = args[0].getString(rt).utf8(rt);
     std::string value = args[1].getString(rt).utf8(rt);
     bool autocomplete = args[2].getBool();
-    return createPromiseAsJSIValue(
-        rt, [maskValue, value, autocomplete](jsi::Runtime &rt2, std::shared_ptr<facebook::react::Promise> promise) {
+    return createPromiseAsJSIValue(rt,
+        [maskValue, value, autocomplete](jsi::Runtime &rt2, std::shared_ptr<facebook::react::Promise> promise) {
             try {
                 auto start = std::chrono::high_resolution_clock::now();
                 std::string result = getString(maskValue, value, autocomplete, 0);
@@ -262,37 +264,14 @@ static jsi::Value __hostFunction_RNTextInputMask_unmask(jsi::Runtime &rt, react:
             }
         });
 }
-
-static jsi::Value __hostFunction_RNTextInputMask_unmaskWithRightToLeft(jsi::Runtime &rt, react::TurboModule &turboModule,
-                                                        const jsi::Value *args, size_t count) {
-    std::string maskValue = args[0].getString(rt).utf8(rt);
-    std::string value = args[1].getString(rt).utf8(rt);
-    bool autocomplete = args[2].getBool();
-    bool rightToLeft = args[3].getBool();
-    return createPromiseAsJSIValue(
-        rt, [maskValue, value, autocomplete, rightToLeft](jsi::Runtime &rt2, std::shared_ptr<facebook::react::Promise> promise) {
-            try {
-                auto start = std::chrono::high_resolution_clock::now();
-                std::string result = getString(maskValue, value, autocomplete, 0, rightToLeft);
-                promise->resolve(jsi::String::createFromUtf8(rt2, result));
-                // 获取结束时间点
-                auto end = std::chrono::high_resolution_clock::now();
-                // 计算延迟
-                std::chrono::duration<double, std::milli> latency = end - start;
-                DLOG(INFO) << "=======unmask 响应时长: " << latency.count() << " 毫秒" << std::endl;
-            } catch (FormatError e) {
-                promise->reject(e.what());
-            }
-        });
-}
-
 static jsi::Value __hostFunction_RNTextInputMask_mask(jsi::Runtime &rt, react::TurboModule &turboModule,
-                                                      const jsi::Value *args, size_t count) {
+    const jsi::Value *args, size_t count)
+{
     std::string maskValue = args[0].getString(rt).utf8(rt);
     std::string value = args[1].getString(rt).utf8(rt);
     bool autocomplete = args[2].getBool();
-    return createPromiseAsJSIValue(
-        rt, [maskValue, value, autocomplete](jsi::Runtime &rt2, std::shared_ptr<facebook::react::Promise> promise) {
+    return createPromiseAsJSIValue(rt,
+        [maskValue, value, autocomplete](jsi::Runtime &rt2, std::shared_ptr<facebook::react::Promise> promise) {
             try {
                 auto start = std::chrono::high_resolution_clock::now();
                 std::string result = getString(maskValue, value, autocomplete, 1);
@@ -307,10 +286,9 @@ static jsi::Value __hostFunction_RNTextInputMask_mask(jsi::Runtime &rt, react::T
             }
         });
 }
-
 static jsi::Value __hostFunction_RNTextInputMask_setMask(jsi::Runtime &rt, react::TurboModule &turboModule,
-                                                         const jsi::Value *args, size_t count) {
-
+    const jsi::Value *args, size_t count)
+{
     auto turbo = static_cast<RNTextInputMask *>(&turboModule);
     if (turbo->grt == nullptr) {
         turbo->grt = &rt;
@@ -330,8 +308,8 @@ static jsi::Value __hostFunction_RNTextInputMask_setMask(jsi::Runtime &rt, react
             for (size_t i = 0; i < length; ++i) {
                 // 获取数组元素
                 jsi::Value value = arrayAffineFormats.getValueAtIndex(rt, i);
-                std::cout << "===affineFormats index" + std::to_string(i) << "--" << value.getString(rt).utf8(rt)
-                          << std::endl;
+                std::cout << "===affineFormats index" + std::to_string(i) << "--" << value.getString(rt).utf8(rt) <<
+                    std::endl;
                 affineFormatsValues.push_back(value.getString(rt).utf8(rt));
             }
         } else {
@@ -369,8 +347,6 @@ static jsi::Value __hostFunction_RNTextInputMask_setMask(jsi::Runtime &rt, react
             std::cerr << "====The property 'myArray' is not an array." << std::endl;
         }
     }
-
-
     std::string affinityCalculationStrategy;
     if (obj.hasProperty(rt, "affinityCalculationStrategy") &&
         !obj.getProperty(rt, "affinityCalculationStrategy").isUndefined()) {
@@ -393,24 +369,25 @@ static jsi::Value __hostFunction_RNTextInputMask_setMask(jsi::Runtime &rt, react
     }
 
     auto maskOptions = new MaskOptions(affineFormatsValues, customNotationsValues, affinityCalculationStrategy,
-                                       autocomplete, autoskip, rightToLeft);
+        autocomplete, autoskip, rightToLeft);
     static_cast<RNTextInputMask *>(&turboModule)->setMask(reactNode, primaryFormat, *maskOptions);
     return jsi::Value::undefined();
 }
 
 RNTextInputMask::RNTextInputMask(const ArkTSTurboModule::Context ctx, const std::string name)
-    : ArkTSTurboModule(ctx, name) {
-    methodMap_["setMask"] = MethodMetadata{3, __hostFunction_RNTextInputMask_setMask};
-    methodMap_["mask"] = MethodMetadata{3, __hostFunction_RNTextInputMask_mask};
-    methodMap_["unmask"] = MethodMetadata{3, __hostFunction_RNTextInputMask_unmask};
-    methodMap_["unmaskWithRightToLeft"] = MethodMetadata{4, __hostFunction_RNTextInputMask_unmaskWithRightToLeft};
+    : ArkTSTurboModule(ctx, name)
+{
+    methodMap_["setMask"] = MethodMetadata{ 3, __hostFunction_RNTextInputMask_setMask };
+    methodMap_["mask"] = MethodMetadata{ 3, __hostFunction_RNTextInputMask_mask };
+    methodMap_["unmask"] = MethodMetadata{ 3, __hostFunction_RNTextInputMask_unmask };
 }
-
-RNTextInputMask::~RNTextInputMask() {
+RNTextInputMask::~RNTextInputMask()
+{
     for (auto userData : m_userDatas) {
         if (userData != nullptr) {
             NativeNodeApi::getInstance()->unregisterNodeEvent(userData->data, NODE_TEXT_INPUT_ON_CHANGE);
             NativeNodeApi::getInstance()->unregisterNodeEvent(userData->data, NODE_ON_FOCUS);
+            NativeNodeApi::getInstance()->unregisterNodeEvent(userData->data, NODE_TEXT_INPUT_ON_TEXT_SELECTION_CHANGE);
             NativeNodeApi::getInstance()->removeNodeEventReceiver(userData->data, myEventReceiver);
             delete userData;
             userData = nullptr;

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

@@ -12,6 +12,8 @@
  *
  * @generatorVersion: 1
  */
+#ifndef RNTEXTINPUTMASK_H
+#define RNTEXTINPUTMASK_H
 #pragma once
 
 #include "RNOH/ArkTSTurboModule.h"
@@ -37,7 +39,8 @@ struct MaskParams {
     MaskParams() = default;
     MaskParams(const std::string &m, const std::string &v, std::optional<bool> autoComplete = std::nullopt)
         : mask(m), value(v), autocomplete(autoComplete) {} // 构造函数
-    MaskParams &operator=(const MaskParams &input) {
+    MaskParams &operator=(const MaskParams &input)
+    {
         this->mask = input.mask;
         this->value = input.value;
         this->autocomplete = input.autocomplete;
@@ -55,12 +58,13 @@ struct MaskOptions {
 
     MaskOptions()
         : affineFormats(std::vector<std::string>()), customNotations(std::vector<Notation>()),
-          affinityCalculationStrategy(std::nullopt), autocomplete(true), autoskip(false), rightToLeft(false) {}
+        affinityCalculationStrategy(std::nullopt), autocomplete(true), autoskip(false), rightToLeft(false) {}
     MaskOptions(const std::vector<std::string> &formats, const std::vector<Notation> &notations,
-                const std::string &strategy, bool autoComp, bool autoSkip, bool rtl)
+        const std::string &strategy, bool autoComp, bool autoSkip, bool rtl)
         : affineFormats(formats), customNotations(notations),
-          affinityCalculationStrategy(strategy.empty() ? std::make_optional("WHOLE_STRING") : std::make_optional(strategy)),
-          autocomplete(autoComp), autoskip(autoSkip), rightToLeft(rtl) {}
+        affinityCalculationStrategy(strategy.empty() ?
+            std::make_optional("WHOLE_STRING") : std::make_optional(strategy)),
+        autocomplete(autoComp), autoskip(autoSkip), rightToLeft(rtl) {}
 };
 
 typedef struct {
@@ -78,16 +82,14 @@ public:
     void setMask(int reactNode, std::string primaryFormat, MaskOptions options);
     jsi::Value mask(std::string mask, std::string value, bool autocomplete);
     jsi::Value unmask(std::string mask, std::string value, bool autocomplete);
-    jsi::Value unmaskWithRightToLeft(std::string mask, std::string value, bool autocomplete, bool rightToLeft);
     jsi::Runtime *grt = nullptr;
     std::shared_ptr<Mask> pickMask(const CaretString &text, MaskOptions maskOptions, std::string primaryMask);
-
+    std::shared_ptr<std::string> lastStrPtr_ {nullptr};
     // 释放资源
     ~RNTextInputMask();
 
 private:
     std::unordered_set<UserData *> m_userDatas;
 };
-
-
 } // namespace rnoh
+#endif

package/harmony/text_input_mask/src/main/cpp/RNTextInputMaskPackage.h

@@ -13,7 +13,8 @@ using namespace facebook;
 namespace rnoh {
 class RNTextInputMaskTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
 public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override
+    {
         if (name == "RNTextInputMask") {
             return std::make_shared<RNTextInputMask>(ctx, name);
         }
@@ -24,7 +25,8 @@ public:
 class RNTextInputMaskPackage : public Package {
 public:
     RNTextInputMaskPackage(Package::Context ctx) : Package(ctx) {}
-    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override
+    {
         return std::make_unique<RNTextInputMaskTurboModuleFactoryDelegate>();
     }
     // std::vector<ArkTSMessageHandler::Shared> createArkTSMessageHandlers() override;