Support header style (#8)

* support header style

* Fix header style behaving oddly with string with emoji

* Using standard font size

* Fix style is not setting when we add typing attributes

Author: cp-divyesh-v

RichEditorDemo/RichEditorDemo/ContentView.swift

@@ -28,7 +28,7 @@ struct ContentView: View {
             VStack {
                 RichEditor(state: _state)
             }
-            .padding()
+            .padding(10)
             .toolbar {
                 ToolbarItem(placement: .topBarTrailing) {
                     Button(action: {

RichEditorDemo/RichEditorDemo/Sample_json.json

@@ -22,7 +22,7 @@
         },
         {
             "from": 52,
-            "to": 61,
+            "to": 59,
             "style": "italic"
         },
         {
@@ -87,7 +87,7 @@
         },
         {
             "from": 237,
-            "to": 251,
+            "to": 250,
             "style": "h4"
         },
         {

Sources/RichEditorSwiftUI/Attributes/RichTextAttributeWriter+Style.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import UIKit
 
 public extension NSMutableAttributedString {
 
@@ -34,19 +35,31 @@ public extension NSMutableAttributedString {
         let shouldAdd = newValue && !styles.hasStyle(style)
         let shouldRemove = !newValue && styles.hasStyle(style)
         guard shouldAdd || shouldRemove || style.isHeaderStyle else { return }
-            let newFont: FontRepresentable? = FontRepresentable(
-                descriptor: font.fontDescriptor.byTogglingStyle(style),
-                size: byTogglingFontSizeFor(style: style, fontSize: font.pointSize, shouldAdd: newValue))
-            guard let newFont = newFont else { return }
-            setRichTextFont(newFont, at: range)
+        var descriptor = font.fontDescriptor
+        if !style.isDefault && !style.isHeaderStyle {
+            descriptor = descriptor.byTogglingStyle(style)
+        }
+        let newFont: FontRepresentable? = FontRepresentable(
+            descriptor: descriptor,
+            size: byTogglingFontSizeFor(style: style, font: font, shouldAdd: newValue))
+        guard let newFont = newFont else { return }
+        setRichTextFont(newFont, at: range)
     }
 
-    private func byTogglingFontSizeFor(style: TextSpanStyle, fontSize: CGFloat, shouldAdd: Bool) -> CGFloat {
-        guard style.isHeaderStyle else { return fontSize }
+    /**
+     This will reset font size befor multiplying new size
+     */
+    private func byTogglingFontSizeFor(style: TextSpanStyle, font: UIFont, shouldAdd: Bool) -> CGFloat {
+        guard style.isHeaderStyle || style.isDefault else { return  font.pointSize }
+        
+        let cleanFont = style.getFontAfterRemovingStyle(font: font)
+//        if style.isDefault {
+//            return cleanFont.pointSize
+//        }
         if shouldAdd {
-            return fontSize * style.fontSizeMultiplier
+            return cleanFont.pointSize * style.fontSizeMultiplier
         } else {
-            return fontSize / style.fontSizeMultiplier
+            return font.pointSize / style.fontSizeMultiplier
         }
     }
 }

Sources/RichEditorSwiftUI/Fonts/FontRepresentable.swift

@@ -24,3 +24,14 @@ import AppKit
  */
 public typealias FontRepresentable = NSFont
 #endif
+
+public extension FontRepresentable {
+    
+    /**
+     The standard font to use for rich text.
+     
+     You can change this value to affect all types that make
+     use of the value.
+     */
+    static var standardRichTextFont = systemFont(ofSize: .standardRichTextFontSize)
+}

Sources/RichEditorSwiftUI/Fonts/StandardFontSizeProvider.swift

@@ -0,0 +1,41 @@
+//
+// StandardFontSizeProvider.swift
+//  
+//
+//  Created by Divyesh Vekariya on 12/01/24.
+//
+
+import Foundation
+
+public protocol StandardFontSizeProvider {}
+
+extension CGFloat: StandardFontSizeProvider {}
+
+extension Double: StandardFontSizeProvider {}
+
+extension RichEditorState: StandardFontSizeProvider {}
+
+#if iOS || macOS || os(tvOS)
+extension RichTextEditor: StandardFontSizeProvider {}
+
+extension RichTextView: StandardFontSizeProvider {}
+#endif
+
+public extension StandardFontSizeProvider {
+    
+    /**
+     The standard font size to use for rich text.
+     
+     You can change this value to affect all types that make
+     use of this value.
+     */
+    static var standardRichTextFontSize: CGFloat {
+        get { StandardFontSizeProviderStorage.standardRichTextFontSize }
+        set { StandardFontSizeProviderStorage.standardRichTextFontSize = newValue }
+    }
+}
+
+private class StandardFontSizeProviderStorage {
+    
+    static var standardRichTextFontSize: CGFloat = 16
+}

Sources/RichEditorSwiftUI/UI/Editor/RichEditor.swift

@@ -16,16 +16,13 @@ public struct RichEditor: View {
 
     public var body: some View {
         VStack(content: {
-            EditorToolBarView(appliedTools: state.activeStyles,
-                              onToolSelect: state.onToolSelection(_:))
+            EditorToolBarView(state: state)
 
             TextViewWrapper(state: _state,
-                            typingAttributes: $state.activeAttributes,
                             attributesToApply:  $state.attributesToApply,
                             isScrollEnabled: true,
                             fontStyle: state.curretFont,
                             onTextViewEvent: state.onTextViewEvent(_:))
         })
-        .padding()
     }
 }