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

Merge pull request #257 from NativeScript/ios-list-view-sanity-fixes

Browse Source 
Fix some crashes for ListView's iOS UITableView
This commit is contained in:
Hristo Hristov
2015-06-02 11:34:17 +03:00
parent 137688dba1 068dd8b868
commit 812db046b3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,23 +99,22 @@ class UITableViewDelegateImpl extends NSObject implements UITableViewDelegate {
} }
public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number { public tableViewHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
if (utils.ios.MajorVersion < 8) { var height = undefined;
// in iOS 7.1 this method is called before tableViewCellForRowAtIndexPath so we need fake cell to measure its content. if (utils.ios.MajorVersion >= 8) {
height = this._owner.getHeight(indexPath.row);
}
if (utils.ios.MajorVersion < 8 || height === undefined) {
// in iOS 7.1 (or iOS8+ after call to scrollToRowAtIndexPath:atScrollPosition:animated:) this method is called before tableViewCellForRowAtIndexPath so we need fake cell to measure its content.
var cell = this._measureCell; var cell = this._measureCell;
if (!cell) { if (!cell) {
this._measureCell = tableView.dequeueReusableCellWithIdentifier(CELLIDENTIFIER) || ListViewCell.new(); this._measureCell = tableView.dequeueReusableCellWithIdentifier(CELLIDENTIFIER) || ListViewCell.new();
cell = this._measureCell; cell = this._measureCell;
} }
return this._owner._prepareCell(cell, indexPath); height = this._owner._prepareCell(cell, indexPath);
} }
return this._owner.getHeight(indexPath.row); return height;
}
public tableViewEstimatedHeightForRowAtIndexPath(tableView: UITableView, indexPath: NSIndexPath): number {
// TODO: Consider exposing such property on ListView.
return DEFAULT_HEIGHT;
} }
} }
@@ -148,6 +147,7 @@ export class ListView extends common.ListView {
this._ios.registerClassForCellReuseIdentifier(ListViewCell.class(), CELLIDENTIFIER); this._ios.registerClassForCellReuseIdentifier(ListViewCell.class(), CELLIDENTIFIER);
this._ios.autoresizesSubviews = false; this._ios.autoresizesSubviews = false;
this._ios.autoresizingMask = UIViewAutoresizing.UIViewAutoresizingNone; this._ios.autoresizingMask = UIViewAutoresizing.UIViewAutoresizingNone;
this._ios.estimatedRowHeight = DEFAULT_HEIGHT;
var dataSource = DataSource.new().initWithOwner(this); var dataSource = DataSource.new().initWithOwner(this);