react-native-tinyui 0.2.0 → 0.3.0

package/ios/Menu/TinyuiMenuViewSwift.swift

@@ -253,30 +253,21 @@ private struct TinyuiMenuLabel: View {
     return AnyView(EmptyView())
   }
 
-  @ViewBuilder
-  private var title: some View {
-    if let subtitle = dictionary["subtitle"] as? String,
-       !subtitle.isEmpty {
-      VStack(alignment: .leading, spacing: 1) {
-        titleText
-        Text(subtitle)
-          .font(.caption)
-          .foregroundStyle(.secondary)
-      }
-    } else {
-      titleText
+  private var title: Text {
+    let title = dictionary["title"] as? String ?? ""
+    let subtitle = (dictionary["subtitle"] as? String).flatMap {
+      $0.isEmpty ? nil : $0
     }
-  }
+    let text = subtitle.map { subtitle in
+      Text("\(title)\n\(subtitle)")
+    } ?? Text(title)
 
-  @ViewBuilder
-  private var titleText: some View {
-    let text = Text(dictionary["title"] as? String ?? "")
     if destructive {
-      text.foregroundStyle(Color.red)
+      return text.foregroundColor(.red)
     } else if let color = TinyuiMenuColor.uiColor(from: dictionary["titleColor"]) {
-      text.foregroundStyle(Color(uiColor: color))
+      return text.foregroundColor(Color(uiColor: color))
     } else {
-      text
+      return text
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tinyui",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Dependency-free native iOS Menu and Popover components for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",