dazscript-framework 0.1.15 → 0.1.16

package/src/dialog/builders/node-selection-builder.ts

@@ -1,56 +1,56 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class NodeSelectionComboBoxBuilder extends WidgetBuilderBase<DzNodeSelectionComboBox> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).withArgs(['DzNode', true]).build(DzNodeSelectionComboBox))
-    }
-
-    node(node: Observable<DzNode>): this {
-        this.widget.setNode(node.value)
-        node.connect((node) => {
-            this.widget.setNode(node)
-        })
-        return this
-    }
-
-    nodes(nodes: Observable<DzNode[]>): this {
-        this.widget.setNodes(nodes.value)
-        nodes.connect((nodes) => {
-            this.widget.setNodes(nodes)
-        })
-        return this
-    }
-
-    selected(node: Observable<DzNode>): this {
-        this.widget.setSelectedNode(node.value)
-        node.connect((node) => {
-            this.widget.setSelectedNode(node)
-        })
-        return this
-    }
-
-    value(node: Observable<DzNode>): this {
-        this.widget.nodeSelectionChanged.scriptConnect(() => {
-            node.value = this.widget.getSelectedNode()
-        })
-        this.selected(node)
-        return this
-    }
-
-    changed(then: (node: DzNode) => void): this {
-        this.widget.nodeSelectionChanged.scriptConnect(() => {
-            then(this.widget.getSelectedNode())
-        })
-        return this
-    }
-
-    refresh(): void {
-        this.widget.update()
-    }
-
-    build(then?: (comboBox: DzNodeSelectionComboBox) => void): DzNodeSelectionComboBox {
-        return super.build()
-    }
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class NodeSelectionComboBoxBuilder extends WidgetBuilderBase<DzNodeSelectionComboBox> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).withArgs(['DzNode', true]).build(DzNodeSelectionComboBox))
+    }
+
+    node(node: Observable<DzNode>): this {
+        this.widget.setNode(node.value)
+        node.connect((node) => {
+            this.widget.setNode(node)
+        })
+        return this
+    }
+
+    nodes(nodes: Observable<DzNode[]>): this {
+        this.widget.setNodes(nodes.value)
+        nodes.connect((nodes) => {
+            this.widget.setNodes(nodes)
+        })
+        return this
+    }
+
+    selected(node: Observable<DzNode>): this {
+        this.widget.setSelectedNode(node.value)
+        node.connect((node) => {
+            this.widget.setSelectedNode(node)
+        })
+        return this
+    }
+
+    value(node: Observable<DzNode>): this {
+        this.widget.nodeSelectionChanged.scriptConnect(() => {
+            node.value = this.widget.getSelectedNode()
+        })
+        this.selected(node)
+        return this
+    }
+
+    changed(then: (node: DzNode) => void): this {
+        this.widget.nodeSelectionChanged.scriptConnect(() => {
+            then(this.widget.getSelectedNode())
+        })
+        return this
+    }
+
+    refresh(): void {
+        this.widget.update()
+    }
+
+    build(then?: (comboBox: DzNodeSelectionComboBox) => void): DzNodeSelectionComboBox {
+        return super.build()
+    }
 }

package/src/dialog/builders/path-combo-box-builder.ts

@@ -1,24 +1,24 @@
-import { Observable } from '@dsf/lib/observable';
-import { createWidget, WidgetBuilderBase } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-
-export class PathComboBoxBuilder extends WidgetBuilderBase<DzPathComboBox> {
-    constructor(context: WidgetBuilderContext, checkBoxes: boolean = false) {
-        super(createWidget(context).withArgs([checkBoxes]).build(DzPathComboBox))
-    }
-
-    items(items: string[] | Observable<string[]>): this {
-        if (items instanceof Array) {
-            this.widget.setTypes(items)
-        }
-        else {
-            this.widget.setTypes(items.value)
-            items.connect((items) => {
-                this.widget.setTypes(items)
-            })
-        }
-
-        return this
-    }
-}
+import { Observable } from '@dsf/lib/observable';
+import { createWidget, WidgetBuilderBase } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+
+export class PathComboBoxBuilder extends WidgetBuilderBase<DzPathComboBox> {
+    constructor(context: WidgetBuilderContext, checkBoxes: boolean = false) {
+        super(createWidget(context).withArgs([checkBoxes]).build(DzPathComboBox))
+    }
+
+    items(items: string[] | Observable<string[]>): this {
+        if (items instanceof Array) {
+            this.widget.setTypes(items)
+        }
+        else {
+            this.widget.setTypes(items.value)
+            items.connect((items) => {
+                this.widget.setTypes(items)
+            })
+        }
+
+        return this
+    }
+}

