Merge branch 'master' into separate-rendering-logic

Author: JohnSundell

sources/HUBViewControllerImplementation.m

@@ -468,7 +468,7 @@ - (void)componentWrapper:(HUBComponentWrapper *)componentWrapper
 - (HUBComponentWrapper *)componentWrapper:(HUBComponentWrapper *)componentWrapper
                    childComponentForModel:(id<HUBComponentModel>)model
 {
-    CGSize const containerViewSize = HUBComponentLoadViewIfNeeded(componentWrapper).frame.size;
+    CGSize const containerViewSize = [self childComponentContainerViewSizeForParentWrapper:componentWrapper];
 
     HUBComponentWrapper * const childComponentWrapper = [self.childComponentReusePool componentWrapperForModel:model
                                                                                                       delegate:self
@@ -822,6 +822,16 @@ - (void)configureComponentWrapper:(HUBComponentWrapper *)wrapper withModel:(id<H
     self.componentWrappersByModelIdentifier[model.identifier] = wrapper;
 }
 
+- (CGSize)childComponentContainerViewSizeForParentWrapper:(HUBComponentWrapper *)parentWrapper
+{
+    if (parentWrapper.isRootComponent && parentWrapper.model.type == HUBComponentTypeBody) {
+        NSIndexPath * const indexPath = [NSIndexPath indexPathForItem:(NSInteger)parentWrapper.model.index inSection:0];
+        return [self.collectionView.collectionViewLayout layoutAttributesForItemAtIndexPath:indexPath].frame.size;
+    }
+    
+    return HUBComponentLoadViewIfNeeded(parentWrapper).frame.size;
+}
+
 - (nullable HUBComponentWrapper *)componentWrapperFromCell:(HUBComponentCollectionViewCell *)cell
 {
     return self.componentWrappersByCellIdentifier[cell.identifier];

tests/HUBViewControllerTests.m

@@ -1385,12 +1385,13 @@ - (void)testContainerViewSizeForReusedRootComponentsAreSameAsCollectionViewSize
     XCTAssertTrue(CGSizeEqualToSize(self.component.currentContainerViewSize, self.collectionView.bounds.size));
 }
 
-- (void)testContainerViewSizeForChildComponentsAreParerentComponentsViewSize
+- (void)testContainerViewSizeForChildComponentsAreParentComponentsViewSize
 {
     NSString * const componentNamespace = @"childComponentSelection";
     NSString * const componentName = @"component";
     NSString * const childComponentName = @"componentB";
     HUBComponentMock * const component = [HUBComponentMock new];
+    component.preferredViewSize = CGSizeMake(200, 200);
     HUBComponentMock * const childComponent = [HUBComponentMock new];
 
     HUBComponentFactoryMock * const componentFactory = [[HUBComponentFactoryMock alloc] initWithComponents:@{
@@ -1417,17 +1418,16 @@ - (void)testContainerViewSizeForChildComponentsAreParerentComponentsViewSize
     NSIndexPath * const indexPath = [NSIndexPath indexPathForItem:0 inSection:0];
     [self.collectionView.dataSource collectionView:self.collectionView cellForItemAtIndexPath:indexPath];
 
-    const CGRect expectedParentFrame = CGRectMake(0, 0, 88, 88);
-    component.view.frame = expectedParentFrame;
-
     id<HUBComponentChildDelegate> const childDelegate = component.childDelegate;
 
     id<HUBComponentModel> const childComponentModelA = [component.model childAtIndex:0];
     XCTAssertNotNil(childComponentModelA);
 
     [childDelegate component:component childComponentForModel:childComponentModelA];
 
-    XCTAssertTrue(CGSizeEqualToSize(childComponent.currentContainerViewSize, expectedParentFrame.size));
+    CGSize const expectedContainerViewSize = [self.collectionView.collectionViewLayout layoutAttributesForItemAtIndexPath:indexPath].frame.size;
+    XCTAssertTrue(CGSizeEqualToSize(expectedContainerViewSize, CGSizeMake(200, 200)));
+    XCTAssertTrue(CGSizeEqualToSize(childComponent.currentContainerViewSize, expectedContainerViewSize));
 }
 
 - (void)testCollectionViewNotAddedOnTopOfInitialOverlayComponent