From 7c94608b6fa6755bbcafb12c8f349bef19702f3e Mon Sep 17 00:00:00 2001 From: Matt Karl Date: Sun, 10 Jul 2022 07:03:59 -0400 Subject: [PATCH] Chore: Remove Renderer cast in Accessibility (#8476) --- packages/accessibility/src/AccessibilityManager.ts | 4 ++-- packages/core/global.d.ts | 6 ++++++ packages/core/src/IRenderer.ts | 2 +- packages/events/global.d.ts | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/accessibility/src/AccessibilityManager.ts b/packages/accessibility/src/AccessibilityManager.ts index c63a95237d..b5db844596 100644 --- a/packages/accessibility/src/AccessibilityManager.ts +++ b/packages/accessibility/src/AccessibilityManager.ts @@ -6,7 +6,7 @@ import type { Rectangle } from '@pixi/math'; import type { Container } from '@pixi/display'; import { ExtensionType } from '@pixi/core'; import type { IAccessibleHTMLElement } from './accessibleTarget'; -import type { IRenderer, ExtensionMetadata, Renderer } from '@pixi/core'; +import type { IRenderer, ExtensionMetadata } from '@pixi/core'; import { FederatedEvent } from '@pixi/events'; // add some extra variables to the container.. @@ -504,7 +504,7 @@ export class AccessibilityManager private _dispatchEvent(e: UIEvent, type: string[]): void { const { displayObject: target } = e.target as IAccessibleHTMLElement; - const boundry = (this.renderer as Renderer).events.rootBoundary; + const boundry = this.renderer.events.rootBoundary; const event: FederatedEvent = Object.assign(new FederatedEvent(boundry), { target }); boundry.rootTarget = this.renderer.lastObjectRendered as DisplayObject; diff --git a/packages/core/global.d.ts b/packages/core/global.d.ts index c9f994eb65..29ad46e51b 100644 --- a/packages/core/global.d.ts +++ b/packages/core/global.d.ts @@ -36,6 +36,12 @@ declare namespace GlobalMixins } + // eslint-disable-next-line @typescript-eslint/no-empty-interface + interface IRenderer + { + + } + // eslint-disable-next-line @typescript-eslint/no-empty-interface interface IRendererPlugins { diff --git a/packages/core/src/IRenderer.ts b/packages/core/src/IRenderer.ts index b23f6c8249..8c36737b5f 100644 --- a/packages/core/src/IRenderer.ts +++ b/packages/core/src/IRenderer.ts @@ -78,7 +78,7 @@ export interface IRendererRenderOptions * Starard Interface for a Pixi renderer. * @memberof PIXI */ -export interface IRenderer extends SystemManager +export interface IRenderer extends SystemManager, GlobalMixins.IRenderer { resize(width: number, height: number): void; diff --git a/packages/events/global.d.ts b/packages/events/global.d.ts index 2f3a7df413..786f889e4a 100644 --- a/packages/events/global.d.ts +++ b/packages/events/global.d.ts @@ -7,6 +7,11 @@ declare namespace GlobalMixins } + interface IRenderer + { + readonly events: import('@pixi/events').EventSystem; + } + interface Renderer { readonly events: import('@pixi/events').EventSystem;