Commit Graph
5091 Commits
Author SHA1 Message Date
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
Adlai Holler 1801620094 Make ASTextNode copy exclusionPaths and attributedString 2015-10-06 00:46:20 -07:00
Adlai Holler ae3eb70f6a Public API fast paths in ASTextNode 2015-10-06 00:40:33 -07:00
Adlai Holler 87caed27e2 Add more deep compares when setting public properties to the same value 2015-10-05 23:48:48 -07:00
Adlai Holler f0b7e150cd Limit 1 inflight Photos.framework request per multiplex image node 2015-10-05 23:40:33 -07:00
Adlai Holler d94dcdef0f Only do PHAsset metadata requests one at a time to workaround Photos framework deadlock 2015-10-05 23:40:33 -07:00
appleguy 2e5da5599d Merge pull request #713 from Adlai-Holler/MultiplexImageNodeShortCircuit
Use deep compare when setting image identifiers in ASMultiplexImageNode
2015-10-05 22:52:01 -07:00
Adlai Holler ce97b56580 Sugar 2015-10-05 20:41:21 -07:00
Adlai Holler c5b5bdd29c Use deep compare when setting image identifiers in ASMultiplexImageNode 2015-10-05 20:34:42 -07:00
appleguy 00e993c07b Merge pull request #710 from garrettmoon/fixShouldRasterizeSubnodes
Fix shouldRasterizeSubnodes skipping setting offset and clipping.
2015-10-05 18:04:54 -07:00
Garrett Moon b1d03f1d58 Address comments 2015-10-05 16:02:01 -07:00
Garrett Moon d6c107a896 Fix shouldRasterizeSubnodes skipping setting offset and clipping. 2015-10-05 16:02:01 -07:00
Adlai Holler ee970d412b Annotate ASCollectionViewProtocols.h 2015-10-05 13:48:09 -07:00
Adlai Holler 8bb9d173dc Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
	AsyncDisplayKit/ASMultiplexImageNode.h
	AsyncDisplayKit/ASViewController.h
	AsyncDisplayKit/Details/ASDataController.h
2015-10-05 13:24:16 -07:00
appleguy 2f1d57e50c Merge pull request #708 from Adlai-Holler/FasterLayoutNodes
Faster handling of iteration to lay out nodes in ASDataController.
2015-10-05 12:46:37 -07:00
Adlai Holler 99b9f73b1a Fix index into size ranges 2015-10-05 11:51:05 -07:00
Adlai Holler 33c07db58c Set node.frame entirely 2015-10-05 11:42:25 -07:00
Adlai Holler 4601fccb5a Optimize ASDataController._layoutNodes 2015-10-05 11:37:29 -07:00
Scott Goodson 77745c55b0 Properly support operating with nil asyncDelegate for Table & Collection. 2015-10-04 17:11:41 -07:00
appleguy 67cf6d3951 Merge pull request #705 from facebook/ThreadAffinity
Improved messages for thread affinity and frame transform identity assertions.
2015-10-04 16:24:39 -07:00
Scott Goodson 61bb4f022e Improved messages for thread affinity and frame transform identity assertions. 2015-10-04 11:15:57 -07:00
appleguy 057422d52b Merge pull request #699 from rcancro/staticLayout
Fix static layout to ensure it always considers its sub layout's preferred sizes.
2015-10-04 10:52:02 -07:00
appleguy ca2399f57f Merge pull request #704 from marmelroy/feature-dynamic-framework-test
Fixing dynamic framework target and adding an example for Travis
2015-10-04 09:12:53 -07:00
Roy Marmelstein c92a15515d Adding readme 2015-10-04 11:07:47 +02:00