Merge branch 'master' into feature/result_builders

xmartlabs · Sep 6, 2023 · a9fb495 · a9fb495
2 parents e4312e4 + 76de3c2
commit a9fb495
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/Eureka.jpg b/Eureka.jpg
diff --git a/Eureka.png b/Eureka.png
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Eureka: Elegant form builder in Swift](Eureka.jpg)
+![Eureka: Elegant form builder in Swift](Eureka.png)
 
 <p align="center">
 <a href="https://travis-ci.org/xmartlabs/Eureka"><img src="https://travis-ci.org/xmartlabs/Eureka.svg?branch=master" alt="Build status" /></a>

diff --git a/Source/Rows/PickerInlineRow.swift b/Source/Rows/PickerInlineRow.swift
@@ -102,6 +102,12 @@ open class _DoublePickerInlineRow<A, B> : Row<PickerInlineCell<Tuple<A, B>>>, No
 
     /// Options for second component given the selected value from the first component. Will be called often so should be O(1)
     public var secondOptions: ((A) -> [B]) = { _ in [] }
+
+    /// Modify the displayed values for the first picker row.
+    public var displayValueForFirstRow: ((A) -> (String)) = { a in return String(describing: a) }
+
+    /// Modify the displayed values for the second picker row.
+    public var displayValueForSecondRow: ((B) -> (String)) = { b in return String(describing: b) }
 
     public var noValueDisplayText: String?
 
@@ -140,6 +146,8 @@ public final class DoublePickerInlineRow<A, B> : _DoublePickerInlineRow<A, B>, R
     public func setupInlineRow(_ inlineRow: InlineRow) {
         inlineRow.firstOptions = firstOptions
         inlineRow.secondOptions = secondOptions
+        inlineRow.displayValueForFirstRow = displayValueForFirstRow
+        inlineRow.displayValueForSecondRow = displayValueForSecondRow
         inlineRow.displayValueFor = self.displayValueFor
         inlineRow.cell.height = { UITableView.automaticDimension }
     }

diff --git a/Source/Rows/TextAreaRow.swift b/Source/Rows/TextAreaRow.swift
@@ -73,7 +73,12 @@ open class _TextAreaCell<T> : Cell<T>, UITextViewDelegate, AreaCell where T: Equ
 
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
-        let textView = UITextView()
+        let textView: UITextView
+        if #available(iOS 16, *) {
+            textView = UITextView(usingTextLayoutManager: false)
+        } else {
+            textView = UITextView()
+        }
         self.textView = textView
         textView.translatesAutoresizingMaskIntoConstraints = false
         textView.keyboardType = .default