Skip to content

Commit 70a8f6b

Browse files
adolgachevadolgachev
authored
Merge branch 'angular:main' into select-color
2 parents faa07db + f137183 commit 70a8f6b

File tree

32 files changed

+6394
-3392
lines changed

32 files changed

+6394
-3392
lines changed

‎MODULE.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
6666
npm.npm_translate_lock(
6767
name = "npm",
6868
custom_postinstalls = {
69-
"@angular/animations": "node ../../@nginfra/angular-linking/index.mjs",
7069
"@angular/common": "node ../../@nginfra/angular-linking/index.mjs",
7170
"@angular/forms": "node ../../@nginfra/angular-linking/index.mjs",
7271
"@angular/localize": "node ../../@nginfra/angular-linking/index.mjs",

‎docs/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"npm": "Please use pnpm instead of NPM to install dependencies"
2929
},
3030
"dependencies": {
31-
"@angular/animations": "catalog:",
3231
"@angular/cdk": "workspace:*",
3332
"@angular/cdk-experimental": "workspace:*",
3433
"@angular/common": "catalog:",

‎docs/src/app/shared/header-tag-manager.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,25 @@ export class HeaderTagManager {
1919
private readonly _document = inject(DOCUMENT);
2020

2121
/**
22-
* Sets the canonical link in the header.
23-
* It supposes the header link is already present in the index.html
22+
* Sets the canonical link in the header. If the link already exists,
23+
* it will be updated. Otherwise, a new link will be created and inserted.
2424
*
2525
* The function behave invariably and will always point to angular.dev,
2626
* no matter if it's a specific version build
2727
*/
2828
setCanonical(absolutePath: string): void {
2929
const pathWithoutFragment = this._normalizePath(absolutePath).split('#')[0];
3030
const fullPath = `${MAT_ANGULAR_DEV}/${pathWithoutFragment}`;
31-
this._document.querySelector('link[rel=canonical]')?.setAttribute('href', fullPath);
31+
let canonicalLink = this._document.querySelector<HTMLLinkElement>('link[rel=canonical]');
32+
33+
if (canonicalLink) {
34+
canonicalLink.setAttribute('href', fullPath);
35+
} else {
36+
canonicalLink = this._document.createElement('link');
37+
canonicalLink.setAttribute('rel', 'canonical');
38+
canonicalLink.setAttribute('href', fullPath);
39+
this._document.head.appendChild(canonicalLink);
40+
}
3241
}
3342

3443
private _normalizePath(path: string): string {

‎docs/src/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Angular Material UI Component Library</title>
6-
<link rel="canonical" href="https://material.angular.dev">
76
<base href="/">
87

98
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

‎goldens/cdk/drag-drop/index.api.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class CdkDrag<T = any> implements AfterViewInit, OnChanges, OnDestroy {
6666
getFreeDragPosition(): Readonly<Point>;
6767
getPlaceholderElement(): HTMLElement;
6868
getRootElement(): HTMLElement;
69-
lockAxis: DragAxis;
69+
lockAxis: DragAxis | null;
7070
readonly moved: Observable<CdkDragMove<T>>;
7171
// (undocumented)
7272
static ngAcceptInputType_disabled: unknown;
@@ -259,7 +259,7 @@ export class CdkDropList<T = any> implements OnDestroy {
259259
getSortedItems(): CdkDrag[];
260260
hasAnchor: boolean;
261261
id: string;
262-
lockAxis: DragAxis;
262+
lockAxis: DragAxis | null;
263263
// (undocumented)
264264
static ngAcceptInputType_autoScrollDisabled: unknown;
265265
// (undocumented)
@@ -330,7 +330,7 @@ export interface DragDropConfig extends Partial<DragRefConfig> {
330330
// (undocumented)
331331
listOrientation?: DropListOrientation;
332332
// (undocumented)
333-
lockAxis?: DragAxis;
333+
lockAxis?: DragAxis | null;
334334
// (undocumented)
335335
previewClass?: string | string[];
336336
// (undocumented)
@@ -423,7 +423,7 @@ export class DragRef<T = any> {
423423
getRootElement(): HTMLElement;
424424
getVisibleElement(): HTMLElement;
425425
isDragging(): boolean;
426-
lockAxis: 'x' | 'y';
426+
lockAxis: 'x' | 'y' | null;
427427
readonly moved: Observable<{
428428
source: DragRef;
429429
pointerPosition: {
@@ -523,7 +523,7 @@ export class DropListRef<T = any> {
523523
isDragging(): boolean;
524524
_isOverContainer(x: number, y: number): boolean;
525525
isReceiving(): boolean;
526-
lockAxis: 'x' | 'y';
526+
lockAxis: 'x' | 'y' | null;
527527
readonly receivingStarted: Subject<{
528528
receiver: DropListRef;
529529
initiator: DropListRef;

‎integration/harness-e2e-cli/package.json‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "20.0.0",
1716
"@angular/cdk": "next",
18-
"@angular/common": "20.0.0",
19-
"@angular/compiler": "20.0.0",
20-
"@angular/core": "20.0.0",
21-
"@angular/forms": "20.0.0",
17+
"@angular/common": "20.2.0",
18+
"@angular/compiler": "20.2.0",
19+
"@angular/core": "20.2.0",
20+
"@angular/forms": "20.2.0",
2221
"@angular/material": "next",
23-
"@angular/platform-browser": "20.0.0",
24-
"@angular/router": "20.0.0",
22+
"@angular/platform-browser": "20.2.0",
23+
"@angular/router": "20.2.0",
2524
"rxjs": "^7.5.5",
2625
"tslib": "^2.3.0",
2726
"zone.js": "~0.15.0"
2827
},
2928
"devDependencies": {
30-
"@angular-devkit/build-angular": "20.0.0",
31-
"@angular/cli": "20.0.0",
32-
"@angular/compiler-cli": "20.0.0",
29+
"@angular-devkit/build-angular": "20.2.0",
30+
"@angular/cli": "20.2.0",
31+
"@angular/compiler-cli": "20.2.0",
3332
"@types/jasmine": "5.1.8",
3433
"@types/node": "22.15.33",
3534
"@types/selenium-webdriver": "3.0.26",

0 commit comments

Comments
 (0)