javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable recycling of native views

Browse Source 
createNativeView will set iOS nativeView if it is null/undefined
This commit is contained in:
Hristo Hristov
2017-03-28 18:08:39 +03:00
parent 84e726e6b9
commit e6250e718a
59 changed files with 112 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/action-bar/action-bar.android.ts
View File

@@ -137,11 +137,13 @@ export class ActionBar extends ActionBarBase {
}
public initNativeView(): void {
super.initNativeView();
(<any>this.nativeView).menuItemClickListener.owner = this;
}
public disposeNativeView() {
(<any>this.nativeView).menuItemClickListener.owner = null;
super.disposeNativeView();
}
public onLoaded() {
@@ -365,7 +367,7 @@ export class ActionBar extends ActionBarBase {
}
}
ActionBar.prototype.recycleNativeView = true;
// ActionBar.prototype.recycleNativeView = true;
let defaultTitleTextColor: number;

2
tns-core-modules/ui/activity-indicator/activity-indicator-common.ts
View File

@@ -7,7 +7,7 @@ export class ActivityIndicatorBase extends View implements ActivityIndicatorDefi
public busy: boolean;
}
ActivityIndicatorBase.prototype.recycleNativeView = true;
// ActivityIndicatorBase.prototype.recycleNativeView = true;
export const busyProperty = new Property<ActivityIndicatorBase, boolean>({ name: "busy", defaultValue: false, valueConverter: booleanConverter });
busyProperty.register(ActivityIndicatorBase);

2
tns-core-modules/ui/border/border.ts
View File

@@ -41,4 +41,4 @@ export class Border extends ContentView implements BorderDefinition {
}
}
Border.prototype.recycleNativeView = true;
// Border.prototype.recycleNativeView = true;

2
tns-core-modules/ui/button/button-common.ts
View File

@@ -14,4 +14,4 @@ export abstract class ButtonBase extends TextBase implements ButtonDefinition {
}
}
ButtonBase.prototype.recycleNativeView = true;
// ButtonBase.prototype.recycleNativeView = true;

2
tns-core-modules/ui/button/button.android.ts
View File

@@ -52,10 +52,12 @@ export class Button extends ButtonBase {
public initNativeView(): void {
(<any>this.nativeView).clickListener.owner = this;
super.initNativeView();
}
public disposeNativeView() {
(<any>this.nativeView).clickListener.owner = null;
super.disposeNativeView();
}
@PseudoClassHandler("normal", "highlighted", "pressed", "active")

2
tns-core-modules/ui/content-view/content-view.ts
View File

@@ -92,4 +92,4 @@ export class ContentView extends CustomLayoutView implements ContentViewDefiniti
}
}
ContentView.prototype.recycleNativeView = true;
// ContentView.prototype.recycleNativeView = true;

7
tns-core-modules/ui/core/bindable/bindable.ts
View File

