feat: remove the Event service provider and the animation service

tom-wegener · tom-wegener · commit ca7c47b2066b · 2025-09-03T11:11:44.000+02:00
provider and just provide them in root
diff --git a/src/breadcrumb/breadcrumb.component.ts b/src/breadcrumb/breadcrumb.component.ts
@@ -18,7 +18,7 @@ import { I18n } from "carbon-components-angular/i18n";
 import { NgClass, NgTemplateOutlet } from "@angular/common";
 import { IconDirective } from "carbon-components-angular/icon";
 import { OverflowMenu } from "carbon-components-angular/dialog";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import {  EventService } from "carbon-components-angular/utils";
 
 const MINIMUM_OVERFLOW_THRESHOLD = 4;
 
@@ -129,7 +129,7 @@ const MINIMUM_OVERFLOW_THRESHOLD = 4;
 	`,
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
-	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
+	providers: [EventService],
 	imports: [NgClass, BreadcrumbItemComponent, NgTemplateOutlet, IconDirective, OverflowMenu]
 })
 export class Breadcrumb implements AfterContentInit {
diff --git a/src/code-snippet/code-snippet.component.ts b/src/code-snippet/code-snippet.component.ts
@@ -10,7 +10,7 @@ import {
 
 import { BaseIconButton } from "carbon-components-angular/button";
 import { I18n } from "carbon-components-angular/i18n";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 import { NgTemplateOutlet, NgClass, NgStyle } from "@angular/common";
 import { IconDirective } from "carbon-components-angular/icon";
 import { IconButton } from "carbon-components-angular/button";
@@ -141,7 +141,7 @@ export enum SnippetType {
 	`,
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
-	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
+	providers: [EventService],
 	imports: [NgTemplateOutlet, NgClass, NgStyle, IconDirective, IconButton]
 })
 export class CodeSnippet extends BaseIconButton implements OnInit, AfterViewInit {
diff --git a/src/dialog/dialog.directive.ts b/src/dialog/dialog.directive.ts
@@ -15,7 +15,7 @@ import {
 } from "@angular/core";
 import { DialogService } from "./dialog.service";
 import { CloseMeta, CloseReasons, DialogConfig } from "./dialog-config.interface";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import {  EventService } from "carbon-components-angular/utils";
 import { Dialog } from "./dialog.component";
 import { fromEvent, Subscription } from "rxjs";
 
@@ -33,8 +33,7 @@ import { fromEvent, Subscription } from "rxjs";
 	exportAs: "dialog",
 	providers: [
 		DialogService,
-		EventService,
-		DOCUMENT_SERVICE_PROVIDER
+		EventService
 	],
 	standalone: true
 })
diff --git a/src/dialog/overflow-menu/overflow-menu.directive.ts b/src/dialog/overflow-menu/overflow-menu.directive.ts
@@ -10,7 +10,7 @@ import { DialogDirective } from "../dialog.directive";
 import { DialogService } from "../dialog.service";
 import { OverflowMenuPane } from "./overflow-menu-pane.component";
 import { OverflowMenuCustomPane } from "./overflow-menu-custom-pane.component";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 import { PlaceholderService } from "carbon-components-angular/placeholder";
 
 
@@ -43,7 +43,6 @@ import { PlaceholderService } from "carbon-components-angular/placeholder";
 	providers: [
 		DialogService,
 		EventService,
-		DOCUMENT_SERVICE_PROVIDER,
 		PlaceholderService
 	],
 	standalone: true
diff --git a/src/dropdown/dropdown.component.ts b/src/dropdown/dropdown.component.ts
@@ -31,7 +31,7 @@ import { DropdownService } from "./dropdown.service";
 import {
 	AnimationFrameService,
 	AnimationFrameServiceSingleton,
-	DOCUMENT_SERVICE_PROVIDER,
+
 	ElementService,
 	EventService,
 	getScrollableParents
@@ -225,8 +225,7 @@ import { PlaceholderService } from "carbon-components-angular/placeholder";
 		AnimationFrameServiceSingleton,
 		DropdownService,
 		ElementService,
-		EventService,
-		DOCUMENT_SERVICE_PROVIDER
+		EventService
 	],
 	changeDetection: ChangeDetectionStrategy.OnPush,
 	standalone: true,
