mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
feat: Scoped Packages (#7911)
* chore: move tns-core-modules to nativescript-core * chore: preparing compat generate script * chore: add missing definitions * chore: no need for http-request to be private * chore: packages chore * test: generate tests for tns-core-modules * chore: add anroid module for consistency * chore: add .npmignore * chore: added privateModulesWhitelist * chore(webpack): added bundle-entry-points * chore: scripts * chore: tests changed to use @ns/core * test: add scoped-packages test project * test: fix types * test: update test project * chore: build scripts * chore: update build script * chore: npm scripts cleanup * chore: make the compat pgk work with old wp config * test: generate diff friendly tests * chore: create barrel exports * chore: move files after rebase * chore: typedoc config * chore: compat mode * chore: review of barrels * chore: remove tns-core-modules import after rebase * chore: dev workflow setup * chore: update developer-workflow * docs: experiment with API extractor * chore: api-extractor and barrel exports * chore: api-extractor configs * chore: generate d.ts rollup with api-extractor * refactor: move methods inside Frame * chore: fic tests to use Frame static methods * refactor: create Builder class * refactor: use Builder class in tests * refactor: include Style in ui barrel * chore: separate compat build script * chore: fix tslint errors * chore: update NATIVESCRIPT_CORE_ARGS * chore: fix compat pack * chore: fix ui-test-app build with linked modules * chore: Application, ApplicationSettings, Connectivity and Http * chore: export Trace, Profiling and Utils * refactor: Static create methods for ImageSource * chore: fix deprecated usages of ImageSource * chore: move Span and FormattedString to ui * chore: add events-args and ImageSource to index files * chore: check for CLI >= 6.2 when building for IOS * chore: update travis build * chore: copy Pod file to compat package * chore: update error msg ui-tests-app * refactor: Apply suggestions from code review Co-Authored-By: Martin Yankov <m.i.yankov@gmail.com> * chore: typings and refs * chore: add missing d.ts files for public API * chore: adress code review FB * chore: update api-report * chore: dev-workflow for other apps * chore: api update * chore: update api-report
This commit is contained in:
committed by
GitHub
parent
6c7139477e
commit
cc97a16800
5
nativescript-core/ui/text-view/package.json
Normal file
5
nativescript-core/ui/text-view/package.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"name": "text-view",
|
||||
"main": "text-view",
|
||||
"types": "text-view.d.ts"
|
||||
}
|
||||
20
nativescript-core/ui/text-view/text-view.android.ts
Normal file
20
nativescript-core/ui/text-view/text-view.android.ts
Normal file
@@ -0,0 +1,20 @@
|
||||
import { TextView as TextViewDefinition } from ".";
|
||||
import { EditableTextBase, CSSType } from "../editable-text-base";
|
||||
|
||||
export * from "../text-base";
|
||||
|
||||
@CSSType("TextView")
|
||||
export class TextView extends EditableTextBase implements TextViewDefinition {
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
public resetNativeView(): void {
|
||||
super.resetNativeView();
|
||||
this.nativeTextViewProtected.setGravity(android.view.Gravity.TOP | android.view.Gravity.START);
|
||||
}
|
||||
}
|
||||
|
||||
TextView.prototype.recycleNativeView = "auto";
|
||||
21
nativescript-core/ui/text-view/text-view.d.ts
vendored
Normal file
21
nativescript-core/ui/text-view/text-view.d.ts
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
/**
|
||||
* Contains the TextView class, which represents an editable multi-line line box.
|
||||
* @module "ui/text-view"
|
||||
*/ /** */
|
||||
|
||||
import { EditableTextBase } from "../editable-text-base";
|
||||
|
||||
/**
|
||||
* Represents an editable multiline text view.
|
||||
*/
|
||||
export class TextView extends EditableTextBase {
|
||||
/**
|
||||
* Gets the native [android widget](http://developer.android.com/reference/android/widget/EditText.html) that represents the user interface for this component. Valid only when running on Android OS.
|
||||
*/
|
||||
android: any /* android.widget.EditText */;
|
||||
|
||||
/**
|
||||
* 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 */;
|
||||
}
|
||||
338
nativescript-core/ui/text-view/text-view.ios.ts
Normal file
338
nativescript-core/ui/text-view/text-view.ios.ts
Normal file
@@ -0,0 +1,338 @@
|
||||
import { ScrollEventData } from "../scroll-view";
|
||||
import { TextView as TextViewDefinition } from ".";
|
||||
import {
|
||||
EditableTextBase, editableProperty, hintProperty, textProperty, colorProperty, placeholderColorProperty,
|
||||
borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty,
|
||||
paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty,
|
||||
Length, _updateCharactersInRangeReplacementString, Color, layout,
|
||||
CSSType
|
||||
} from "../editable-text-base";
|
||||
|
||||
export * from "../editable-text-base";
|
||||
|
||||
import { profile } from "../../profiling";
|
||||
import { ios } from "../../utils/utils";
|
||||
|
||||
const majorVersion = ios.MajorVersion;
|
||||
|
||||
class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
|
||||
public static ObjCProtocols = [UITextViewDelegate];
|
||||
|
||||
private _owner: WeakRef<TextView>;
|
||||
|
||||
public static initWithOwner(owner: WeakRef<TextView>): UITextViewDelegateImpl {
|
||||
const impl = <UITextViewDelegateImpl>UITextViewDelegateImpl.new();
|
||||
impl._owner = owner;
|
||||
|
||||
return impl;
|
||||
}
|
||||
|
||||
public textViewShouldBeginEditing(textView: UITextView): boolean {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
owner.showText();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public textViewDidBeginEditing(textView: UITextView): void {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
owner._isEditing = true;
|
||||
owner.notify({ eventName: TextView.focusEvent, object: owner });
|
||||
}
|
||||
}
|
||||
|
||||
public textViewDidEndEditing(textView: UITextView) {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
if (owner.updateTextTrigger === "focusLost") {
|
||||
textProperty.nativeValueChange(owner, textView.text);
|
||||
}
|
||||
|
||||
owner._isEditing = false;
|
||||
owner.dismissSoftInput();
|
||||
owner._refreshHintState(owner.hint, textView.text);
|
||||
}
|
||||
}
|
||||
|
||||
public textViewDidChange(textView: UITextView) {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
if (owner.updateTextTrigger === "textChanged") {
|
||||
textProperty.nativeValueChange(owner, textView.text);
|
||||
}
|
||||
owner.requestLayout();
|
||||
}
|
||||
}
|
||||
|
||||
public textViewShouldChangeTextInRangeReplacementText(textView: UITextView, range: NSRange, replacementString: string): boolean {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
const delta = replacementString.length - range.length;
|
||||
if (delta > 0) {
|
||||
if (textView.text.length + delta > owner.maxLength) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (owner.formattedText) {
|
||||
_updateCharactersInRangeReplacementString(owner.formattedText, range.location, range.length, replacementString);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public scrollViewDidScroll(sv: UIScrollView): void {
|
||||
const owner = this._owner.get();
|
||||
if (owner) {
|
||||
const contentOffset = owner.nativeViewProtected.contentOffset;
|
||||
owner.notify(<ScrollEventData>{
|
||||
object: owner,
|
||||
eventName: "scroll",
|
||||
scrollX: contentOffset.x,
|
||||
scrollY: contentOffset.y
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class NoScrollAnimationUITextView extends UITextView {
|
||||
// see https://github.com/NativeScript/NativeScript/issues/6863
|
||||
// UITextView internally scrolls the text you are currently typing to visible when newline character
|
||||
// is typed but the scroll animation is not needed because at the same time we are expanding
|
||||
// the textview (setting its frame)
|
||||
public setContentOffsetAnimated(contentOffset: CGPoint, animated: boolean): void {
|
||||
super.setContentOffsetAnimated(contentOffset, false);
|
||||
}
|
||||
}
|
||||
|
||||
@CSSType("TextView")
|
||||
export class TextView extends EditableTextBase implements TextViewDefinition {
|
||||
nativeViewProtected: UITextView;
|
||||
private _delegate: UITextViewDelegateImpl;
|
||||
private _isShowingHint: boolean;
|
||||
public _isEditing: boolean;
|
||||
|
||||
private _hintColor = majorVersion <= 12 ? UIColor.blackColor.colorWithAlphaComponent(0.22) : UIColor.placeholderTextColor;
|
||||
private _textColor = majorVersion <= 12 ? null : UIColor.labelColor;
|
||||
|
||||
createNativeView() {
|
||||
const textView = NoScrollAnimationUITextView.new();
|
||||
if (!textView.font) {
|
||||
textView.font = UIFont.systemFontOfSize(12);
|
||||
}
|
||||
|
||||
return textView;
|
||||
}
|
||||
|
||||
initNativeView() {
|
||||
super.initNativeView();
|
||||
this._delegate = UITextViewDelegateImpl.initWithOwner(new WeakRef(this));
|
||||
}
|
||||
|
||||
disposeNativeView() {
|
||||
this._delegate = null;
|
||||
super.disposeNativeView();
|
||||
}
|
||||
|
||||
@profile
|
||||
public onLoaded() {
|
||||
super.onLoaded();
|
||||
this.ios.delegate = this._delegate;
|
||||
}
|
||||
|
||||
public onUnloaded() {
|
||||
this.ios.delegate = null;
|
||||
super.onUnloaded();
|
||||
}
|
||||
|
||||
get ios(): UITextView {
|
||||
return this.nativeViewProtected;
|
||||
}
|
||||
|
||||
public _refreshHintState(hint: string, text: string) {
|
||||
if (this.formattedText) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (text !== null && text !== undefined && text !== "") {
|
||||
this.showText();
|
||||
} else if (!this._isEditing && hint !== null && hint !== undefined && hint !== "") {
|
||||
this.showHint(hint);
|
||||
} else {
|
||||
this._isShowingHint = false;
|
||||
this.nativeTextViewProtected.text = "";
|
||||
}
|
||||
}
|
||||
|
||||
private _refreshColor() {
|
||||
if (this._isShowingHint) {
|
||||
const placeholderColor = this.style.placeholderColor;
|
||||
const color = this.style.color;
|
||||
|
||||
if (placeholderColor) {
|
||||
this.nativeTextViewProtected.textColor = placeholderColor.ios;
|
||||
} else if (color) {
|
||||
// Use semi-transparent version of color for back-compatibility
|
||||
this.nativeTextViewProtected.textColor = color.ios.colorWithAlphaComponent(0.22);
|
||||
} else {
|
||||
this.nativeTextViewProtected.textColor = this._hintColor;
|
||||
}
|
||||
} else {
|
||||
const color = this.style.color;
|
||||
|
||||
if (color) {
|
||||
this.nativeTextViewProtected.textColor = color.ios;
|
||||
this.nativeTextViewProtected.tintColor = color.ios;
|
||||
} else {
|
||||
this.nativeTextViewProtected.textColor = this._textColor;
|
||||
this.nativeTextViewProtected.tintColor = this._textColor;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public showHint(hint: string) {
|
||||
const nativeView = this.nativeTextViewProtected;
|
||||
|
||||
this._isShowingHint = true;
|
||||
this._refreshColor();
|
||||
|
||||
const hintAsString: string = (hint === null || hint === undefined) ? "" : hint.toString();
|
||||
nativeView.text = hintAsString;
|
||||
}
|
||||
|
||||
public showText() {
|
||||
this._isShowingHint = false;
|
||||
this._refreshColor();
|
||||
this._setNativeText();
|
||||
this.requestLayout();
|
||||
}
|
||||
|
||||
[textProperty.getDefault](): string {
|
||||
return "";
|
||||
}
|
||||
[textProperty.setNative](value: string) {
|
||||
this._refreshHintState(this.hint, value);
|
||||
}
|
||||
|
||||
[hintProperty.getDefault](): string {
|
||||
return "";
|
||||
}
|
||||
[hintProperty.setNative](value: string) {
|
||||
this._refreshHintState(value, this.text);
|
||||
}
|
||||
|
||||
[editableProperty.getDefault](): boolean {
|
||||
return this.nativeTextViewProtected.editable;
|
||||
}
|
||||
[editableProperty.setNative](value: boolean) {
|
||||
this.nativeTextViewProtected.editable = value;
|
||||
}
|
||||
|
||||
[colorProperty.setNative](color: Color) {
|
||||
this._refreshColor();
|
||||
}
|
||||
[placeholderColorProperty.setNative](value: Color) {
|
||||
this._refreshColor();
|
||||
}
|
||||
|
||||
[borderTopWidthProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.top,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[borderTopWidthProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: top, left: inset.left, bottom: inset.bottom, right: inset.right };
|
||||
}
|
||||
|
||||
[borderRightWidthProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.right,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[borderRightWidthProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: inset.left, bottom: inset.bottom, right: right };
|
||||
}
|
||||
|
||||
[borderBottomWidthProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.bottom,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[borderBottomWidthProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: inset.left, bottom: bottom, right: inset.right };
|
||||
}
|
||||
|
||||
[borderLeftWidthProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.left,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[borderLeftWidthProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: left, bottom: inset.bottom, right: inset.right };
|
||||
}
|
||||
|
||||
[paddingTopProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.top,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[paddingTopProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let top = layout.toDeviceIndependentPixels(this.effectivePaddingTop + this.effectiveBorderTopWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: top, left: inset.left, bottom: inset.bottom, right: inset.right };
|
||||
}
|
||||
|
||||
[paddingRightProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.right,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[paddingRightProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let right = layout.toDeviceIndependentPixels(this.effectivePaddingRight + this.effectiveBorderRightWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: inset.left, bottom: inset.bottom, right: right };
|
||||
}
|
||||
|
||||
[paddingBottomProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.bottom,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[paddingBottomProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let bottom = layout.toDeviceIndependentPixels(this.effectivePaddingBottom + this.effectiveBorderBottomWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: inset.left, bottom: bottom, right: inset.right };
|
||||
}
|
||||
[paddingLeftProperty.getDefault](): Length {
|
||||
return {
|
||||
value: this.nativeTextViewProtected.textContainerInset.left,
|
||||
unit: "px"
|
||||
};
|
||||
}
|
||||
[paddingLeftProperty.setNative](value: Length) {
|
||||
let inset = this.nativeTextViewProtected.textContainerInset;
|
||||
let left = layout.toDeviceIndependentPixels(this.effectivePaddingLeft + this.effectiveBorderLeftWidth);
|
||||
this.nativeTextViewProtected.textContainerInset = { top: inset.top, left: left, bottom: inset.bottom, right: inset.right };
|
||||
}
|
||||
}
|
||||
|
||||
TextView.prototype.recycleNativeView = "auto";
|
||||
Reference in New Issue
Block a user