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

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

@@ -3,7 +3,8 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef CARETSTRINGITERATOR_H
+#define CARETSTRINGITERATOR_H
 #pragma once
 #include <string>
 #include <memory>
@@ -20,11 +21,12 @@ protected:
 
 public:
     // 构造函数
-    CaretStringIterator(const CaretString &caretStr, int index = 0) : caretString(caretStr), currentIndex(index) {}
+    explicit CaretStringIterator(const CaretString &caretStr, int index = 0) : caretString(caretStr),
+        currentIndex(index) {}
 
     // 插入是否影响光标位置
-    virtual bool insertionAffectsCaret() {
-
+    virtual bool insertionAffectsCaret()
+    {
         if (dynamic_cast<CaretString::Backward *>(caretString.caretGravity.get())) {
             return currentIndex < caretString.getCaretPosition();
         } else if (dynamic_cast<CaretString::Forward *>(caretString.caretGravity.get())) {
@@ -33,26 +35,23 @@ public:
         }
         return false;
     }
-
     // 删除是否影响光标位置
     virtual bool deletionAffectsCaret() { return currentIndex < caretString.getCaretPosition(); }
-
     /**
      * 遍历 CaretString.string
      * @postcondition: 迭代器位置移到下一个符号。
      * @returns 当前符号。如果迭代器到达字符串末尾，返回 nullptr。
      */
-    virtual char next() {
+    virtual char next()
+    {
         if (currentIndex >= caretString.getString().length()) {
             return '\0'; // 返回空指针表示到达字符串末尾
         }
-
 //         char *charPtr = new char;                         // 创建一个字符指针
         auto charPtr = caretString.getString()[currentIndex]; // 获取当前字符
         currentIndex += 1;                                // 移动到下一个索引
         return charPtr;                                   // 返回当前字符
     }
 };
-
-
 } // namespace TinpMask
+#endif

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

@@ -3,7 +3,8 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef NEXT_H
+#define NEXT_H
 #pragma once
 #include <memory>
 #include "State.h"
@@ -13,13 +14,12 @@ namespace TinpMask {
 class State;
 class Next {
 public:
-    std::shared_ptr<State> state; // 存储状态的智能指针
-    char insert;                  // 可插入的字符
-    bool pass;                    // 是否通过
-    char value;                   // 值字符，可选
-
-    // 构造函数
+    std::shared_ptr<State> state;
+    char insert;
+    bool pass;
+    char value;
     Next(std::shared_ptr<State> state, char insert, bool pass, char value)
         : state(state), insert(insert), pass(pass), value(value) {}
 };
-} // namespace TinpMask
+}
+#endif

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

@@ -3,28 +3,28 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef NOTATION_H
+#define NOTATION_H
 #pragma once
 #include <string>
 
 namespace TinpMask {
-
 class Notation {
 public:
     // 构造函数
     Notation(const char character, const std::string &characterSet, bool isOptional)
-        : character(character), characterSet(characterSet), isOptional(isOptional) {}
-
+        : character(character), characterSet(characterSet), isOptional(isOptional)
+    {}
     // 成员变量
     char character;           // 单个字符作为字符串
     std::string characterSet; // 字符集
     bool isOptional;          // 是否可选
-
-    // 其他方法和成员可以根据需要添加
-     bool operator==(const Notation& other) const {
-        return (this->character == other.character) &&
-               (this->characterSet == other.characterSet) &&
-               (this->isOptional == other.isOptional);
+                              // 其他方法和成员可以根据需要添加
+    bool operator == (const Notation &other) const
+    {
+        return (this->character == other.character) && (this->characterSet == other.characterSet) &&
+            (this->isOptional == other.isOptional);
     }
 };
-} // namespace TinpMask
+} // namespace TinpMask
+#endif

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

