Expose CKCompositeComponent to Swift

Summary: Ditto.

Reviewed By: Andrey-Mishanin

Differential Revision: D19744254

fbshipit-source-id: 84bf5ffb663db8570d47cf0ea91616fd62d6adeb

Author: cuva

ComponentKit/Core/CKCompositeComponent.h

@@ -8,10 +8,8 @@
  *
  */
 
+#import <Foundation/Foundation.h>
 #import <ComponentKit/CKDefines.h>
-
-#if CK_NOT_SWIFT
-
 #import <ComponentKit/CKComponent.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -29,8 +27,17 @@ NS_ASSUME_NONNULL_BEGIN
 
  @warning Overriding -layoutThatFits:parentSize: or -computeLayoutThatFits: is **not allowed** for any subclass.
  */
+NS_SWIFT_NAME(CompositeComponent)
 @interface CKCompositeComponent : CKComponent
 
+- (instancetype)init NS_UNAVAILABLE;
+- (instancetype _Nullable)initWithComponent:(NS_RELEASES_ARGUMENT CKComponent *_Nullable)component CK_OBJC_UNAVAILABLE;
+
+#if CK_NOT_SWIFT
+
+- (instancetype _Nullable)initWithView:(const CKComponentViewConfiguration &)view
+                             component:(NS_RELEASES_ARGUMENT CKComponent  * _Nullable)component CK_SWIFT_DESIGNATED_INITIALIZER;
+
 /** Calls the initializer with {} for view. */
 + (instancetype _Nullable)newWithComponent:(NS_RELEASES_ARGUMENT CKComponent * _Nullable)component;
 
@@ -41,18 +48,20 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (instancetype _Nullable)newWithView:(const CKComponentViewConfiguration &)view component:(NS_RELEASES_ARGUMENT CKComponent  * _Nullable)component;
 
-/** Access the child component. For intenral use only. */
-- (CKComponent * _Nullable)child;
+CK_COMPONENT_INIT_UNAVAILABLE;
+
+#endif
+
+/** Access the child component. For internal use only. */
+@property (nonatomic, strong, readonly, nullable) CKComponent *child;
+
 
 @end
 
 #define CK_COMPOSITE_COMPONENT_INIT_UNAVAILABLE \
-CK_COMPONENT_INIT_UNAVAILABLE; \
 + (instancetype _Nullable)newWithComponent:(NS_RELEASES_ARGUMENT CKComponent * _Nullable)component NS_UNAVAILABLE; \
 + (instancetype _Nullable)newWithView:(const CKComponentViewConfiguration &)view component:(NS_RELEASES_ARGUMENT CKComponent  * _Nullable)component NS_UNAVAILABLE
 
 NS_ASSUME_NONNULL_END
 
 #import <ComponentKit/CompositeComponentBuilder.h>
-
-#endif

ComponentKit/Core/CKCompositeComponent.mm

@@ -41,21 +41,40 @@ + (void)initialize
 }
 #endif
 
+- (instancetype _Nullable)initWithView:(const CKComponentViewConfiguration &)view
+                             component:(CKComponent  * _Nullable)component
+{
+  if (component == nil) {
+    return nil;
+  }
+
+  if (self = [super initWithView:view size:{}]) {
+    _child = component;
+  }
+  return self;
+}
+
+- (instancetype _Nullable)initWithComponent:(CKComponent * _Nullable)component
+{
+  return [self initWithView:{} component:component];
+}
+
 + (instancetype)newWithComponent:(CKComponent *)component
 {
   return [self newWithView:{} component:component];
 }
 
 + (instancetype)newWithView:(const CKComponentViewConfiguration &)view component:(CKComponent *)component
 {
-  if (!component) {
+  if (component == nil) {
     return nil;
   }
 
   CKCompositeComponent *c = [super newWithView:view size:{}];
-  if (c) {
+  if (c != nil) {
     c->_child = component;
   }
+
   return c;
 }
 

ComponentKitTestHelpers/CKEmbeddedTestComponent.h

@@ -8,6 +8,10 @@
     This can be used to test what happens when state changes and the LifecycleTestComponent is removed.
     Call setLifecycleTestComponentIsHidden to trigger the corresponding state change. */
 @interface CKEmbeddedTestComponent : CKCompositeComponent
+
++ (instancetype)newWithView:(const CKComponentViewConfiguration &)view size:(const CKComponentSize &)size;
+
 - (void)setLifecycleTestComponentIsHidden:(BOOL)isHidden;
 - (CKLifecycleTestComponent *)lifecycleTestComponent;
+
 @end

ComponentKitTests/CKComponentGeneratorTests.mm

@@ -22,6 +22,8 @@ @interface CKComponentGeneratorTests : XCTestCase <CKComponentGeneratorDelegate>
 
 @interface CKTestStateComponent : CKCompositeComponent
 
++ (instancetype)new;
+
 @property (nonatomic, readonly, strong) id state;
 
 @end

ComponentKitTests/CKComponentViewContextTests.mm

@@ -24,6 +24,8 @@ @interface CKComponentViewContextTests : XCTestCase
 @interface CKNestedComponent : CKCompositeComponent
 @property (nonatomic, strong) CKComponent *subcomponent;
 
++ (instancetype)new;
+
 @end
 
 @implementation CKComponentViewContextTests
@@ -40,7 +42,6 @@ @implementation CKComponentViewContextTests
   return [CKNestedComponent new];
 }
 
-
 static const CKSizeRange size = {{100, 100}, {100, 100}};
 
 - (void)testMountingComponentWithViewExposesViewContextWithTheCreatedView

ComponentKitTests/TransactionalDataSource/CKDataSourceReloadModificationTests.mm

@@ -30,6 +30,9 @@
 static u_int32_t lifecycleComponentState = 1;
 
 @interface CKTestGlobalStateComponent : CKCompositeComponent
+
++ (instancetype)new;
+
 @property (nonatomic, readonly) u_int32_t globalStateAtTimeOfCreation;
 @property (nonatomic, readonly) CKLifecycleTestComponent *lifecycleComponent;
 @end

ComponentKitTests/TransactionalDataSource/CKDataSourceUpdateStateModificationTests.mm

@@ -29,6 +29,9 @@
 static NSString *const kTestStateForLifecycleComponent = @"kTestStateForLifecycleComponent";
 
 @interface CKStatefulTestComponent : CKCompositeComponent
+
++ (instancetype)new;
+
 @property (nonatomic, readonly) NSString *state;
 @property (nonatomic, readonly) CKLifecycleTestComponent *lifecycleComponent;
 @end