Make format toolbar render great on iOS, iPadOS and macOS

danielsaidi · Feb 15, 2024 · 91ea919 · 91ea919
1 parent 5aa68af
commit 91ea919
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 82 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -47,6 +47,7 @@ By deprecating these functions, we can simplify the library in 1.0, and focus mo
 * The library once again builds on visionOS.
 
 * `RichTextAlignment` now behaves better.
+* `RichTextAlignment.Picker` now uses provided values.
 * `RichTextCoordinator` now handles indentation changes.
 
 ### 🗑️ Deprecations 

diff --git a/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift b/Sources/RichTextKit/Alignment/RichTextAlignment+Picker.swift
@@ -40,7 +40,7 @@ public extension RichTextAlignment {
 
         public var body: some View {
             SwiftUI.Picker("", selection: $selection) {
-                ForEach(RichTextAlignment.allCases) { value in
+                ForEach(values) { value in
                     value.label
                         .labelStyle(.iconOnly)
                 }

diff --git a/Sources/RichTextKit/Fonts/RichTextFont+SizePicker.swift b/Sources/RichTextKit/Fonts/RichTextFont+SizePicker.swift
@@ -47,6 +47,7 @@ public extension RichTextFont {
                         .tag($0)
                 }
             }
+            .labelsHidden()
             .accessibilityLabel(RTKL10n.fontSize.text)
         }
     }

diff --git a/Sources/RichTextKit/Fonts/RichTextFont+SizePickerStack.swift b/Sources/RichTextKit/Fonts/RichTextFont+SizePickerStack.swift
@@ -49,7 +49,8 @@ public extension RichTextFont {
             HStack(spacing: 3) {
                 picker
                 stepper
-            }.overlay(macShortcutOverlay)
+            }
+            .overlay(macShortcutOverlay)
             #endif
         }
     }

diff --git a/Sources/RichTextKit/Format/RichTextFormatSidebar.swift b/Sources/RichTextKit/Format/RichTextFormatSidebar.swift
@@ -45,15 +45,15 @@ public struct RichTextFormatSidebar: View {
 
     public var body: some View {
         VStack(alignment: .leading, spacing: spacing) {
-            SidebarSection(title: RTKL10n.font.text) {
+            SidebarSection {
                 RichTextFont.Picker(selection: $context.fontName, fontSize: 12)
                 HStack {
                     RichTextStyle.ToggleGroup(context: context)
                     RichTextFont.SizePickerStack(context: context)
                 }
             }
 
-            SidebarSection(title: nil) {
+            SidebarSection {
                 RichTextAlignment.Picker(selection: $context.textAlignment)
                     .pickerStyle(.segmented)
                 HStack {
@@ -73,7 +73,7 @@ public struct RichTextFormatSidebar: View {
                 }
             }
 
-            SidebarSection(title: nil) {
+            SidebarSection {
                 VStack(spacing: 4) {
                     ForEach(colorPickers) {
                         RichTextColor.Picker(
@@ -107,16 +107,11 @@ private extension RichTextFormatSidebar {
 
 private struct SidebarSection<Content: View>: View {
 
-    let title: String?
-
     @ViewBuilder
     let content: () -> Content
 
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
-            if let title {
-                Text(title).font(.headline)
-            }
             content()
             Divider()
         }
@@ -137,7 +132,7 @@ struct RichTextFormatSidebar_Previews: PreviewProvider {
 
     static var previews: some View {
         Preview()
-            .frame(width: 250)
+            .frame(width: 350)
     }
 }
 #endif