VStack and ZStack

zhuowei · Jun 7, 2019 · 5f3044d · 5f3044d
1 parent 88b97af
commit 5f3044d
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/marina.swift b/marina.swift
@@ -122,6 +122,38 @@ struct HStack<Content> : View, MarinaHStackAccess where Content: View {
     }
 }
 
+protocol MarinaVStackAccess : MarinaViewContentAccessor {
+}
+
+struct VStack<Content> : View, MarinaVStackAccess where Content: View {
+    var body:Never {
+        fatalError("VStack has no body")
+    }
+    var content:Content
+    init(@ViewBuilder content: () -> Content) {
+        self.content = content()
+    }
+    func getContent() -> Any {
+        return content
+    }
+}
+
+protocol MarinaZStackAccess : MarinaViewContentAccessor {
+}
+
+struct ZStack<Content> : View, MarinaHStackAccess where Content: View {
+    var body:Never {
+        fatalError("ZStack has no body")
+    }
+    var content:Content
+    init(@ViewBuilder content: () -> Content) {
+        self.content = content()
+    }
+    func getContent() -> Any {
+        return content
+    }
+}
+
 struct MarinaDemo : View {
     var body: some View {
         HStack {

diff --git a/marina_html.swift b/marina_html.swift
@@ -45,6 +45,16 @@ func render(view: Any, emitter: DOMEmitter) {
             let v = view as! MarinaHStackAccess
             render(view: v.getContent(), emitter: emitter)
             emitter.close("div")
+        case "VStack":
+            emitter.emit("div", ["class": "marina-vstack"])
+            let v = view as! MarinaVStackAccess
+            render(view: v.getContent(), emitter: emitter)
+            emitter.close("div")
+        case "ZStack":
+            emitter.emit("div", ["class": "marina-zstack"])
+            let v = view as! MarinaZStackAccess
+            render(view: v.getContent(), emitter: emitter)
+            emitter.close("div")
         case "Text":
             emitter.emit("div", ["class": "marina-text"])
             let v = view as! MarinaTextAccess