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

Manually applying CSS in removed and now it is done once per cell. (#2174)

Browse Source 
* Manually applying CSS in removed and now it is done once per cell.
Clearing bindingContext is now done in refresh method instead of preparing cell.
Obsolete isScrolling property on ListView.
Removed android scroll listener.
Added test for nulling cells bindingContext.
Uncommented few tests and made them work.
Fixed android ListView eachChildView to return the wrapping StackLayout so that Unloading now works as expected.
onUnload method in view-common now raise unloaded only if item isLoaded=true.

* Fix navigation path
This commit is contained in:
Hristo Hristov
2016-05-25 14:03:45 +03:00
parent 90f8b0da74
commit b0cff20450
6 changed files with 220 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/list-view/list-view-common.ts
View File

@@ -127,10 +127,10 @@ export class ListView extends view.View implements definition.ListView {
}
get isScrolling(): boolean {
return this._getValue(ListView.isScrollingProperty);
return false;
}
set isScrolling(value: boolean) {
this._setValue(ListView.isScrollingProperty, value);
// Do nothing.
}
get separatorColor(): color.Color {
@@ -169,12 +169,7 @@ export class ListView extends view.View implements definition.ListView {
public _prepareItem(item: view.View, index: number) {
if (item) {
var dataItem = this._getDataItem(index);
if (!(dataItem instanceof observable.Observable)) {
item.bindingContext = null;
}
item.bindingContext = dataItem;
item._inheritProperties(this);
item.bindingContext = this._getDataItem(index);
}
}
@@ -215,8 +210,4 @@ export class ListView extends view.View implements definition.ListView {
public _onRowHeightPropertyChanged(data: dependencyObservable.PropertyChangeData) {
this.refresh();
}
public _propagateInheritableProperties(view: view.View) {
// do not get binding context from parent when adding items, since the binding context of the items will be different.
}
}

143
ui/list-view/list-view.android.ts
View File

@@ -5,27 +5,25 @@ import stackLayout = require("ui/layouts/stack-layout");
import proxy = require("ui/core/proxy");
import dependencyObservable = require("ui/core/dependency-observable");
import definition = require("ui/list-view");
import utils = require("utils/utils")
import {ProxyViewContainer} from "ui/proxy-view-container";
import * as layoutBase from "ui/layouts/layout-base";
import * as colorModule from "color";
var color: typeof colorModule;
let color: typeof colorModule;
function ensureColor() {
if (!color) {
color = require("color");
}
}
var ITEMLOADING = common.ListView.itemLoadingEvent;
var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
var ITEMTAP = common.ListView.itemTapEvent;
var REALIZED_INDEX = "realizedIndex";
let ITEMLOADING = common.ListView.itemLoadingEvent;
let LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
let ITEMTAP = common.ListView.itemTapEvent;
global.moduleMerge(common, exports);
function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var bar = <ListView>data.object;
let bar = <ListView>data.object;
if (!bar.android) {
return;
}
@@ -42,9 +40,9 @@ function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChan
(<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
export class ListView extends common.ListView {
private _android: android.widget.ListView;
public _realizedItems = {};
private _androidViewId: number = -1;
private _android: android.widget.ListView;
public _realizedItems = new Map<android.view.View, viewModule.View>();
public _createUI() {
this._android = new android.widget.ListView(this._context);
@@ -59,42 +57,10 @@ export class ListView extends common.ListView {
ensureListViewAdapterClass();
this.android.setAdapter(new ListViewAdapterClass(this));
var that = new WeakRef(this);
// TODO: This causes many marshalling calls, rewrite in Java and generate bindings
this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<utils.Owned & android.widget.AbsListView.IOnScrollListener>{
onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
var owner: ListView = this.owner;
if (!owner) {
return;
}
if (scrollState === android.widget.AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
owner._setValue(common.ListView.isScrollingProperty, false);
owner._notifyScrollIdle();
} else {
owner._setValue(common.ListView.isScrollingProperty, true);
}
},
onScroll: function (view: android.widget.AbsListView, firstVisibleItem: number, visibleItemCount: number, totalItemCount: number) {
var owner: ListView = this.owner;
if (!owner) {
return;
}
if (totalItemCount > 0 && firstVisibleItem + visibleItemCount === totalItemCount) {
owner.notify(<observable.EventData>{ eventName: LOADMOREITEMS, object: owner });
}
},
get owner() {
return that.get();
}
}));
let that = new WeakRef(this);
this.android.setOnItemClickListener(new android.widget.AdapterView.OnItemClickListener({
onItemClick: function (parent: any, convertView: android.view.View, index: number, id: number) {
var owner = that.get();
let owner = that.get();
if (owner) {
owner.notify({ eventName: ITEMTAP, object: owner, index: index, view: owner._getRealizedView(convertView, index) });
}
@@ -111,6 +77,13 @@ export class ListView extends common.ListView {
return;
}
// clear bindingContext when it is not observable because otherwise bindings to items won't reevaluate
this._realizedItems.forEach((view, nativeView, map) => {
if (!(view.bindingContext instanceof observable.Observable)) {
view.bindingContext = null;
}
});
(<android.widget.BaseAdapter>this.android.getAdapter()).notifyDataSetChanged();
}
@@ -122,35 +95,22 @@ export class ListView extends common.ListView {
public _onDetached(force?: boolean) {
super._onDetached(force);
// clear the cache
var keys = Object.keys(this._realizedItems);
var i;
var length = keys.length;
var view: viewModule.View;
var key;
for (i = 0; i < length; i++) {
key = keys[i];
view = this._realizedItems[key];
view.parent._removeView(view);
delete this._realizedItems[key];
}
this.clearRealizedCells();
}
get _childrenCount(): number {
let keys = Object.keys(this._realizedItems);
return keys.length;
return this._realizedItems.size;
}
public _eachChildView(callback: (child: viewModule.View) => boolean): void {
let keys = Object.keys(this._realizedItems);
let length = keys.length;
for (let i = 0; i < length; i++) {
let key = keys[i];
let view: viewModule.View = this._realizedItems[key];
callback(view);
}
this._realizedItems.forEach((view, nativeView, map) => {
if (view.parent instanceof ListView) {
callback(view);
}
else {
callback(view.parent);
}
});
}
public _getRealizedView(convertView: android.view.View, index: number) {
@@ -158,31 +118,25 @@ export class ListView extends common.ListView {
return this._getItemTemplateContent(index);
}
return this._realizedItems[convertView.hashCode()];
return this._realizedItems.get(convertView);
}
public _notifyScrollIdle() {
var keys = Object.keys(this._realizedItems);
var i;
var length = keys.length;
var view: viewModule.View;
var key;
for (i = 0; i < length; i++) {
key = keys[i];
view = this._realizedItems[key];
if (view[REALIZED_INDEX] < this.items.length) {
this.notify({
eventName: ITEMLOADING,
object: this,
index: view[REALIZED_INDEX],
view: view
});
private clearRealizedCells(): void {
// clear the cache
this._realizedItems.forEach((view, nativeView, map) => {
// This is to clear the StackLayout that is used to wrap non LayoutBase & ProxyViewContainer instances.
if (!(view.parent instanceof ListView)) {
this._removeView(view.parent);
}
}
view.parent._removeView(view);
});
this._realizedItems.clear();
}
}
var ListViewAdapterClass;
let ListViewAdapterClass;
function ensureListViewAdapterClass() {
if (ListViewAdapterClass) {
return;
@@ -224,12 +178,18 @@ function ensureListViewAdapterClass() {
return null;
}
var view = this._listView._getRealizedView(convertView, index);
var args = <definition.ItemEventData>{
let totalItemCount = this._listView.items ? this._listView.items.length : 0;
if (index === (totalItemCount - 1)) {
this._listView.notify({ eventName: LOADMOREITEMS, object: this._listView });
}
let view = this._listView._getRealizedView(convertView, index);
let args: definition.ItemEventData = {
eventName: ITEMLOADING, object: this._listView, index: index, view: view,
android: parent,
ios: undefined
};
this._listView.notify(args);
if (!args.view) {
@@ -243,6 +203,7 @@ function ensureListViewAdapterClass() {
else {
args.view.height = Number.NaN;
}
this._listView._prepareItem(args.view, index);
if (!args.view.parent) {
// Proxy containers should not get treated as layouts.
@@ -252,7 +213,7 @@ function ensureListViewAdapterClass() {
this._listView._addView(args.view);
convertView = args.view.android;
} else {
var sp = new stackLayout.StackLayout();
let sp = new stackLayout.StackLayout();
sp.addChild(args.view);
this._listView._addView(sp);
@@ -260,9 +221,7 @@ function ensureListViewAdapterClass() {
}
}
this._listView._realizedItems[convertView.hashCode()] = args.view;
// cache the realized index (used to raise the ItemLoading event upon scroll stop)
args.view[REALIZED_INDEX] = index;
this._listView._realizedItems.set(convertView, args.view);
}
return convertView;
@@ -270,4 +229,4 @@ function ensureListViewAdapterClass() {
}
ListViewAdapterClass = ListViewAdapter;
}
}

2
ui/list-view/list-view.d.ts vendored
View File

@@ -47,6 +47,7 @@ declare module "ui/list-view" {
/**
* Represents the observable property backing the isScrolling property of each ListView instance.
*/
@Deprecated // in 2.1
public static isScrollingProperty: dependencyObservable.Property;
/**
@@ -67,6 +68,7 @@ declare module "ui/list-view" {
/**
* Gets a value indicating whether the ListView is currently scrolling.
*/
@Deprecated // in 2.1
isScrolling: boolean;
/**

43
ui/list-view/list-view.ios.ts
View File

@@ -28,7 +28,7 @@ var infinity = utils.layout.makeMeasureSpec(0, utils.layout.UNSPECIFIED);
class ListViewCell extends UITableViewCell {
public willMoveToSuperview(newSuperview: UIView): void {
let parent: ListView = <ListView>(this.view ? this.view.parent : null);
let parent = <ListView>(this.view ? this.view.parent : null);
// When inside ListView and there is no newSuperview this cell is
// removed from native visual tree so we remove it from our tree too.
@@ -117,14 +117,14 @@ class UITableViewDelegateImpl extends NSObject implements UITableViewDelegate {
public tableViewDidSelectRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): NSIndexPath {
tableView.deselectRowAtIndexPathAnimated(indexPath, true);
return indexPath;
}
public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
let owner = this._owner.get();
if (!owner) {
return 44;
return DEFAULT_HEIGHT;
}
let height = undefined;
@@ -171,7 +171,7 @@ class UITableViewRowHeightDelegateImpl extends NSObject implements UITableViewDe
if (owner) {
notifyForItemAtIndex(owner, cell, cell.view, ITEMTAP, indexPath);
}
return indexPath;
return indexPath;
}
public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
@@ -246,9 +246,9 @@ export class ListView extends common.ListView {
}
public _eachChildView(callback: (child: view.View) => boolean): void {
this._map.forEach(function(view, key) {
this._map.forEach((view, key) => {
callback(view);
}, this._map);
});
}
public scrollToIndex(index: number) {
@@ -259,6 +259,13 @@ export class ListView extends common.ListView {
}
public refresh() {
// clear bindingContext when it is not observable because otherwise bindings to items won't reevaluate
this._map.forEach((view, nativeView, map) => {
if (!(view.bindingContext instanceof observable.Observable)) {
view.bindingContext = null;
}
});
if (this.isLoaded) {
this._ios.reloadData();
this.requestLayout();
@@ -287,9 +294,11 @@ export class ListView extends common.ListView {
this._nativeView.estimatedRowHeight = data.newValue;
this._delegate = UITableViewRowHeightDelegateImpl.initWithOwner(new WeakRef(this));
}
if (this.isLoaded) {
this._nativeView.delegate = this._delegate;
}
super._onRowHeightPropertyChanged(data);
}
@@ -310,20 +319,18 @@ export class ListView extends common.ListView {
}
private _layoutCell(cellView: view.View, indexPath: NSIndexPath): number {
if (cellView) {
var measuredSize = view.View.measureChild(this, cellView, this.widthMeasureSpec, infinity);
var height = measuredSize.measuredHeight;
let measuredSize = view.View.measureChild(this, cellView, this.widthMeasureSpec, infinity);
let height = measuredSize.measuredHeight;
this.setHeight(indexPath.row, height);
return height;
}
return 0;
return DEFAULT_HEIGHT;
}
public _prepareCell(cell: ListViewCell, indexPath: NSIndexPath): number {
let cellHeight: number;
try {
this._preparingCell = true;
let view = cell.view;
@@ -337,12 +344,12 @@ export class ListView extends common.ListView {
// Proxy containers should not get treated as layouts.
// Wrap them in a real layout as well.
if (view instanceof ProxyViewContainer) {
var sp = new StackLayout();
let sp = new StackLayout();
sp.addChild(view);
view = sp;
}
// If cell is reused be have old content - remove it first.
// If cell is reused it have old content - remove it first.
if (!cell.view) {
cell.owner = new WeakRef(view);
} else if (cell.view !== view) {
@@ -367,7 +374,13 @@ export class ListView extends common.ListView {
}
public _removeContainer(cell: ListViewCell): void {
this._removeView(cell.view)
let view = cell.view;
// This is to clear the StackLayout that is used to wrap ProxyViewContainer instances.
if (!(view.parent instanceof ListView)) {
this._removeView(view.parent);
}
view.parent._removeView(view);
this._map.delete(cell);
}
}
}