dazscript-framework 1.0.24 → 1.0.26

package/package.json

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

package/src/dialog/builders/groupbox-builder.ts

@@ -10,6 +10,7 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
     private _style: { flat?: boolean }
     private _visible: Observable<boolean>
     private _enabled: Observable<boolean>
+    private _checked: Observable<boolean>
     private _columns: number = 1
     private _height: number | null = null
     private _minHeight: number | null = null
@@ -50,6 +51,13 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
         return this
     }
 
+    checkable(value: boolean | Observable<boolean> = true): this {
+        this._checked = typeof value === 'boolean'
+            ? new Observable(value)
+            : value
+        return this
+    }
+
     visible(value: boolean | Observable<boolean>): this {
         this._visible = typeof value === 'boolean'
             ? new Observable(value)
@@ -90,6 +98,10 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
         groupBox.title = this._title?.value
         groupBox.flat = this._style?.flat
         groupBox.columns = this._columns
+        if (this._checked) {
+            groupBox.checkable = true
+            groupBox.checked = this._checked.value
+        }
         if (this._height !== null) groupBox.height = this._height
         if (this._minHeight !== null) groupBox.minHeight = this._minHeight
         if (this._maxHeight !== null) groupBox.maxHeight = this._maxHeight
@@ -98,6 +110,15 @@ export default class GroupBoxBuilder implements IWidgetBuilder<DzGroupBox> {
             groupBox.title = text
         })
 
+        if (this._checked) {
+            this._checked.connect((checked) => {
+                groupBox.checked = checked
+            })
+            groupBox.toggled.scriptConnect((checked) => {
+                this._checked.value = checked
+            })
+        }
+
         new LayoutBuilder(this.context)
             .parent(groupBox)
             .direction(this._direction)

package/src/helpers/custom-action-installer-helper.ts

@@ -12,7 +12,7 @@ import { TreeNode } from '@dsf/lib/tree-node'
 import { promptKeyboardShortcut } from '@dsf/shared/set-keyboard-shortcut'
 import { readFromFile, saveToFile } from './file-helper'
 import { getCanonicalInstallerEntry, toActionKey } from './custom-action-installer-entries'
-import { canResetSetupShortcut, getDisplayedSetupShortcut, resetSetupShortcut, setSetupShortcut, updateShortcutOverrideState } from './custom-action-installer-shortcuts'
+import { canResetSetupShortcut, getDisplayedSetupShortcut, resetSetupShortcut, resetSetupShortcuts, setSetupShortcut, updateShortcutOverrideState } from './custom-action-installer-shortcuts'
 import { getScriptPath } from './script-helper'
 
 type InstallerEntry = {
@@ -397,6 +397,7 @@ class InstallerSelectionDialog extends BasicDialog {
         debug(`[Setup] context menu row resolved item="${this.safeListItemText(contextItem, 1)}" entry="${entry?.action?.text ?? ''}"`)
         const canSetShortcut = Boolean(entry)
         const canResetShortcut = Boolean(entry && canResetSetupShortcut(entry))
+        const canResetAllShortcuts = this.entries.some(canResetSetupShortcut)
 
         const items = [
             {
@@ -413,6 +414,10 @@ class InstallerSelectionDialog extends BasicDialog {
                     this.resetDefaultShortcut(entry)
                 }
             },
+            {
+                text: 'Reset All Shortcuts to Defaults',
+                activated: () => this.resetAllDefaultShortcuts()
+            },
             {},
             { text: 'Check All', activated: () => this.checkVisible(listView, true) },
             { text: 'Uncheck All', activated: () => this.checkVisible(listView, false) }
@@ -421,6 +426,7 @@ class InstallerSelectionDialog extends BasicDialog {
         return new PopupMenuBuilder(this.builder.context).items(...items).build((menu) => {
             menu.setItemEnabled(0, canSetShortcut)
             menu.setItemEnabled(1, canResetShortcut)
+            menu.setItemEnabled(2, canResetAllShortcuts)
         })
     }
 
@@ -498,6 +504,15 @@ class InstallerSelectionDialog extends BasicDialog {
         this.refreshListEvent$.trigger()
     }
 
+    private resetAllDefaultShortcuts() {
+        const resettableEntries = this.entries.filter(canResetSetupShortcut)
+        if (resettableEntries.length === 0) return
+
+        resetSetupShortcuts(resettableEntries)
+        debug(`[Setup] reset ${resettableEntries.length} shortcuts to defaults`)
+        this.refreshListEvent$.trigger()
+    }
+
     private checkVisible(listView: DzListView, onOff: boolean) {
         if (!this.keywords$.value?.trim()) {
             checkAll(listView, onOff)

package/src/helpers/custom-action-installer-shortcuts.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
     canResetSetupShortcut,
     getDisplayedSetupShortcut,
+    resetSetupShortcuts,
     resetSetupShortcut,
     setSetupShortcut,
     updateShortcutOverrideState
@@ -80,6 +81,29 @@ describe('setup shortcut state', () => {
         expect(canResetSetupShortcut(entry)).toBe(false)
     })
 
+    it('resets all shortcut entries to their defaults', () => {
+        const installed = shortcutState({
+            installedActionName: 'installed-guid',
+            defaultShortcut: 'Ctrl+P',
+            installedShortcut: 'F12',
+            effectiveShortcut: 'F12',
+            isShortcutOverridden: true
+        })
+        const pending = shortcutState({
+            defaultShortcut: '',
+            effectiveShortcut: 'Ctrl+Alt+K'
+        })
+
+        resetSetupShortcuts([installed, pending])
+
+        expect(installed.installedShortcut).toBe('Ctrl+P')
+        expect(installed.effectiveShortcut).toBe('Ctrl+P')
+        expect(installed.isShortcutOverridden).toBe(false)
+        expect(pending.installedShortcut).toBe('')
+        expect(pending.effectiveShortcut).toBe('')
+        expect(pending.isShortcutOverridden).toBe(false)
+    })
+
     it('displays custom marker when installed shortcut was changed outside setup', () => {
         const entry = shortcutState({
             installedActionName: 'installed-guid',

package/src/helpers/custom-action-installer-shortcuts.ts

@@ -47,3 +47,7 @@ export const resetSetupShortcut = (entry: InstallerShortcutState): void => {
     entry.effectiveShortcut = defaultShortcut
     updateShortcutOverrideState(entry)
 }
+
+export const resetSetupShortcuts = (entries: InstallerShortcutState[]): void => {
+    entries.forEach(resetSetupShortcut)
+}