From 9b34527b3b209c200c77679f054164bb26363092 Mon Sep 17 00:00:00 2001
From: Dmitry Malyugin <dmitry.malyugin@toptal.com>
Date: Fri, 23 Jul 2021 18:46:28 +0300
Subject: [PATCH 1/2] Fix OTSubscriberView, OTPublishderView layout issue on
 iOS

---
 ios/OpenTokReactNative/OTPublisherView.swift  | 16 +++++++++-------
 ios/OpenTokReactNative/OTSubscriberView.swift | 17 +++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ios/OpenTokReactNative/OTPublisherView.swift b/ios/OpenTokReactNative/OTPublisherView.swift
index 9bd52077..f6c8b070 100644
--- a/ios/OpenTokReactNative/OTPublisherView.swift
+++ b/ios/OpenTokReactNative/OTPublisherView.swift
@@ -10,7 +10,15 @@ import Foundation
 
 @objc(OTPublisherView)
 class OTPublisherView : UIView {
-  @objc var publisherId: NSString?
+  @objc var publisherId: NSString? {
+    didSet {
+      if let publisherView = OTRN.sharedState.publishers[publisherId! as String]?.view{
+        publisherView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        addSubview(publisherView)
+      }
+    }
+  }
+
   override init(frame: CGRect) {
     super.init(frame: frame)
   }
@@ -18,11 +26,5 @@ class OTPublisherView : UIView {
   required init?(coder aDecoder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
-  override func layoutSubviews() {
-    if let publisherView = OTRN.sharedState.publishers[publisherId! as String]?.view {
-      publisherView.frame = self.bounds
-      addSubview(publisherView)
-    }
-  }
 }
 
diff --git a/ios/OpenTokReactNative/OTSubscriberView.swift b/ios/OpenTokReactNative/OTSubscriberView.swift
index 1bcf1cf0..5d14378a 100644
--- a/ios/OpenTokReactNative/OTSubscriberView.swift
+++ b/ios/OpenTokReactNative/OTSubscriberView.swift
@@ -10,7 +10,15 @@ import Foundation
 
 @objc(OTSubscriberView)
 class OTSubscriberView: UIView {
-  @objc var streamId: NSString?
+  @objc var streamId: NSString? {
+    didSet {
+      if let subscriberView = OTRN.sharedState.subscribers[streamId! as String]?.view {
+        subscriberView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        addSubview(subscriberView)
+      }
+    }
+  }
+
   override init(frame: CGRect) {
     super.init(frame: frame)
   }
@@ -18,12 +26,5 @@ class OTSubscriberView: UIView {
   required init?(coder aDecoder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
-  
-  override func layoutSubviews() {
-    if let subscriberView = OTRN.sharedState.subscribers[streamId! as String]?.view {
-      subscriberView.frame = self.bounds
-      addSubview(subscriberView)
-    }
-  }
 }
 

From 833233bf604ade5e615b03ed5730252c357325fb Mon Sep 17 00:00:00 2001
From: Dmitry Malyugin <dmitry.malyugin@toptal.com>
Date: Fri, 23 Jul 2021 18:54:23 +0300
Subject: [PATCH 2/2] Code style fix

---
 ios/OpenTokReactNative/OTPublisherView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/OpenTokReactNative/OTPublisherView.swift b/ios/OpenTokReactNative/OTPublisherView.swift
index f6c8b070..39a0b053 100644
--- a/ios/OpenTokReactNative/OTPublisherView.swift
+++ b/ios/OpenTokReactNative/OTPublisherView.swift
@@ -12,7 +12,7 @@ import Foundation
 class OTPublisherView : UIView {
   @objc var publisherId: NSString? {
     didSet {
-      if let publisherView = OTRN.sharedState.publishers[publisherId! as String]?.view{
+      if let publisherView = OTRN.sharedState.publishers[publisherId! as String]?.view {
         publisherView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         addSubview(publisherView)
       }