@@ -348,9 +348,10 @@ export class Binding {
let context = this.source && this.source.get && this.source.get() || global;
let model = {};
let addedProps = [];
for (let prop in application.resources) {
if (application.resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
context[prop] = application.resources[prop];
const resources = application.getResources();
for (let prop in resources) {
if (resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
context[prop] = resources[prop];
addedProps.push(prop);
}
}

6
tns-core-modules/ui/core/view-base/view-base.ts
View File

@@ -659,8 +659,10 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
}
} else {
// TODO: Implement _createNativeView for iOS
this.createNativeView();
// this.nativeView = this._iosView = (<any>this)._nativeView;
const nativeView = this.createNativeView();
if (!currentNativeView && nativeView) {
this.nativeView = this._iosView = nativeView;
}
}
this.initNativeView();

2
tns-core-modules/ui/date-picker/date-picker-common.ts
View File

@@ -12,7 +12,7 @@ export class DatePickerBase extends View implements DatePickerDefinition {
public date: Date;
}
DatePickerBase.prototype.recycleNativeView = true;
// DatePickerBase.prototype.recycleNativeView = true;
export const yearProperty = new Property<DatePickerBase, number>({ name: "year", valueConverter: (v) => parseInt(v) });
yearProperty.register(DatePickerBase);

2
tns-core-modules/ui/date-picker/date-picker.android.ts
View File

@@ -64,11 +64,13 @@ export class DatePicker extends DatePickerBase {
}
public initNativeView(): void {
super.initNativeView();
(<any>this.nativeView).listener.owner = this;
}
public disposeNativeView() {
(<any>this.nativeView).listener.owner = null;
super.disposeNativeView();
}
private updateNativeDate(): void {

1
tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
View File

@@ -150,6 +150,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
}
public initNativeView(): void {
super.initNativeView();
const nativeView = this.nativeView;
(<any>nativeView).listener.owner = this;
this._keyListenerCache = nativeView.getKeyListener();

29
tns-core-modules/ui/frame/frame.android.ts
View File

@@ -290,12 +290,6 @@ export class Frame extends FrameBase {
}
public createNativeView() {
// TODO: probably memory leak.
// this._listener = new android.view.View.OnAttachStateChangeListener({
// onViewAttachedToWindow: this.onNativeViewAttachedToWindow.bind(this),
// onViewDetachedFromWindow: this.onNativeViewDetachedToWindow.bind(this)
// });
const root = new org.nativescript.widgets.ContentLayout(this._context);
if (this._containerViewId < 0) {
this._containerViewId = android.view.View.generateViewId();
@@ -304,31 +298,17 @@ export class Frame extends FrameBase {
}
public initNativeView(): void {
super.initNativeView();
this._android.rootViewGroup = this.nativeView;
this._android.rootViewGroup.setId(this._containerViewId);
// this._android.rootViewGroup.addOnAttachStateChangeListener(this._listener);
}
// public resetNativeView() {
// this._android.rootViewGroup.removeOnAttachStateChangeListener(this._listener);
// }
public disposeNativeView() {
// we should keep the reference to underlying native object, since frame can contain many pages.
this._android.rootViewGroup = null;
super.disposeNativeView();
}
// private onNativeViewAttachedToWindow(view: android.view.View): void {
// if (this._delayedNavigationEntry) {
// this._navigateCore(this._delayedNavigationEntry);
// this._delayedNavigationEntry = undefined;
// }
// }
// private onNativeViewDetachedToWindow(view: android.view.View): void {
// // unused for the moment.
// }
public _popFromFrameStack() {
if (!this._isInFrameStack) {
return;
@@ -795,10 +775,7 @@ class ActivityCallbacksImplementation implements AndroidActivityCallbacks {
}
if (!rootView) {
navParam = application.mainEntry;
if (!navParam) {
navParam = application.mainModule;
}
navParam = application.getMainEntry();
if (navParam) {
frame = new Frame();

2
tns-core-modules/ui/html-view/html-view-common.ts
View File

@@ -7,7 +7,7 @@ export class HtmlViewBase extends View implements HtmlViewDefinition {
public html: string;
}
HtmlViewBase.prototype.recycleNativeView = true;
// HtmlViewBase.prototype.recycleNativeView = true;
// TODO: Can we use Label.ios optimization for affectsLayout???
export const htmlProperty = new Property<HtmlViewBase, string>({ name: "html", defaultValue: "", affectsLayout: true });

2
tns-core-modules/ui/image/image-common.ts
View File

@@ -103,7 +103,7 @@ export abstract class ImageBase extends View implements ImageDefinition {
}
}
ImageBase.prototype.recycleNativeView = true;
// ImageBase.prototype.recycleNativeView = true;
export const imageSourceProperty = new Property<ImageBase, ImageSource>({ name: "imageSource" });
imageSourceProperty.register(ImageBase);

2
tns-core-modules/ui/image/image.android.ts
View File

@@ -97,11 +97,13 @@ export class Image extends ImageBase {
}
public initNativeView(): void {
super.initNativeView();
(<any>this.nativeView).listener.owner = this;
}
public disposeNativeView() {
(<any>this.nativeView).listener.owner = null;
super.disposeNativeView();
}
public _createImageSourceFromSrc() {

5
tns-core-modules/ui/label/label.android.ts
View File

@@ -21,10 +21,11 @@ export class Label extends TextBase implements LabelDefinition {
}
public initNativeView(): void {
super.initNativeView();
const textView = this.nativeView;
textView.setSingleLine(true);
// textView.setEllipsize(android.text.TextUtils.TruncateAt.END);
textView.setEllipsize(android.text.TextUtils.TruncateAt.END);
}
}
Label.prototype.recycleNativeView = true;
// Label.prototype.recycleNativeView = true;

2
tns-core-modules/ui/label/label.ios.ts
View File

@@ -234,4 +234,4 @@ export class Label extends TextBase implements LabelDefinition {
}
}
Label.prototype.recycleNativeView = true;
// Label.prototype.recycleNativeView = true;

2
tns-core-modules/ui/layouts/absolute-layout/absolute-layout-common.ts
View File

@@ -43,7 +43,7 @@ export class AbsoluteLayoutBase extends LayoutBase implements AbsoluteLayoutDefi
}
}
AbsoluteLayoutBase.prototype.recycleNativeView = true;
// AbsoluteLayoutBase.prototype.recycleNativeView = true;
export const leftProperty = new Property<View, Length>({
name: "left", defaultValue: zeroLength,

2
tns-core-modules/ui/layouts/dock-layout/dock-layout-common.ts
View File

@@ -27,7 +27,7 @@ export class DockLayoutBase extends LayoutBase implements DockLayoutDefinition {
}
}
DockLayoutBase.prototype.recycleNativeView = true;
// DockLayoutBase.prototype.recycleNativeView = true;
export const dockProperty = new Property<View, "left" | "top" | "right" | "bottom">({
name: "dock", defaultValue: "left", valueChanged: (target, oldValue, newValue) => {

2
tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout-common.ts
View File

@@ -209,7 +209,7 @@ export abstract class FlexboxLayoutBase extends LayoutBase {
}
}
FlexboxLayoutBase.prototype.recycleNativeView = true;
// FlexboxLayoutBase.prototype.recycleNativeView = true;
export const flexDirectionProperty = new CssProperty<Style, FlexDirection>({ name: "flexDirection", cssName: "flex-direction", defaultValue: FlexDirection.ROW, affectsLayout: isIOS, valueConverter: FlexDirection.parse });
flexDirectionProperty.register(Style);

1
tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.android.ts
View File

@@ -85,6 +85,7 @@ export class FlexboxLayout extends FlexboxLayoutBase {
public disposeNativeView() {
(<any>this.nativeView).invalidateOrdersCache();
super.disposeNativeView();
}
[flexDirectionProperty.getDefault](): FlexDirection {

2
tns-core-modules/ui/layouts/grid-layout/grid-layout-common.ts
View File

@@ -305,7 +305,7 @@ export class GridLayoutBase extends LayoutBase implements GridLayoutDefinition {
}
}
GridLayoutBase.prototype.recycleNativeView = true;
// GridLayoutBase.prototype.recycleNativeView = true;
export const columnProperty = new Property<View, number>({
name: "col", defaultValue: 0,

3
tns-core-modules/ui/layouts/grid-layout/grid-layout.android.ts
View File

@@ -57,6 +57,7 @@ export class GridLayout extends GridLayoutBase {
}
public initNativeView(): void {
super.initNativeView();
// Update native GridLayout
this.rowsInternal.forEach((itemSpec: ItemSpec, index, rows) => { this._onRowAdded(itemSpec); }, this);
this.columnsInternal.forEach((itemSpec: ItemSpec, index, rows) => { this._onColumnAdded(itemSpec); }, this);
@@ -73,6 +74,8 @@ export class GridLayout extends GridLayoutBase {
const itemSpec = <ItemSpec>this.columnsInternal[i];
this._onColumnRemoved(itemSpec, i);
}
super.disposeNativeView();
}
public _onRowAdded(itemSpec: ItemSpec) {

1
tns-core-modules/ui/layouts/layout.android.ts
View File

@@ -47,6 +47,7 @@ export class Layout extends LayoutBase implements LayoutDefinition {
}
public initNativeView(): void {
super.initNativeView();
(<any>this.nativeView)[OWNER] = this;
}

2
tns-core-modules/ui/layouts/stack-layout/stack-layout-common.ts
View File

@@ -7,7 +7,7 @@ export class StackLayoutBase extends LayoutBase implements StackLayoutDefinition
public orientation: "horizontal" | "vertical";
}
StackLayoutBase.prototype.recycleNativeView = true;
// StackLayoutBase.prototype.recycleNativeView = true;
export const orientationProperty = new Property<StackLayoutBase, "horizontal" | "vertical">({
name: "orientation", defaultValue: "vertical", affectsLayout: isIOS,

2
tns-core-modules/ui/layouts/wrap-layout/wrap-layout-common.ts
View File

@@ -11,7 +11,7 @@ export class WrapLayoutBase extends LayoutBase implements WrapLayoutDefinition {
public effectiveItemHeight: number;
}
WrapLayoutBase.prototype.recycleNativeView = true;
// WrapLayoutBase.prototype.recycleNativeView = true;
export const itemWidthProperty = new Property<WrapLayoutBase, Length>({
name: "itemWidth", defaultValue: "auto", affectsLayout: isIOS, valueConverter: (v) => Length.parse(v),

2
tns-core-modules/ui/list-picker/list-picker-common.ts
View File

@@ -20,7 +20,7 @@ export class ListPickerBase extends View implements ListPickerDefinition {
}
}
ListPickerBase.prototype.recycleNativeView = true;
// ListPickerBase.prototype.recycleNativeView = true;
export const selectedIndexProperty = new CoercibleProperty<ListPickerBase, number>({
name: "selectedIndex", defaultValue: -1,

2
tns-core-modules/ui/list-picker/list-picker.android.ts
View File

@@ -99,6 +99,7 @@ export class ListPicker extends ListPickerBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView = this.nativeView;
this._selectorWheelPaint = getSelectorWheelPaint(nativeView);
(<any>nativeView).formatter.owner = this;
@@ -119,6 +120,7 @@ export class ListPicker extends ListPickerBase {
const nativeView = this.nativeView;
(<any>nativeView).formatter.owner = null;
(<any>nativeView).valueChangedListener.owner = null;
super.disposeNativeView();
}
private _fixNumberPickerRendering() {

2
tns-core-modules/ui/list-view/list-view-common.ts
View File

@@ -124,7 +124,7 @@ export abstract class ListViewBase extends View implements ListViewDefinition {
}
}
ListViewBase.prototype.recycleNativeView = true;
// ListViewBase.prototype.recycleNativeView = true;
/**
* Represents the property backing the items property of each ListView instance.

1
tns-core-modules/ui/list-view/list-view.android.ts
View File

@@ -74,6 +74,7 @@ export class ListView extends ListViewBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
(<any>nativeView).itemClickListener.owner = this;
const adapter = (<any>nativeView).adapter;

1
tns-core-modules/ui/page/page.android.ts
View File

@@ -99,6 +99,7 @@ export class Page extends PageBase {
}
public initNativeView(): void {
super.initNativeView();
this.nativeView.setBackgroundColor(-1); // White color.
}

2
tns-core-modules/ui/progress/progress-common.ts
View File

@@ -27,7 +27,7 @@ export class ProgressBase extends View implements ProgressDefinition {
// }
}
ProgressBase.prototype.recycleNativeView = true;
// ProgressBase.prototype.recycleNativeView = true;
/**
* Represents the observable property backing the value property of each Progress instance.

2
tns-core-modules/ui/repeater/repeater.ts
View File

@@ -118,7 +118,7 @@ export class Repeater extends CustomLayoutView implements RepeaterDefinition {
}
Repeater.prototype.recycleNativeView = true;
// Repeater.prototype.recycleNativeView = true;
/**
* Represents the item template property of each ListView instance.

2
tns-core-modules/ui/scroll-view/scroll-view.android.ts
View File

@@ -132,4 +132,4 @@ export class ScrollView extends ScrollViewBase {
}
}
ScrollView.prototype.recycleNativeView = false;
// ScrollView.prototype.recycleNativeView = false;

2
tns-core-modules/ui/scroll-view/scroll-view.ios.ts
View File

@@ -150,4 +150,4 @@ export class ScrollView extends ScrollViewBase {
}
}
ScrollView.prototype.recycleNativeView = true;
// ScrollView.prototype.recycleNativeView = true;

2
tns-core-modules/ui/search-bar/search-bar-common.ts
View File

@@ -14,7 +14,7 @@ export abstract class SearchBarBase extends View implements SearchBarDefinition
public abstract dismissSoftInput();
}
SearchBarBase.prototype.recycleNativeView = true;
// SearchBarBase.prototype.recycleNativeView = true;
export const textProperty = new Property<SearchBarBase, string>({ name: "text", defaultValue: "", affectsLayout: isIOS });
textProperty.register(SearchBarBase);

2
tns-core-modules/ui/search-bar/search-bar.android.ts
View File

@@ -108,6 +108,7 @@ export class SearchBar extends SearchBarBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
nativeView.closeListener.owner = this;
nativeView.queryTextListener.owner = this;
@@ -117,6 +118,7 @@ export class SearchBar extends SearchBarBase {
const nativeView: any = this.nativeView;
nativeView.closeListener.owner = null;
nativeView.queryTextListener.owner = null;
super.disposeNativeView();
}
[backgroundColorProperty.getDefault](): number {

2
tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
View File

@@ -84,7 +84,7 @@ export abstract class SegmentedBarBase extends View implements SegmentedBarDefin
}
}
SegmentedBarBase.prototype.recycleNativeView = true;
// SegmentedBarBase.prototype.recycleNativeView = true;
/**
* Gets or sets the selected index dependency property of the SegmentedBar.

2
tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
View File

@@ -211,6 +211,7 @@ export class SegmentedBar extends SegmentedBarBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
nativeView.listener.owner = this;
this._tabContentFactory = this._tabContentFactory || new TabContentFactory(this);
@@ -219,6 +220,7 @@ export class SegmentedBar extends SegmentedBarBase {
public disposeNativeView() {
const nativeView: any = this.nativeView;
nativeView.listener.owner = null;
super.disposeNativeView();
}
private insertTab(tabItem: SegmentedBarItem, index: number): void {

2
tns-core-modules/ui/slider/slider-common.ts
View File

@@ -10,7 +10,7 @@ export class SliderBase extends View implements SliderDefinition {
public maxValue: number;
}
SliderBase.prototype.recycleNativeView = true;
// SliderBase.prototype.recycleNativeView = true;
/**
* Represents the observable property backing the value property of each Slider instance.

2
tns-core-modules/ui/slider/slider.android.ts
View File

@@ -58,6 +58,7 @@ export class Slider extends SliderBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
nativeView.listener.owner = this;
}
@@ -65,6 +66,7 @@ export class Slider extends SliderBase {
public disposeNativeView() {
const nativeView: any = this.nativeView;
nativeView.listener.owner = null;
super.disposeNativeView();
}
/**

2
tns-core-modules/ui/switch/switch-common.ts
View File

@@ -7,7 +7,7 @@ export class SwitchBase extends View implements SwitchDefinition {
public checked: boolean;
}
SwitchBase.prototype.recycleNativeView = true;
// SwitchBase.prototype.recycleNativeView = true;
export const checkedProperty = new Property<SwitchBase, boolean>({ name: "checked", defaultValue: false, valueConverter: booleanConverter });
checkedProperty.register(SwitchBase);

2
tns-core-modules/ui/switch/switch.android.ts
View File

@@ -45,6 +45,7 @@ export class Switch extends SwitchBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
nativeView.listener.owner = this;
}
@@ -52,6 +53,7 @@ export class Switch extends SwitchBase {
public disposeNativeView() {
const nativeView: any = this.nativeView;
nativeView.listener.owner = null;
super.disposeNativeView();
}
[checkedProperty.getDefault](): boolean {

2
tns-core-modules/ui/tab-view/tab-view.android.ts
View File

@@ -309,6 +309,7 @@ export class TabView extends TabViewBase {
}
public initNativeView(): void {
super.initNativeView();
if (this._androidViewId < 0) {
this._androidViewId = android.view.View.generateViewId();
}
@@ -335,6 +336,7 @@ export class TabView extends TabViewBase {
this._tabLayout = null;
(<any>this._viewPager).listener.owner = null;
this._viewPager = null;
super.disposeNativeView();
}
private setAdapter(items: Array<TabViewItem>) {

1
tns-core-modules/ui/text-base/text-base.android.ts
View File

@@ -60,6 +60,7 @@ export class TextBase extends TextBaseCommon {
super.resetNativeView();
// We reset it here too because this could be changed by multiple properties - whiteSpace, secure, textTransform
this.nativeView.setTransformationMethod(this._defaultTransformationMethod);
this._defaultTransformationMethod = null;
}
[textProperty.getDefault](): string {

2
tns-core-modules/ui/text-field/text-field-common.ts
View File

@@ -8,7 +8,7 @@ export class TextFieldBase extends EditableTextBase implements TextFieldDefiniti
public secure: boolean;
}
TextFieldBase.prototype.recycleNativeView = true;
// TextFieldBase.prototype.recycleNativeView = true;
export const secureProperty = new Property<TextFieldBase, boolean>({ name: "secure", defaultValue: false, valueConverter: booleanConverter });
secureProperty.register(TextFieldBase);

2
tns-core-modules/ui/text-view/text-view.android.ts
View File

@@ -16,4 +16,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
}
}
TextView.prototype.recycleNativeView = true;
// TextView.prototype.recycleNativeView = true;

2
tns-core-modules/ui/text-view/text-view.ios.ts
View File

@@ -270,4 +270,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
}
}
TextView.prototype.recycleNativeView = true;
// TextView.prototype.recycleNativeView = true;

2
tns-core-modules/ui/time-picker/time-picker-common.ts
View File

@@ -95,7 +95,7 @@ export abstract class TimePickerBase extends View implements TimePickerDefinitio
public maxMinute: number;
}
TimePickerBase.prototype.recycleNativeView = true;
// TimePickerBase.prototype.recycleNativeView = true;
export var minHourProperty = new Property<TimePickerBase, number>({
name: "minHour", defaultValue: 0, valueChanged: (picker, oldValue, newValue) => {

1
tns-core-modules/ui/time-picker/time-picker.android.ts
View File

@@ -53,6 +53,7 @@ export class TimePicker extends TimePickerBase {
}
public initNativeView(): void {
super.initNativeView();
const nativeView: any = this.nativeView;
nativeView.listener.owner = this;

1
tns-core-modules/ui/web-view/web-view.android.ts
View File

@@ -101,6 +101,7 @@ export class WebView extends WebViewBase {
}
public initNativeView(): void {
super.initNativeView();
(<any>this.nativeView).client.owner = this;
}