Properly showing selected state in SelectionView

openHAB/OpenHABSitemapViewController.swift

@@ -85,6 +85,7 @@ class OpenHABSitemapViewController: OpenHABViewController, GenericUITableViewCel
  private let search = UISearchController(searchResultsController: nil)
  private var isUserInteracting = false
  private var isWaitingToReload = false
+ private let logger = Logger(subsystem: "org.openhab.app", category: "OpenHABSitemapViewController")
 
  var relevantPage: OpenHABSitemapPage? {
  if isFiltering {
@@ -777,16 +778,13 @@ extension OpenHABSitemapViewController: UITableViewDelegate, UITableViewDataSour
  newViewController.openHABRootUrl = openHABRootUrl
  navigationController?.pushViewController(newViewController, animated: true)
  } else if widget?.type == .selection {
- os_log("Selected selection widget", log: .viewCycle, type: .info)
  selectedWidgetRow = indexPath.row
  let selectedWidget: OpenHABWidget? = relevantWidget(indexPath: indexPath)
+ let selectionItemState = selectedWidget?.item?.state
+ logger.info("Selected selection widget in status: \(selectionItemState ?? "unknown")")
  let hostingController = UIHostingController(rootView: SelectionView(
  mappings: selectedWidget?.mappingsOrItemOptions ?? [],
- selectionItem:
- Binding(
- get: { selectedWidget?.item },
- set: { selectedWidget?.item = $0 }
- ),
+ selectionItemState: selectionItemState,
  onSelection: { selectedMappingIndex in
  let selectedWidget: OpenHABWidget? = self.relevantPage?.widgets[self.selectedWidgetRow]
  let selectedMapping: OpenHABWidgetMapping? = selectedWidget?.mappingsOrItemOptions[selectedMappingIndex]

openHAB/SelectionView.swift

@@ -15,39 +15,42 @@ import SwiftUI
 
 struct SelectionView: View {
  var mappings: [OpenHABWidgetMapping] // List of mappings (instead of AnyHashable, we use a concrete type)
- @Binding var selectionItem: OpenHABItem? // Binding to track the selected item state
+ @State var selectionItemState: String? // To track the selected item state
  var onSelection: (Int) -> Void // Closure to handle selection
 
+ private let logger = Logger(subsystem: "org.openhab.app", category: "SelectionView")
+
  var body: some View {
  List(0 ..< mappings.count, id: \.self) { index in
  let mapping = mappings[index]
  HStack {
  Text(mapping.label)
  Spacer()
- if selectionItem?.state == mapping.command {
+ if selectionItemState == mapping.command {
  Image(systemSymbol: .checkmark)
  .foregroundColor(.blue)
  }
  }
- .contentShape(Rectangle()) // Ensures entire row is tappable
+ .contentShape(.interaction, Rectangle()) // Ensures entire row is tappable
  .onTapGesture {
- os_log("Selected mapping %d", log: .viewCycle, type: .info, index)
+ selectionItemState = mappings[index].command
+ logger.info("Selected mapping \(index)")
  onSelection(index)
  }
+ .accessibilityElement(children: .combine)
+ .accessibilityAddTraits(.isButton)
  }
  .navigationTitle("Select Mapping") // Navigation title
  }
 }
 
 #Preview {
- let selectedItem: OpenHABItem? = OpenHABItem(name: "", type: "", state: "command2", link: "", label: nil, groupType: nil, stateDescription: nil, commandDescription: nil, members: [], category: nil, options: nil)
-
- return SelectionView(
+ SelectionView(
  mappings: [
  OpenHABWidgetMapping(command: "command1", label: "Option 1"),
  OpenHABWidgetMapping(command: "command2", label: "Option 2")
  ],
- selectionItem: .constant(selectedItem)
+ selectionItemState: "command2"
  ) { selectedMappingIndex in
  print("Selected mapping at index \(selectedMappingIndex)")
  }