From 894ad578d09d50759f0d8651c7d3ce6fb0f125a8 Mon Sep 17 00:00:00 2001
From: yangziyon <nsyangziyong@huawei.com>
Date: Fri, 29 Mar 2024 19:33:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20wordBreak=E8=AE=BE=E7=BD=AEundifined?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangziyon <nsyangziyong@huawei.com>
---
 frameworks/bridge/declarative_frontend/jsview/js_textfield.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frameworks/bridge/declarative_frontend/jsview/js_textfield.cpp b/frameworks/bridge/declarative_frontend/jsview/js_textfield.cpp
index 1aac8791f31..0df34950811 100644
--- a/frameworks/bridge/declarative_frontend/jsview/js_textfield.cpp
+++ b/frameworks/bridge/declarative_frontend/jsview/js_textfield.cpp
@@ -467,10 +467,12 @@ void JSTextField::SetWordBreak(const JSCallbackInfo& info)
         return;
     }
     if (!info[0]->IsNumber()) {
+        TextFieldModel::GetInstance()->SetWordBreak(WordBreak::BREAK_WORD);
         return;
     }
     auto index = info[0]->ToNumber<int32_t>();
     if (index < 0 || index >= static_cast<int32_t>(WORD_BREAK_TYPES.size())) {
+        TextFieldModel::GetInstance()->SetWordBreak(WordBreak::BREAK_WORD);
         return;
     }
     TextFieldModel::GetInstance()->SetWordBreak(WORD_BREAK_TYPES[index]);
-- 
Gitee


From 51a6987fe173fa17a46916f6c52ea76493710ff5 Mon Sep 17 00:00:00 2001
From: yangziyong <nsyangziyong@huawei.com>
Date: Fri, 5 Apr 2024 10:30:35 +0800
Subject: [PATCH 2/2] fix word-break modifier

Signed-off-by: yangziyong <nsyangziyong@huawei.com>
Change-Id: Ic0ab69c67b3348001945bd504f45976362a19b03
---
 .../ark_component/src/ArkTextArea.ts                   |  6 +++---
 .../ark_component/src/ArkTextInput.ts                  |  4 ++--
 .../bridge/declarative_frontend/engine/arkComponent.js | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextArea.ts b/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextArea.ts
index 900be6b2ec4..d8a48dd2e3a 100644
--- a/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextArea.ts
+++ b/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextArea.ts
@@ -98,12 +98,12 @@ class TextAreaWordBreakModifier extends ModifierWithKey<WordBreak> {
   constructor(value: WordBreak) {
     super(value);
   }
-  static identity: Symbol = Symbol('textInputWordBreak');
+  static identity: Symbol = Symbol('textAreaWordBreak');
   applyPeer(node: KNode, reset: boolean): void {
     if (reset) {
-      getUINativeModule().text.resetWordBreak(node);
+      getUINativeModule().textArea.resetWordBreak(node);
     } else {
-      getUINativeModule().text.setWordBreak(node, this.value!);
+      getUINativeModule().textArea.setWordBreak(node, this.value!);
     }
   }
   checkObjectDiff(): boolean {
diff --git a/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextInput.ts b/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextInput.ts
index 5a3291d14d9..0cb32272249 100644
--- a/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextInput.ts
+++ b/frameworks/bridge/declarative_frontend/ark_component/src/ArkTextInput.ts
@@ -166,9 +166,9 @@ class TextInputWordBreakModifier extends ModifierWithKey<WordBreak> {
   static identity: Symbol = Symbol('textInputWordBreak');
   applyPeer(node: KNode, reset: boolean): void {
     if (reset) {
-      getUINativeModule().text.resetWordBreak(node);
+      getUINativeModule().textInput.resetWordBreak(node);
     } else {
-      getUINativeModule().text.setWordBreak(node, this.value!);
+      getUINativeModule().textInput.setWordBreak(node, this.value!);
     }
   }
   checkObjectDiff(): boolean {
diff --git a/frameworks/bridge/declarative_frontend/engine/arkComponent.js b/frameworks/bridge/declarative_frontend/engine/arkComponent.js
index f1a93486c6f..9ea3e475fd7 100644
--- a/frameworks/bridge/declarative_frontend/engine/arkComponent.js
+++ b/frameworks/bridge/declarative_frontend/engine/arkComponent.js
@@ -8563,17 +8563,17 @@ class TextAreaWordBreakModifier extends ModifierWithKey {
     }
     applyPeer(node, reset) {
         if (reset) {
-            getUINativeModule().text.resetWordBreak(node);
+            getUINativeModule().textArea.resetWordBreak(node);
         }
         else {
-            getUINativeModule().text.setWordBreak(node, this.value);
+            getUINativeModule().textArea.setWordBreak(node, this.value);
         }
     }
     checkObjectDiff() {
         return !isBaseOrResourceEqual(this.stageValue, this.value);
     }
 }
-TextAreaWordBreakModifier.identity = Symbol('textInputWordBreak');
+TextAreaWordBreakModifier.identity = Symbol('textAreaWordBreak');
 class TextAreaCopyOptionModifier extends ModifierWithKey {
   constructor(value) {
     super(value);
@@ -9161,10 +9161,10 @@ class TextInputWordBreakModifier extends ModifierWithKey {
     }
     applyPeer(node, reset) {
         if (reset) {
-            getUINativeModule().text.resetWordBreak(node);
+            getUINativeModule().textInput.resetWordBreak(node);
         }
         else {
-            getUINativeModule().text.setWordBreak(node, this.value);
+            getUINativeModule().textInput.setWordBreak(node, this.value);
         }
     }
     checkObjectDiff() {
-- 
Gitee