dazscript-framework 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dazscript-framework",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "author": "Freddy Diaz",
   "license": "MPL-2.0",
   "description": "",
@@ -53,7 +53,7 @@
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "commander": "^11.1.0",
     "cross-env": "^7.0.3",
-    "dazscript-types": "^0.1.0",
+    "dazscript-types": "file:C:/src/DazScript.Framework/dazscript-types",
     "glob": "^7.2.0",
     "ts-file-parser": "^0.0.21",
     "ts-loader": "^9.5.0",

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

@@ -1,3 +1,4 @@
+import { AlignmentFlags } from '@dst/types/common/alignmentFlags';
 import { WidgetBuilderBase, createWidget } from './widget-builder';
 import { WidgetBuilderContext } from './widgets-builder';
 
@@ -12,6 +13,16 @@ export default class LabelBuilder extends WidgetBuilderBase<DzLabel> {
         return this;
     }
 
+    minWidth(width: number): this {
+        this.widget.minWidth = width
+        return this;
+    }
+
+    align(alignment: AlignmentFlags): this {
+        this.widget.alignment = alignment
+        return this;
+    }
+
     build(): DzLabel {
         return this.widget;
     }

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

@@ -1,9 +1,17 @@
 import { Direction } from '@dsf/dialog/shared';
 import { WidgetBuilderContext } from './widgets-builder';
 
