javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(textview): added maxLines property (#7943)

Browse Source 
* feat(textview): added maxLines property

* feat(text-view): moved implementation to TextView

* feat(text-view): changes based on CR

* feat(text-view): Normalize behavior in between android and iOS

* chore: updated NativeScript.api.md

* chore: add new line before return

Co-authored-by: Dimitar Topuzov <dtopuzov@gmail.com>
Co-authored-by: Vasil Trifonov <v.trifonov@gmail.com>
This commit is contained in:
Nicu
2020-01-16 12:41:26 +02:00
committed by Dimitar Topuzov
parent 6133d6b6bd
commit 3c79ded42b
9 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nativescript-core/ui/text-view/text-view-common.ts Normal file
View File

@ -0,0 +1,10 @@
import { TextView as TextViewDefinition } from ".";
import { EditableTextBase } from "../editable-text-base";
import { Property } from "../text-base";
export class TextViewBase extends EditableTextBase implements TextViewDefinition {
public maxLines: number;
}
export const maxLinesProperty = new Property<EditableTextBase, number>({ name: "maxLines", valueConverter: parseInt });
maxLinesProperty.register(EditableTextBase);

21
nativescript-core/ui/text-view/text-view.android.ts
View File

@ -1,11 +1,10 @@
import { TextView as TextViewDefinition } from ".";
import { EditableTextBase, CSSType } from "../editable-text-base";
import { TextViewBase as TextViewBaseCommon, maxLinesProperty } from "./text-view-common";
import { CSSType } from "../editable-text-base";
export * from "../text-base";
@CSSType("TextView")
export class TextView extends EditableTextBase implements TextViewDefinition {
export class TextView extends TextViewBaseCommon {
public _configureEditText(editText: android.widget.EditText) {
editText.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_NORMAL | android.text.InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE | android.text.InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
editText.setGravity(android.view.Gravity.TOP | android.view.Gravity.START);
@ -15,6 +14,20 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
super.resetNativeView();
this.nativeTextViewProtected.setGravity(android.view.Gravity.TOP | android.view.Gravity.START);
}
[maxLinesProperty.getDefault](): number {
return 0;
}
[maxLinesProperty.setNative](value: number) {
if (value <= 0) {
this.nativeTextViewProtected.setMaxLines(Number.MAX_VALUE);
return;
}
this.nativeTextViewProtected.setMaxLines(value);
}
}
TextView.prototype.recycleNativeView = "auto";

8
nativescript-core/ui/text-view/text-view.d.ts vendored
View File

@ -4,6 +4,7 @@
*/ /** */
import { EditableTextBase } from "../editable-text-base";
import { Property } from "../text-base";
/**
* Represents an editable multiline text view.
@ -18,4 +19,11 @@ export class TextView extends EditableTextBase {
* Gets the native iOS [UITextView](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UITextView_Class/) that represents the user interface for this component. Valid only when running on iOS.
*/
ios: any /* UITextView */;
/**
* Limits input to a certain number of lines.
*/
maxLines: number;
}
export const maxLinesProperty: Property<EditableTextBase, number>;

20
nativescript-core/ui/text-view/text-view.ios.ts
View File

@ -1,7 +1,7 @@
import { ScrollEventData } from "../scroll-view";
import { TextView as TextViewDefinition } from ".";
import { TextViewBase as TextViewBaseCommon, maxLinesProperty } from "./text-view-common";
import {
EditableTextBase, editableProperty, hintProperty, textProperty, colorProperty, placeholderColorProperty,
editableProperty, hintProperty, textProperty, colorProperty, placeholderColorProperty,
borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty,
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty,
Length, _updateCharactersInRangeReplacementString, Color, layout,
@ -110,7 +110,7 @@ class NoScrollAnimationUITextView extends UITextView {
}
@CSSType("TextView")
export class TextView extends EditableTextBase implements TextViewDefinition {
export class TextView extends TextViewBaseCommon {
nativeViewProtected: UITextView;
private _delegate: UITextViewDelegateImpl;
private _isShowingHint: boolean;
@ -333,6 +333,20 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
let left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: left, bottom: inset.bottom, right: inset.right };
}
[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;
}
}
}
TextView.prototype.recycleNativeView = "auto";