Skip to content

fix(ui5-textarea): stop showing valueStateMsg in value-state="None" #1568

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.

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

Merged
merged 1 commit into from
Apr 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions packages/main/src/TextArea.js
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ class TextArea extends UI5Element {
}

_onResize() {
if (this.displayValueStateMessage) {
if (this.displayValueStateMessagePopover) {
this._width = this.offsetWidth;
}
}
Expand Down Expand Up @@ -546,19 +546,19 @@ class TextArea extends UI5Element {
}

get openValueStateMsgPopover() {
return !this._firstRendering && this._openValueStateMsgPopover && this.displayValueStateMessage;
return !this._firstRendering && this._openValueStateMsgPopover && this.displayValueStateMessagePopover;
}

get displayValueStateMessage() {
return !!this.valueStateMessage.length || this.exceeding || (this.valueState !== ValueState.Success && this.valueState !== ValueState.None);
get displayValueStateMessagePopover() {
return this.hasCustomValueState || this.hasValueState || this.exceeding;
}

get displayDefaultValueStateMessage() {
if (this.valueStateMessage.length) {
return false;
}
get hasCustomValueState() {
return !!this.valueStateMessage.length && this.hasValueState;
}

return this.exceeding || (this.valueState !== ValueState.Success && this.valueState !== ValueState.None);
get hasValueState() {
return this.valueState === ValueState.Error || this.valueState === ValueState.Warning || this.valueState === ValueState.Information;
}

get valueStateMessageText() {
Expand Down
8 changes: 4 additions & 4 deletions packages/main/src/TextAreaPopover.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{#if displayValueStateMessage}}
{{#if displayValueStateMessagePopover}}
<ui5-popover
skip-registry-update
no-padding
Expand All @@ -16,11 +16,11 @@
{{/if}}

{{#*inline "valueStateMessage"}}
{{#if displayDefaultValueStateMessage}}
{{valueStateText}}
{{else}}
{{#if hasCustomValueState}}
{{#each valueStateMessageText}}
{{this}}
{{/each}}
{{else}}
{{valueStateText}}
{{/if}}
{{/inline}}
6 changes: 5 additions & 1 deletion packages/main/test/pages/TextArea.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@

<section class="group">
<ui5-title>Simple TextArea</ui5-title>
<ui5-textarea id="basic-textarea" placeholder="Basic text area"></ui5-textarea>
<ui5-textarea id="basic-textarea" placeholder="Basic text area">
<div slot="valueStateMessage">
This msg will not be displayed as no value-state is set.
</div>
</ui5-textarea>

<br>
<br>
Expand Down
12 changes: 12 additions & 0 deletions packages/main/test/specs/TextArea.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,18 @@ describe("when enabled", () => {
assert.ok(popover.isDisplayedInViewport(), "The value state message popover is displayed");
});

it("does not show value state msg when valueState='None'", () => {
const textarea = browser.$("#basic-textarea");
const staticAreaItemClassName = browser.getStaticAreaItemClassName("#basic-textarea");
const popover = browser.$(`.${staticAreaItemClassName}`).shadow$("ui5-popover")

// act
textarea.click();

// assert
assert.ok(!popover.isDisplayedInViewport(), "The value state message popover is not displayed");
});

it("can type inside", () => {
const textarea = browser.$("#basic-textarea");
const textareaInner = browser.$("#basic-textarea").shadow$("textarea");
Expand Down