From 5e152a0e908858a6bc64c50b8c2caa9a998d0756 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sun, 25 Aug 2024 18:41:54 +1000 Subject: [PATCH] feat: use GetClientRectConfig interface --- src/Container.ts | 11 ++--------- src/Shape.ts | 9 ++------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Container.ts b/src/Container.ts index d7bb5494..dfffb0cd 100644 --- a/src/Container.ts +++ b/src/Container.ts @@ -2,7 +2,7 @@ import { Factory } from './Factory'; import { Node, NodeConfig } from './Node'; import { getNumberValidator } from './Validators'; -import { GetSet, IRect } from './types'; +import { GetClientRectConfig, GetSet, IRect } from './types'; import { Shape } from './Shape'; import { HitCanvas, SceneCanvas } from './Canvas'; import { SceneContext } from './Context'; @@ -440,14 +440,7 @@ export abstract class Container< } } - getClientRect( - config: { - skipTransform?: boolean; - skipShadow?: boolean; - skipStroke?: boolean; - relativeTo?: Container; - } = {} - ): IRect { + getClientRect(config: GetClientRectConfig = {}): IRect { var skipTransform = config.skipTransform; var relativeTo = config.relativeTo; diff --git a/src/Shape.ts b/src/Shape.ts index e34abbfd..45108c27 100644 --- a/src/Shape.ts +++ b/src/Shape.ts @@ -14,7 +14,7 @@ import { Context, SceneContext } from './Context'; import { _registerNode } from './Global'; import * as PointerEvents from './PointerEvents'; -import { GetSet, Vector2d } from './types'; +import { GetClientRectConfig, GetSet, Vector2d } from './types'; import { HitCanvas, SceneCanvas } from './Canvas'; // hack from here https://stackoverflow.com/questions/52667959/what-is-the-purpose-of-bivariancehack-in-typescript-types/52668133#52668133 @@ -82,12 +82,7 @@ export interface ShapeConfig extends NodeConfig { perfectDrawEnabled?: boolean; } -export interface ShapeGetClientRectConfig { - skipTransform?: boolean; - skipShadow?: boolean; - skipStroke?: boolean; - relativeTo?: Node; -} +export interface ShapeGetClientRectConfig extends GetClientRectConfig {} export type FillFuncOutput = | void