Commit Graph

3364 Commits

Author SHA1 Message Date
appleguy
281a355ffd Merge pull request #743 from facebook/Podfile
Bump podspec version to 1.9 in preparation for release.
2015-10-14 19:28:12 -07:00
Scott Goodson
58a880eaea Bump podspec version to 1.9 in preparation for release. 2015-10-14 19:27:23 -07:00
appleguy
1850238242 Merge pull request #738 from Adlai-Holler/DeprioritizeImageRequests
Demote Photos.framework image request QoS
2015-10-14 12:49:47 -07:00
appleguy
d48455672e Merge pull request #740 from Adlai-Holler/ImageNodeErrorHandling
Improve Error Handling in ASMultiplexImageNode
2015-10-14 12:47:56 -07:00
Adlai Holler
a53c8a3c34 Improve error handling in ASMultiplexImageNode 2015-10-14 11:00:56 -07:00
Adlai Holler
fb0341215f Fix nullability in MultiplexImageNodeDataSource 2015-10-13 21:27:18 -07:00
Adlai Holler
b1e60a95e6 Merge branch 'master' into update-objc 2015-10-13 21:26:20 -07:00
Adlai Holler
b09d6a3602 Demote Photos.framework image requests to UserInitiated quality of service 2015-10-13 21:22:03 -07:00
Huy Nguyen
210a89e83c Animate subnodes swap in Kitten example. 2015-10-12 22:24:19 +03:00
Huy Nguyen
91f3ba1f49 Don't invalidateCalculatedLayout when ASTextCellNode's text is changed
Because calling -invalidateCalculatedLayout removes the current constrained size and therefore any -setNeedsLayout calls in the future won't have a valid constrained size to proceed.

Instead, cell nodes should be relaid-out using the new APIs introduced in ASTableView and ASCollectionView, which are -relayoutRowAtIndexPath:withRowAnimation and -relayoutItemAtIndexPath, respectively.
2015-10-12 21:48:01 +03:00
Huy Nguyen
12c087d967 Merge branch 'master' into RelayoutCellAPI 2015-10-12 21:31:49 +03:00
appleguy
55c9167e7f Merge pull request #736 from Adlai-Holler/DocumentCellLayoutPasses
Document Cell Layout Passes
2015-10-11 10:30:03 -07:00
Adlai Holler
fbd3c77fec Finish that thought 2015-10-11 08:43:43 -07:00
Adlai Holler
d964364cd5 Add some documentation in DataController, plus use Fast Enumeration more 2015-10-11 08:39:29 -07:00
appleguy
090a12bdd1 Merge pull request #735 from Adlai-Holler/MeasureCellNodesOnMain
[ASDataController] Allow reusing ASCellNodes by measuring on main thread for .nodeLoaded = YES
2015-10-10 20:20:36 -07:00
Adlai Holler
595891629c Remove pointless assertion 2015-10-10 10:33:56 -07:00
Adlai Holler
0c361894ac Remove comment 2015-10-09 21:17:11 -07:00
Adlai Holler
1e232561f4 Whitespace 2015-10-09 21:16:28 -07:00
Adlai Holler
0eb3490363 Finish removing needsMeasure 2015-10-09 21:15:32 -07:00
Adlai Holler
7f42b37dec Remove needsMeasure 2015-10-09 21:13:00 -07:00
Adlai Holler
0848aac186 Revert prior change 2015-10-09 20:28:42 -07:00
Adlai Holler
d8e99e00bd Remove public needsMeasure 2015-10-09 20:27:38 -07:00
Adlai Holler
fdb11275db Put back the frame-setting behavior when measuring cell nodes 2015-10-09 20:23:54 -07:00
Adlai Holler
06b7897bc1 Finish measuring on main thread when possible 2015-10-09 20:06:59 -07:00
Adlai Holler
93cdc0f2f5 Don't set cell node frames during measurement 2015-10-09 19:55:14 -07:00
Adlai Holler
223e9ff504 Merge branch 'DontSetCellNodeFramesDuringMeasure' into MeasureCellNodesOnMain
Conflicts:
	AsyncDisplayKit/Details/ASDataController.mm
