diff --git a/types/react/index.d.ts b/types/react/index.d.ts index 9780afc546..2f0c8a17bb 100644 --- a/types/react/index.d.ts +++ b/types/react/index.d.ts @@ -281,10 +281,10 @@ declare namespace React { constructor(props: P, context?: any); // Disabling unified-signatures to have separate overloads. It's easier to understand this way. - // tslint:disable:unified-signatures + // tslint:disable-next-line:unified-signatures setState(f: (prevState: Readonly, props: P) => Pick, callback?: () => any): void; + // tslint:disable-next-line:unified-signatures setState(state: Pick, callback?: () => any): void; - // tslint:enable:unified-signatures forceUpdate(callBack?: () => any): void; render(): ReactNode; @@ -3524,7 +3524,7 @@ declare namespace React { declare global { namespace JSX { - // tslint:disable:no-empty-interface + // tslint:disable-next-line:no-empty-interface interface Element extends React.ReactElement { } interface ElementClass extends React.Component { render(): React.ReactNode; @@ -3532,9 +3532,10 @@ declare global { interface ElementAttributesProperty { props: {}; } interface ElementChildrenAttribute { children: {}; } + // tslint:disable-next-line:no-empty-interface interface IntrinsicAttributes extends React.Attributes { } + // tslint:disable-next-line:no-empty-interface interface IntrinsicClassAttributes extends React.ClassAttributes { } - // tslint:enable:no-empty-interface interface IntrinsicElements { // HTML diff --git a/types/react/test/index.ts b/types/react/test/index.ts index 3c49215c8a..d13b7eea3f 100644 --- a/types/react/test/index.ts +++ b/types/react/test/index.ts @@ -255,7 +255,7 @@ myComponent.reset(); // Refs // -------------------------------------------------------------------------- -// tslint:disable:no-empty-interface +// tslint:disable-next-line:no-empty-interface interface RCProps { } class RefComponent extends React.Component {