Commit Graph

25012 Commits

Author SHA1 Message Date
Michael Schneider
1b0b9e4830 Fix layout transition measurement completion on main test (#2639) 2016-11-20 07:05:54 -08:00
Scott Goodson
72585e4262 Revert "Prevent premature placeholder image clearing when setting the video asset at a later point in time."
See test failure in https://github.com/facebook/AsyncDisplayKit/pull/2626

This reverts commit 4ad8361eea.
2016-11-19 21:59:14 -08:00
appleguy
49aee6eb03 Merge pull request #2637 from maicki/MSReaddConstrainedSizeCheckForLayoutTransition
[ASDisplayNode] Re-add layout transition check for invalid constrained size
2016-11-19 21:36:07 -08:00
Michael Schneider
ddd4ef62ae Fix overlapping of nodes in layout transitions 2016-11-19 20:53:32 -08:00
Michael Schneider
9530b609f1 Readd layout transition check for invalid constrained size 2016-11-19 18:31:56 -08:00
appleguy
050de2af5c Merge pull request #2626 from master-nevi/video-flicker-fix
[ASVideoNode] Ensure we don't clear the placeholder image when setting the video asset
2016-11-19 16:20:00 -08:00
appleguy
3d524dfe3a Merge pull request #2635 from garrettmoon/moveASCollectionViewLayoutInspector
[ASCollectionView] Move ASCollectionViewLayoutInspector to its own file
2016-11-19 16:16:19 -08:00
Garrett Moon
00968ed984 Undo addinng 📦 2016-11-19 15:53:14 -08:00
Garrett Moon
0253ae1291 Do not assert when scrollableDirections is called in base class. 2016-11-19 15:43:47 -08:00
Garrett Moon
55ba1c5e45 Fix build for life without cocoapods 2016-11-19 15:42:38 -08:00
appleguy
0cd2d8d6fc Merge pull request #2597 from maicki/CoalAnotherApproach
[Layout] Upgrade and optimize the behavior of the layout system; coalesce -setNeedsLayout calls.
2016-11-19 15:27:42 -08:00
Garrett Moon
88d0dff09c [ASCollectionView] Move ASCollectionViewLayoutInspector to its own file 2016-11-19 15:14:03 -08:00
Michael Schneider
8d5fc9efe3 We need to invalidate the layout before the transition does start 2016-11-19 06:58:07 -08:00
Michael Schneider
66ad9bd5e3 Apply patch from Scott 2016-11-19 06:46:21 -08:00
Michael Schneider
acc080ab9c Revert setting isMutable to true in ASLayoutSpecSnapshotTestHelper 2016-11-19 06:43:46 -08:00
Michael Schneider
ed4f7eff73 Force layout pass in ASViewController viewWillAppear: to trigger automatic subnode management
A measure as well as layout pass is forced this early to get nodes like ASCollectionNode, ASTableNode etc. into the hierarchy before UIKit applies the scroll view inset adjustments, if automatic subnode management is enabled. Otherwise the insets would not be applied.
2016-11-19 06:43:46 -08:00
Michael Schneider
8c778c5410 Remove SampleSizingNode 2016-11-19 06:43:46 -08:00
Michael Schneider
eef4a61ea0 Add checks to bail out early in layout transition 2016-11-19 06:43:46 -08:00
Michael Schneider
f9c70470d8 Address another round of comments 2016-11-19 06:43:46 -08:00
Michael Schneider
fc747ca58a Small code improvements 2016-11-19 06:43:46 -08:00
Michael Schneider
cb37f10ed1 Revert sample code 2016-11-19 06:43:46 -08:00
Michael Schneider
b762998336 Add detection for a loop if invalidation of a size is happening multiple times 2016-11-19 06:43:46 -08:00
Michael Schneider
5d61b2b4e6 Address further comments 2016-11-19 06:43:46 -08:00
Michael Schneider
2cd49642b9 Address comments from @appleguy 2016-11-19 06:43:46 -08:00
Michael Schneider
bd851cae9c Change some invalidateCalculatedLayout to setNeedsLayout calls 2016-11-19 06:43:46 -08:00
Michael Schneider
a88b2ae916 Call setNeedsLayout in ASTextNode instead of just invalidate the calculated layout to trigger a relayout if necessary 2016-11-19 06:43:46 -08:00
Michael Schneider
d73712059d Remove unecessary measurement pass in ASCellNode 2016-11-19 06:43:46 -08:00
Michael Schneider
c29b7a184c Introduce ASFloorSizeValues and ASCeilSizeValues 2016-11-19 06:43:46 -08:00
Michael Schneider
8964ce86b6 Revert ASTextNode workaround for side effect in calculateSizeThatFits: 2016-11-19 06:43:46 -08:00
Michael Schneider
cc297a2dae Fix some tests and add a workaround to ceil the values from self.bounds.size before checking for equality 2016-11-19 06:43:46 -08:00
Michael Schneider
3d37e55c7b Some more improvements around constrained size 2016-11-19 06:43:46 -08:00
Michael Schneider
30b7644415 Factor out constrainedSize usage for layout pass 2016-11-19 06:43:46 -08:00
Michael Schneider
257d4c3a1f Further improvements and fixing tests 2016-11-19 06:43:46 -08:00
Michael Schneider
c14a86c4d6 More improvements to figure out the constrained size that should be used in the layout pass 2016-11-19 06:43:46 -08:00
Michael Schneider
a71a1d8519 Address comments 2016-11-19 06:43:46 -08:00
Michael Schneider
2744998a10 Further progress 2016-11-19 06:43:46 -08:00
Michael Schneider
c7765f6183 Add pending layout to ASDisplayNode 2016-11-19 06:43:46 -08:00
Michael Schneider
d21a512907 Some commit 2016-11-19 06:43:46 -08:00
Michael Schneider
8f079bd1ca Fix some tests 2016-11-19 06:43:46 -08:00
Michael Schneider
5d84f21fda Add sizeThatFits: to _ASDisplayView 2016-11-19 06:43:46 -08:00
Michael Schneider
b0eb2f81c2 Cleanup 2016-11-19 06:43:46 -08:00
Michael Schneider
dcc54c0d36 Proper relayout if size changes 2016-11-19 06:43:46 -08:00
Michael Schneider
0eb882bae5 Some more changes 2016-11-19 06:43:46 -08:00
Michael Schneider
c819d716b4 Implement sizeToFit: 2016-11-19 06:43:46 -08:00
Michael Schneider
f81c7a05b6 Reverse ASViewController project change 2016-11-19 06:43:45 -08:00
Michael Schneider
e7fccb2363 Improve ASButtonNode layout invalidation 2016-11-19 06:43:45 -08:00
Michael Schneider
0f8eac4757 Some other commit 2016-11-19 06:43:45 -08:00
Michael Schneider
bcb032d5a5 Make tests happy 2016-11-19 06:43:45 -08:00
Michael Schneider
6f40e9a654 Some more stuff in flux 2016-11-19 06:43:45 -08:00
Michael Schneider
c61ba65ba3 Some commit 2016-11-19 06:43:45 -08:00