fix(dialog): should extend HTMLElement (#723)

material-components · Mar 18, 2019 · af449f4 · af449f4
1 parent 603f5d5
commit af449f4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/packages/dialog/DialogContent.tsx b/packages/dialog/DialogContent.tsx
@@ -30,7 +30,7 @@ export interface DialogContentProps<T> extends React.HTMLProps<T> {
   id?: string,
 };
 
-const DialogContent: <T extends {} = HTMLDivElement>(props: DialogContentProps<T>) =>
+const DialogContent: <T extends HTMLElement = HTMLDivElement>(props: DialogContentProps<T>) =>
   React.ReactElement<T> = ({
     /* eslint-disable react/prop-types */
     className = '',

diff --git a/packages/dialog/DialogFooter.tsx b/packages/dialog/DialogFooter.tsx
@@ -30,7 +30,7 @@ export interface DialogFooterProps<T> extends React.HTMLProps<T> {
 };
 
 
-const DialogFooter: <T extends {} = HTMLElement>(props: DialogFooterProps<T>) =>
+const DialogFooter: <T extends HTMLElement = HTMLElement>(props: DialogFooterProps<T>) =>
   React.ReactElement<T> = ({
     /* eslint-disable react/prop-types */
     className = '',

diff --git a/packages/dialog/DialogTitle.tsx b/packages/dialog/DialogTitle.tsx
@@ -30,7 +30,7 @@ export interface DialogTitleProps<T> extends React.HTMLProps<T> {
   id?: string,
 };
 
-const DialogTitle: <T extends {} = HTMLHeadingElement>(props: DialogTitleProps<T>) =>
+const DialogTitle: <T extends HTMLElement = HTMLHeadingElement>(props: DialogTitleProps<T>) =>
     React.ReactElement<T> = ({
       /* eslint-disable react/prop-types */
       className = '',

diff --git a/packages/dialog/index.tsx b/packages/dialog/index.tsx
@@ -84,7 +84,7 @@ function isDialogContent(element: any): element is DialogContent<any> {
   return element.type === DialogContent;
 }
 
-class Dialog<T extends {} = HTMLElement> extends React.Component<
+class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
   DialogProps<T>,
   DialogState
   > {

diff --git a/test/unit/dialog/index.test.tsx b/test/unit/dialog/index.test.tsx
@@ -5,7 +5,7 @@ import * as td from 'testdouble';
 import {shallow, mount} from 'enzyme';
 // @ts-ignore
 import Dialog, {
-  ChildTypes, DialogProps, DialogTitle, DialogContent, DialogFooter, DialogButton,
+  ChildTypes, DialogTitle, DialogContent, DialogFooter, DialogButton,
 } from '../../../packages/dialog';
 // @ts-ignore no mdc .d.ts file
 import {util} from '@material/dialog/dist/mdc.dialog';
@@ -227,7 +227,7 @@ test('#adapter.isContentScrollable returns false when there is no content', () =
 });
 
 test('#adapter.isContentScrollable returns the value of util.isScrollable', () => {
-  const wrapper = mount<Dialog<DialogProps<HTMLDivElement>>, {classList: Set<string>}>(
+  const wrapper = mount<Dialog>(
     <Dialog open><DialogContent><p>meowkay</p></DialogContent></Dialog>
   );
   const content = wrapper.instance().content;