forty-cdk 0.3.0 → 0.4.0

package/fesm2022/forty-cdk-tree.mjs

@@ -232,9 +232,27 @@ function injectTreeItemContext(piece) {
  * Library fallback for tree defaults, read at the root injector when no
  * consumer has called `provideForTreeDefaults`. Exported for the shared
  * defaults contract spec; not re-exported from the primitive's public entry.
+ *
+ * The drag announcement formatters mirror the lift / move / drop / cancel
+ * cadence the drag-drop and listbox coordinators use, so a consumer hears
+ * consistent reorder announcements across primitives. Defining them inside the
+ * tree's own defaults (rather than importing `FOR_DRAG_DROP_DEFAULTS` /
+ * `FOR_LISTBOX_DEFAULTS`) keeps `[forTreeNodeDrag]` from pulling in those
+ * primitives.
  */
 const FOR_TREE_FALLBACK_DEFAULTS = {
     selectionFollowsFocus: false,
+    dragAnnounceLift: (label) => `Picked up ${label}. Use arrow keys to move, Space to drop, Escape to cancel.`,
+    dragAnnounceMove: (label, parentLabel, position, total) => {
+        const parentPart = parentLabel ? `under ${parentLabel}, ` : 'at root, ';
+        return `${label}: ${parentPart}position ${position} of ${total}.`;
+    },
+    dragAnnounceDrop: (label, parentLabel, position, total) => {
+        const parentPart = parentLabel ? `under ${parentLabel}, ` : 'at root, ';
+        return `Dropped ${label} ${parentPart}position ${position} of ${total}.`;
+    },
+    dragAnnounceCancel: (label) => `Cancelled. ${label} returned to its original position.`,
+    dragAnnounceInvalid: (label) => `Cannot drop ${label} here.`,
 };
 const { token, provideDefaults } = createDefaults('FOR_TREE_DEFAULTS', FOR_TREE_FALLBACK_DEFAULTS);
 /** Token holding the resolved tree defaults for the current scope. */
@@ -881,34 +899,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImpor
                 }]
         }], ctorParameters: () => [], propDecorators: { value: [{ type: i0.Input, args: [{ isSignal: true, alias: "value", required: false }] }, { type: i0.Output, args: ["valueChange"] }], expanded: [{ type: i0.Input, args: [{ isSignal: true, alias: "expanded", required: false }] }, { type: i0.Output, args: ["expandedChange"] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: false }] }], orientation: [{ type: i0.Input, args: [{ isSignal: true, alias: "orientation", required: false }] }], selectionMode: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectionMode", required: false }] }], cascade: [{ type: i0.Input, args: [{ isSignal: true, alias: "cascade", required: false }] }], descendantsOf: [{ type: i0.Input, args: [{ isSignal: true, alias: "descendantsOf", required: false }] }], totalCount: [{ type: i0.Input, args: [{ isSignal: true, alias: "totalCount", required: false }] }], visibleRange: [{ type: i0.Input, args: [{ isSignal: true, alias: "visibleRange", required: false }] }], scrollToIndex: [{ type: i0.Output, args: ["scrollToIndex"] }], ariaLabel: [{ type: i0.Input, args: [{ isSignal: true, alias: "ariaLabel", required: false }] }], _dirInput: [{ type: i0.Input, args: [{ isSignal: true, alias: "dir", required: false }] }], selectionFollowsFocus: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectionFollowsFocus", required: false }] }] } });
 
