Merge pull request #773 from BarryThePenguin/refactor/css-declaration…

…-types

Refactor CSS Style Declaration types to support latest TypeScript

lib/assertions.ts

@@ -24,9 +24,9 @@ export interface ExistsOptions {
  count: number;
 }
 
-export interface Dictionary<T> {
- [key: string]: T;
-}
+type CSSStyleDeclarationProperty = keyof CSSStyleDeclaration;
+
+type ActualCSSStyleDeclaration = Partial<Record<CSSStyleDeclarationProperty, unknown>>;
 
 export default class DOMAssertions {
  constructor(
@@ -749,14 +749,14 @@ export default class DOMAssertions {
  */
  hasPseudoElementStyle(
  selector: string | null,
- expected: Dictionary<string>,
+ expected: Record<string, string>,
  message?: string
  ): DOMAssertions {
  let element = this.findTargetElement();
  if (!element) return this;
 
  let computedStyle = window.getComputedStyle(element, selector);
- let expectedProperties = Object.keys(expected) as [keyof CSSStyleDeclaration];
+ let expectedProperties = Object.keys(expected) as CSSStyleDeclarationProperty[];
  if (expectedProperties.length <= 0) {
  throw new TypeError(
  `Missing style expectations. There must be at least one style property in the passed in expectation object.`
@@ -766,7 +766,7 @@ export default class DOMAssertions {
  let result = expectedProperties.every(
  property => computedStyle[property] === expected[property]
  );
- let actual: Dictionary<string> = {};
+ let actual: ActualCSSStyleDeclaration = {};
 
  expectedProperties.forEach(property => (actual[property] = computedStyle[property]));
 
@@ -819,15 +819,15 @@ export default class DOMAssertions {
  */
  doesNotHavePseudoElementStyle(
  selector: string | null,
- expected: Dictionary<any>,
+ expected: Record<string, unknown>,
  message: string
  ): DOMAssertions {
  let element = this.findTargetElement();
  if (!element) return this;
 
  let computedStyle = window.getComputedStyle(element, selector);
 
- let expectedProperties = Object.keys(expected) as [keyof CSSStyleDeclaration];
+ let expectedProperties = Object.keys(expected) as CSSStyleDeclarationProperty[];
  if (expectedProperties.length <= 0) {
  throw new TypeError(
  `Missing style expectations. There must be at least one style property in the passed in expectation object.`
@@ -837,7 +837,7 @@ export default class DOMAssertions {
  let result = expectedProperties.some(
  property => computedStyle[property] !== expected[property]
  );
- let actual: Dictionary<any> = {};
+ let actual: ActualCSSStyleDeclaration = {};
 
  expectedProperties.forEach(property => (actual[property] = computedStyle[property]));