dazscript-framework 1.0.42 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",

package/src/dialog/builders/list-view-builder.items.test.ts

@@ -2,6 +2,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { Observable } from '@dsf/lib/observable'
 import { TreeNode } from '@dsf/lib/tree-node'
 
+const buildEvents = vi.hoisted(() => [] as string[])
+
 const listView = vi.hoisted(() => ({
     items: [] as any[],
     addColumn: vi.fn(),
@@ -12,7 +14,7 @@ const listView = vi.hoisted(() => ({
     deleteItem: vi.fn(function (this: any, item: any) {
         this.items = this.items.filter((candidate: any) => candidate !== item)
     }),
-    setSorting: vi.fn(),
+    setSorting: vi.fn((column: number) => buildEvents.push(`sorting:${column}`)),
     hide: vi.fn(),
     show: vi.fn(),
     getWidget: vi.fn(() => focusWidget),
@@ -42,6 +44,7 @@ class FakeListViewItem {
     textByColumn: Record<number, string> = {}
 
     constructor(parent: any, public id: number) {
+        buildEvents.push('item')
         parent.items.push(this)
     }
 
@@ -63,6 +66,19 @@ describe('ListViewBuilder item updates', () => {
         vi.clearAllMocks()
         vi.mocked(filter).mockReset()
         focusWidget.focusPolicy = 15
+        buildEvents.length = 0
+    })
+
+    it('suspends sorting while building rows and restores it afterward', () => {
+        new ListViewBuilder<any, any>({ dialog: {}, layout: null } as any)
+            .sorting(true)
+            .items(new Observable([new TreeNode('Action A', '', { name: 'ActionA' })]))
+            .columns(['Name'])
+            .text(item => [item.name])
+            .data(item => item.value)
+            .build()
+
+        expect(buildEvents).toEqual(['sorting:-1', 'item', 'sorting:0'])
     })
 
     it('keeps unchanged rows when data has no explicit id', () => {

package/src/dialog/builders/list-view-builder.ts

@@ -314,7 +314,7 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
     }
     let delayedFilter: Delayed | null = null
 
-    const buildList = (items: TreeNode<TItem>[], selectedId?: number) => {
+    const buildListRows = (items: TreeNode<TItem>[], selectedId?: number) => {
         rowId = -1
         context.decorated = false
         if (!context.text)
@@ -370,6 +370,15 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
         }
     }
 
+    const buildList = (items: TreeNode<TItem>[], selectedId?: number) => {
+        listView.setSorting(-1, context.sortAscending)
+        try {
+            buildListRows(items, selectedId)
+        } finally {
+            listView.setSorting(context.sorting, context.sortAscending)
+        }
+    }
+
     const updateList = (items: TreeNode<TItem>[]) => {
         if (!context.text) return
         if (!items) return
@@ -440,7 +449,6 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
     })
 
     listView.showSortIndicator = context.sorting >= 0
-    listView.setSorting(context.sorting, context.sortAscending)
     if (context.selectionMode !== null) {
         listView.selectionMode = context.selectionMode
     }