fix: Fix compilation issues with TypeScript 4.4

The type `ClientRect` has changed in TS4.4. This casts the assignment to ClientRect type in order to make it build with TS4.4 PiperOrigin-RevId: 395252281
material-components · Sep 7, 2021 · 7246447 · 7246447
1 parent 42d175e
commit 7246447
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 26 deletions.
diff --git a/packages/mdc-chips/action/component-ripple.ts b/packages/mdc-chips/action/component-ripple.ts
@@ -39,8 +39,8 @@ export function computePrimaryActionRippleClientRect(
  top: clientRect.top,
  right: clientRect.right,
  bottom: clientRect.bottom,
- left: clientRect.left,
- };
+ left: clientRect.left
+ } as any;
 }
 
 /**

diff --git a/packages/mdc-chips/action/test/component-ripple.test.ts b/packages/mdc-chips/action/test/component-ripple.test.ts
@@ -33,7 +33,7 @@ describe('ripple', () => {
  left: 10,
  bottom: 42,
  right: 110,
- };
+ } as any;
 
  expect(computePrimaryActionRippleClientRect(rect, '')).toEqual(rect);
  });
@@ -47,7 +47,7 @@ describe('ripple', () => {
  left: 10,
  bottom: 42,
  right: 110,
- };
+ } as any;
 
  expect(computePrimaryActionRippleClientRect(rect, 'xyz'))
  .toEqual(rect);
@@ -61,7 +61,7 @@ describe('ripple', () => {
  left: 10,
  bottom: 42,
  right: 110,
- };
+ } as any;
 
  expect(computePrimaryActionRippleClientRect(rect, '20YYpx'))
  .toEqual(rect);
@@ -75,7 +75,7 @@ describe('ripple', () => {
  left: 10,
  bottom: 42,
  right: 110,
- };
+ } as any;
 
  expect(computePrimaryActionRippleClientRect(rect, '20px')).toEqual({
  ...rect,

diff --git a/packages/mdc-chips/deprecated/chip/foundation.ts b/packages/mdc-chips/deprecated/chip/foundation.ts
@@ -35,7 +35,7 @@ const emptyClientRect = {
  right: 0,
  top: 0,
  width: 0,
-};
+} as any;
 
 enum FocusBehavior {
  SHOULD_FOCUS,
@@ -153,7 +153,7 @@ export class MDCChipFoundation extends MDCFoundation<MDCChipAdapter> {
  right: rootRect.right,
  top: rootRect.top,
  width: rootRect.width + checkmarkRect.height,
- };
+ } as any;
  }
  }
 

diff --git a/packages/mdc-menu-surface/foundation.ts b/packages/mdc-menu-surface/foundation.ts
@@ -377,20 +377,20 @@ export class MDCMenuSurfaceFoundation extends
  left: this.position.x,
  width: 0,
  height: 0,
- };
+ } as any;
  // tslint:enable:object-literal-sort-keys
  }
 
  return {
- anchorSize: anchorRect,
+ anchorSize: anchorRect!,
  bodySize,
  surfaceSize: this.dimensions,
  viewportDistance: {
  // tslint:disable:object-literal-sort-keys Positional properties are more readable when they're grouped together
- top: anchorRect.top,
- right: viewportSize.width - anchorRect.right,
- bottom: viewportSize.height - anchorRect.bottom,
- left: anchorRect.left,
+ top: anchorRect!.top,
+ right: viewportSize.width - anchorRect!.right,
+ bottom: viewportSize.height - anchorRect!.bottom,
+ left: anchorRect!.left,
  // tslint:enable:object-literal-sort-keys
  },
  viewportSize,

diff --git a/packages/mdc-ripple/foundation.ts b/packages/mdc-ripple/foundation.ts
@@ -83,7 +83,8 @@ export class MDCRippleFoundation extends MDCFoundation<MDCRippleAdapter> {
  return {
  addClass: () => undefined,
  browserSupportsCssVars: () => true,
- computeBoundingRect: () => ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ computeBoundingRect: () =>
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  containsEventTarget: () => true,
  deregisterDocumentInteractionHandler: () => undefined,
  deregisterInteractionHandler: () => undefined,

diff --git a/packages/mdc-segmented-button/segment/foundation.ts b/packages/mdc-segmented-button/segment/foundation.ts
@@ -33,7 +33,7 @@ const emptyClientRect = {
  right: 0,
  top: 0,
  width: 0,
-};
+} as any;
 
 export class MDCSegmentedButtonSegmentFoundation extends
  MDCFoundation<MDCSegmentedButtonSegmentAdapter> {

diff --git a/packages/mdc-slider/foundation.ts b/packages/mdc-slider/foundation.ts
@@ -149,9 +149,9 @@ export class MDCSliderFoundation extends MDCFoundation<MDCSliderAdapter> {
  isInputFocused: () => false,
  getThumbKnobWidth: () => 0,
  getThumbBoundingClientRect: () =>
- ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  getBoundingClientRect: () =>
- ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  isRTL: () => false,
  setThumbStyleProperty: () => undefined,
  removeThumbStyleProperty: () => undefined,

diff --git a/packages/mdc-tab-bar/foundation.ts b/packages/mdc-tab-bar/foundation.ts
@@ -66,8 +66,10 @@ export class MDCTabBarFoundation extends MDCFoundation<MDCTabBarAdapter> {
  activateTabAtIndex: () => undefined,
  deactivateTabAtIndex: () => undefined,
  focusTabAtIndex: () => undefined,
- getTabIndicatorClientRectAtIndex: () => ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
- getTabDimensionsAtIndex: () => ({rootLeft: 0, rootRight: 0, contentLeft: 0, contentRight: 0}),
+ getTabIndicatorClientRectAtIndex: () =>
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
+ getTabDimensionsAtIndex: () =>
+ ({rootLeft: 0, rootRight: 0, contentLeft: 0, contentRight: 0}),
  getPreviousActiveTabIndex: () => -1,
  getFocusedTabIndex: () => -1,
  getIndexOfTabById: () => -1,

diff --git a/packages/mdc-tab-indicator/foundation.ts b/packages/mdc-tab-indicator/foundation.ts
@@ -39,7 +39,8 @@ export abstract class MDCTabIndicatorFoundation extends MDCFoundation<MDCTabIndi
  return {
  addClass: () => undefined,
  removeClass: () => undefined,
- computeContentClientRect: () => ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ computeContentClientRect: () =>
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  setContentStyleProperty: () => undefined,
  };
  // tslint:enable:object-literal-sort-keys

diff --git a/packages/mdc-tab-scroller/foundation.ts b/packages/mdc-tab-scroller/foundation.ts
@@ -53,8 +53,10 @@ export class MDCTabScrollerFoundation extends MDCFoundation<MDCTabScrollerAdapte
  getScrollAreaScrollLeft: () => 0,
  getScrollContentOffsetWidth: () => 0,
  getScrollAreaOffsetWidth: () => 0,
- computeScrollAreaClientRect: () => ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
- computeScrollContentClientRect: () => ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ computeScrollAreaClientRect: () =>
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
+ computeScrollContentClientRect: () =>
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  computeHorizontalScrollbarHeight: () => 0,
  };
  // tslint:enable:object-literal-sort-keys

diff --git a/packages/mdc-tooltip/foundation.ts b/packages/mdc-tooltip/foundation.ts
@@ -63,9 +63,9 @@ export class MDCTooltipFoundation extends MDCFoundation<MDCTooltipAdapter> {
  getViewportHeight: () => 0,
  getTooltipSize: () => ({width: 0, height: 0}),
  getAnchorBoundingRect: () =>
- ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  getParentBoundingRect: () =>
- ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  getAnchorAttribute: () => null,
  setAnchorAttribute: () => null,
  isRTL: () => false,
@@ -82,7 +82,7 @@ export class MDCTooltipFoundation extends MDCFoundation<MDCTooltipAdapter> {
  deregisterWindowEventHandler: () => undefined,
  notifyHidden: () => undefined,
  getTooltipCaretBoundingRect: () =>
- ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0}),
+ ({top: 0, right: 0, bottom: 0, left: 0, width: 0, height: 0} as any),
  setTooltipCaretStyle: () => undefined,
  clearTooltipCaretStyles: () => undefined,
  getActiveElement: () => null,