Fix sitemap scroll hitching under frequent long-poll updates

openHAB/Models/SitemapPageViewModel.swift

@@ -267,32 +267,48 @@ class SitemapPageViewModel: ObservableObject {
 
     func rebuildRowInputs() {
         let pageKey = "\(defaultSitemap)|\(pageId)"
+        let widgets = relevantWidgets
+        let inputs = SitemapRowInputMapper.map(pageKey: pageKey, widgets: widgets)
+        rowWidgetIndex = buildWidgetIndex(pageKey: pageKey, widgets: widgets)
+        if inputs != rowInputs {
+            rowInputs = inputs
+        }
+    }
+
+    private func buildWidgetIndex(pageKey: String, widgets: [OpenHABWidget]) -> [RowID: OpenHABWidget] {
         var occurrenceByWidgetID: [String: Int] = [:]
-        var inputs: [SitemapRowInput] = []
         var index: [RowID: OpenHABWidget] = [:]
-        inputs.reserveCapacity(relevantWidgets.count)
-        index.reserveCapacity(relevantWidgets.count)
-
-        for widget in relevantWidgets {
+        index.reserveCapacity(widgets.count)
+        for widget in widgets {
             let identityWidgetID = SitemapRowInputMapper.rowIdentityWidgetID(for: widget)
             occurrenceByWidgetID[identityWidgetID, default: 0] += 1
             let occurrence = occurrenceByWidgetID[identityWidgetID]!
             let rowID = RowID(pageKey: pageKey, widgetId: identityWidgetID, occurrence: occurrence)
-            let input = SitemapRowInputMapper.map(widget: widget, rowID: rowID)
-            inputs.append(input)
             index[rowID] = widget
         }
+        return index
+    }
 
-        rowWidgetIndex = index
-        rowInputs = inputs
+    /// Increments `widgetUpdateVersions` for each row whose content differs between `oldInputs`
+    /// and `newInputs`, keyed by full row identity.
+    func bumpWidgetVersions(from oldInputs: [SitemapRowInput], to newInputs: [SitemapRowInput]) {
+        if newInputs.count == oldInputs.count {
+            for (new, old) in zip(newInputs, oldInputs) where new != old {
+                widgetUpdateVersions[new.rowID.rawValue, default: 0] += 1
+            }
+        } else {
+            for input in newInputs {
+                widgetUpdateVersions[input.rowID.rawValue, default: 0] += 1
+            }
+        }
     }
 
     func widget(for rowID: RowID) -> OpenHABWidget? {
         rowWidgetIndex[rowID]
     }
 
-    func widgetUpdateVersion(for widgetId: String) -> Int {
-        widgetUpdateVersions[widgetId] ?? 0
+    func widgetUpdateVersion(for rowID: RowID) -> Int {
+        widgetUpdateVersions[rowID.rawValue] ?? 0
     }
 
     func sliderOverrideValue(for itemname: String?) -> Double? {
@@ -528,34 +544,51 @@ extension SitemapPageViewModel {
     @MainActor
     private func updateUI(with page: OpenHABPage, origin: PageUpdateOrigin) {
         logger.debug("Incoming sitemap update origin=\(origin.rawValue, privacy: .public), widgets=\(page.widgets.count)")
-        let newWidgets = page.widgets
 
-        // Check if list structure changed (count, order, or IDs)
+        let pageKey = "\(defaultSitemap)|\(pageId)"
+
+        // Snapshot what the list would render from the new data — before any widget mutation.
+        let incomingFiltered: [OpenHABWidget]
+        if searchText.isEmpty {
+            incomingFiltered = page.widgets
+        } else {
+            incomingFiltered = page.widgets.filter {
+                $0.label.lowercased().contains(searchText.lowercased()) && $0.type != .frame
+            }
+        }
+        let previewInputs = SitemapRowInputMapper.map(pageKey: pageKey, widgets: incomingFiltered)
+
+        let titleChanged = currentPage == nil || currentPage?.title != page.title
+        let canSkipReconciliation = searchText.isEmpty && previewInputs == rowInputs && !titleChanged
+        guard !canSkipReconciliation else {
+            _ = clearSyncedSliderOverrides(using: page.widgets)
+            return
+        }
+
+        // Something changed — reconcile widget objects and update stored state.
         let currentWidgets = currentPage?.widgets ?? []
-        let structureChanged = currentWidgets.count != newWidgets.count
-            || !zip(currentWidgets, newWidgets).allSatisfy { $0.widgetId == $1.widgetId }
-        let reconciledWidgets = reconcileWidgets(newWidgets, with: currentWidgets)
+        let structureChanged = currentWidgets.count != page.widgets.count
+            || !zip(currentWidgets, page.widgets).allSatisfy { $0.widgetId == $1.widgetId }
+        let reconciledWidgets = reconcileWidgets(page.widgets, with: currentWidgets)
+        injectSendCommand(for: reconciledWidgets)
 
-        // Only replace currentPage when structure or title changed
-        if structureChanged || currentPage?.title != page.title || currentPage == nil {
+        if structureChanged || titleChanged {
             page.widgets = reconciledWidgets
-            injectSendCommand(for: reconciledWidgets)
             currentPage = page
         } else {
             currentPage?.widgets = reconciledWidgets
-            // Inject sendCommand into existing widgets without replacing the page
-            injectSendCommand(for: reconciledWidgets)
         }
 
-        trackWidgetUpdates(in: reconciledWidgets)
         _ = clearSyncedSliderOverrides(using: reconciledWidgets)
-        rebuildRowInputs()
-    }
 
-    private func trackWidgetUpdates(in widgets: [OpenHABWidget]) {
-        for widget in widgets {
-            widgetUpdateVersions[widget.widgetId, default: 0] += 1
-        }
+        // Rebuild command-dispatch index from the now-current reconciled widgets.
+        rowWidgetIndex = buildWidgetIndex(pageKey: pageKey, widgets: relevantWidgets)
+
+        // Bump widget versions only for rows whose content actually changed.
+        bumpWidgetVersions(from: rowInputs, to: previewInputs)
+
+        // Publish new row inputs — guaranteed to differ from current (checked above).
+        rowInputs = previewInputs
     }
 
     private func clearSyncedSliderOverrides(using widgets: [OpenHABWidget]) -> Int {

openHAB/UI/SwiftUI/Rows/ImageRowView.swift

@@ -54,7 +54,7 @@ private struct ImageRowContent: View {
     }
 
     private var chartWidgetVersion: Int {
-        viewModel.widgetUpdateVersion(for: input.widgetId)
+        viewModel.widgetUpdateVersion(for: input.rowID)
     }
 
     private var chartSyncToken: String {

openHAB/UI/SwiftUI/Rows/SegmentedRowView.swift

@@ -344,7 +344,7 @@ struct SegmentedRowView: View {
     var body: some View {
         SegmentedRowContent(
             input: input,
-            widgetVersion: viewModel.widgetUpdateVersion(for: input.widgetId),
+            widgetVersion: viewModel.widgetUpdateVersion(for: input.rowID),
             fallbackSymbol: fallbackSymbol
         ) { command, policy, phase in
             guard let itemName = input.itemName else { return }
@@ -377,13 +377,16 @@ private extension SegmentedRowView {
                                    icon: String = "switch",
                                    mappings: [OpenHABWidgetMapping],
                                    selectedState: String? = nil) -> SegmentedRowInput {
-        SegmentedRowInput.from(widget: PreviewWidgetFactory.segmented(
-            label: label,
-            mappings: mappings,
-            selectedState: selectedState,
-            icon: icon,
-            valueText: detailLabel
-        ))
+        SegmentedRowInput.from(
+            widget: PreviewWidgetFactory.segmented(
+                label: label,
+                mappings: mappings,
+                selectedState: selectedState,
+                icon: icon,
+                valueText: detailLabel
+            ),
+            rowID: RowID(pageKey: "preview", widgetId: UUID().uuidString, occurrence: 1)
+        )
     }
 }
 
@@ -577,7 +580,10 @@ private extension SegmentedRowView {
 #Preview("From PreviewConstants") {
     PreviewList {
         SegmentedRowView(
-            input: SegmentedRowInput.from(widget: PreviewConstants.openHABSitemapPage!.widgets[4])
+            input: SegmentedRowInput.from(
+                widget: PreviewConstants.openHABSitemapPage!.widgets[4],
+                rowID: RowID(pageKey: "preview", widgetId: UUID().uuidString, occurrence: 1)
+            )
         )
     }
 }

openHAB/UI/SwiftUI/Rows/SelectionRowView.swift

@@ -178,7 +178,7 @@ struct SelectionRowView: View {
     var body: some View {
         SelectionRowContent(
             input: input,
-            widgetVersion: viewModel.widgetUpdateVersion(for: input.widgetId)
+            widgetVersion: viewModel.widgetUpdateVersion(for: input.rowID)
         ) { command in
             guard let itemName = input.itemName else { return }
             viewModel.sendCommand(command, for: itemName)

openHAB/UI/SwiftUI/Rows/SliderRowView.swift

@@ -218,7 +218,7 @@ struct SliderRowView: View {
         makeSliderRowContent(
             SliderRowConfig(
                 input: input,
-                widgetVersion: viewModel.widgetUpdateVersion(for: input.widgetId),
+                widgetVersion: viewModel.widgetUpdateVersion(for: input.rowID),
                 overrideValue: viewModel.sliderOverrideValue(for: input.itemName),
                 fallbackSymbol: fallbackSymbol,
                 viewModel: viewModel
@@ -245,7 +245,7 @@ private extension SliderRowView {
             step: step,
             icon: icon,
             switchSupport: switchSupport
-        ))
+        ), rowID: RowID(pageKey: "preview", widgetId: UUID().uuidString, occurrence: 1))
     }
 }
 
@@ -335,7 +335,10 @@ private extension SliderRowView {
 #Preview("From PreviewConstants") {
     PreviewList {
         SliderRowView(
-            input: SliderRowInput.from(widget: PreviewConstants.openHABSitemapPage!.widgets[3]),
+            input: SliderRowInput.from(
+                widget: PreviewConstants.openHABSitemapPage!.widgets[3],
+                rowID: RowID(pageKey: "preview", widgetId: UUID().uuidString, occurrence: 1)
+            ),
             fallbackSymbol: .sliderHorizontal3
         )
     }

openHAB/UI/SwiftUI/SitemapRowInputMapper.swift

@@ -37,11 +37,11 @@ enum SitemapRowInputMapper {
 
         switch widget.renderingKind {
         case .slider:
-            return SitemapRowInput.slider(rowID, SliderRowInput.from(widget: widget))
+            return SitemapRowInput.slider(rowID, SliderRowInput.from(widget: widget, rowID: rowID))
         case .selection:
-            return SitemapRowInput.selection(rowID, SelectionRowInput.from(widget: widget))
+            return SitemapRowInput.selection(rowID, SelectionRowInput.from(widget: widget, rowID: rowID))
         case .segmentedSwitch:
-            return SitemapRowInput.segmented(rowID, SegmentedRowInput.from(widget: widget))
+            return SitemapRowInput.segmented(rowID, SegmentedRowInput.from(widget: widget, rowID: rowID))
         case .frame:
             return SitemapRowInput.frame(rowID, FrameRowInput.from(widget: widget))
         case .text:
@@ -57,7 +57,7 @@ enum SitemapRowInputMapper {
         case .colorPicker:
             return SitemapRowInput.colorPicker(rowID, ColorPickerRowInput.from(widget: widget))
         case .image, .chart, .video, .webview, .mapview:
-            return SitemapRowInput.media(rowID, MediaRowInput.from(widget: widget))
+            return SitemapRowInput.media(rowID, MediaRowInput.from(widget: widget, rowID: rowID))
         case .colorTemperaturePicker:
             return SitemapRowInput.colorTemperature(rowID, ColorTemperatureRowInput.from(widget: widget))
         case .buttonGrid:

openHAB/UI/SwiftUI/WidgetRowInputs.swift

@@ -44,6 +44,7 @@ struct RowIconInput: Equatable, Sendable {
 }
 
 struct SelectionRowInput: Equatable, RowWithIconInput {
+    let rowID: RowID
     let displayState: WidgetDisplayState
     let mappings: [OpenHABWidgetMapping]
     let labelColor: String
@@ -53,9 +54,10 @@ struct SelectionRowInput: Equatable, RowWithIconInput {
     let icon: RowIconInput
     let itemName: String?
 
-    static func from(widget: OpenHABWidget) -> SelectionRowInput {
+    static func from(widget: OpenHABWidget, rowID: RowID) -> SelectionRowInput {
         let displayState = widget.displayState
         return SelectionRowInput(
+            rowID: rowID,
             displayState: displayState,
             mappings: displayState.mappings,
             labelColor: widget.labelcolor,
@@ -69,6 +71,7 @@ struct SelectionRowInput: Equatable, RowWithIconInput {
 }
 
 struct SegmentedRowInput: Equatable, RowWithIconInput {
+    let rowID: RowID
     let displayState: WidgetDisplayState
     let mappings: [OpenHABWidgetMapping]
     let labelColor: String
@@ -77,9 +80,10 @@ struct SegmentedRowInput: Equatable, RowWithIconInput {
     let icon: RowIconInput
     let itemName: String?
 
-    static func from(widget: OpenHABWidget) -> SegmentedRowInput {
+    static func from(widget: OpenHABWidget, rowID: RowID) -> SegmentedRowInput {
         let displayState = widget.displayState
         return SegmentedRowInput(
+            rowID: rowID,
             displayState: displayState,
             mappings: displayState.mappings,
             labelColor: widget.labelcolor,
@@ -408,6 +412,7 @@ struct ColorTemperatureRowInput: Equatable, RowWithIconInput {
 }
 
 struct MediaRowInput: Equatable {
+    let rowID: RowID
     let widgetId: String
     let renderingKind: WidgetRenderingKind
     let displayState: WidgetDisplayState
@@ -423,12 +428,13 @@ struct MediaRowInput: Equatable {
     let coordinateLatitude: Double?
     let coordinateLongitude: Double?
 
-    static func from(widget: OpenHABWidget) -> MediaRowInput {
+    static func from(widget: OpenHABWidget, rowID: RowID) -> MediaRowInput {
         let coordinate = widget.coordinate
         let hasValidCoordinate = (-90.0 ... 90.0).contains(coordinate.latitude)
             && (-180.0 ... 180.0).contains(coordinate.longitude)
 
         return MediaRowInput(
+            rowID: rowID,
             widgetId: widget.widgetId,
             renderingKind: widget.renderingKind,
             displayState: widget.displayState,
@@ -478,6 +484,7 @@ struct TextRowInput: Equatable, RowWithIconInput {
 }
 
 struct SliderRowInput: Equatable, RowWithIconInput {
+    let rowID: RowID
     let widgetId: String
     let displayState: WidgetDisplayState
     let numberPattern: String?
@@ -500,7 +507,7 @@ struct SliderRowInput: Equatable, RowWithIconInput {
         displayState.minValue ... displayState.maxValue
     }
 
-    static func from(widget: OpenHABWidget) -> SliderRowInput {
+    static func from(widget: OpenHABWidget, rowID: RowID) -> SliderRowInput {
         let displayState = widget.displayState
         let numberPattern = if let pattern = widget.pattern, !pattern.isEmpty {
             pattern
@@ -515,6 +522,7 @@ struct SliderRowInput: Equatable, RowWithIconInput {
         }
 
         return SliderRowInput(
+            rowID: rowID,
             widgetId: widget.widgetId,
             displayState: displayState,
             numberPattern: numberPattern,