package/src/dialog/builders/popup-menu-builder.ts

@@ -1,47 +1,47 @@
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class PopupMenuItem {
-    id?: number
-    text?: string
-    checkbox?: boolean
-    activated?: (id?: number) => void
-}
-
-export class PopupMenuBuilder extends WidgetBuilderBase<DzPopupMenu> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzPopupMenu));
-    }
-
-    parent(parent: DzWidget): this {
-        this.widget.reparent(parent)
-        return this
-    }
-
-    items(...items: PopupMenuItem[]): this {
-        items?.forEach((item, idx) => {
-            if (!item.text) {
-                this.widget.insertSeparator(idx)
-            }
-            else {
-                this.widget.insertTextItem(item.text, item.id ?? idx, idx)
-
-            }
-
-            if (item.activated) this.widget.connectItem(item.id ?? idx, null, item.activated)
-        })
-        return this
-    }
-
-    selected(fn: (idx: number) => void): this {
-        this.widget.activated.scriptConnect((idx) => {
-            fn(idx)
-        })
-        return this
-    }
-
-    build(then?: (popupMenu: DzPopupMenu) => void): DzPopupMenu {
-        then?.(this.widget)
-        return this.widget
-    }
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class PopupMenuItem {
+    id?: number
+    text?: string
+    checkbox?: boolean
+    activated?: (id?: number) => void
+}
+
+export class PopupMenuBuilder extends WidgetBuilderBase<DzPopupMenu> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzPopupMenu));
+    }
+
+    parent(parent: DzWidget): this {
+        this.widget.reparent(parent)
+        return this
+    }
+
+    items(...items: PopupMenuItem[]): this {
+        items?.forEach((item, idx) => {
+            if (!item.text) {
+                this.widget.insertSeparator(idx)
+            }
+            else {
+                this.widget.insertTextItem(item.text, item.id ?? idx, idx)
+
+            }
+
+            if (item.activated) this.widget.connectItem(item.id ?? idx, null, item.activated)
+        })
+        return this
+    }
+
+    selected(fn: (idx: number) => void): this {
+        this.widget.activated.scriptConnect((idx) => {
+            fn(idx)
+        })
+        return this
+    }
+
+    build(then?: (popupMenu: DzPopupMenu) => void): DzPopupMenu {
+        then?.(this.widget)
+        return this.widget
+    }
 }

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

@@ -1,43 +1,43 @@
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export default class RadioButtonBuilder extends WidgetBuilderBase<DzRadioButton> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzRadioButton))
-    }
-
-    label(text: string): this {
-        this.widget.text = text ?? ''
-        return this
-    }
-
-    value(source: boolean | Observable<boolean>): this {
-        if (typeof source === 'boolean') {
-            this.widget.checked = source
-        }
-        else {
-            this.widget.checked = source.value
-            source.connect((value) => {
-                this.widget.checked = value
-            })
-            this.widget.toggled.scriptConnect((value) => {
-                source.value = value
-            })
-        }
-        return this
-    }
-
-    toggled(fn: (value: boolean) => void): this {
-        this.widget.toggled.scriptConnect((value) => {
-            fn(value)
-        })
-        return this
-    }
-
-    build(checkbox?: (checkbox: DzRadioButton) => void): DzRadioButton {
-        checkbox?.(this.widget)
-        return this.widget
-    }
-
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export default class RadioButtonBuilder extends WidgetBuilderBase<DzRadioButton> {
+    constructor(context: WidgetBuilderContext) {
+        super(createWidget(context).build(DzRadioButton))
+    }
+
+    label(text: string): this {
+        this.widget.text = text ?? ''
+        return this
+    }
+
+    value(source: boolean | Observable<boolean>): this {
+        if (typeof source === 'boolean') {
+            this.widget.checked = source
+        }
+        else {
+            this.widget.checked = source.value
+            source.connect((value) => {
+                this.widget.checked = value
+            })
+            this.widget.toggled.scriptConnect((value) => {
+                source.value = value
+            })
+        }
+        return this
+    }
+
+    toggled(fn: (value: boolean) => void): this {
+        this.widget.toggled.scriptConnect((value) => {
+            fn(value)
+        })
+        return this
+    }
+
+    build(checkbox?: (checkbox: DzRadioButton) => void): DzRadioButton {
+        checkbox?.(this.widget)
+        return this.widget
+    }
+
 }

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

