ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-11 17:00:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic cleaning data if delegate / dataSource changes and bring over logic to ASTableView (#1200)

Browse Source 
* Cleanup in ASTableView datasource/delegate change

* Fix experiments logic

* Add changelog entry
This commit is contained in:
Michael Schneider 2018-11-01 08:08:45 -07:00 committed by GitHub
parent 055d27c45a
commit fec14f8310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -69,6 +69,7 @@
- Yoga integration improvements [Michael Schneider](https://github.com/maicki)[#1187] (https://github.com/TextureGroup/Texture/pull/1187) - Yoga integration improvements [Michael Schneider](https://github.com/maicki)[#1187] (https://github.com/TextureGroup/Texture/pull/1187)
- Correct linePositionModifier behavior [Michael Schneider](https://github.com/maicki)[#1192] (https://github.com/TextureGroup/Texture/pull/1192) - Correct linePositionModifier behavior [Michael Schneider](https://github.com/maicki)[#1192] (https://github.com/TextureGroup/Texture/pull/1192)
- Tweak a11y label aggregation behavior to enable container label overrides [Michael Schneider](https://github.com/maicki)[#1199] (https://github.com/TextureGroup/Texture/pull/1199) - Tweak a11y label aggregation behavior to enable container label overrides [Michael Schneider](https://github.com/maicki)[#1199] (https://github.com/TextureGroup/Texture/pull/1199)
- Fix logic cleaning data if delegate / dataSource changes and bring over logic to ASTableView [Michael Schneider](https://github.com/maicki)[#1200] (https://github.com/TextureGroup/Texture/pull/1200)
## 2.7 ## 2.7
- Fix pager node for interface coalescing. [Max Wang](https://github.com/wsdwsd0829) [#877](https://github.com/TextureGroup/Texture/pull/877) - Fix pager node for interface coalescing. [Max Wang](https://github.com/wsdwsd0829) [#877](https://github.com/TextureGroup/Texture/pull/877)

8
Source/ASCollectionView.mm
View File

@ -577,9 +577,15 @@ static NSString * const kReuseIdentifier = @"_ASCollectionReuseIdentifier";
{ {
ASDisplayNodeAssertMainThread(); ASDisplayNodeAssertMainThread();
if (_asyncDataSource == nil && _asyncDelegate == nil && _isDeallocating && ASActivateExperimentalFeature(ASExperimentalClearDataDuringDeallocation)) { if (_asyncDataSource == nil && _asyncDelegate == nil) {
if (ASActivateExperimentalFeature(ASExperimentalClearDataDuringDeallocation)) {
if (_isDeallocating) {
[_dataController clearData]; [_dataController clearData];
} }
} else {
[_dataController clearData];
}
}
} }
- (void)setCollectionViewLayout:(nonnull UICollectionViewLayout *)collectionViewLayout - (void)setCollectionViewLayout:(nonnull UICollectionViewLayout *)collectionViewLayout

17
Source/ASTableView.mm
View File

@ -436,6 +436,7 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
_dataController.validationErrorSource = asyncDataSource; _dataController.validationErrorSource = asyncDataSource;
super.dataSource = (id<UITableViewDataSource>)_proxyDataSource; super.dataSource = (id<UITableViewDataSource>)_proxyDataSource;
[self _asyncDelegateOrDataSourceDidChange];
} }
- (id<ASTableDelegate>)asyncDelegate - (id<ASTableDelegate>)asyncDelegate
@ -506,6 +507,22 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
} }
super.delegate = (id<UITableViewDelegate>)_proxyDelegate; super.delegate = (id<UITableViewDelegate>)_proxyDelegate;
[self _asyncDelegateOrDataSourceDidChange];
}
- (void)_asyncDelegateOrDataSourceDidChange
{
ASDisplayNodeAssertMainThread();
if (_asyncDataSource == nil && _asyncDelegate == nil) {
if (ASActivateExperimentalFeature(ASExperimentalClearDataDuringDeallocation)) {
if (_isDeallocating) {
[_dataController clearData];
}
} else {
[_dataController clearData];
}
}
} }
- (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy - (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy