Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui5-input, ui5-combobox): improve samples with value state message #8595

Merged
merged 9 commits into from
Apr 2, 2024
Merged

fix(ui5-input, ui5-combobox): improve samples with value state message #8595

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c2d656
refactor(ui5-input, ui5-combobox): improve samples with value state m…
ndeshev Apr 1, 2024
4e8db98
fix(ui5-input, ui5-combobox): improve docs
ndeshev Apr 1, 2024
ea8b844
fix(ui5-input, ui5-combobox): improve docs
ndeshev Apr 1, 2024
ccef103
Revert "fix(ui5-input, ui5-combobox): improve docs
ndeshev Apr 1, 2024
c51cff0
fix(ui5-input, ui5-combobox): improve samples with value state message
ndeshev Apr 2, 2024
d533c3a
Merge branch 'main' into input-cb-vsm-samples
ndeshev Apr 2, 2024
167e141
Update TextArea.ts indents
ndeshev Apr 2, 2024
6010420
Update TextArea.ts
ndeshev Apr 2, 2024
86a77fe
Update TextArea.ts
ndeshev Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/main/src/ComboBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ 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.
*
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/Input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ 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.
*
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/MultiComboBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ class MultiComboBox 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.
*
Expand Down
5 changes: 3 additions & 2 deletions packages/main/src/TextArea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,9 @@ 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. *
ndeshev marked this conversation as resolved.
Show resolved Hide resolved
* 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
Expand Down
3 changes: 0 additions & 3 deletions packages/main/test/pages/ComboBox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
<ui5-cb-item text="Belgium"></ui5-cb-item>
<ui5-cb-item text="Bosnia and Herzegovina"></ui5-cb-item>
<div slot="valueStateMessage">Custom error value state message with a <a href="#">Link</a>.</div>
<div slot="valueStateMessage">Additionl custom error value state message with a <a href="#">Link</a>. 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.</div>
</ui5-combobox>
<ui5-combobox id="vs-warning-default" class="combobox2auto" value-state="Warning">
<ui5-cb-item text="Algeria"></ui5-cb-item>
Expand Down
1 change: 0 additions & 1 deletion packages/main/test/pages/Input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ <h3>Input with valueState and Dynamic suggestions</h3>
value-state="Error"
placeholder="Search for a country ...">
<div slot="valueStateMessage">Custom error value state message with a <a href="#">Link</a>.</div>
<div slot="valueStateMessage">Additionl custom error value state message with a <a href="#">Link</a>. 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.</div>
</ui5-input>

<h3>Input with long suggestions with valueState and ui5-li</h3>
Expand Down