Merge branch 'angular:master' into tabs

Author: zelliott

.circleci/config.yml

@@ -472,7 +472,6 @@ jobs:
       - *yarn_install
       - *setup_bazel_binary
 
-      - run: yarn integration-tests:partial-ivy
       - run: yarn integration-tests
       - run:
           name: Running size integration tests (failures are reported in Slack only).
@@ -482,9 +481,47 @@ jobs:
       - *slack_notify_on_failure
 
   # ----------------------------------------------------------------------------
-  # Job that runs all integration tests against Angular snapshot builds.
+  # Job that runs the AOT linker tests.
   # ----------------------------------------------------------------------------
-  integration_tests_snapshot:
+  linker_aot_test:
+    <<: *job_defaults
+    resource_class: xlarge
+    environment:
+      GCP_DECRYPT_TOKEN: *gcp_decrypt_token
+    steps:
+      - checkout_and_rebase
+      - *restore_cache
+      - *setup_bazel_ci_config
+      - *setup_bazel_remote_execution
+      - *yarn_install
+      - *setup_bazel_binary
+
+      - run: yarn test-linker-aot
+      - *slack_notify_on_failure
+
+  # ----------------------------------------------------------------------------
+  # Job that runs the JIT linker tests.
+  # ----------------------------------------------------------------------------
+  linker_jit_test:
+    <<: *job_defaults
+    resource_class: xlarge
+    environment:
+      GCP_DECRYPT_TOKEN: *gcp_decrypt_token
+    steps:
+      - checkout_and_rebase
+      - *restore_cache
+      - *setup_bazel_ci_config
+      - *setup_bazel_remote_execution
+      - *yarn_install
+      - *setup_bazel_binary
+
+      - run: yarn test-linker-jit
+      - *slack_notify_on_failure
+
+  # ----------------------------------------------------------------------------
+  # Job that runs both AOT and JIT linker tests against Angular snapshot builds.
+  # ----------------------------------------------------------------------------
+  snapshot_linker_tests:
     <<: *job_defaults
     resource_class: xlarge
     environment:
@@ -498,7 +535,8 @@ jobs:
       - *yarn_install_loose_lockfile
       - *setup_bazel_binary
 
-      - run: yarn integration-tests:partial-ivy
+      - run: yarn test-linker-aot
+      - run: yarn test-linker-jit
       - *slack_notify_on_failure
 
   # ----------------------------------------------------------------------------
@@ -544,6 +582,10 @@ workflows:
           filters: *ignore_presubmit_branch_filter
       - integration_tests:
           filters: *ignore_presubmit_branch_filter
+      - linker_aot_test:
+          filters: *ignore_presubmit_branch_filter
+      - linker_jit_test:
+          filters: *ignore_presubmit_branch_filter
       - tests_local_browsers:
           filters: *ignore_presubmit_branch_filter
       - tests_browserstack:
@@ -578,7 +620,7 @@ workflows:
           filters: *only_main_branch_filter
       - mdc_snapshot_test_cronjob:
           filters: *only_main_branch_filter
-      - integration_tests_snapshot:
+      - snapshot_linker_tests:
           filters: *only_main_branch_filter
 
     triggers:

integration/linker/BUILD.bazel

@@ -19,5 +19,4 @@ nodejs_test(
         "@npm//glob",
     ],
     entry_point = "link-packages-test.mjs",
-    tags = ["partial-compilation-integration"],
 )

package.json

@@ -40,8 +40,9 @@
     "approve-api": "node ./scripts/approve-api-golden.js",
     "approve-size-tests": "node ./scripts/approve-size-golden.js",
     "integration-tests": "bazel test --test_tag_filters=-linker-integration-test --build_tests_only -- //integration/... -//integration/size-test/...",
-    "integration-tests:partial-ivy": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only -- //integration/... //src/...",
     "integration-tests:size-test": "bazel test //integration/size-test/...",
+    "test-linker-aot": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only -- //integration/... //src/...",
+    "test-linker-jit": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only --//tools:force_partial_jit_compilation=True  -- //integration/... //src/...",
     "check-mdc-tests": "ts-node --project scripts/tsconfig.json scripts/check-mdc-tests.ts",
     "check-mdc-exports": "ts-node --project scripts/tsconfig.json scripts/check-mdc-exports.ts",
     "check-tooling-setup": "yarn tsc --project tools/tsconfig.json && yarn tsc --project .ng-dev/tsconfig.json",

