Merge pull request #3 from mshibanami/macos-inset-improvements

macOS: Make the padding inside the editable text view clickable

Author: mshibanami

Sources/ResizingTextView/ResizingTextView.swift

@@ -118,10 +118,13 @@ public struct ResizingTextView: View, Equatable {
                 }
             },
             onInsertNewline: onInsertNewline,
-            textContainerInset: textContainerInset
+            textContainerInset: textContainerInset ?? {
+                var inset = CGSize(width: -5, height: 0)
+                inset.width += (isEditable ? 9 : 0)
+                inset.height += (isEditable ? 8 : 0)
+                return inset
+            }()
         )
-        .padding(.vertical, isEditable ? 8 : 0)
-        .padding(.horizontal, isEditable ? 9 : 0)
         .background(isEditable ? Color(UXColor.controlBackgroundColor) : .clear)
         .roundedFilledBorder(
             isEditable ? Color(UXColor.separatorColor) : .clear,

Sources/ResizingTextView/TextView (AppKit).swift

@@ -33,7 +33,7 @@ struct TextView: NSViewRepresentable {
         foregroundColor: Color?,
         onFocusChanged: ((Bool) -> Void)?,
         onInsertNewline: (() -> Bool)?,
-        textContainerInset: CGSize?
+        textContainerInset: CGSize
     ) {
         self._text = text
         self.placeholder = placeholder
@@ -47,7 +47,7 @@ struct TextView: NSViewRepresentable {
         self.font = font
         self.onFocusChanged = onFocusChanged
         self.onInsertNewline = onInsertNewline
-        self.textContainerInset = textContainerInset ?? CGSize(width: -5, height: 0)
+        self.textContainerInset = textContainerInset
     }
 
     func makeNSView(context: Context) -> TextEnclosingScrollView {
@@ -138,6 +138,7 @@ struct TextView: NSViewRepresentable {
                 textView.textContainer?.lineBreakMode = .byTruncatingTail
             }
         }
+        
         if !context.coordinator.selectedRanges.isEmpty,
            textView.selectedRanges != context.coordinator.selectedRanges {
             textView.selectedRanges = context.coordinator.selectedRanges