+export enum LayoutOrientation {
+    LeftToRight = 0,
+    RightToLeft = 1,
+    TopToBottom = 2,
+    BottomToTop = 3
+}
+
 export default class LayoutBuilder {
     private widgetParent: DzWidget | DzLayout | null;
     private _direction: Direction = 'vertical';
+    private _orientation?: LayoutOrientation;
 
     constructor(protected context: WidgetBuilderContext) { }
 
@@ -11,6 +19,11 @@ export default class LayoutBuilder {
         return new LayoutBuilder(context)
     }
 
+    orientation(orientation: LayoutOrientation): this {
+        this._orientation = orientation;
+        return this
+    }
+
     direction(direction: Direction): this {
         this._direction = direction;
         return this;
@@ -25,6 +38,7 @@ export default class LayoutBuilder {
         let parent = this.widgetParent ?? this.context.parent;
         let type = this.getLayoutFor(this._direction);
         let layout = new type(parent);
+        if (this._orientation) layout.direction = this._orientation;
 
         let currentLayout = this.context.layout;
         this.context.layout = layout;
@@ -38,7 +52,6 @@ export default class LayoutBuilder {
         return layout;
     }
 
-
     private getLayoutFor(direction: string): new (arg: any) => DzVBoxLayout | DzHBoxLayout {
         return direction === 'horizontal' ? DzHBoxLayout : DzVBoxLayout;
     }

package/src/dialog/builders/line-edit-builder.ts

@@ -61,9 +61,10 @@ export default class LineEditBuilder extends WidgetBuilderBase<DzLineEdit> {
         return this.min(min).max(max)
     }
 
-    readOnly(onOff: boolean | Observable<boolean>): this {
-        if (typeof onOff === 'boolean') {
-            this.widget.readOnly = onOff
+    readOnly(onOff?: Observable<boolean> | null): this {
+        if (onOff == null) {
+            this.widget.readOnly = true
+            return this
         }
         else {
             this.widget.readOnly = onOff.value

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

@@ -10,7 +10,8 @@ type ListViewFilterOptions = {
     keywords: Observable<string>,
     field: (listItem: DzListViewItem) => string,
     selectOnFilter?: boolean,
-    filters?: (viewItem: DzListViewItem) => boolean
+    filters?: (viewItem: DzListViewItem) => boolean,
+    delay?: { min: number, max: number }
 }
 
 export enum ListViewRefreshOptions {
@@ -309,7 +310,7 @@ const build = <TItem, TData>(context: ListViewBuilderContext<TItem, TData>): DzL
         context.filter.keywords.connect((keywords) => {
             new Delayed(() => {
                 filterList(keywords)
-            }, 100, 400).trigger()
+            }, context.filter.delay?.min ?? 100, context.filter.delay?.max ?? 400).trigger()
         })
     }
 

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

@@ -0,0 +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
+    }
+}

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

@@ -23,6 +23,21 @@ export abstract class WidgetBuilderBase<T extends DzWidget> implements IWidgetBu
         return this
     }
 
+    clickFocus(): this {
+        this.widget.getWidget().focusPolicy = DzWidget.ClickFocus
+        return this
+    }
+
+    tabFocus(): this {
+        this.widget.getWidget().focusPolicy = DzWidget.TabFocus
+        return this
+    }
+
+    noFocus(): this {
+        this.widget.getWidget().focusPolicy = DzWidget.NoFocus
+        return this
+    }
+
     toolTip(toolTip: string): this {
         this.widget.toolTip = toolTip
         this.widget.whatsThis = toolTip

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

@@ -5,7 +5,7 @@ import { ComboBoxBuilder } from './combo-box-builder'
 import { ComboEditBuilder } from './combo-edit-builder'
 import GroupBoxBuilder from './groupbox-builder'
 import LabelBuilder from './label-builder'
-import LayoutBuilder from './layout-builder'
+import LayoutBuilder, { LayoutOrientation } from './layout-builder'
 import LineEditBuilder from './line-edit-builder'
 import { ListViewBuilder } from './list-view-builder'
 import { NodeSelectionComboBoxBuilder } from './node-selection-builder'
@@ -36,16 +36,18 @@ export class WidgetsBuilder {
         this.splitterContext = new SplitterBuilderContext(this.context)
     }
 
-    vertical(then?: (layout: DzVBoxLayout) => void): DzVBoxLayout {
+    vertical(then: (layout: DzVBoxLayout) => void, orientation: LayoutOrientation = LayoutOrientation.LeftToRight): DzVBoxLayout {
         return LayoutBuilder
             .create(this.context)
+            .orientation(orientation)
             .direction('vertical')
             .build(then)
     }
 
-    horizontal(then?: (layout: DzHBoxLayout) => void): DzHBoxLayout {
+    horizontal(then: (layout: DzHBoxLayout) => void, orientation: LayoutOrientation = LayoutOrientation.LeftToRight): DzHBoxLayout {
         return LayoutBuilder
             .create(this.context)
+            .orientation(orientation)
             .direction('horizontal')
             .build(then)
     }
@@ -98,6 +100,10 @@ export class WidgetsBuilder {
         return new ComboEditBuilder(this.context)
     }
 
+    // pathComboBox(checkBoxes: boolean = false): PathComboBoxBuilder {
+    //     return new PathComboBoxBuilder(this.context, checkBoxes)
+    // }
+
     /**
      *
      * @returns

package/src/helpers/node-helper.ts

@@ -143,47 +143,67 @@ export const getScales = (node: DzNode): DzFloatProperty[] => {
     return [node.getXScaleControl(), node.getYScaleControl(), node.getZScaleControl(), node.getScaleControl()];
 }
 
-export const getPropertiesTree = <T = DzProperty>(node: DzNode, map?: (property: DzProperty) => T, filter?: (property: DzProperty) => boolean): TreeNode<T>[] => {
-    let items = entries(group(sceneHelper.getPropertiesOnNode(node), (p) => p.getPath())).map(x => ({ path: x[0], properties: x[1] }))
+export const getPropertiesTree = <T = DzProperty>(node: DzNode, map?: (property: DzProperty) => T/*, filter?: (property: DzProperty) => boolean*/, showProgress: boolean = false): TreeNode<T>[] => {
+    if (showProgress) startProgress(`Collecting Properties`, 3)
+    let root: TreeNode<T>;
 
-    const root = new TreeNode<T>('root', '')
-    const pathMap: { [key: string]: TreeNode<T> } = { '': root }
+    // Fetch properties and group them by their path
+    const properties = sceneHelper.getPropertiesOnNode(node);
+    if (showProgress) stepProgress()
 
-    items.forEach(element => {
-        const paths = element.path.split('/')
-        let currentPath = ''
+    const grouped = group(properties, (p) => p.getPath());
+    if (showProgress) stepProgress()
 
-        paths.forEach((path, index) => {
-            currentPath += `${index === 0 ? '' : '/'}${path}`
-            if (!pathMap[currentPath]) {
-                const newNode = new TreeNode<T>(path, currentPath)
-                pathMap[currentPath] = newNode
-
-                if (index !== 0) {
-                    const parentPath = currentPath.substring(0, currentPath.lastIndexOf('/'))
-                    const parentNode = pathMap[parentPath]
-                    parentNode?.addChild(newNode)
-                    newNode.parent = parentNode
-                }
-            }
-        })
+    // Root TreeNode
+    root = new TreeNode<T>('root', '');
+    const pathMap: Record<string, TreeNode<T>> = { '': root };
 
-        element.properties.forEach(property => {
-            const currentNode = pathMap[property.getPath()]
-            const newNode = new TreeNode<T>(
-                property.getLabel(),
-                property.getPath(),
-                map?.(property) ?? property as T
-            )
+    // Process grouped entries
+    const groupedEntries = entries(grouped);
+    if (showProgress) stepProgress()
 
-            currentNode?.addChild(newNode)
-            newNode.parent = currentNode
-        })
-    })
+    if (showProgress) startProgress(`Processing ${groupedEntries.length} properties`, groupedEntries.length)
+    for (const [path, props] of groupedEntries) {
+        const paths = path.split('/');
+        let currentPath = '';
 
-    const rootChildren = pathMap[''].children
-    return rootChildren && rootChildren.length > 0 ? rootChildren : root.children
-}
+        // Create nodes for the path hierarchy
+        for (let i = 0; i < paths.length; i++) {
+            currentPath = paths.slice(0, i + 1).join('/');
+            if (!pathMap[currentPath]) {
+                const newNode = new TreeNode<T>(paths[i], currentPath);
+                pathMap[currentPath] = newNode;
+
+                if (i > 0) {
+                    const parentPath = paths.slice(0, i).join('/');
+                    const parentNode = pathMap[parentPath];
+                    parentNode?.addChild(newNode);
+                    newNode.parent = parentNode;
+                }
+            }
+        }
+
+        // Add property nodes to the current path
+        const currentNode = pathMap[path];
+        if (currentNode) {
+            for (const property of props) {
+                const newNode = new TreeNode<T>(
+                    property.getLabel(),
+                    property.getPath(),
+                    map?.(property) ?? (property as T)
+                );
+                currentNode.addChild(newNode);
+                newNode.parent = currentNode;
+            }
+        }
+        if (showProgress) stepProgress()
+    }
+    if (showProgress) finishProgress()
+    if (showProgress) finishProgress()
+
+    // Return root children or an empty array if none exist
+    return root.children.length > 0 ? root.children : [];
+};
 
 export const getPropertiesPathsTree = (node: DzNode): TreeNode<string>[] => {
     let items = entries(group(sceneHelper.getPropertiesOnNode(node), (p) => p.getPath())).map(x => ({ path: x[0], properties: x[1] }))

package/src/helpers/string-helper.ts

@@ -18,6 +18,10 @@ export const remove = (source: string, search: string): string => {
     return source.replace(search, "")
 }
 
+export const trimEnd = (source: string, search: string): string => {
+    return source.endsWith(search) ? source.slice(0, -search.length) : source
+}
+
 export const count = (source: string, search: string): number => {
     return source.split(search).length - 1
 }

package/src/shared/set-keyboard-shortcut.ts

@@ -63,14 +63,14 @@ class KeyboardShortcutDialog extends BasicDialog {
 
         add.group('Assign Keyboard Shortcut').build((layout) => {
             layout.spacing = 5
-            add.edit().value(model.actionLabel).readOnly(true)
+            add.edit().value(model.actionLabel).readOnly()
             add.comboEdit().focus().items([...letters, ...keys]).changed(this.key).edited(this.key)
             add.checkbox('Control').value(model.control)
             add.checkbox('Option / Alt').value(model.alt)
             add.checkbox('Shift').value(model.shift)
             add.checkbox('Command / Windows').value(model.windows)
             add.group('Shortcut:').style({ flat: true }).build(() => {
-                add.edit().value(model.shortcut).readOnly(true)
+                add.edit().value(model.shortcut).readOnly()
             })
         })
     }