feat(textview): added maxLines property

Surdu · Surdu · commit 974bdb1eab4e · 2019-10-22T18:35:58.000+03:00
diff --git a/nativescript-core/ui/editable-text-base/editable-text-base-common.ts b/nativescript-core/ui/editable-text-base/editable-text-base-common.ts
@@ -16,6 +16,7 @@ export abstract class EditableTextBase extends TextBase implements EditableTextB
     public autocorrect: boolean;
     public hint: string;
     public maxLength: number;
+    public maxLines: number;
 
     public abstract dismissSoftInput();
     public abstract _setInputType(inputType: number): void;
@@ -67,3 +68,6 @@ hintProperty.register(EditableTextBase);
 
 export const maxLengthProperty = new Property<EditableTextBase, number>({ name: "maxLength", defaultValue: Number.POSITIVE_INFINITY, valueConverter: parseInt });
 maxLengthProperty.register(EditableTextBase);
+
+export const maxLinesProperty = new Property<EditableTextBase, number>({ name: "maxLines", valueConverter: parseInt });
+maxLinesProperty.register(EditableTextBase);
diff --git a/nativescript-core/ui/editable-text-base/editable-text-base.android.ts b/nativescript-core/ui/editable-text-base/editable-text-base.android.ts
@@ -2,7 +2,7 @@ import {
     EditableTextBase as EditableTextBaseCommon, keyboardTypeProperty,
     returnKeyTypeProperty, editableProperty,
     autocapitalizationTypeProperty, autocorrectProperty, hintProperty, resetSymbol,
-    textProperty, placeholderColorProperty, Color, textTransformProperty, maxLengthProperty
+    textProperty, placeholderColorProperty, Color, textTransformProperty, maxLengthProperty, maxLinesProperty
 } from "./editable-text-base-common";
 
 import { ad } from "../../utils/utils";
@@ -456,4 +456,12 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
             this.nativeTextViewProtected.setFilters(newFilters);
         }
     }
+
+    [maxLinesProperty.getDefault](): number {
+        return -1;
+    }
+
+    [maxLinesProperty.setNative](value: number) {
+      this.nativeTextViewProtected.setMaxLines(value);
+    }
 }
diff --git a/nativescript-core/ui/editable-text-base/editable-text-base.d.ts b/nativescript-core/ui/editable-text-base/editable-text-base.d.ts
@@ -52,6 +52,11 @@ export class EditableTextBase extends TextBase {
      */
     maxLength: number;
 
+    /**
+     * Limits input to a certain number of lines.
+     */
+    maxLines: number;
+
     /**
      * Hides the soft input method, ususally a soft keyboard.
      */
@@ -79,6 +84,7 @@ export const autocorrectProperty: Property<EditableTextBase, boolean>;
 export const hintProperty: Property<EditableTextBase, string>;
 export const placeholderColorProperty: CssProperty<Style, Color>;
 export const maxLengthProperty: Property<EditableTextBase, number>;
+export const maxLinesProperty: Property<EditableTextBase, number>;
 
 //@private
 /**
diff --git a/nativescript-core/ui/editable-text-base/editable-text-base.ios.ts b/nativescript-core/ui/editable-text-base/editable-text-base.ios.ts
@@ -1,7 +1,7 @@
 import {
     EditableTextBase as EditableTextBaseCommon, keyboardTypeProperty,
     returnKeyTypeProperty,
-    autocapitalizationTypeProperty, autocorrectProperty, FormattedString
+    autocapitalizationTypeProperty, autocorrectProperty, FormattedString, maxLinesProperty
 } from "./editable-text-base-common";
 
 export * from "./editable-text-base-common";
@@ -186,6 +186,21 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
 
         this.nativeTextViewProtected.autocorrectionType = newValue;
     }
+
+    [maxLinesProperty.getDefault](): number {
+        return 0;
+    }
+
+    [maxLinesProperty.setNative](value: number) {
+      this.nativeTextViewProtected.textContainer.maximumNumberOfLines = value;
+
+      if (value !== 0) {
+        this.nativeTextViewProtected.textContainer.lineBreakMode = NSLineBreakMode.ByTruncatingTail;
+      }
+      else {
+        this.nativeTextViewProtected.textContainer.lineBreakMode = NSLineBreakMode.ByWordWrapping;
+      }
+    }
 }
 
 export function _updateCharactersInRangeReplacementString(formattedText: FormattedString, rangeLocation: number, rangeLength: number, replacementString: string): void {
diff --git a/tests/app/ui/text-view/text-view-tests-native.android.ts b/tests/app/ui/text-view/text-view-tests-native.android.ts
@@ -63,3 +63,7 @@ export function typeTextNatively(textView: textViewModule.TextView, text: string
     textView.android.setText(text);
     textView.android.clearFocus();
 }
+
+export function getNativeMaxLines(textView: textViewModule.TextView): number {
+    return textView.android.getMaxLines();
+}
diff --git a/tests/app/ui/text-view/text-view-tests-native.d.ts b/tests/app/ui/text-view/text-view-tests-native.d.ts
@@ -10,3 +10,4 @@ export declare function getNativeColor(textView: textViewModule.TextView): color
 export declare function getNativeBackgroundColor(textView: textViewModule.TextView): colorModule.Color;
 export declare function getNativeTextAlignment(textView: textViewModule.TextView): string;
 export declare function typeTextNatively(textView: textViewModule.TextView, text: string): void;
+export declare function getNativeMaxLines(textView: textViewModule.TextView): number;
diff --git a/tests/app/ui/text-view/text-view-tests-native.ios.ts b/tests/app/ui/text-view/text-view-tests-native.ios.ts
@@ -51,3 +51,7 @@ export function typeTextNatively(textView: textViewModule.TextView, text: string
     // Setting the text will not trigger the delegate method, so we have to do it by hand.
     textView.ios.delegate.textViewDidEndEditing(textView.ios);
 }
+
+export function getNativeMaxLines(textView: textViewModule.TextView): number {
+    return textView.ios.textContainer.maximumNumberOfLines;
+}
diff --git a/tests/app/ui/text-view/text-view-tests.ts b/tests/app/ui/text-view/text-view-tests.ts
@@ -346,6 +346,18 @@ export var testBindEditableToBindingConext = function () {
     });
 };
 
+export var testSetMaxLines = function () {
+    helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {
+        var textView = <textViewModule.TextView>views[0];
+
+        textView.maxLines = 3;
+
+        var expectedValue = 3;
+        var actualValue = textViewTestsNative.getNativeMaxLines(textView);
+        TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
+    });
+};
+
 var expectedFontSize = 42;
 export var testLocalFontSizeFromCss = function () {
     helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array<viewModule.View>) {

Original file line number	Diff line number	Diff line change
`@@ -63,3 +63,7 @@ export function typeTextNatively(textView: textViewModule.TextView, text: string`
`63`	`63`	`textView.android.setText(text);`
`64`	`64`	`textView.android.clearFocus();`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+export function getNativeMaxLines(textView: textViewModule.TextView): number {`
	`68`	`+ return textView.android.getMaxLines();`
	`69`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,3 +51,7 @@ export function typeTextNatively(textView: textViewModule.TextView, text: string`
`51`	`51`	`// Setting the text will not trigger the delegate method, so we have to do it by hand.`
`52`	`52`	`textView.ios.delegate.textViewDidEndEditing(textView.ios);`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+export function getNativeMaxLines(textView: textViewModule.TextView): number {`
	`56`	`+ return textView.ios.textContainer.maximumNumberOfLines;`
	`57`	`+}`