Allow initial values to be specified for some views

abra-code · abra-code · commit e71cd89daf7d · 2026-03-06T18:50:23.000-05:00
The following ActionUI views:
- ComboBox
- SecureField
- TextEditor
- TextField
- Toggle
now allow specifying initial value in their JSON properties.
diff --git a/ActionUI/Views/ComboBox.swift b/ActionUI/Views/ComboBox.swift
@@ -5,6 +5,7 @@
    "type": "ComboBox",
    "id": 1,              // Optional: Non-zero positive integer for runtime programmatic interaction
    "properties": {
+     "text": "Option1",                  // Optional: String initial value, defaults to ""
      "placeholder": "Select an option", // Optional: String, defaults to ""
      "options": ["Option1", "Option2"], // Optional: Array of strings, defaults to []
    }
@@ -25,6 +26,12 @@ struct ComboBox: ActionUIViewConstruction {
         logger.log("ComboBox is not supported on watchOS/tvOS; defaulting to empty properties", .warning)
         validatedProperties = [:]
         #else
+        // Validate text (initial value)
+        if properties["text"] != nil && !(properties["text"] is String) {
+            logger.log("ComboBox text must be a String; ignoring", .warning)
+            validatedProperties["text"] = nil
+        }
+
         // Validate options
         if let options = validatedProperties["options"] as? [String] {
             if options.isEmpty {
@@ -87,6 +94,9 @@ struct ComboBox: ActionUIViewConstruction {
         if let initialValue = model.value as? String {
             return initialValue
         }
+        if let text = model.validatedProperties["text"] as? String {
+            return text
+        }
         return ""
     }
 }
diff --git a/ActionUI/Views/SecureField.swift b/ActionUI/Views/SecureField.swift
@@ -4,6 +4,7 @@
    "type": "SecureField",
    "id": 1,              // Optional: Non-zero positive integer for runtime programmatic interaction
    "properties": {
+     "text": "secret",               // Optional: String initial value, defaults to ""
      "placeholder": "Enter password", // Optional: String for placeholder, defaults to ""
      "textContentType": "password",  // Optional: String for content type, must be one of: "password", "newPassword", "oneTimeCode"; defaults to nil, ignored on macOS
      "actionID": "secure.submit"     // Optional: String for action triggered on submit (e.g., Return key)
@@ -25,6 +26,12 @@ struct SecureField: ActionUIViewConstruction {
     static var validateProperties: ([String: Any], any ActionUILogger) -> [String: Any] = { properties, logger in
         var validatedProperties = properties
 
+        // Validate text (initial value)
+        if properties["text"] != nil && !(properties["text"] is String) {
+            logger.log("SecureField text must be a String; ignoring", .warning)
+            validatedProperties["text"] = nil
+        }
+
         // Validate placeholder
         if !(properties["placeholder"] is String?), properties["placeholder"] != nil {
             logger.log("SecureField placeholder must be a String; defaulting to nil", .warning)
@@ -101,6 +108,9 @@ struct SecureField: ActionUIViewConstruction {
         if let initialValue = model.value as? String {
             return initialValue
         }
+        if let text = model.validatedProperties["text"] as? String {
+            return text
+        }
         return ""
     }
 }
diff --git a/ActionUI/Views/TextEditor.swift b/ActionUI/Views/TextEditor.swift
@@ -4,6 +4,7 @@
    "type": "TextEditor",
    "id": 1,              // Optional: Non-zero positive integer for runtime programmatic interaction
    "properties": {
+     "text": "Initial content",        // Optional: String initial value, defaults to ""
      "placeholder": "Enter text here" // Optional: String, no default value if omitted or empty
    }
    // Note: These properties are specific to TextEditor. Baseline View properties (padding, hidden, foregroundColor, font, background, frame, opacity, cornerRadius, actionID, disabled) and additional View protocol modifiers are inherited and applied via ActionUIRegistry.shared.applyViewModifiers(to: baseView, properties: element.properties).
@@ -19,12 +20,18 @@ struct TextEditor: ActionUIViewConstruction {
     static var validateProperties: ([String: Any], any ActionUILogger) -> [String: Any] = { properties, logger in
         var validatedProperties = properties
         
+        // Validate text (initial value)
+        if properties["text"] != nil && !(properties["text"] is String) {
+            logger.log("TextEditor text must be a String; ignoring", .warning)
+            validatedProperties["text"] = nil
+        }
+
         // Validate placeholder
         if !(properties["placeholder"] is String?), properties["placeholder"] != nil {
             logger.log("TextEditor placeholder must be a String; defaulting to nil", .warning)
             validatedProperties["placeholder"] = nil
         }
-        
+
         return validatedProperties
     }
     
@@ -71,6 +78,9 @@ struct TextEditor: ActionUIViewConstruction {
         if let initialValue = model.value as? String {
             return initialValue
         }
+        if let text = model.validatedProperties["text"] as? String {
+            return text
+        }
         return ""
     }
 }
diff --git a/ActionUI/Views/TextField.swift b/ActionUI/Views/TextField.swift
@@ -5,6 +5,7 @@
    "type": "TextField",
    "id": 1,              // Optional: Non-zero positive integer for runtime programmatic interaction
    "properties": {
+     "text": "Hello",              // Optional: String initial value for the field, defaults to ""
      "placeholder": "Enter text", // Optional: String for placeholder, defaults to "" in buildView
      "textContentType": "username", // Optional: String for content type (e.g., "username", "password"), defaults to nil, ignored on macOS
      "actionID": "text.submit",   // Optional: String for action triggered on submit (e.g., Return key, inherited from View)
@@ -35,12 +36,18 @@ struct TextField: ActionUIViewConstruction {
             validatedProperties["placeholder"] = nil
         }
         
+        // Validate text (initial value)
+        if properties["text"] != nil && !(properties["text"] is String) {
+            logger.log("TextField text must be a String; ignoring", .warning)
+            validatedProperties["text"] = nil
+        }
+
         // Validate textContentType
         if !(properties["textContentType"] is String?), properties["textContentType"] != nil {
             logger.log("TextField textContentType must be a String; defaulting to nil", .warning)
             validatedProperties["textContentType"] = nil
         }
-        
+
         return validatedProperties
     }
     
diff --git a/ActionUI/Views/Toggle.swift b/ActionUI/Views/Toggle.swift
@@ -4,6 +4,7 @@
    "type": "Toggle",
    "id": 1,              // Optional: Non-zero positive integer for runtime programmatic interaction
    "properties": {
+     "isOn": true,              // Optional: Boolean initial state, defaults to false
      "title": "Enable Feature", // Optional: String, defaults to "Toggle"
      "style": "switch",        // Optional: "switch" (iOS/macOS/visionOS), "checkbox" (macOS only), "button" (iOS/macOS/visionOS); defaults to "switch"
    }
@@ -19,6 +20,12 @@ struct Toggle: ActionUIViewConstruction {
     static var validateProperties: ([String: Any], any ActionUILogger) -> [String: Any] = { properties, logger in
         var validatedProperties = properties
         
+        // Validate isOn (initial value)
+        if properties["isOn"] != nil && !(properties["isOn"] is Bool) {
+            logger.log("Toggle isOn must be a Bool; ignoring", .warning)
+            validatedProperties["isOn"] = nil
+        }
+
         // Validate style based on platform
         #if os(macOS)
         let validStyles = ["switch", "button", "checkbox"]
@@ -29,7 +36,7 @@ struct Toggle: ActionUIViewConstruction {
             logger.log("Toggle style '\(style)' invalid on \(ProcessInfo.processInfo.operatingSystemVersionString); falling back to default", .warning)
             validatedProperties["style"] = nil
         }
-        
+
         return validatedProperties
     }
     
@@ -85,6 +92,9 @@ struct Toggle: ActionUIViewConstruction {
         if let initialValue = model.value as? Bool {
             return initialValue
         }
+        if let isOn = model.validatedProperties["isOn"] as? Bool {
+            return isOn
+        }
         return false
     }
 }
diff --git a/ActionUISwiftTestApp/Resources/ComboBox.json b/ActionUISwiftTestApp/Resources/ComboBox.json
@@ -25,6 +25,14 @@
         "placeholder": "Choose",
         "options": ["A", "B", "C"]
       }
+    },
+    {
+      "type": "ComboBox",
+      "properties": {
+        "text": "Option2",
+        "placeholder": "Pre-selected",
+        "options": ["Option1", "Option2", "Option3"]
+      }
     }
   ]
 }
diff --git a/ActionUISwiftTestApp/Resources/SecureField.json b/ActionUISwiftTestApp/Resources/SecureField.json
@@ -26,6 +26,13 @@
         "placeholder": "New Password",
         "textContentType": "newPassword"
       }