@@ -14,8 +14,8 @@ class RTLCaretStringIterator : public CaretStringIterator {
 public:
     RTLCaretStringIterator(const CaretString& caretString)
         : CaretStringIterator(caretString) {}
-
-    bool insertionAffectsCaret()  {
+    bool insertionAffectsCaret()
+    {
         return currentIndex <= caretString.caretPosition;
     }
 };

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

@@ -3,24 +3,19 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef STATE_H
+#define STATE_H
 #pragma once
 #include <memory>
 #include <iostream>
 
 namespace TinpMask {
-
-
 class Next;
 class State {
 public:
     std::shared_ptr<State> child; // 指向下一个状态的智能指针
-
 public:
-    // 构造函数
     explicit State(std::shared_ptr<State> child = nullptr) : child(child) {}
-
-    // 虚析构函数，以确保派生类的析构函数被正确调用
     virtual ~State() = default;
 
     /**
@@ -44,7 +39,8 @@ public:
      * @returns Next object instance with a set of actions to complete user input. If no
      * autocomplete available, returns nullptr.
      */
-    virtual std::shared_ptr<Next> autocomplete() {
+    virtual std::shared_ptr<Next> autocomplete()
+    {
         return nullptr; // 默认返回 nullptr
     }
 
@@ -56,7 +52,8 @@ public:
      *
      * @returns State object.
      */
-    virtual std::shared_ptr<State> nextState() {
+    virtual std::shared_ptr<State> nextState()
+    {
         return child; // 返回下一个状态
     }
 
@@ -67,13 +64,15 @@ public:
 // EOLState 类的实现
 class EOLState : public State {
 public:
-    EOLState(std::shared_ptr<State> child = nullptr) : State(child) {}
+    explicit EOLState(std::shared_ptr<State> child = nullptr) : State(child) {}
 
-    std::shared_ptr<Next> accept(char character) override {
+    std::shared_ptr<Next> accept(char character) override
+    {
         return nullptr; // 该状态不接受字符
     }
 
-    std::string toString() const override {
+    std::string toString() const override
+    {
         return "EOL"; // 返回字符串表示
     }
 };
@@ -83,11 +82,11 @@ public:
 class FixedState : public State {
 public:
     char ownCharacter;
-
 public:
     FixedState(std::shared_ptr<State> child, char ownCharacter) : State(child), ownCharacter(ownCharacter) {}
 
-    std::shared_ptr<Next> accept(char character) override {
+    std::shared_ptr<Next> accept(char character) override
+    {
         if (this->ownCharacter == character) {
             return std::make_shared<Next>(this->nextState(), character, true, character);
         } else {
@@ -95,16 +94,16 @@ public:
         }
     }
 
-    std::shared_ptr<Next> autocomplete() override {
+    std::shared_ptr<Next> autocomplete() override
+    {
         return std::make_shared<Next>(this->nextState(), this->ownCharacter, false, this->ownCharacter);
     }
 
-    std::string toString() const override {
+    std::string toString() const override
+    {
         return "{" + std::string(1, this->ownCharacter) + "} -> " + (child ? child->toString() : "null");
     }
 };
-
-// FreeState 类的实现
 class FreeState : public State {
 public:
     char ownCharacter;
@@ -112,7 +111,8 @@ public:
 public:
     FreeState(std::shared_ptr<State> child, char ownCharacter) : State(child), ownCharacter(ownCharacter) {}
 
-    std::shared_ptr<Next> accept(char character) override {
+    std::shared_ptr<Next> accept(char character) override
+    {
         if (this->ownCharacter == character) {
             return std::make_shared<Next>(this->nextState(), character, true, '\0');
         } else {
@@ -120,11 +120,13 @@ public:
         }
     }
 
-    std::shared_ptr<Next> autocomplete() override {
+    std::shared_ptr<Next> autocomplete() override
+    {
         return std::make_shared<Next>(this->nextState(), this->ownCharacter, false, '\0');
     }
 
-    std::string toString() const override {
+    std::string toString() const override
+    {
         return std::string(1, this->ownCharacter) + " -> " + (child ? child->toString() : "null");
     }
 };
@@ -160,7 +162,8 @@ public:
 public:
     std::shared_ptr<OptionalValueStateType> type;
 
-    bool accepts(char character) {
+    bool accepts(char character)
+    {
         if (dynamic_cast<Numeric *>(type.get())) {
             return std::isdigit(character);
         } else if (dynamic_cast<Literal *>(type.get())) {
@@ -179,7 +182,8 @@ public:
     OptionalValueState(std::shared_ptr<State> child, std::shared_ptr<OptionalValueStateType> &type)
         : State(child), type(type) {}
 
-    std::shared_ptr<Next> accept(char character) override {
+    std::shared_ptr<Next> accept(char character) override
+    {
         if (this->accepts(character)) {
             return std::make_shared<Next>(this->nextState(), character, true, character);
         } else {
@@ -187,7 +191,8 @@ public:
         }
     }
 
-    std::string toString() const override {
+    std::string toString() const override
+    {
         if (dynamic_cast<Literal *>(type.get())) {
             return "[a] -> " + (child ? child->toString() : "null");
         } else if (dynamic_cast<Numeric *>(type.get())) {
@@ -228,17 +233,18 @@ public:
         StateTypeName getName() override { return StateTypeName::Custom; }
     };
     class Custom : public ValueStateType {
-
     public:
         char character;
         std::string characterSet;
-        Custom(char character, const std::string &characterSet) : character(character), characterSet(characterSet) {}
+        Custom(char character,
+            const std::string &characterSet) : character(character), characterSet(characterSet) {}
         StateTypeName getName() override { return StateTypeName::Custom; }
     };
 
 public:
     std::shared_ptr<ValueStateType> type;
-    bool accepts(char character) {
+    bool accepts(char character)
+    {
         if (dynamic_cast<Numeric *>(type.get())) {
             return std::isdigit(character);
         } else if (dynamic_cast<Literal *>(type.get())) {
@@ -253,7 +259,8 @@ public:
         return false;
     }
 
-    bool acceptsWithInheritedType(std::shared_ptr<ValueStateType> inheritedType, char character) {
+    bool acceptsWithInheritedType(std::shared_ptr<ValueStateType> inheritedType, char character)
+    {
         if (dynamic_cast<Numeric *>(inheritedType.get())) {
             return std::isdigit(character);
         } else if (dynamic_cast<Literal *>(inheritedType.get())) {
@@ -268,14 +275,16 @@ public:
 
 public:
     // 构造函数用于创建 Ellipsis 类型的 ValueState
-    ValueState(std::shared_ptr<ValueStateType> inheritedType)
+    explicit ValueState(std::shared_ptr<ValueStateType> inheritedType)
         : State(nullptr), type(std::make_shared<Ellipsis>(inheritedType)) {}
 
     ValueState(std::shared_ptr<State> child, std::shared_ptr<ValueStateType> type) : State(child), type(type) {}
 
-    std::shared_ptr<Next> accept(char character) override {
-        if (!accepts(character))
+    std::shared_ptr<Next> accept(char character) override
+    {
+        if (!accepts(character)) {
             return nullptr;
+        }
         return std::make_shared<Next>(nextState(), character, true, character);
     }
 
@@ -283,7 +292,8 @@ public:
 
     std::shared_ptr<State> nextState() override { return isElliptical() ? shared_from_this() : State::nextState(); }
 
-    std::string toString() const override {
+    std::string toString() const override
+    {
         if (dynamic_cast<Literal *>(type.get())) {
             return "[A] -> " + (child ? child->toString() : "null");
         } else if (dynamic_cast<Numeric *>(type.get())) {
@@ -300,3 +310,4 @@ public:
 };
 
 }
+#endif

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

@@ -3,7 +3,8 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
-
+#ifndef COMMON_H
+#define COMMON_H
 #pragma once
 #include "CaretString.h"
 #include <string>
@@ -23,15 +24,17 @@ public:
     std::string tailPlaceholder;
 
     // 构造函数
-    Result(const CaretString &formattedText, const std::string &extractedValue, int affinity, bool complete,
-           const std::string &tailPlaceholder)
+    Result(const CaretString &formattedText,
+        const std::string &extractedValue, int affinity, bool complete,
+        const std::string &tailPlaceholder)
         : formattedText(formattedText), extractedValue(extractedValue), affinity(affinity), complete(complete),
-          tailPlaceholder(tailPlaceholder) {}
+        tailPlaceholder(tailPlaceholder) {}
 
     // reversed 方法
-    Result reversed() const {
+    Result reversed() const
+    {
         return Result(this->formattedText.reversed(), reverseString(this->extractedValue), this->affinity,
-                      this->complete, reverseString(this->tailPlaceholder));
+            this->complete, reverseString(this->tailPlaceholder));
     }
 
 private:
@@ -53,7 +56,8 @@ private:
 
 public:
     // Push 方法
-    std::optional<Next> push(const std::optional<Next> &item) {
+    std::optional<Next> push(const std::optional<Next> &item)
+    {
         if (item.has_value()) {
             stack.push_back(item.value());
             return item;
@@ -67,12 +71,14 @@ public:
     void clear() { stack.clear(); }
 
     // Optional: 获取栈的元素（用于检查或调试）
-    std::vector<Next> getStack() const {
+    std::vector<Next> getStack() const
+    {
         return stack; // 返回当前栈的拷贝
     }
 
     // Optional: 从栈中弹出一个元素
-    std::optional<Next> pop() {
+    std::optional<Next> pop()
+    {
         if (stack.empty()) {
             return std::nullopt; // 栈为空时返回 std::nullopt
         }
@@ -85,11 +91,13 @@ public:
     bool isEmpty() const { return stack.empty(); }
 
     // Optional: 获取栈顶元素而不移除它
-    std::optional<Next> peek() const {
+    std::optional<Next> peek() const
+    {
         if (stack.empty()) {
             return std::nullopt; // 栈为空时返回 std::nullopt
         }
         return stack.back();
     }
 };
-} // namespace TinpMask
+} // namespace TinpMask
+#endif

package/harmony/text_input_mask/src/main/ets/{RNTextInputMaskPackage.ts → RNTextInputMaskPackage.ets}

@@ -5,6 +5,7 @@
  */
 
 import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import { RNOHPackage } from "@rnoh/react-native-openharmony";
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
 import { RNTextInputMaskTurboModule } from './RNTextInputMaskTurboModle';
 
@@ -22,7 +23,7 @@ class RNTextInputMaskTurboModuleFactory extends TurboModulesFactory {
   }
 }
 
-export class RNTextInputMaskPackage extends RNPackage {
+export class RNTextInputMaskPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new RNTextInputMaskTurboModuleFactory(ctx);
   }

package/harmony/text_input_mask/src/main/ets/RNTextInputMaskTurboModle.ts

@@ -26,8 +26,4 @@ export class RNTextInputMaskTurboModule extends TurboModule  {
     console.log("==================", "setMask")
   }
 
-  unmaskWithRightToLeft(mask: string, value: string, autocomplete: boolean, rightToLeft: boolean): Promise<string> {
-    return;
-  }
-
 }

package/harmony/text_input_mask/src/ohosTest/ets/test/Ability.test.ets

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import { hilog } from '@kit.PerformanceAnalysisKit';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+
+export default function abilityTest() {
+  describe('ActsAbilityTest', () => {
+    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
+    beforeAll(() => {
+      // Presets an action, which is performed only once before all test cases of the test suite start.
+      // This API supports only one parameter: preset action function.
+    })
+    beforeEach(() => {
+      // Presets an action, which is performed before each unit test case starts.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: preset action function.
+    })
+    afterEach(() => {
+      // Presets a clear action, which is performed after each unit test case ends.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: clear action function.
+    })
+    afterAll(() => {
+      // Presets a clear action, which is performed after all test cases of the test suite end.
+      // This API supports only one parameter: clear action function.
+    })
+    it('assertContain', 0, () => {
+      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
+      hilog.info(0x0000, 'testTag', '%{public}s', 'it begin');
+      let a = 'abc';
+      let b = 'b';
+      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
+      expect(a).assertContain(b);
+      expect(a).assertEqual(a);
+    })
+  })
+}

package/harmony/text_input_mask/src/ohosTest/ets/test/List.test.ets

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import abilityTest from './Ability.test';
+
+export default function testsuite() {
+  abilityTest();
+}

package/harmony/text_input_mask/src/ohosTest/module.json5

@@ -0,0 +1,13 @@
+{
+  "module": {
+    "name": "text_input_mask_test",
+    "type": "feature",
+    "deviceTypes": [
+      "default",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false
+  }
+}

package/harmony/text_input_mask/src/test/List.test.ets

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import localUnitTest from './LocalUnit.test';
+
+export default function testsuite() {
+  localUnitTest();
+}

package/harmony/text_input_mask/src/test/LocalUnit.test.ets

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+
+export default function localUnitTest() {
+  describe('localUnitTest', () => {
+    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
+    beforeAll(() => {
+      // Presets an action, which is performed only once before all test cases of the test suite start.
+      // This API supports only one parameter: preset action function.
+    });
+    beforeEach(() => {
+      // Presets an action, which is performed before each unit test case starts.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: preset action function.
+    });
+    afterEach(() => {
+      // Presets a clear action, which is performed after each unit test case ends.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: clear action function.
+    });
+    afterAll(() => {
+      // Presets a clear action, which is performed after all test cases of the test suite end.
+      // This API supports only one parameter: clear action function.
+    });
+    it('assertContain', 0, () => {
+      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
+      let a = 'abc';
+      let b = 'b';
+      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
+      expect(a).assertContain(b);
+      expect(a).assertEqual(a);
+    });
+  });
+}

package/index.tsx

@@ -15,12 +15,9 @@ import React, {
 
 import { findNodeHandle, Platform, TextInput, TextInputProps } from 'react-native'
 import exportMasker from './src/index'
-import HarmonyTextInputMask from './src/index.harmony'
-const isIosAndroid = Platform.OS === 'ios' || Platform.OS === 'android';
 export const mask = exportMasker.mask
 export const unmask = exportMasker.unmask
 export const setMask = exportMasker.setMask
-export const unmaskWithRightToLeft = HarmonyTextInputMask.unmaskWithRightToLeft
 const TextInputMask = forwardRef<Handles, TextInputMaskProps>(({
     mask: primaryFormat,
     defaultValue,
@@ -37,14 +34,6 @@ const TextInputMask = forwardRef<Handles, TextInputMaskProps>(({
 }, ref) => {
   const input = useRef<TextInput>(null)
   const [ maskedValue, setMaskedValue ] = useState<string>()
-  const didLayout = useRef(false);
-  const handleLayout = () => {
-    didLayout.current = true;
-    const nodeId = findNodeHandle(input.current);
-    if (primaryFormat && nodeId) {
-      setMask(nodeId, primaryFormat, { affineFormats, affinityCalculationStrategy, customNotations, autocomplete, autoskip, rightToLeft });
-    }
-  };
 
   useEffectAsync(async () => {
     const initialValue = value ?? defaultValue
@@ -68,11 +57,9 @@ const TextInputMask = forwardRef<Handles, TextInputMaskProps>(({
   }, [value])
 
   useEffect(() => {
-    if (didLayout.current) {
-      const nodeId = findNodeHandle(input.current)
-      if (primaryFormat && nodeId) {
-        setMask(nodeId, primaryFormat, { affineFormats, affinityCalculationStrategy, customNotations, autocomplete, autoskip, rightToLeft })
-      }
+    const nodeId = findNodeHandle(input.current)
+    if (primaryFormat && nodeId) {
+      setMask(nodeId, primaryFormat, { affineFormats, affinityCalculationStrategy, customNotations, autocomplete, autoskip, rightToLeft })
     }
   }, [primaryFormat])
 
@@ -91,17 +78,11 @@ const TextInputMask = forwardRef<Handles, TextInputMaskProps>(({
           ref={input}
           value={maskedValue}
           multiline={primaryFormat && Platform.OS === 'ios' ? false : multiline}
-          onLayout={handleLayout}
           onChangeText={async (masked) => {
             setMaskedValue(masked)
             if (primaryFormat) {
-              if (isIosAndroid) {
-                const unmasked = await unmask(primaryFormat, masked, true)
-                onChangeText?.(masked, unmasked)
-              } else {
-                const unmasked = await unmaskWithRightToLeft(primaryFormat, masked, true, rightToLeft === undefined ? false : rightToLeft)
-                onChangeText?.(masked, unmasked)
-              }
+              const unmasked = await unmask(primaryFormat, masked, true)
+              onChangeText?.(masked, unmasked)
             } else {
               onChangeText?.(masked)
             }