fix interface

plaidev · Jul 7, 2023 · a972579 · a972579
1 parent 4fc5d43
commit a972579
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/ios/Example/Nativebrik_Example/Nativebrik_Example/ContentView.swift b/ios/Example/Nativebrik_Example/Nativebrik_Example/ContentView.swift
@@ -129,7 +129,14 @@ Morondava is a charming coastal town located on the western coast of Madagascar.
  VStack(alignment: .leading, spacing: 0) {
  Header()
  ScrollView(.vertical) {
- nativebrik.component(id: "ci396q223akg00audcqg").frame(width: UIScreen.main.bounds.width, height: 270)
+ nativebrik.component(id: "ci396q223akg00audcqg", onEvent: nil) { phase in
+ switch phase {
+ case .completed(let view):
+ view.frame(width: UIScreen.main.bounds.width, height: 270)
+ default:
+ Text("Loading")
+ }
+ }
  ForEach(self.items, id: \.title) { item in
  item.padding()
  }

diff --git a/ios/Nativebrik/Classes/component.swift b/ios/Nativebrik/Classes/component.swift
@@ -65,7 +65,7 @@ public enum ComponentPhase {
  case failure
 }
 
-class ComponentView: UIView {
+class ComponentUIView: UIView {
  private let componentId: String
  private let config: Config
  private let repositories: Repositories
@@ -178,12 +178,12 @@ class ComponentSwiftViewModel: ObservableObject {
  switch view {
  case .EUIRootBlock(let root):
  self.phase = .completed(
- RootViewRepresentable(
+ ComponentView(content: RootViewRepresentable(
  root: root,
  config: config,
  repositories: repositories,
  modalViewController: modalViewController
- )
+ ))
  )
  default:
  self.phase = .failure
@@ -198,9 +198,15 @@ class ComponentSwiftViewModel: ObservableObject {
  }
 }
 
+public struct ComponentView: View {
+ fileprivate let content: RootViewRepresentable
+ public var body: some View {
+ self.content
+ }
+}
 public enum AsyncComponentPhase {
  case loading
- case completed(any View)
+ case completed(ComponentView)
  case failure
 }
 struct ComponentSwiftView: View {

diff --git a/ios/Nativebrik/Classes/sdk.swift b/ios/Nativebrik/Classes/sdk.swift
@@ -213,7 +213,7 @@ public class Nativebrik: ObservableObject {
  }
 
  public func componentView(id: String) -> UIView {
- return ComponentView(
+ return ComponentUIView(
  componentId: id,
  config: self.config,
  repositories: self.repositories,
@@ -223,7 +223,7 @@ public class Nativebrik: ObservableObject {
  }
 
  public func componentView(id: String, onEvent: ((_ event: ComponentEvent) -> Void)?) -> UIView {
- return ComponentView(
+ return ComponentUIView(
  componentId: id,
  config: self.config.initFrom(onEvent: onEvent),
  repositories: self.repositories,
@@ -233,7 +233,7 @@ public class Nativebrik: ObservableObject {
  }
 
  public func componentView(id: String, onEvent: ((_ event: ComponentEvent) -> Void)?, content: @escaping (_ phase: ComponentPhase) -> UIView) -> UIView {
- return ComponentView(
+ return ComponentUIView(
  componentId: id,
  config: self.config.initFrom(onEvent: onEvent),
  repositories: self.repositories,