+    },
+    {
+      "type": "SecureField",
+      "properties": {
+        "text": "secret",
+        "placeholder": "With initial value"
+      }
     }
   ]
 }
diff --git a/ActionUISwiftTestApp/Resources/TextEditor.json b/ActionUISwiftTestApp/Resources/TextEditor.json
@@ -16,7 +16,16 @@
     {
       "type": "TextEditor",
       "properties": {
-        "placeholder": "Enter text here"
+        "placeholder": "Enter text here",
+        "border": { "color": "#80808060", "width": 1.0 }
+      }
+    },
+    {
+      "type": "TextEditor",
+      "properties": {
+        "text": "This editor has initial content.\nIt supports multiple lines.",
+        "placeholder": "With initial text",
+        "border": { "color": "#80808060", "width": 1.0 }
       }
     }
   ]
diff --git a/ActionUISwiftTestApp/Resources/TextField.json b/ActionUISwiftTestApp/Resources/TextField.json
@@ -26,6 +26,13 @@
         "placeholder": "Email",
         "textContentType": "emailAddress"
       }
+    },
+    {
+      "type": "TextField",
+      "properties": {
+        "text": "Pre-filled value",
+        "placeholder": "With initial text"
+      }
     }
   ]
 }
diff --git a/ActionUISwiftTestApp/Resources/Toggle.json b/ActionUISwiftTestApp/Resources/Toggle.json
@@ -27,6 +27,24 @@
         "style": "checkbox",
         "padding": "default"
       }
