File tree 4 files changed +30
-14
lines changed
4 files changed +30
-14
lines changed Original file line number Diff line number Diff line change @@ -427,7 +427,7 @@ class TextArea extends UI5Element {
427
427
}
428
428
429
429
_onResize ( ) {
430
- if ( this . displayValueStateMessage ) {
430
+ if ( this . displayValueStateMessagePopover ) {
431
431
this . _width = this . offsetWidth ;
432
432
}
433
433
}
@@ -546,19 +546,19 @@ class TextArea extends UI5Element {
546
546
}
547
547
548
548
get openValueStateMsgPopover ( ) {
549
- return ! this . _firstRendering && this . _openValueStateMsgPopover && this . displayValueStateMessage ;
549
+ return ! this . _firstRendering && this . _openValueStateMsgPopover && this . displayValueStateMessagePopover ;
550
550
}
551
551
552
- get displayValueStateMessage ( ) {
553
- return ! ! this . valueStateMessage . length || this . exceeding || ( this . valueState !== ValueState . Success && this . valueState !== ValueState . None ) ;
552
+ get displayValueStateMessagePopover ( ) {
553
+ return this . hasCustomValueState || this . hasValueState || this . exceeding ;
554
554
}
555
555
556
- get displayDefaultValueStateMessage ( ) {
557
- if ( this . valueStateMessage . length ) {
558
- return false ;
559
- }
556
+ get hasCustomValueState ( ) {
557
+ return ! ! this . valueStateMessage . length && this . hasValueState ;
558
+ }
560
559
561
- return this . exceeding || ( this . valueState !== ValueState . Success && this . valueState !== ValueState . None ) ;
560
+ get hasValueState ( ) {
561
+ return this . valueState === ValueState . Error || this . valueState === ValueState . Warning || this . valueState === ValueState . Information ;
562
562
}
563
563
564
564
get valueStateMessageText ( ) {
Original file line number Diff line number Diff line change 1
- {{ #if displayValueStateMessage }}
1
+ {{ #if displayValueStateMessagePopover }}
2
2
<ui5-popover
3
3
skip-registry-update
4
4
no-padding
16
16
{{ /if }}
17
17
18
18
{{ #*inline " valueStateMessage" }}
19
- {{ #if displayDefaultValueStateMessage }}
20
- {{ valueStateText }}
21
- {{ else }}
19
+ {{ #if hasCustomValueState }}
22
20
{{ #each valueStateMessageText }}
23
21
{{ this }}
24
22
{{ /each }}
23
+ {{ else }}
24
+ {{ valueStateText }}
25
25
{{ /if }}
26
26
{{ /inline }}
Original file line number Diff line number Diff line change 80
80
81
81
< section class ="group ">
82
82
< ui5-title > Simple TextArea</ ui5-title >
83
- < ui5-textarea id ="basic-textarea " placeholder ="Basic text area "> </ ui5-textarea >
83
+ < ui5-textarea id ="basic-textarea " placeholder ="Basic text area ">
84
+ < div slot ="valueStateMessage ">
85
+ This msg will not be displayed as no value-state is set.
86
+ </ div >
87
+ </ ui5-textarea >
84
88
85
89
< br >
86
90
< br >
Original file line number Diff line number Diff line change @@ -73,6 +73,18 @@ describe("when enabled", () => {
73
73
assert . ok ( popover . isDisplayedInViewport ( ) , "The value state message popover is displayed" ) ;
74
74
} ) ;
75
75
76
+ it ( "does not show value state msg when valueState='None'" , ( ) => {
77
+ const textarea = browser . $ ( "#basic-textarea" ) ;
78
+ const staticAreaItemClassName = browser . getStaticAreaItemClassName ( "#basic-textarea" ) ;
79
+ const popover = browser . $ ( `.${ staticAreaItemClassName } ` ) . shadow$ ( "ui5-popover" )
80
+
81
+ // act
82
+ textarea . click ( ) ;
83
+
84
+ // assert
85
+ assert . ok ( ! popover . isDisplayedInViewport ( ) , "The value state message popover is not displayed" ) ;
86
+ } ) ;
87
+
76
88
it ( "can type inside" , ( ) => {
77
89
const textarea = browser . $ ( "#basic-textarea" ) ;
78
90
const textareaInner = browser . $ ( "#basic-textarea" ) . shadow$ ( "textarea" ) ;
You can’t perform that action at this time.
0 commit comments