2015-10-09 19:53:46 -07:00
Adlai Holler
e716ccb580 Don't set cell node frames during measure, set them just before returning the cell size to UITableView/UICollectionView 2015-10-09 19:51:12 -07:00
Adlai Holler
e92a6ce9e3 Initial work on measuring loaded cell nodes on the main thread 2015-10-09 19:37:36 -07:00
appleguy
ca5780f6f4 Merge pull request #714 from Adlai-Holler/WorkaroundPhotosDeadlock
Workaround Photos.framework deadlock by locking
2015-10-07 17:20:52 -07:00
appleguy
5eb5e431c4 Merge pull request #726 from facebook/RestoreTableAndCollectionDelegates
Revert "Properly support operating with nil asyncDelegate for Table & Collection."
2015-10-07 14:50:00 -07:00
Scott Goodson
a8435b494c Revert "Properly support operating with nil asyncDelegate for Table & Collection."
This reverts commit 77745c55b0.

Bug was found / reported in https://github.com/facebook/AsyncDisplayKit/issues/721

Attempting resolution here, but need to fix for current clients now:
https://github.com/facebook/AsyncDisplayKit/pull/724
2015-10-07 14:48:37 -07:00
appleguy
ba951d139c Merge pull request #725 from nguyenhuy/CodeStyleInASDisplayNode
Clean up #723 - indentation and thread affinity / lock enforcement
2015-10-07 13:35:06 -07:00
Huy Nguyen
c2fbd651da Lock the property lock in ASDisplayNode __setSafeFrame 2015-10-07 22:21:43 +03:00
Huy Nguyen
8b7dc916f8 Fix indentations in ASDisplayNode:layout 2015-10-07 22:16:37 +03:00
appleguy
243873dc1f Merge pull request #723 from nguyenhuy/LayoutSubnodesUsingBoundsAndPosition
Use bounds and position to layout subnodes
2015-10-07 12:12:43 -07:00
Huy Nguyen
5a2fea7c1d Use bounds and position to layout subnodes, instead of frame because it is not safe in case the transform property constains a non-identity transform. 2015-10-07 21:54:48 +03:00
Huy Nguyen
f13f61c2f0 Add relayout item/row APIs to ASTableView and ASCollectionView. 2015-10-07 21:25:07 +03:00
Adlai Holler
cb407367be Cancel image requests in ASMultiplexImageNode.clearFetchedData 2015-10-07 10:08:54 -07:00
Adlai Holler
cdfd5c1fdd Check whether data source responds to asset method 2015-10-07 10:08:28 -07:00
appleguy
697142240c Merge pull request #719 from rcancro/baselineFixes
Fixes to baseline stack alignment
2015-10-06 22:27:38 -07:00
ricky cancro
89a216b90d Fixes to baseline stack alignment
1) Set the ascender/descender of an ASTextNode when the attributeString is set. Previously ascender/descender were only being computed in `setValuesFromLayoutable` and only when the attribute string was not nil. May make sense to remove the computation from `setValuesFromLayoutable` entirely.
2) Remove ability to allow different children of a stack spec to aling to different baselines. This wasn't working before and I'm not convinced it is possible to do properly/useful enough to invest the time.
3) Have all stack spec run `ASStackBaselinePositionedLayout::compute` to compute the stack's ascender and descender. Even if the stack isn't aligning its children to a baseline, the stack itself may be a child of another stack that IS aligning to a baseline.
2015-10-06 21:41:39 -07:00
Adlai Holler
6d73cee9fd Give ASMultiplexImageNodeDataSources an opportunity to provide PHAssets quicker 2015-10-06 16:35:50 -07:00
appleguy
e41f7c59c4 Merge pull request #717 from levi/scrollnode-initializer
Use long-form view block initializer for better Swift support
2015-10-06 15:26:31 -07:00
appleguy
ed7f2274f9 Merge pull request #711 from garrettmoon/addSupportForDisablingAndEnablingShouldRasterize
Adds support for disabling and re-enabling should rasterize.
2015-10-06 13:36:54 -07:00
appleguy
656fbeb526 Merge pull request #706 from facebook/NilDelegate
Properly support operating with nil asyncDelegate for Table & Collection.
2015-10-06 13:35:23 -07:00
Adlai Holler
fffc76a353 Have ASMultiplexImageNode store its image request operation weakly 2015-10-06 13:21:42 -07:00
Garrett Moon
1a8f66919b Add tests for enabling / disabling shouldRasterize 2015-10-06 11:47:13 -07:00
Garrett Moon
8a70c8d416 Adds support for disabling and re-enabling should rasterize. 2015-10-06 11:47:13 -07:00
appleguy
f91e008b23 Merge pull request #715 from Adlai-Holler/DeeperCompares
Expand usage of ASObjectIsEqual to clean up / encourage fast-path compares.
2015-10-06 11:31:44 -07:00
Levi McCallum
1f799a6687 Use long-form view block initializer for better Swift support 2015-10-06 09:34:57 -07:00