+    },
+    {
+      "type": "Toggle",
+      "properties": {
+        "title": "Initially On",
+        "isOn": true,
+        "style": "switch",
+        "padding": "default"
+      }
+    },
+    {
+      "type": "Toggle",
+      "properties": {
+        "title": "Checked by Default",
+        "isOn": true,
+        "style": "checkbox",
+        "padding": "default"
+      }
     }
   ]
 }
diff --git a/ActionUITests/Views/ComboBoxTests.swift b/ActionUITests/Views/ComboBoxTests.swift
@@ -137,5 +137,31 @@ final class ComboBoxTests: XCTestCase {
         #else
         XCTAssertTrue(view is SwiftUI.EmptyView, "ComboBox should return EmptyView on watchOS/tvOS")
         #endif
-    }    
+    }
+
+    func testComboBoxTextPropertyValidation() {
+        let valid = ComboBox.validateProperties(["text": "hello"], logger)
+        XCTAssertEqual(valid["text"] as? String, "hello", "Valid text should be preserved")
+
+        let invalid = ComboBox.validateProperties(["text": 123], logger)
+        XCTAssertNil(invalid["text"], "Non-String text should be removed")
+    }
+
+    func testComboBoxInitialValueFromTextProperty() {
+        let viewModel = ViewModel()
+        viewModel.validatedProperties = ["text": "Option1"]
+
+        let closure = ActionUI.ComboBox.initialValue
+        let value = closure(viewModel) as? String
+        XCTAssertEqual(value, "Option1", "initialValue should fall back to text property")
+    }
+
+    func testComboBoxInitialValuePrefersModelValue() {
+        let viewModel = ViewModel()
+        viewModel.value = "Option2"
+        viewModel.validatedProperties = ["text": "Option1"]
+
+        let value = ActionUI.ComboBox.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "Option2", "initialValue should prefer model.value over text property")
+    }
 }
