Merge remote-tracking branch 'upstream/cdk-tree-revamp' into cdk-tree-revamp-merge2

Author: zarend

src/material/tree/node.ts

@@ -57,7 +57,15 @@ function isLegacyTreeKeyManager<T extends TreeKeyManagerItem>(
   },
 })
 export class MatTreeNode<T, K = T> extends CdkTreeNode<T, K> implements OnInit, OnDestroy {
-  /** Tabindex of the node. */
+  /**
+   * The tabindex of the tree node.
+   *
+   * @deprecated By default MatTreeNode manages focus using TreeKeyManager instead of tabIndex.
+   *   Recommend to avoid setting tabIndex directly to prevent TreeKeyManager form getting into
+   *   an unexpected state. Tabindex to be removed in a future version.
+   * @breaking-change 19.0.0 Remove this attribute.
+   */
+
   @Input({
     transform: (value: unknown) => (value == null ? 0 : numberAttribute(value)),
   })
@@ -70,15 +78,6 @@ export class MatTreeNode<T, K = T> extends CdkTreeNode<T, K> implements OnInit,
   }
   private _tabIndex: number;
 
-  /**
-   * The tabindex of the tree node.
-   *
-   * @deprecated By default MatTreeNode manages focus using TreeKeyManager instead of tabIndex.
-   *   Recommend to avoid setting tabIndex directly to prevent TreeKeyManager form getting into
-   *   an unexpected state. Tabindex to be removed in a future version.
-   * @breaking-change 19.0.0 Remove this attribute.
-   */
-
   /**
    * The default tabindex of the tree node.
    *

tools/public_api_guard/material/tree.md

@@ -132,6 +132,7 @@ export class MatTreeNode<T, K = T> extends CdkTreeNode<T, K> implements OnInit,
     ngOnDestroy(): void;
     // (undocumented)
     ngOnInit(): void;
+    // @deprecated
     get tabIndex(): number;
     set tabIndex(value: number);
     // (undocumented)