Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions AsyncDisplayKit/Details/ASRangeController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ - (BOOL)shouldSkipVisibleNodesForRangeType:(ASLayoutRangeType)rangeType

- (void)configureContentView:(UIView *)contentView forCellNode:(ASCellNode *)cellNode
{
[cellNode recursivelySetDisplaySuspended:NO];

if (cellNode.view.superview == contentView) {
// this content view is already correctly configured
return;
Expand Down
64 changes: 17 additions & 47 deletions AsyncDisplayKit/Details/ASRangeHandlerRender.mm
Original file line number Diff line number Diff line change
Expand Up @@ -12,64 +12,34 @@
#import "ASDisplayNode+Subclasses.h"
#import "ASDisplayNodeInternal.h"

@interface ASDisplayNode (ASRangeHandlerRender)

- (void)display;
- (void)recursivelyDisplay;

@end

@implementation ASDisplayNode (ASRangeHandlerRender)
@implementation ASRangeHandlerRender

- (void)display
+ (UIWindow *)workingWindow
{
if (![self __shouldLoadViewOrLayer]) {
return;
}

ASDisplayNodeAssertMainThread();
ASDisplayNodeAssert(self.nodeLoaded, @"backing store must be loaded before calling -display");

CALayer *layer = self.layer;

// rendering a backing store requires a node be laid out
[layer setNeedsLayout];
[layer layoutIfNeeded];

if (layer.contents) {
return;
}

[layer setNeedsDisplay];
[layer displayIfNeeded];

// we add nodes' views to this invisible window to start async rendering
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to be absolutely safe, can we add an ASDisplayNodeAssertMainThread() here?

static UIWindow *workingWindow = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
workingWindow = [[UIWindow alloc] initWithFrame:CGRectZero];
workingWindow.windowLevel = UIWindowLevelNormal - 1000;
workingWindow.userInteractionEnabled = NO;
workingWindow.clipsToBounds = YES;
workingWindow.hidden = YES;
});
return workingWindow;
}

- (void)recursivelyDisplay
{
if (![self __shouldLoadViewOrLayer]) {
return;
}

for (ASDisplayNode *node in self.subnodes) {
[node recursivelyDisplay];
}

[self display];
}

@end

@implementation ASRangeHandlerRender

- (void)node:(ASDisplayNode *)node enteredRangeOfType:(ASLayoutRangeType)rangeType
{
ASDisplayNodeAssertMainThread();
ASDisplayNodeAssert(rangeType == ASLayoutRangeTypeRender, @"Render delegate should not handle other ranges");

// if node is in the working range it should not actively be in view
[node.view removeFromSuperview];
[node recursivelySetDisplaySuspended:NO];

[node recursivelyDisplay];
// add the node to an off-screen window to force display and preserve its contents
[[self.class workingWindow] addSubnode:node];
}

- (void)node:(ASDisplayNode *)node exitedRangeOfType:(ASLayoutRangeType)rangeType
Expand Down