diff --git a/ActionUITests/Views/SecureFieldTests.swift b/ActionUITests/Views/SecureFieldTests.swift
@@ -133,4 +133,29 @@ final class SecureFieldTests: XCTestCase {
         }
         XCTAssertEqual(viewModel.value as? String, "", "Initial viewModel value should be empty string")
     }
+
+    func testSecureFieldTextPropertyValidation() {
+        let valid = SecureField.validateProperties(["text": "secret"], logger)
+        XCTAssertEqual(valid["text"] as? String, "secret", "Valid text should be preserved")
+
+        let invalid = SecureField.validateProperties(["text": 123], logger)
+        XCTAssertNil(invalid["text"], "Non-String text should be removed")
+    }
+
+    func testSecureFieldInitialValueFromTextProperty() {
+        let viewModel = ViewModel()
+        viewModel.validatedProperties = ["text": "prefilled"]
+
+        let value = SecureField.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "prefilled", "initialValue should fall back to text property")
+    }
+
+    func testSecureFieldInitialValuePrefersModelValue() {
+        let viewModel = ViewModel()
+        viewModel.value = "typed"
+        viewModel.validatedProperties = ["text": "prefilled"]
+
+        let value = SecureField.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "typed", "initialValue should prefer model.value over text property")
+    }
 }
diff --git a/ActionUITests/Views/TextEditorTests.swift b/ActionUITests/Views/TextEditorTests.swift
@@ -125,4 +125,29 @@ final class TextEditorTests: XCTestCase {
         }
         XCTAssertEqual(viewModel.value as? String, "", "Initial viewModel value should be an empty string")
     }
+
+    func testTextEditorTextPropertyValidation() {
+        let valid = TextEditor.validateProperties(["text": "hello"], logger)
+        XCTAssertEqual(valid["text"] as? String, "hello", "Valid text should be preserved")
+
+        let invalid = TextEditor.validateProperties(["text": 123], logger)
+        XCTAssertNil(invalid["text"], "Non-String text should be removed")
+    }
+
+    func testTextEditorInitialValueFromTextProperty() {
+        let viewModel = ViewModel()
+        viewModel.validatedProperties = ["text": "initial content"]
+
+        let value = TextEditor.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "initial content", "initialValue should fall back to text property")
+    }
+
+    func testTextEditorInitialValuePrefersModelValue() {
+        let viewModel = ViewModel()
+        viewModel.value = "edited"
+        viewModel.validatedProperties = ["text": "initial content"]
+
+        let value = TextEditor.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "edited", "initialValue should prefer model.value over text property")
+    }
 }
diff --git a/ActionUITests/Views/TextFieldTests.swift b/ActionUITests/Views/TextFieldTests.swift
@@ -133,4 +133,29 @@ final class TextFieldTests: XCTestCase {
         }
         XCTAssertEqual(viewModel.value as? String, "", "Initial viewModel value should be an empty string")
     }
+
+    func testTextFieldTextPropertyValidation() {
+        let valid = TextField.validateProperties(["text": "hello"], logger)
+        XCTAssertEqual(valid["text"] as? String, "hello", "Valid text should be preserved")
+
+        let invalid = TextField.validateProperties(["text": 123], logger)
+        XCTAssertNil(invalid["text"], "Non-String text should be removed")
+    }
+
+    func testTextFieldInitialValueFromTextProperty() {
+        let viewModel = ViewModel()
+        viewModel.validatedProperties = ["text": "prefilled"]
+
+        let value = TextField.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "prefilled", "initialValue should fall back to text property")
+    }
+
+    func testTextFieldInitialValuePrefersModelValue() {
+        let viewModel = ViewModel()
+        viewModel.value = "typed"
+        viewModel.validatedProperties = ["text": "prefilled"]
+
+        let value = TextField.initialValue(viewModel) as? String
+        XCTAssertEqual(value, "typed", "initialValue should prefer model.value over text property")
+    }
 }
diff --git a/ActionUITests/Views/ToggleTests.swift b/ActionUITests/Views/ToggleTests.swift
diff --git a/Documentation/ActionUI-JSON-Specifications.json b/Documentation/ActionUI-JSON-Specifications.json

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"type": "TextEditor",`
`5`	`5`	`"id": 1, // Optional: Non-zero positive integer for runtime programmatic interaction`
`6`	`6`	`"properties": {`
	`7`	`+ "text": "Initial content", // Optional: String initial value, defaults to ""`
