Fix preview, add viewport

marshallino16 · marshallino16 · commit 3c69c065f751 · 2020-12-07T16:14:41.000+01:00
diff --git a/Snip/Components/CodeViewer/CodeViewer.swift b/Snip/Components/CodeViewer/CodeViewer.swift
@@ -18,8 +18,6 @@ struct CodeViewer: View {
   @Environment(\.themeTextColor) var themeTextColor
   @Environment(\.themePrimaryColor) var themePrimaryColor
   
-  @State private var shouldShowPreview = false
-  
   var body: some View {
     
     VStack(alignment: .leading) {
@@ -44,7 +42,7 @@ struct CodeViewer: View {
                                                         },
                                                         onPreviewToggle: viewModel.snipItem.mode == CodeMode.html.mode() || viewModel.snipItem.mode == CodeMode.markdown.mode() ? {
                                                           withAnimation(Animation.easeOut(duration: 0.6)) { () -> () in
-                                                            self.shouldShowPreview.toggle()
+                                                            viewModel.shouldShowPreview.toggle()
                                                           }
                                                         } : nil
       ))
@@ -73,10 +71,10 @@ struct CodeViewer: View {
                    onContentChange: { newCode in
                     viewModel.saveNewCodeSnippet(newCode)
                    })
-            .frame(width: self.shouldShowPreview ? reader.size.width / 2 : reader.size.width, height: reader.size.height)
+            .frame(width: viewModel.shouldShowPreview ? reader.size.width / 2 : reader.size.width, height: reader.size.height)
           
           
-          if self.shouldShowPreview {
+          if viewModel.shouldShowPreview {
             Divider()
             
             MarkdownHTMLViewer(code: viewModel.snipItem.snippet, mode: viewModel.snipItem.mode)
@@ -105,6 +103,7 @@ struct CodeViewer: View {
 final class CodeViewerViewModel: ObservableObject {
   
   @Published var snipItem: SnipItem
+  @Published var shouldShowPreview = false
   var onTrigger: (SnipItemsListAction) -> Void
   var onDimiss: () -> Void
   
diff --git a/Snip/Representables/MarkdownHTMLViewer.swift b/Snip/Representables/MarkdownHTMLViewer.swift
@@ -70,7 +70,7 @@ struct MarkdownHTMLViewer: NSViewRepresentable {
       let down = Down(markdownString: code)
 
       if let html = try? down.toHTML() {
-          htmlSource = "<article class=\"markdown-body\">\(html)</article>"
+          htmlSource = "<head><meta name=\"viewport\" content=\"initial-scale=1.0\" /></head>" +  "<article class=\"markdown-body\">\(html)</article>"
       }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ struct MarkdownHTMLViewer: NSViewRepresentable {`
`70`	`70`	`let down = Down(markdownString: code)`
`71`	`71`
`72`	`72`	`if let html = try? down.toHTML() {`
`73`		`- htmlSource = "<article class=\"markdown-body\">\(html)</article>"`
	`73`	`+ htmlSource = "<head><meta name=\"viewport\" content=\"initial-scale=1.0\" /></head>" + "<article class=\"markdown-body\">\(html)</article>"`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`