-/**
- * Screen-reader announcement strings for `ForTreeNodeDrag`. Kept framework-free and
- * separate from the directive so the live-region copy lives in one place and can be unit
- * tested without rendering the tree. Not part of the public API.
- */
-/** Spoken when a node is picked up (assertive). */
-function announceTreeLift(label) {
-    return `Picked up ${label}. Use arrow keys to move, Space to drop, Escape to cancel.`;
-}
-/** Spoken on each intermediate move while a node is lifted (polite). */
-function announceTreeMove(label, parentLabel, position, total) {
-    const parentPart = parentLabel ? `under ${parentLabel}, ` : 'at root, ';
-    return `${label}: ${parentPart}position ${position} of ${total}.`;
-}
-/** Spoken when a node is committed to its new position (assertive). */
-function announceTreeDrop(label, parentLabel, position, total) {
-    const parentPart = parentLabel ? `under ${parentLabel}, ` : 'at root, ';
-    return `Dropped ${label} ${parentPart}position ${position} of ${total}.`;
-}
-/** Spoken when a lift is cancelled and the node returns to its origin (assertive). */
-function announceTreeCancel(label) {
-    return `Cancelled. ${label} returned to its original position.`;
-}
-/** Spoken when a `canDrop` veto rejects the attempted drop (assertive). */
-function announceTreeInvalid(label) {
-    return `Cannot drop ${label} here.`;
-}
-
 /**
  * Resolves the action for a key press while a node is lifted, honoring writing direction for
  * the depth keys (ArrowRight deepens in LTR, ArrowLeft deepens in RTL). Cancel / commit are
@@ -1056,6 +1046,7 @@ class ForTreeNodeDrag {
     #isBrowser = isPlatformBrowser(inject(PLATFORM_ID));
     #announcer = inject(LiveAnnouncer);
     #destroyRef = inject(DestroyRef);
+    #defaults = inject(FOR_TREE_DEFAULTS);
     /** Disables all drag interactions on this tree. */
     disabled = input(false, { ...(ngDevMode ? { debugName: "disabled" } : /* istanbul ignore next */ {}), transform: booleanAttribute });
     /**
@@ -1270,7 +1261,7 @@ class ForTreeNodeDrag {
         this.#desiredLevel = entry.handle.level();
         this._dragging.set(true);
         this.#publishDropTarget(rows, this.#desiredLevel);
-        this.#announcer.announce(announceTreeLift(this.#label), 'assertive');
+        this.#announcer.announce(this.#defaults.dragAnnounceLift(this.#label), 'assertive');
     }
     #publishDropTarget(rows, level) {
         this._dropTargetValid.set(true);
@@ -1294,19 +1285,20 @@ class ForTreeNodeDrag {
         };
         const veto = this.canDrop();
         if (veto !== undefined && !veto(event)) {
-            this.#announcer.announce(announceTreeInvalid(this.#label), 'assertive');
-            this.#cancelSession(true);
+            this.#restoreExpansion();
+            this.#announcer.announce(this.#defaults.dragAnnounceInvalid(this.#label), 'assertive');
+            this.#clearSession();
             return;
         }
         this.#restoreExpansion();
         this.nodeDrop.emit(event);
-        this.#announcer.announce(announceTreeDrop(this.#label, parentLabel, target.index + 1, target.siblingCount + 1), 'assertive');
+        this.#announcer.announce(this.#defaults.dragAnnounceDrop(this.#label, parentLabel, target.index + 1, target.siblingCount + 1), 'assertive');
         this.#clearSession();
     }
     #cancelSession(restore) {
         if (restore) {
             this.#restoreExpansion();
-            this.#announcer.announce(announceTreeCancel(this.#label), 'assertive');
+            this.#announcer.announce(this.#defaults.dragAnnounceCancel(this.#label), 'assertive');
         }
         this.#clearSession();
     }
@@ -1340,7 +1332,7 @@ class ForTreeNodeDrag {
         this.#desiredLevel = target.level;
         this.#publishDropTarget(rows, target.level);
         const parentLabel = treeParentLabel(visible, target.parentValue);
-        this.#announcer.announce(announceTreeMove(this.#label, parentLabel, target.index + 1, target.siblingCount + 1), 'polite');
+        this.#announcer.announce(this.#defaults.dragAnnounceMove(this.#label, parentLabel, target.index + 1, target.siblingCount + 1), 'polite');
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: ForTreeNodeDrag, deps: [], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "22.0.2", type: ForTreeNodeDrag, isStandalone: true, selector: "[forTreeNodeDrag]", inputs: { disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: false, transformFunction: null }, canDrop: { classPropertyName: "canDrop", publicName: "canDrop", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { nodeDrop: "nodeDrop" }, host: { properties: { "attr.data-dragging": "_dragging() ? \"\" : null", "attr.data-drop-target": "_dropTargetValid() ? \"\" : null", "style.--for-tree-drop-level": "_dropLevel()" } }, providers: [{ provide: FOR_TREE_NODE_DRAG_CONTEXT, useExisting: ForTreeNodeDrag }], exportAs: ["forTreeNodeDrag"], ngImport: i0 });