`7`	`8`	`"placeholder": "Enter text here" // Optional: String, no default value if omitted or empty`
`8`	`9`	`}`
`9`	`10`	`// Note: These properties are specific to TextEditor. Baseline View properties (padding, hidden, foregroundColor, font, background, frame, opacity, cornerRadius, actionID, disabled) and additional View protocol modifiers are inherited and applied via ActionUIRegistry.shared.applyViewModifiers(to: baseView, properties: element.properties).`
`@@ -19,12 +20,18 @@ struct TextEditor: ActionUIViewConstruction {`
`19`	`20`	`static var validateProperties: ([String: Any], any ActionUILogger) -> [String: Any] = { properties, logger in`
`20`	`21`	`var validatedProperties = properties`
`21`	`22`
	`23`	`+ // Validate text (initial value)`
	`24`	`+ if properties["text"] != nil && !(properties["text"] is String) {`
	`25`	`+ logger.log("TextEditor text must be a String; ignoring", .warning)`
	`26`	`+ validatedProperties["text"] = nil`
	`27`	`+ }`
	`28`	`+`
`22`	`29`	`// Validate placeholder`
`23`	`30`	`if !(properties["placeholder"] is String?), properties["placeholder"] != nil {`
`24`	`31`	`logger.log("TextEditor placeholder must be a String; defaulting to nil", .warning)`
`25`	`32`	`validatedProperties["placeholder"] = nil`
`26`	`33`	`}`
`27`		`-`
	`34`	`+`
`28`	`35`	`return validatedProperties`
`29`	`36`	`}`
`30`	`37`
`@@ -71,6 +78,9 @@ struct TextEditor: ActionUIViewConstruction {`
`71`	`78`	`if let initialValue = model.value as? String {`
`72`	`79`	`return initialValue`
`73`	`80`	`}`
	`81`	`+ if let text = model.validatedProperties["text"] as? String {`
	`82`	`+ return text`
	`83`	`+ }`
`74`	`84`	`return ""`
`75`	`85`	`}`
`76`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,14 @@`
`25`	`25`	`"placeholder": "Choose",`
`26`	`26`	`"options": ["A", "B", "C"]`
`27`	`27`	`}`
	`28`	`+ },`
	`29`	`+ {`
	`30`	`+ "type": "ComboBox",`
	`31`	`+ "properties": {`
	`32`	`+ "text": "Option2",`
	`33`	`+ "placeholder": "Pre-selected",`
	`34`	`+ "options": ["Option1", "Option2", "Option3"]`
	`35`	`+ }`
`28`	`36`	`}`
`29`	`37`	`]`
`30`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,13 @@`
`26`	`26`	`"placeholder": "New Password",`
`27`	`27`	`"textContentType": "newPassword"`
`28`	`28`	`}`
	`29`	`+ },`
	`30`	`+ {`
	`31`	`+ "type": "SecureField",`
	`32`	`+ "properties": {`
	`33`	`+ "text": "secret",`
	`34`	`+ "placeholder": "With initial value"`
	`35`	`+ }`
`29`	`36`	`}`
`30`	`37`	`]`
`31`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,16 @@`
`16`	`16`	`{`
`17`	`17`	`"type": "TextEditor",`
`18`	`18`	`"properties": {`
`19`		`- "placeholder": "Enter text here"`
	`19`	`+ "placeholder": "Enter text here",`
	`20`	`+ "border": { "color": "#80808060", "width": 1.0 }`
	`21`	`+ }`
	`22`	`+ },`
	`23`	`+ {`
	`24`	`+ "type": "TextEditor",`
	`25`	`+ "properties": {`
	`26`	`+ "text": "This editor has initial content.\nIt supports multiple lines.",`
	`27`	`+ "placeholder": "With initial text",`
	`28`	`+ "border": { "color": "#80808060", "width": 1.0 }`
`20`	`29`	`}`
`21`	`30`	`}`
`22`	`31`	`]`