@arsedizioni/ars-utils 21.2.269 → 21.2.271

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arsedizioni/ars-utils",
-  "version": "21.2.269",
+  "version": "21.2.271",
   "author": {
     "email": "software@arsedizioni.it",
     "name": "Fabio Buscaroli, Alberto Doria"

package/types/arsedizioni-ars-utils-help.d.ts

@@ -2,9 +2,8 @@ import * as i0 from '@angular/core';
 import { OnInit, OnDestroy, AfterViewInit } from '@angular/core';
 import { Folder, ApiResult } from '@arsedizioni/ars-utils/core';
 import { BreakpointObserver } from '@angular/cdk/layout';
-import { FlatTreeControl } from '@angular/cdk/tree';
 import { MatSidenav } from '@angular/material/sidenav';
-import { MatTreeFlatDataSource } from '@angular/material/tree';
+import { MatTree } from '@angular/material/tree';
 import * as rxjs from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 
@@ -78,19 +77,14 @@ declare class HelpViewerComponent implements OnInit, OnDestroy, AfterViewInit {
     protected indexNode: IndexInfo | undefined;
     private readonly history;
     protected readonly canGoBack: i0.Signal<boolean>;
-    /**
-   * Manage flat tree view
-   */
     private tree;
-    private treeFlattener;
-    protected treeControl: FlatTreeControl<IndexNode>;
-    protected treeData: MatTreeFlatDataSource<IndexInfo, IndexNode>;
+    readonly matTree: i0.Signal<MatTree<IndexNode, IndexNode>>;
+    /** Provides the level of a flat node to the tree component. */
+    protected readonly levelAccessor: (node: IndexNode) => number;
+    /** Flat list of all tree nodes used as the tree data source. */
+    protected readonly flatNodes: i0.WritableSignal<IndexNode[]>;
     private folders?;
-    private getChildren;
-    private getLevel;
-    private isExpandable;
     protected hasChild: (_: number, _node: IndexNode) => boolean;
-    protected transformer: (item: IndexInfo, level: number) => IndexNode;
     ngOnInit(): void;
     ngOnDestroy(): void;
     ngAfterViewInit(): void;
@@ -128,6 +122,12 @@ declare class HelpViewerComponent implements OnInit, OnDestroy, AfterViewInit {
      * and all its ancestor nodes.
      */
     private expandCurrentFolder;
+    /**
+     * Recursively flattens a nested IndexInfo tree into a depth-first ordered array of IndexNodes.
+     * @param items - Root-level nodes to flatten.
+     * @param level - Current depth level.
+     */
+    private flattenNodes;
     /**
      * Retrieves and displays a help chapter by id.
      * Optionally scrolls to an anchor or pixel offset after loading.

package/types/arsedizioni-ars-utils-ui.application.d.ts

@@ -4,8 +4,7 @@ import { Searchable, SearchBag, NameValueItem, DateInterval, SearchFilterMetadat
 import { MatFormFieldAppearance, MatFormFieldControl } from '@angular/material/form-field';
 import { MatDialogRef } from '@angular/material/dialog';
 import { DialogService } from '@arsedizioni/ars-utils/ui';
-import { FlatTreeControl } from '@angular/cdk/tree';
-import { MatTreeFlatDataSource } from '@angular/material/tree';
+import { MatTree } from '@angular/material/tree';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { NgForm, ControlValueAccessor, NgControl } from '@angular/forms';
 import { MatCheckboxChange } from '@angular/material/checkbox';
@@ -383,23 +382,22 @@ declare class SelectTreeDialogComponent implements OnInit {
     /** Dialog configuration, injected and exposed as a signal. */
     protected readonly dialogData: _angular_core.WritableSignal<SelectTreeDialogData>;
     private readonly tree;
-    private treeFlattener;
-    protected treeControl: FlatTreeControl<SelectableNode>;
-    protected treeData: MatTreeFlatDataSource<ItemNode, SelectableNode>;
+    /** Reference to the Material tree component. */
+    protected readonly matTree: _angular_core.Signal<MatTree<ItemNode, ItemNode>>;
+    /** Provides children of a tree node to the tree component. */
+    protected readonly childrenAccessor: (node: ItemNode) => ItemNode[];
+    /** Root nodes used as the tree data source. */
+    protected readonly treeNodes: _angular_core.WritableSignal<ItemNode[]>;
     /** Currently selected tree node. */
-    protected readonly currentNode: _angular_core.WritableSignal<SelectableNode>;
+    protected readonly currentNode: _angular_core.WritableSignal<ItemNode>;
+    /** Current filter text, bound via ngModel. */
     protected filterText: string;
-    protected filteredItems: SelectableNode[];
-    protected filterIndex: number;
+    /** Nodes matching the current filter text. */
+    protected readonly filteredItems: _angular_core.WritableSignal<ItemNode[]>;
+    /** Index of the currently highlighted filtered node. */
+    protected readonly filterIndex: _angular_core.WritableSignal<number>;
     protected readonly canAppend: _angular_core.WritableSignal<boolean>;
-    /**
-     * Manage flat tree view
-     */
-    private getChildren;
-    private getLevel;
-    private isExpandable;
-    protected hasChild: (_: number, _node: SelectableNode) => boolean;
-    protected transformer: (item: ItemNode, level: number) => SelectableNode;
+    protected hasChild: (_: number, node: ItemNode) => boolean;
     ngOnInit(): void;
     /**
      * Confirm the current selection and close the dialog.
@@ -410,7 +408,7 @@ declare class SelectTreeDialogComponent implements OnInit {
      * @param e - The mouse event (propagation is stopped).
      * @param node - The node that was clicked.
      */
-    protected select(e: MouseEvent, node: SelectableNode): void;
+    protected select(e: MouseEvent, node: ItemNode): void;
     /**
      * Clear the active filter text.
      */
@@ -426,9 +424,22 @@ declare class SelectTreeDialogComponent implements OnInit {
     protected nextFiltered(): void;
     /**
      * Expand a node and all of its parent nodes.
-     * @param node - The selectable node to expand.
+     * @param node - The node to expand.
+     * @returns Always false.
+     */
+    expand(node: ItemNode): boolean;
+    /**
+     * Recursively get all nodes in depth-first order.
+     * @param nodes - Root nodes to traverse.
+     * @param result - Accumulator array.
+     */
+    private getAllNodes;
+    /**
+     * Recursively find a node by id.
+     * @param nodes - Nodes to search.
+     * @param id - The id to find.
      */
-    expand(node: SelectableNode): boolean;
+    private findInTree;
     /**
      * Append a new node to the tree.
      * @param node - The node to insert.