diff --git a/Package.swift b/Package.swift index 86426e6..c43b6d6 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription public let package = Package( - name: "HighlightedTextEditor", + name: "highlighted-text-editor", platforms: [ .macOS(.v10_15), .iOS(.v13) diff --git a/Sources/HighlightedTextEditor/HighlightedTextEditor.AppKit.swift b/Sources/HighlightedTextEditor/HighlightedTextEditor.AppKit.swift index 073356c..5b2c66b 100644 --- a/Sources/HighlightedTextEditor/HighlightedTextEditor.AppKit.swift +++ b/Sources/HighlightedTextEditor/HighlightedTextEditor.AppKit.swift @@ -19,13 +19,13 @@ public struct HighlightedTextEditor: NSViewRepresentable, HighlightingTextEditor public let scrollView: SystemScrollView? } - @Binding var text: String { + @Binding public var text: String { didSet { onTextChange?(text) } } - let highlightRules: [HighlightRule] + public let highlightRules: [HighlightRule] private(set) var onEditingChanged: OnEditingChangedCallback? private(set) var onCommit: OnCommitCallback? diff --git a/Sources/HighlightedTextEditor/HighlightedTextEditor.UIKit.swift b/Sources/HighlightedTextEditor/HighlightedTextEditor.UIKit.swift index 4301f47..f486242 100644 --- a/Sources/HighlightedTextEditor/HighlightedTextEditor.UIKit.swift +++ b/Sources/HighlightedTextEditor/HighlightedTextEditor.UIKit.swift @@ -15,13 +15,13 @@ public struct HighlightedTextEditor: UIViewRepresentable, HighlightingTextEditor public let scrollView: SystemScrollView? } - @Binding var text: String { + @Binding public var text: String { didSet { onTextChange?(text) } } - let highlightRules: [HighlightRule] + public let highlightRules: [HighlightRule] private(set) var onEditingChanged: OnEditingChangedCallback? private(set) var onCommit: OnCommitCallback? @@ -44,6 +44,7 @@ public struct HighlightedTextEditor: UIViewRepresentable, HighlightingTextEditor public func makeUIView(context: Context) -> UITextView { let textView = UITextView() textView.delegate = context.coordinator + textView.textContainer.widthTracksTextView = false updateTextViewModifiers(textView) return textView diff --git a/Sources/HighlightedTextEditor/HighlightingTextEditor.swift b/Sources/HighlightedTextEditor/HighlightingTextEditor.swift index 16d5e1c..c704f43 100644 --- a/Sources/HighlightedTextEditor/HighlightingTextEditor.swift +++ b/Sources/HighlightedTextEditor/HighlightingTextEditor.swift @@ -86,7 +86,7 @@ public struct HighlightRule { } } -internal protocol HighlightingTextEditor { +public protocol HighlightingTextEditor { var text: String { get set } var highlightRules: [HighlightRule] { get } } @@ -98,7 +98,7 @@ public typealias OnCommitCallback = EmptyCallback public typealias OnEditingChangedCallback = EmptyCallback public typealias OnTextChangeCallback = (_ editorContent: String) -> Void -extension HighlightingTextEditor { +public extension HighlightingTextEditor { var placeholderFont: SystemColorAlias { SystemColorAlias() } static func getHighlightedText(text: String, highlightRules: [HighlightRule]) -> NSMutableAttributedString {