File tree 2 files changed +20
-16
lines changed
2 files changed +20
-16
lines changed Original file line number Diff line number Diff line change @@ -341,40 +341,37 @@ export class Label extends LabelBase {
341
341
const nativeView = this . nativeTextViewProtected ;
342
342
switch ( value ) {
343
343
case 'end' :
344
- // nativeView.setSingleLine(true);
345
344
nativeView . setEllipsize ( android . text . TextUtils . TruncateAt . END ) ;
346
345
break ;
347
346
case 'start' :
348
- // nativeView.setSingleLine(true);
349
347
nativeView . setEllipsize ( android . text . TextUtils . TruncateAt . START ) ;
350
348
break ;
351
349
case 'marquee' :
352
- // nativeView.setSingleLine(true);
353
350
nativeView . setEllipsize ( android . text . TextUtils . TruncateAt . MARQUEE ) ;
354
351
break ;
355
352
case 'middle' :
356
- // nativeView.setSingleLine(true);
357
353
nativeView . setEllipsize ( android . text . TextUtils . TruncateAt . MIDDLE ) ;
358
354
break ;
359
355
case 'none' :
360
- // nativeView.setSingleLine(false);
361
356
nativeView . setEllipsize ( null ) ;
362
357
break ;
363
358
}
364
359
}
365
360
366
361
[ whiteSpaceProperty . setNative ] ( value : WhiteSpace ) {
367
- const nativeView = this . nativeTextViewProtected ;
368
- switch ( value ) {
369
- case 'initial' :
370
- case 'normal' :
371
- nativeView . setSingleLine ( false ) ;
372
- // nativeView.setEllipsize(null);
373
- break ;
374
- case 'nowrap' :
375
- nativeView . setSingleLine ( true ) ;
376
- // nativeView.setEllipsize(android.text.TextUtils.TruncateAt.END);
377
- break ;
362
+ if ( ! this . lineBreak ) {
363
+ const nativeView = this . nativeTextViewProtected ;
364
+ switch ( value ) {
365
+ case 'initial' :
366
+ case 'normal' :
367
+ nativeView . setSingleLine ( false ) ;
368
+ nativeView . setEllipsize ( null ) ;
369
+ break ;
370
+ case 'nowrap' :
371
+ nativeView . setSingleLine ( true ) ;
372
+ nativeView . setEllipsize ( android . text . TextUtils . TruncateAt . END ) ;
373
+ break ;
374
+ }
378
375
}
379
376
}
380
377
[ textShadowProperty . setNative ] ( value : TextShadow ) {
Original file line number Diff line number Diff line change @@ -808,6 +808,13 @@ export class Label extends LabelBase {
808
808
// only if no lineBreak
809
809
if ( ! this . lineBreak ) {
810
810
nativeView . textContainer . lineBreakMode = whiteSpaceToLineBreakMode ( value ) ;
811
+ if ( ! this . maxLines ) {
812
+ if ( value === 'normal' ) {
813
+ this . nativeViewProtected . textContainer . maximumNumberOfLines = 0 ;
814
+ } else {
815
+ this . nativeViewProtected . textContainer . maximumNumberOfLines = 1 ;
816
+ }
817
+ }
811
818
}
812
819
}
813
820
You can’t perform that action at this time.
0 commit comments