@@ -1,23 +1,40 @@
-import { WidgetBuilderBase, createWidget } from './widget-builder'
-import { WidgetBuilderContext } from './widgets-builder'
-
-export default class SliderBuilder extends WidgetBuilderBase<DzFloatSlider> {
-    constructor(context: WidgetBuilderContext) {
-        super(createWidget(context).build(DzFloatSlider))
-    }
-
-    value(value: number): this {
-        this.widget.value = value
-        return this
-    }
-
-    min(min: number): this {
-        this.widget.min = min
-        return this
-    }
-
-    max(max: number): this {
-        this.widget.max = max
-        return this
-    }
+import { Observable } from '@dsf/lib/observable'
+import { WidgetBuilderBase, createWidget } from './widget-builder'
+import { WidgetBuilderContext } from './widgets-builder'
+
+export default class SliderBuilder extends WidgetBuilderBase<DzFloatSlider | DzIntSlider> {
+    constructor(context: WidgetBuilderContext, readonly type: 'float' | 'integer') {
+        super(createWidget(context).build(type === 'float' ? DzFloatSlider : DzIntSlider))
+    }
+
+    value(value$: number | Observable<number>): this {
+        if (typeof value$ === 'number') {
+            this.widget.value = value$
+        }
+        else {
+            this.widget.value = value$.value
+            value$.connect((value) => {
+                this.widget.value = value
+            });
+            (this.widget.valueChanged as unknown as ISignalT<number>).scriptConnect((value) => {
+                value$.value = value
+            })
+        }
+        return this
+    }
+
+    min(min: number): this {
+        this.widget.min = min
+        return this
+    }
+
+    max(max: number): this {
+        this.widget.max = max
+        return this
+    }
+
+    clamped(yesNo: boolean): this {
+        this.widget.clamped = yesNo
+        return this
+    }
 }

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

@@ -1,89 +1,89 @@
-import { getState, restoreState } from '@dsf/helpers/splitter-helper';
-import { Observable } from '@dsf/lib/observable';
-import { WidgetBuilderBase, createWidget } from './widget-builder';
-import { WidgetBuilderContext } from './widgets-builder';
-
-export class SplitterBuilder extends WidgetBuilderBase<DzSplitter> {
-    private _items: DzWidget[] = []
-
-    constructor(private context: SplitterBuilderContext) {
-        super(createWidget(context.widgetContext).build(DzSplitter))
-    }
-
-    vertical(): this {
-        this.context.orientation = DzSplitter.Vertical
-        return this
-    }
-
-    horizontal(): this {
-        this.context.orientation = DzSplitter.Horizontal
-        return this
-    }
-
-    items(...items: DzWidget[]): this {
-        this._items = items
-        return this
-    }
-
-    collapsible(...collapsible: boolean[]): this {
-        this.context.collapsible = collapsible
-        return this
-    }
-
-    strech(...strech: number[]): this {
-        this.context.strech = strech
-        return this
-    }
-
-    state(bind: Observable<string>): this {
-        this.context.state = bind
-        return this
-    }
-
-    build(then?: (splitter: DzSplitter) => void): DzSplitter {
-        let splitter = createWidget(this.context.widgetContext).build(DzSplitter)
-        splitter.orientation = this.context.orientation
-
-        this._items?.forEach((widget, index) => {
-            splitter.addWidget(widget)
-            splitter.setCollapsible(index, this.context.collapsible[index] ?? this.context.collapsible[0] ?? false)
-            splitter.setStretchFactor(index, this.context.strech[index] ?? this.context.strech[0] ?? 0)
-        })
-
-        restoreState(splitter, this.context.state?.value);
-        (splitter.getWidget() as QSplitter).splitterMoved.scriptConnect(() => {
-            this.context.state.value = getState(splitter)
-        })
-        this.context.state.connect((state) => {
-            restoreState(splitter, state)
-        })
-
-        this.context.add(splitter, (splitter) => {
-            then?.(splitter)
-        })
-
-        return splitter
-    }
-}
-
-export class SplitterBuilderContext {
-    private _current: DzSplitter
-
-    orientation: number = DzSplitter.Vertical
-    collapsible: boolean[] = []
-    strech: number[] = []
-    state = new Observable<string>()
-
-    get current(): DzSplitter | null {
-        return this._current
-    }
-
-    constructor(public readonly widgetContext: WidgetBuilderContext) { }
-
-    add(splitter: DzSplitter, content: (splitterWidget: DzSplitter) => void): DzSplitter {
-        this._current = splitter
-        content(splitter)
-        this._current = null
-        return splitter
-    }
+import { getState, restoreState } from '@dsf/helpers/splitter-helper';
+import { Observable } from '@dsf/lib/observable';
+import { WidgetBuilderBase, createWidget } from './widget-builder';
+import { WidgetBuilderContext } from './widgets-builder';
+
+export class SplitterBuilder extends WidgetBuilderBase<DzSplitter> {
+    private _items: DzWidget[] = []
+
+    constructor(private context: SplitterBuilderContext) {
+        super(createWidget(context.widgetContext).build(DzSplitter))
+    }
+
+    vertical(): this {
+        this.context.orientation = DzSplitter.Vertical
+        return this
+    }
+
+    horizontal(): this {
+        this.context.orientation = DzSplitter.Horizontal
+        return this
+    }
+
+    items(...items: DzWidget[]): this {
+        this._items = items
+        return this
+    }
+
+    collapsible(...collapsible: boolean[]): this {
+        this.context.collapsible = collapsible
+        return this
+    }
+
+    strech(...strech: number[]): this {
+        this.context.strech = strech
+        return this
+    }
+
+    state(bind: Observable<string>): this {
+        this.context.state = bind
+        return this
+    }
+
+    build(then?: (splitter: DzSplitter) => void): DzSplitter {
+        let splitter = createWidget(this.context.widgetContext).build(DzSplitter)
+        splitter.orientation = this.context.orientation
+
+        this._items?.forEach((widget, index) => {
+            splitter.addWidget(widget)
+            splitter.setCollapsible(index, this.context.collapsible[index] ?? this.context.collapsible[0] ?? false)
+            splitter.setStretchFactor(index, this.context.strech[index] ?? this.context.strech[0] ?? 0)
+        })
+
+        restoreState(splitter, this.context.state?.value);
+        (splitter.getWidget() as QSplitter).splitterMoved.scriptConnect(() => {
+            this.context.state.value = getState(splitter)
+        })
+        this.context.state.connect((state) => {
+            restoreState(splitter, state)
+        })
+
+        this.context.add(splitter, (splitter) => {
+            then?.(splitter)
+        })
+
+        return splitter
+    }
+}
+
+export class SplitterBuilderContext {
+    private _current: DzSplitter
+
+    orientation: number = DzSplitter.Vertical
+    collapsible: boolean[] = []
+    strech: number[] = []
+    state = new Observable<string>()
+
+    get current(): DzSplitter | null {
+        return this._current
+    }
+
+    constructor(public readonly widgetContext: WidgetBuilderContext) { }
+
+    add(splitter: DzSplitter, content: (splitterWidget: DzSplitter) => void): DzSplitter {
+        this._current = splitter
+        content(splitter)
+        this._current = null
+        return splitter
+    }
 }