为 QMUICommonTableViewController 和 QMUIModalPresentationViewController 加上 IBOutlet 的支持

MoLice · MoLice · commit 565eceea9cf3 · 2017-07-14T19:38:21.000+08:00
diff --git a/QMUIKit/UIComponents/QMUIModalPresentationViewController.h b/QMUIKit/UIComponents/QMUIModalPresentationViewController.h
@@ -102,20 +102,20 @@ typedef NS_ENUM(NSUInteger, QMUIModalPresentationAnimationStyle) {
     CGFloat                     _keyboardHeight;
 }
 
-@property(nonatomic, weak) id<QMUIModalPresentationViewControllerDelegate> delegate;
+@property(nonatomic, weak) IBOutlet id<QMUIModalPresentationViewControllerDelegate> delegate;
 
 /**
  *  要被弹出的浮层
  *  @warning 当设置了`contentView`时，不要再设置`contentViewController`
  */
-@property(nonatomic, strong) UIView *contentView;
+@property(nonatomic, strong) IBOutlet UIView *contentView;
 
 /**
  *  要被弹出的浮层，适用于浮层以UIViewController的形式来管理的情况。
  *  @warning 当设置了`contentViewController`时，`contentViewController.view`会被当成`contentView`使用，因此不要再自行设置`contentView`
  *  @warning 注意`contentViewController`是强引用，容易导致循环引用，使用时请注意
  */
-@property(nonatomic, strong) UIViewController<QMUIModalPresentationContentViewControllerProtocol> *contentViewController;
+@property(nonatomic, strong) IBOutlet UIViewController<QMUIModalPresentationContentViewControllerProtocol> *contentViewController;
 
 /**
  *  设置`contentView`布局时与外容器的间距，默认为(20, 20, 20, 20)
@@ -134,7 +134,7 @@ typedef NS_ENUM(NSUInteger, QMUIModalPresentationAnimationStyle) {
  *
  *  `QMUIModalPresentationViewController`会自动给自定义的`dimmingView`添加手势以实现点击遮罩隐藏浮层。
  */
-@property(nonatomic, strong) UIView *dimmingView;
+@property(nonatomic, strong) IBOutlet UIView *dimmingView;
 
 /**
  *  由于点击遮罩导致浮层被隐藏时的回调（区分于`hideWithAnimated:completion:`里的completion，这里是特地用于点击遮罩的情况）
diff --git a/QMUIKit/UIComponents/QMUIModalPresentationViewController.m b/QMUIKit/UIComponents/QMUIModalPresentationViewController.m
@@ -90,6 +90,14 @@ - (void)didInitialized {
     [self initDefaultDimmingViewWithoutAddToView];
 }
 
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    if (self.contentViewController) {
+        // 在 IB 里设置了 contentViewController 的话，通过这个调用去触发 contentView 的更新
+        self.contentViewController = self.contentViewController;
+    }
+}
+
 - (void)dealloc {
     self.containerWindow = nil;
 }
diff --git a/QMUIKit/UIMainFrame/QMUICommonTableViewController.m b/QMUIKit/UIMainFrame/QMUICommonTableViewController.m
@@ -345,10 +345,12 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 @implementation QMUICommonTableViewController (QMUISubclassingHooks)
 
 - (void)initTableView {
-    _tableView = [[QMUITableView alloc] initWithFrame:self.view.bounds style:self.style];
-    self.tableView.delegate = self;
-    self.tableView.dataSource = self;
-    [self.view addSubview:self.tableView];
+    if (!_tableView) {
+        _tableView = [[QMUITableView alloc] initWithFrame:self.view.bounds style:self.style];
+        self.tableView.delegate = self;
+        self.tableView.dataSource = self;
+        [self.view addSubview:self.tableView];
+    }
 }
 
 - (BOOL)shouldHideTableHeaderViewInitial {

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,14 @@ - (void)didInitialized {`
`90`	`90`	`[self initDefaultDimmingViewWithoutAddToView];`
`91`	`91`	`}`
`92`	`92`
	`93`	`+- (void)awakeFromNib {`
	`94`	`+ [super awakeFromNib];`
	`95`	`+ if (self.contentViewController) {`
	`96`	`+ // 在 IB 里设置了 contentViewController 的话，通过这个调用去触发 contentView 的更新`
	`97`	`+ self.contentViewController = self.contentViewController;`
	`98`	`+ }`
	`99`	`+}`
	`100`	`+`
`93`	`101`	`- (void)dealloc {`
`94`	`102`	`self.containerWindow = nil;`
`95`	`103`	`}`