Skip to content

Commit

Permalink
fix(ios): revert changes of TIMOB-27935 (#12152)
Browse files Browse the repository at this point in the history
Fixes TIMOB-28148
  • Loading branch information
build authored Oct 2, 2020
1 parent 3fcd69f commit 23c01db
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
3 changes: 1 addition & 2 deletions iphone/Classes/TiUITableViewRowProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,7 @@ - (TiProxy *)parentForBubbling

- (UIView *)view
{
//TIMOB-27935: TiUITableViewRowProxy do not have corresponding view class. So return corresponding cell
return callbackCell;
return nil;
}

//Private method : For internal use only
Expand Down
28 changes: 27 additions & 1 deletion tests/Resources/ti.ui.tableview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,8 @@ describe('Titanium.UI.TableView', function () {
win.open();
});

it.ios('row#rect', function (finish) {
it.iosBroken('row#rect', function (finish) {
// FIXME: TIMOB-27935
if (isCI && utilities.isMacOS()) { // FIXME: On macOS CI (maybe < 10.15.6?), times out! Does app need explicit focus added?
return finish(); // FIXME: skip when we move to official mocha package
}
Expand Down Expand Up @@ -1443,4 +1444,29 @@ describe('Titanium.UI.TableView', function () {
});
win.open();
});

it('TIMOB-28148 : adding view on row causing crash', function (finish) {
var row = Ti.UI.createTableViewRow({ title: 'click me' });
var tableView = Ti.UI.createTableView({
data: [ row ]
});

win = Ti.UI.createWindow({
backgroundColor: 'blue'
});
win.addEventListener('focus', function () {
setTimeout(function () {
try {
const label = Ti.UI.createLabel({ text: 'REQUIRED' });
row.add(label);
finish();
} catch (err) {
return finish(err);
}
}, 2000);
});

win.add(tableView);
win.open();
});
});

0 comments on commit 23c01db

Please sign in to comment.