From 8c2d6567616137d319545c3e738a4bfab50f5b18 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Mon, 1 Apr 2024 16:41:02 +0300 Subject: [PATCH 1/8] refactor(ui5-input, ui5-combobox): improve samples with value state message fixes: #8581 --- packages/main/test/pages/ComboBox.html | 3 --- packages/main/test/pages/Input.html | 1 - 2 files changed, 4 deletions(-) diff --git a/packages/main/test/pages/ComboBox.html b/packages/main/test/pages/ComboBox.html index 84d5caa1656e..dbae84d6650e 100644 --- a/packages/main/test/pages/ComboBox.html +++ b/packages/main/test/pages/ComboBox.html @@ -70,9 +70,6 @@
Custom error value state message with a Link.
-
Additionl custom error value state message with a Link. Extra - long text used as an error message. Extra long text used as an error message - 2. Extra long text used - as an error message - 3.
diff --git a/packages/main/test/pages/Input.html b/packages/main/test/pages/Input.html index 60e40d016982..d61c66168373 100644 --- a/packages/main/test/pages/Input.html +++ b/packages/main/test/pages/Input.html @@ -99,7 +99,6 @@

Input with valueState and Dynamic suggestions

value-state="Error" placeholder="Search for a country ...">
Custom error value state message with a Link.
-
Additionl custom error value state message with a Link. Extra long text used as an error message. Extra long text used as an error message - 2. Extra long text used as an error message - 3.

Input with long suggestions with valueState and ui5-li

From 4e8db98a4f900c4e04e743d6e389258f37fb19f1 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Mon, 1 Apr 2024 17:30:36 +0300 Subject: [PATCH 2/8] fix(ui5-input, ui5-combobox): improve docs fixes: #8581 --- packages/main/src/ComboBox.ts | 2 +- packages/main/src/Input.ts | 2 +- packages/main/src/MultiComboBox.ts | 2 +- packages/main/src/TextArea.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts index 2fbdfc4bda3c..181a69893fc2 100644 --- a/packages/main/src/ComboBox.ts +++ b/packages/main/src/ComboBox.ts @@ -375,7 +375,7 @@ class ComboBox extends UI5Element { items!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. + * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. diff --git a/packages/main/src/Input.ts b/packages/main/src/Input.ts index d54a5d3c4860..c1df658f7ea8 100644 --- a/packages/main/src/Input.ts +++ b/packages/main/src/Input.ts @@ -576,7 +576,7 @@ class Input extends UI5Element implements SuggestionComponent, IFormElement { formSupport!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. + * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. diff --git a/packages/main/src/MultiComboBox.ts b/packages/main/src/MultiComboBox.ts index 785659b7ddf4..78d8e064305c 100644 --- a/packages/main/src/MultiComboBox.ts +++ b/packages/main/src/MultiComboBox.ts @@ -435,7 +435,7 @@ class MultiComboBox extends UI5Element { icon!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. + * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index d15823d9c5d2..6d00b0198abe 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -295,7 +295,7 @@ class TextArea extends UI5Element implements IFormElement { _width?: number; /** - * Defines the value state message that will be displayed as pop up under the component. + * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. * *

* Note: If not specified, a default text (in the respective language) will be displayed. From ea8b84419c18e1993d2b87e41cdbcf4ac8ff179a Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Mon, 1 Apr 2024 17:41:41 +0300 Subject: [PATCH 3/8] fix(ui5-input, ui5-combobox): improve docs fixes: #8581 --- packages/main/src/ComboBox.ts | 3 ++- packages/main/src/Input.ts | 3 ++- packages/main/src/MultiComboBox.ts | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts index 181a69893fc2..3f5144fa6c23 100644 --- a/packages/main/src/ComboBox.ts +++ b/packages/main/src/ComboBox.ts @@ -375,7 +375,8 @@ class ComboBox extends UI5Element { items!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. + * Defines the value state message that will be displayed as pop up under the component. + * The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. diff --git a/packages/main/src/Input.ts b/packages/main/src/Input.ts index c1df658f7ea8..d2e18e7f70cd 100644 --- a/packages/main/src/Input.ts +++ b/packages/main/src/Input.ts @@ -576,7 +576,8 @@ class Input extends UI5Element implements SuggestionComponent, IFormElement { formSupport!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. + * Defines the value state message that will be displayed as pop up under the component. + * The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. diff --git a/packages/main/src/MultiComboBox.ts b/packages/main/src/MultiComboBox.ts index 78d8e064305c..4ba6904d0ee9 100644 --- a/packages/main/src/MultiComboBox.ts +++ b/packages/main/src/MultiComboBox.ts @@ -435,7 +435,8 @@ class MultiComboBox extends UI5Element { icon!: Array; /** - * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. + * Defines the value state message that will be displayed as pop up under the component. + * The value state message slot should contain only one root element. *

