Skip to content

Commit 46344d8

Browse files
authored
refactor(multiple): switch DOCUMENT imports to core (#30905)
Switches all the places where we import `DOCUMENT` from `@angular/common` to be from `@angular/core` instead.
1 parent 204b289 commit 46344d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+104
-72
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {Injectable, OnDestroy, Provider, CSP_NONCE, inject} from '@angular/core';
10-
import {DOCUMENT} from '@angular/common';
9+
import {Injectable, OnDestroy, Provider, CSP_NONCE, inject, DOCUMENT} from '@angular/core';
10+
1111
import {coerceCssPixelValue} from '@angular/cdk/coercion';
1212
import {CdkTable, _CoalescedStyleScheduler, _COALESCED_STYLE_SCHEDULER} from '@angular/cdk/table';
1313

src/cdk-experimental/combobox/combobox.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@angular/cdk/overlay';
1818
import {_getEventTarget} from '@angular/cdk/platform';
1919
import {TemplatePortal} from '@angular/cdk/portal';
20-
import {DOCUMENT} from '@angular/common';
20+
2121
import {
2222
ChangeDetectorRef,
2323
Directive,
@@ -32,6 +32,7 @@ import {
3232
TemplateRef,
3333
ViewContainerRef,
3434
inject,
35+
DOCUMENT,
3536
} from '@angular/core';
3637

3738
export type AriaHasPopupValue = 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';

src/cdk-experimental/popover-edit/focus-escape-notifier.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {Injectable, NgZone, inject} from '@angular/core';
10-
import {DOCUMENT} from '@angular/common';
9+
import {Injectable, NgZone, inject, DOCUMENT} from '@angular/core';
10+
1111
import {FocusTrap, InteractivityChecker} from '@angular/cdk/a11y';
1212
import {Observable, Subject} from 'rxjs';
1313

src/cdk-experimental/table-scroll-container/table-scroll-container.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {CSP_NONCE, Directive, ElementRef, OnDestroy, OnInit, inject} from '@angular/core';
9+
import {CSP_NONCE, Directive, ElementRef, OnDestroy, OnInit, inject, DOCUMENT} from '@angular/core';
1010
import {_IdGenerator} from '@angular/cdk/a11y';
11-
import {DOCUMENT} from '@angular/common';
11+
1212
import {Directionality} from '@angular/cdk/bidi';
1313
import {_getShadowRoot} from '@angular/cdk/platform';
1414
import {

src/cdk/a11y/aria-describer/aria-describer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {DOCUMENT} from '@angular/common';
10-
import {Injectable, OnDestroy, APP_ID, inject} from '@angular/core';
9+
import {Injectable, OnDestroy, APP_ID, inject, DOCUMENT} from '@angular/core';
1110
import {Platform} from '../../platform';
1211
import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
1312
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '../../private';

src/cdk/a11y/focus-monitor/focus-monitor.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {TAB} from '../../keycodes';
22
import {Platform} from '../../platform';
3-
import {DOCUMENT} from '@angular/common';
4-
import {Component, ViewChild} from '@angular/core';
3+
import {Component, ViewChild, DOCUMENT} from '@angular/core';
54
import {ComponentFixture, TestBed, fakeAsync, flush, tick} from '@angular/core/testing';
65
import {By} from '@angular/platform-browser';
76
import {

src/cdk/a11y/focus-monitor/focus-monitor.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import {
2323
Output,
2424
AfterViewInit,
2525
inject,
26+
DOCUMENT,
2627
} from '@angular/core';
2728
import {Observable, of as observableOf, Subject, Subscription} from 'rxjs';
2829
import {takeUntil} from 'rxjs/operators';
2930
import {coerceElement} from '../../coercion';
30-
import {DOCUMENT} from '@angular/common';
31+
3132
import {InputModalityDetector, TOUCH_BUFFER_MS} from '../input-modality/input-modality-detector';
3233

3334
export type FocusOrigin = 'touch' | 'mouse' | 'keyboard' | 'program' | null;

src/cdk/a11y/focus-trap/configurable-focus-trap-factory.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {DOCUMENT} from '@angular/common';
10-
import {Injectable, Injector, NgZone, inject} from '@angular/core';
9+
import {Injectable, Injector, NgZone, inject, DOCUMENT} from '@angular/core';
1110
import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
1211
import {ConfigurableFocusTrap} from './configurable-focus-trap';
1312
import {ConfigurableFocusTrapConfig} from './configurable-focus-trap-config';

src/cdk/a11y/focus-trap/focus-trap.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Platform, _getFocusedElementPierceShadowDom} from '../../platform';
10-
import {DOCUMENT} from '@angular/common';
10+
1111
import {
1212
AfterContentInit,
1313
Directive,
@@ -23,6 +23,7 @@ import {
2323
afterNextRender,
2424
booleanAttribute,
2525
inject,
26+
DOCUMENT,
2627
} from '@angular/core';
2728
import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
2829
import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '../../private';

src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import {
77
} from './high-contrast-mode-detector';
88
import {Platform} from '../../platform';
99
import {TestBed} from '@angular/core/testing';
10-
import {Provider} from '@angular/core';
10+
import {Provider, DOCUMENT} from '@angular/core';
1111
import {A11yModule} from '../a11y-module';
12-
import {DOCUMENT} from '@angular/common';
1312

1413
describe('HighContrastModeDetector', () => {
1514
function getDetector(document: unknown, platform?: Platform) {

0 commit comments

Comments
 (0)