src/cdk-experimental/column-resize/resizable.ts

@@ -67,6 +67,7 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
   protected abstract readonly changeDetectorRef: ChangeDetectorRef;
 
   private _viewInitialized = false;
+  private _isDestroyed = false;
 
   /** The minimum width to allow the column to be sized to. */
   get minWidthPx(): number {
@@ -100,13 +101,15 @@ export abstract class Resizable<HandleComponent extends ResizeOverlayHandle>
     this._appendInlineHandle();
 
     this.styleScheduler.scheduleEnd(() => {
+      if (this._isDestroyed) return;
       this._viewInitialized = true;
       this._applyMinWidthPx();
       this._applyMaxWidthPx();
     });
   }
 
   ngOnDestroy(): void {
+    this._isDestroyed = true;
     this.destroyed.next();
     this.destroyed.complete();
     this.inlineHandle?.remove();

src/cdk-experimental/dialog/dialog.spec.ts

@@ -13,7 +13,6 @@ import {
   Directive,
   Inject,
   Injector,
-  NgModule,
   TemplateRef,
   ViewChild,
   ViewContainerRef,
@@ -45,7 +44,16 @@ describe('Dialog', () => {
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
-      imports: [DialogModule, DialogTestModule],
+      imports: [DialogModule, NoopAnimationsModule],
+      declarations: [
+        ComponentWithChildViewContainer,
+        ComponentWithTemplateRef,
+        PizzaMsg,
+        ContentElementDialog,
+        DialogWithInjectedData,
+        DialogWithoutFocusableElements,
+        DirectiveWithViewContainer,
+      ],
       providers: [{provide: Location, useClass: SpyLocation}],
     });
 
@@ -1138,7 +1146,7 @@ describe('Dialog with a parent Dialog', () => {
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
-      imports: [DialogModule, DialogTestModule],
+      imports: [DialogModule, NoopAnimationsModule],
       declarations: [ComponentThatProvidesMatDialog],
       providers: [
         {
@@ -1315,32 +1323,3 @@ class DialogWithoutFocusableElements {}
   encapsulation: ViewEncapsulation.ShadowDom,
 })
 class ShadowDomComponent {}
-
-// Create a real (non-test) NgModule as a workaround for
-// https://github.com/angular/angular/issues/10760
-const TEST_DIRECTIVES = [
-  ComponentWithChildViewContainer,
-  ComponentWithTemplateRef,
-  PizzaMsg,
-  DirectiveWithViewContainer,
-  ComponentWithOnPushViewContainer,
-  ContentElementDialog,
-  DialogWithInjectedData,
-  DialogWithoutFocusableElements,
-  ShadowDomComponent,
-];
-
-@NgModule({
-  imports: [DialogModule, NoopAnimationsModule],
-  exports: TEST_DIRECTIVES,
-  declarations: TEST_DIRECTIVES,
-  entryComponents: [
-    ComponentWithChildViewContainer,
-    ComponentWithTemplateRef,
-    PizzaMsg,
-    ContentElementDialog,
-    DialogWithInjectedData,
-    DialogWithoutFocusableElements,
-  ],
-})
-class DialogTestModule {}

src/cdk/drag-drop/directives/drag.spec.ts

@@ -5972,6 +5972,63 @@ describe('CdkDrag', () => {
       }),
     );
 
+    it('should return the last item to initial position when dragging back into a container with disabled sorting', fakeAsync(() => {
+      const fixture = createComponent(ConnectedDropZones);
+      fixture.detectChanges();
+
+      const groups = fixture.componentInstance.groupedDragItems;
+      const dropZones = fixture.componentInstance.dropInstances.map(d => d.element.nativeElement);
+      const lastIndex = groups[0].length - 1;
+      const lastItem = groups[0][lastIndex];
+      const targetRect = groups[1][2].element.nativeElement.getBoundingClientRect();
+
+      fixture.componentInstance.dropInstances.first.sortingDisabled = true;
+      startDraggingViaMouse(fixture, lastItem.element.nativeElement);
+
+      const placeholder = dropZones[0].querySelector('.cdk-drag-placeholder')!;
+
+      expect(placeholder).toBeTruthy();
+      expect(dropZones[0].contains(placeholder))
+        .withContext('Expected placeholder to be inside the first container.')
+        .toBe(true);
+      expect(getElementIndexByPosition(placeholder, 'top'))
+        .withContext('Expected placeholder to be at item index.')
+        .toBe(lastIndex);
+
+      dispatchMouseEvent(document, 'mousemove', targetRect.left + 1, targetRect.top + 1);
+      fixture.detectChanges();
+
+      expect(dropZones[1].contains(placeholder))
+        .withContext('Expected placeholder to be inside second container.')
+        .toBe(true);
+      expect(getElementIndexByPosition(placeholder, 'top'))
+        .withContext('Expected placeholder to be at the target index.')
+        .toBe(3);
+
+      const firstInitialSiblingRect = groups[0][0].element.nativeElement.getBoundingClientRect();
+
+      // Return the item to an index that is different from the initial one.
+      dispatchMouseEvent(
+        document,
+        'mousemove',
+        firstInitialSiblingRect.left,
+        firstInitialSiblingRect.top,
+      );
+      fixture.detectChanges();
+
+      expect(dropZones[0].contains(placeholder))
+        .withContext('Expected placeholder to be back inside first container.')
+        .toBe(true);
+      expect(getElementIndexByPosition(placeholder, 'top'))
+        .withContext('Expected placeholder to be back at the initial index.')
+        .toBe(lastIndex);
+
+      dispatchMouseEvent(document, 'mouseup');
+      fixture.detectChanges();
+
+      expect(fixture.componentInstance.droppedSpy).not.toHaveBeenCalled();
+    }));
+
     it(
       'should toggle a class when dragging an item inside a wrapper component component ' +
         'with OnPush change detection',

src/cdk/drag-drop/drop-list-ref.ts

@@ -299,6 +299,16 @@ export class DropListRef<T = any> {
       newPositionReference = activeDraggables[newIndex + 1];
     }
 
+    // If we didn't find a new position reference, it means that either the item didn't start off
+    // in this container, or that the item requested to be inserted at the end of the list.
+    if (
+      !newPositionReference &&
+      (newIndex == null || newIndex === -1 || newIndex < activeDraggables.length - 1) &&
+      this._shouldEnterAsFirstChild(pointerX, pointerY)
+    ) {
+      newPositionReference = activeDraggables[0];
+    }
+
     // Since the item may be in the `activeDraggables` already (e.g. if the user dragged it
     // into another container and back again), we have to ensure that it isn't duplicated.
     if (currentIndex > -1) {
@@ -311,10 +321,6 @@ export class DropListRef<T = any> {
       const element = newPositionReference.getRootElement();
       element.parentElement!.insertBefore(placeholder, element);
       activeDraggables.splice(newIndex, 0, item);
-    } else if (this._shouldEnterAsFirstChild(pointerX, pointerY)) {
-      const reference = activeDraggables[0].getRootElement();
-      reference.parentNode!.insertBefore(placeholder, reference);
-      activeDraggables.unshift(item);
     } else {
       coerceElement(this.element).appendChild(placeholder);
       activeDraggables.push(item);

src/cdk/overlay/dispatchers/overlay-keyboard-dispatcher.spec.ts

@@ -1,7 +1,7 @@
 import {TestBed, inject} from '@angular/core/testing';
 import {dispatchKeyboardEvent} from '../../testing/private';
 import {ESCAPE} from '@angular/cdk/keycodes';
-import {Component, NgModule} from '@angular/core';
+import {Component} from '@angular/core';
 import {OverlayModule, Overlay} from '../index';
 import {OverlayKeyboardDispatcher} from './overlay-keyboard-dispatcher';
 import {ComponentPortal} from '@angular/cdk/portal';
@@ -12,7 +12,8 @@ describe('OverlayKeyboardDispatcher', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule, TestComponentModule],
+      imports: [OverlayModule],
+      declarations: [TestComponent],
     });
 
     inject([OverlayKeyboardDispatcher, Overlay], (kbd: OverlayKeyboardDispatcher, o: Overlay) => {
@@ -184,12 +185,3 @@ describe('OverlayKeyboardDispatcher', () => {
   template: 'Hello',
 })
 class TestComponent {}
-
-// Create a real (non-test) NgModule as a workaround for
-// https://github.com/angular/angular/issues/10760
-@NgModule({
-  exports: [TestComponent],
-  declarations: [TestComponent],
-  entryComponents: [TestComponent],
-})
-class TestComponentModule {}