Move fixedSize modifier to themes (#222)

gonzalezreal · Apr 15, 2023 · ffb2d80 · ffb2d80
1 parent 3830c4c
commit ffb2d80
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 1 deletion.
diff --git a/Sources/MarkdownUI/Theme/Theme+Basic.swift b/Sources/MarkdownUI/Theme/Theme+Basic.swift
@@ -69,6 +69,7 @@ extension Theme {
     }
     .paragraph { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .relativeLineSpacing(.em(0.15))
         .markdownMargin(top: .zero, bottom: .em(1))
     }
@@ -94,6 +95,7 @@ extension Theme {
     }
     .table { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .markdownMargin(top: .zero, bottom: .em(1))
     }
     .tableCell { configuration in
@@ -103,6 +105,7 @@ extension Theme {
             FontWeight(.semibold)
           }
         }
+        .fixedSize(horizontal: false, vertical: true)
         .relativeLineSpacing(.em(0.15))
         .relativePadding(.horizontal, length: .em(0.72))
         .relativePadding(.vertical, length: .em(0.35))

diff --git a/Sources/MarkdownUI/Theme/Theme+DocC.swift b/Sources/MarkdownUI/Theme/Theme+DocC.swift
@@ -75,6 +75,7 @@ extension Theme {
     }
     .paragraph { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .relativeLineSpacing(.em(0.235295))
         .markdownMargin(top: .em(0.8), bottom: .zero)
     }
@@ -123,6 +124,7 @@ extension Theme {
     }
     .table { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .markdownTableBorderStyle(.init(.horizontalBorders, color: .grid))
         .markdownMargin(top: .em(1.6), bottom: .zero)
     }
@@ -133,6 +135,7 @@ extension Theme {
             FontWeight(.semibold)
           }
         }
+        .fixedSize(horizontal: false, vertical: true)
         .relativeLineSpacing(.em(0.235295))
         .relativePadding(length: .rem(0.58824))
     }

diff --git a/Sources/MarkdownUI/Theme/Theme+GitHub.swift b/Sources/MarkdownUI/Theme/Theme+GitHub.swift
@@ -95,6 +95,7 @@ extension Theme {
     }
     .paragraph { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .relativeLineSpacing(.em(0.25))
         .markdownMargin(top: 0, bottom: 16)
     }
@@ -136,6 +137,7 @@ extension Theme {
     }
     .table { configuration in
       configuration.label
+        .fixedSize(horizontal: false, vertical: true)
         .markdownTableBorderStyle(.init(color: .border))
         .markdownTableBackgroundStyle(
           .alternatingRows(Color.background, Color.secondaryBackground)
@@ -150,6 +152,7 @@ extension Theme {
           }
           BackgroundColor(nil)
         }
+        .fixedSize(horizontal: false, vertical: true)
         .padding(.vertical, 6)
         .padding(.horizontal, 13)
         .relativeLineSpacing(.em(0.25))

diff --git a/Sources/MarkdownUI/Views/Inlines/InlineText.swift b/Sources/MarkdownUI/Views/Inlines/InlineText.swift
@@ -32,7 +32,6 @@ struct InlineText: View {
     .task(id: self.inlines) {
       self.inlineImages = (try? await self.loadInlineImages()) ?? [:]
     }
-    .fixedSize(horizontal: false, vertical: true)
   }
 
   private func loadInlineImages() async throws -> [String: Image] {

diff --git a/Tests/MarkdownUITests/__Snapshots__/MarkdownTableTests/testTable.1.png b/Tests/MarkdownUITests/__Snapshots__/MarkdownTableTests/testTable.1.png
diff --git a/Tests/MarkdownUITests/__Snapshots__/ThemeDocCTests/testTable.1.png b/Tests/MarkdownUITests/__Snapshots__/ThemeDocCTests/testTable.1.png
diff --git a/Tests/MarkdownUITests/__Snapshots__/ThemeGitHubTests/testTable.1.png b/Tests/MarkdownUITests/__Snapshots__/ThemeGitHubTests/testTable.1.png