Skip to content

Inherited .disabled on every control #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
colemancda merged 2 commits into from
Jul 23, 2026
Merged

Inherited .disabled on every control #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc186b5
Disable all controls under an inherited .disabled
colemancda Jul 23, 2026
23aaf2d
Show inherited disabled across every control
colemancda Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Demo/App.swiftpm/Sources/StylePlaygrounds.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ struct StylePlayground: View {
@State private var taps = 0
@State private var toggle = true
@State private var slider = 0.5
@State private var name = ""
var body: some View {
ScrollView {
VStack(alignment: .leading, spacing: 0) {
Expand Down Expand Up @@ -52,9 +53,11 @@ struct StylePlayground: View {
}
Example("Inherited disabled") {
VStack(alignment: .leading, spacing: 8) {
Text("Both buttons are disabled (taps: \(taps))")
Button("First") { taps += 1 }
Button("Second") { taps += 1 }
Text("Every control below is disabled (taps: \(taps))")
Button("Button") { taps += 1 }
Toggle("Toggle", isOn: $toggle)
Slider(value: $slider, in: 0...1)
TextField("TextField", text: $name)
}
.disabled(true)
}
Expand Down
22 changes: 15 additions & 7 deletions Demo/swiftui/src/commonMain/kotlin/com/pureswift/swiftui/Render.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,8 @@ private fun RenderResolved(node: ViewNode) {
val onTap = node.long("onTap")
val tint = LocalTint.current
Button(
// own disabled and any inherited `.disabled` both apply
onClick = { onTap?.let { SwiftBridge.sink.invokeVoid(it) } },
enabled = !node.isDisabled() && !LocalInheritedDisabled.current,
enabled = node.isEnabled(),
colors = if (tint != null) ButtonDefaults.buttonColors(containerColor = tint) else ButtonDefaults.buttonColors(),
modifier = node.composeModifiers(),
) {
Expand All @@ -242,6 +241,7 @@ private fun RenderResolved(node: ViewNode) {
Switch(
checked = node.bool("isOn") ?: false,
onCheckedChange = { onChange?.let { id -> SwiftBridge.sink.invokeBool(id, it) } },
enabled = node.isEnabled(),
colors = if (tint != null) SwitchDefaults.colors(checkedTrackColor = tint) else SwitchDefaults.colors(),
)
}
Expand Down Expand Up @@ -349,6 +349,7 @@ private fun RenderResolved(node: ViewNode) {
value = (node.double("value") ?: 0.0).toFloat(),
onValueChange = { onChange?.let { id -> SwiftBridge.sink.invokeDouble(id, it.toDouble()) } },
valueRange = min..max,
enabled = node.isEnabled(),
colors = if (tint != null) SliderDefaults.colors(thumbColor = tint, activeTrackColor = tint) else SliderDefaults.colors(),
modifier = node.composeModifiers().fillMaxWidth(),
)
Expand Down Expand Up @@ -432,6 +433,7 @@ private fun RenderTextField(node: ViewNode) {
}
},
label = { Text(node.string("placeholder") ?: "") },
enabled = node.isEnabled(),
visualTransformation = if (node.bool("secure") == true) PasswordVisualTransformation() else VisualTransformation.None,
modifier = node.composeModifiers().fillMaxWidth(),
)
Expand All @@ -442,11 +444,12 @@ private fun RenderTextField(node: ViewNode) {
private fun RenderStepper(node: ViewNode) {
val onIncrement = node.long("onIncrement")
val onDecrement = node.long("onDecrement")
val enabled = node.isEnabled()
Row(verticalAlignment = Alignment.CenterVertically, modifier = node.composeModifiers().fillMaxWidth()) {
RenderChildren(node)
Spacer(modifier = Modifier.weight(1f))
TextButton(onClick = { onDecrement?.let { SwiftBridge.sink.invokeVoid(it) } }) { Text("−", fontSize = 20.sp) }
TextButton(onClick = { onIncrement?.let { SwiftBridge.sink.invokeVoid(it) } }) { Text("+", fontSize = 20.sp) }
TextButton(onClick = { onDecrement?.let { SwiftBridge.sink.invokeVoid(it) } }, enabled = enabled) { Text("−", fontSize = 20.sp) }
TextButton(onClick = { onIncrement?.let { SwiftBridge.sink.invokeVoid(it) } }, enabled = enabled) { Text("+", fontSize = 20.sp) }
}
}

Expand Down Expand Up @@ -507,7 +510,7 @@ private fun RenderDatePicker(node: ViewNode) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = node.composeModifiers().fillMaxWidth()) {
RenderChildren(node)
Spacer(modifier = Modifier.weight(1f))
TextButton(onClick = { showDialog = true }) { Text(formatDateMillis(millis)) }
TextButton(onClick = { showDialog = true }, enabled = node.isEnabled()) { Text(formatDateMillis(millis)) }
}
if (showDialog) {
val state = rememberDatePickerState(initialSelectedDateMillis = millis)
Expand Down Expand Up @@ -543,7 +546,7 @@ private fun formatDateMillis(millis: Long): String {
private fun RenderMenu(node: ViewNode) {
var expanded by remember { mutableStateOf(false) }
Box {
TextButton(onClick = { expanded = true }) { Text(node.string("label") ?: "") }
TextButton(onClick = { expanded = true }, enabled = node.isEnabled()) { Text(node.string("label") ?: "") }
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
for (child in node.children) {
if (child.isPresentation()) continue
Expand Down Expand Up @@ -575,7 +578,7 @@ private fun RenderPicker(node: ViewNode) {
Row(modifier = node.composeModifiers().fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
Text(node.string("title") ?: "")
Spacer(modifier = Modifier.weight(1f))
TextButton(onClick = { expanded = true }) { Text(currentLabel) }
TextButton(onClick = { expanded = true }, enabled = node.isEnabled()) { Text(currentLabel) }
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
for ((value, label) in options) {
DropdownMenuItem(text = { Text(label) }, onClick = {
Expand Down Expand Up @@ -674,6 +677,11 @@ private fun RenderEffects(node: ViewNode) {
private fun ViewNode.isDisabled(): Boolean =
modifiers.any { it.kind == "disabled" && (it.args["value"] as? kotlinx.serialization.json.JsonPrimitive)?.content == "true" }

// A control is enabled unless its own `.disabled(true)` or an inherited one
// (from an ancestor container) is in scope.
@Composable
private fun ViewNode.isEnabled(): Boolean = !isDisabled() && !LocalInheritedDisabled.current

// A shape fills its (frame-derived) size with its fill color; without a frame
// it collapses to zero, matching this backend's no-layout-engine limitation.
@Composable
Expand Down
Loading