* * Note: If not specified, a default text (in the respective language) will be displayed. From ccef10395753267551e82e50715c5a9d57294cd6 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Mon, 1 Apr 2024 17:47:02 +0300 Subject: [PATCH 4/8] Revert "fix(ui5-input, ui5-combobox): improve docs This reverts commit 4e8db98a4f900c4e04e743d6e389258f37fb19f1. --- packages/main/src/TextArea.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index 6d00b0198abe..d15823d9c5d2 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -295,7 +295,7 @@ class TextArea extends UI5Element implements IFormElement { _width?: number; /** - * Defines the value state message that will be displayed as pop up under the component. The value state message slot should contain only one root element. + * Defines the value state message that will be displayed as pop up under the component. * *

* Note: If not specified, a default text (in the respective language) will be displayed. From c51cff0a56cbeda63379c7d880b229090018ae71 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Tue, 2 Apr 2024 13:10:04 +0300 Subject: [PATCH 5/8] fix(ui5-input, ui5-combobox): improve samples with value state message --- packages/main/src/ComboBox.ts | 1 - packages/main/src/Input.ts | 1 - packages/main/src/TextArea.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts index 3f5144fa6c23..fc5907864ce6 100644 --- a/packages/main/src/ComboBox.ts +++ b/packages/main/src/ComboBox.ts @@ -377,7 +377,6 @@ class ComboBox extends UI5Element { /** * Defines the value state message that will be displayed as pop up under the component. * The value state message slot should contain only one root element. - *

* * Note: If not specified, a default text (in the respective language) will be displayed. *
diff --git a/packages/main/src/Input.ts b/packages/main/src/Input.ts index d2e18e7f70cd..4a5d22715699 100644 --- a/packages/main/src/Input.ts +++ b/packages/main/src/Input.ts @@ -578,7 +578,6 @@ class Input extends UI5Element implements SuggestionComponent, IFormElement { /** * Defines the value state message that will be displayed as pop up under the component. * The value state message slot should contain only one root element. - *

* * Note: If not specified, a default text (in the respective language) will be displayed. *

diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index d15823d9c5d2..3038d5d12fed 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -297,7 +297,6 @@ class TextArea extends UI5Element implements IFormElement { /** * Defines the value state message that will be displayed as pop up under the component. * - *

* Note: If not specified, a default text (in the respective language) will be displayed. * *

From 167e14172c717e0f355a57f3c9d35170674c9f66 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Tue, 2 Apr 2024 14:11:36 +0300 Subject: [PATCH 6/8] Update TextArea.ts indents --- packages/main/src/TextArea.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index 1fe316019d00..1c5f7181898f 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -291,10 +291,10 @@ class TextArea extends UI5Element implements IFormElement { /** * Defines the value state message that will be displayed as pop up under the component. * * The value state message slot should contain only one root element. - * + * * **Note:** If not specified, a default text (in the respective language) will be displayed. * - *

+ *

* **Note:** The `valueStateMessage` would be displayed if the component has * `valueState` of type `Information`, `Warning` or `Error`. * @since 1.0.0-rc.7 From 60104203973eb3af6956a5d309b44999275d40f8 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Tue, 2 Apr 2024 14:34:39 +0300 Subject: [PATCH 7/8] Update TextArea.ts --- packages/main/src/TextArea.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index 1c5f7181898f..63de9fc7763e 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -294,7 +294,6 @@ class TextArea extends UI5Element implements IFormElement { * * **Note:** If not specified, a default text (in the respective language) will be displayed. * - *

* **Note:** The `valueStateMessage` would be displayed if the component has * `valueState` of type `Information`, `Warning` or `Error`. * @since 1.0.0-rc.7 From 86a77fee56fb5d0677d789a3ea1f54898dc8f1b1 Mon Sep 17 00:00:00 2001 From: Nikolay Deshev Date: Tue, 2 Apr 2024 16:08:14 +0300 Subject: [PATCH 8/8] Update TextArea.ts --- packages/main/src/TextArea.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index 63de9fc7763e..4366bff5fd7b 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -289,7 +289,7 @@ class TextArea extends UI5Element implements IFormElement { _width?: number; /** - * Defines the value state message that will be displayed as pop up under the component. * + * Defines the value state message that will be displayed as pop up under the component. * The value state message slot should contain only one root element. * * **Note:** If not specified, a default text (in the respective language) will be displayed.