diff --git a/src/slider/slider.component.ts b/src/slider/slider.component.ts
@@ -13,7 +13,7 @@ import {
 	ChangeDetectorRef
 } from "@angular/core";
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from "@angular/forms";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 import { NgClass, NgTemplateOutlet, NgStyle } from "@angular/common";
 
 /**
@@ -158,7 +158,7 @@ import { NgClass, NgTemplateOutlet, NgStyle } from "@angular/common";
 			useExisting: Slider,
 			multi: true
 		},
-		DOCUMENT_SERVICE_PROVIDER,
+
 		EventService
 	],
 	standalone: true,
diff --git a/src/tabs/base-tab-header.component.ts b/src/tabs/base-tab-header.component.ts
@@ -8,7 +8,7 @@ import {
 	HostBinding,
 	Renderer2
 } from "@angular/core";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 
 /**
  * There are two ways to create a tab, this class is a collection of features
@@ -17,7 +17,7 @@ import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angul
 @Component({
 	template: "",
 	standalone: true,
-	providers: [EventService, DOCUMENT_SERVICE_PROVIDER]
+	providers: [EventService]
 })
 export class BaseTabHeader {
 	/**
diff --git a/src/tabs/tab-header-group.component.ts b/src/tabs/tab-header-group.component.ts
@@ -15,7 +15,7 @@ import {
 } from "@angular/core";
 
 import { Subscription } from "rxjs";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 
 import { TabHeader } from "./tab-header.directive";
 import { BaseTabHeader } from "./base-tab-header.component";
@@ -84,7 +84,7 @@ import { NgClass, NgTemplateOutlet } from "@angular/common";
 		</button>
 	`,
 	standalone: true,
-	providers: [DOCUMENT_SERVICE_PROVIDER, EventService],
+	providers: [EventService],
 	imports: [NgClass, NgTemplateOutlet]
 })
 export class TabHeaderGroup extends BaseTabHeader implements AfterContentInit, OnChanges, OnInit {
diff --git a/src/tabs/tab-headers.component.ts b/src/tabs/tab-headers.component.ts
@@ -16,7 +16,7 @@ import {
 	Renderer2,
 	EventEmitter
 } from "@angular/core";
-import { DOCUMENT_SERVICE_PROVIDER, EventService } from "carbon-components-angular/utils";
+import { EventService } from "carbon-components-angular/utils";
 import { I18n } from "carbon-components-angular/i18n";
 
 import { BaseTabHeader } from "./base-tab-header.component";
@@ -114,7 +114,7 @@ import { NgClass, NgTemplateOutlet } from "@angular/common";
 		</button>
 	`,
 	standalone: true,
-	providers: [EventService, DOCUMENT_SERVICE_PROVIDER],
+	providers: [EventService],
 	imports: [NgClass, NgTemplateOutlet]
 })
 
diff --git a/src/utils/animation-frame.service.ts b/src/utils/animation-frame.service.ts
@@ -5,7 +5,7 @@ import {
 } from "@angular/core";
 import { Observable, Subject, from } from "rxjs";
 
-@Injectable()
+@Injectable({providedIn: "root"})
 export class AnimationFrameServiceSingleton implements OnDestroy {
 	public tick: Observable<number>;
 
diff --git a/src/utils/document.service.ts b/src/utils/document.service.ts
@@ -3,7 +3,7 @@ import { Observable, Subscription } from "rxjs";
 import { EventHandler } from "./types";
 import { getEventObservable } from "./event-observable";
 
-@Injectable()
+@Injectable({providedIn: "root"})
 export class DocumentService implements OnDestroy {
 	protected globalEvents = new Map<string, Observable<Event>>();
 
diff --git a/src/utils/public_api.ts b/src/utils/public_api.ts
@@ -26,10 +26,6 @@ export {
 	closestAttr
 } from "./utils";
 export {
-	ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER,
-	ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER_FACTORY,
-	DOCUMENT_SERVICE_PROVIDER,
-	DOCUMENT_SERVICE_PROVIDER_FACTORY,
 	UtilsModule
 } from "./utils.module";
 export { getScrollbarWidth } from "./window-tools";
diff --git a/src/utils/utils.module.ts b/src/utils/utils.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, Optional, SkipSelf, NgZone } from "@angular/core";
+import { NgModule } from "@angular/core";
 import {
 	AnimationFrameService,
 	AnimationFrameServiceSingleton
@@ -7,34 +7,8 @@ import { ElementService } from "./element.service";
 import { EventService } from "./event.service";
 import { DocumentService } from "./document.service";
 
-// either provides a new instance of DocumentService, or returns the parent
-export function DOCUMENT_SERVICE_PROVIDER_FACTORY(parentService: DocumentService) {
-	return parentService || new DocumentService();
-}
-
-// DocumentService *must* be a singleton to ensure that we handle events and other document level settings once (and only once)
-export const DOCUMENT_SERVICE_PROVIDER = {
-	provide: DocumentService,
-	deps: [[new Optional(), new SkipSelf(), DocumentService]],
-	useFactory: DOCUMENT_SERVICE_PROVIDER_FACTORY
-};
-
-// either provides a new instance of AnimationFrameServiceSingleton, or returns the parent
-export function ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER_FACTORY(parentService: AnimationFrameServiceSingleton, ngZone: NgZone) {
-	return parentService || new AnimationFrameServiceSingleton(ngZone);
-}
-
-// AnimationFrameServiceSingleton is a singleton so we don't have a ton of duplicate RAFs firing (better for scheduling)
-export const ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER = {
-	provide: AnimationFrameServiceSingleton,
-	deps: [[new Optional(), new SkipSelf(), AnimationFrameServiceSingleton], NgZone],
-	useFactory: ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER_FACTORY
-};
-
 @NgModule({
 	providers: [
-		DOCUMENT_SERVICE_PROVIDER,
-		ANIMATION_FRAME_SERVICE_SINGLETON_PROVIDER,
 		AnimationFrameServiceSingleton,
 		DocumentService,
 		AnimationFrameService,
