wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-10 11:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6799 from adidahiya/react-css-transition-group

Browse Source 
[React] Fix linting errors and add support for transition timeout props on CSSTransitionGroup
This commit is contained in:
John Reilly
2015-11-25 12:01:29 +00:00
parent b2d17b5dad 4c0eb8b492
commit 36c6ce86fb
15 changed files with 74 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
material-ui/legacy/material-ui-0.11.1-tests.tsx
+4 -5
View File
@@ -1,9 +1,8 @@
///<reference path='../../react/react.d.ts' />
///<reference path='../../react/react-addons-linked-state-mixin.d.ts' />
///<reference path='../../react/react-0.13.3.d.ts' />
///<reference path='material-ui-0.11.1.d.ts' />
import * as React from "react";
import * as LinkedStateMixin from "react-addons-linked-state-mixin";
import * as React from "react/addons";
import mui = require("material-ui");
import Colors = require("material-ui/lib/styles/colors");
import AppBar = require("material-ui/lib/app-bar");
@@ -475,4 +474,4 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
return element;
}
}
}
material-ui/legacy/material-ui-0.11.1.d.ts
Vendored
+3 -3
View File
@@ -3,7 +3,7 @@
// Definitions by: Nathan Brown <https://github.com/ngbrown>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
///<reference path='../../react/react.d.ts' />
///<reference path='../../react/react-0.13.3.d.ts' />
declare module "material-ui" {
// The reason for exporting the namespace types (__MaterialUI.*) is to also export the type for casting variable.
@@ -233,7 +233,7 @@ declare namespace __MaterialUI {
}
// what's not commonly overridden by Checkbox, RadioButton, or Toggle
interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributes, React.Props<T> {
interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributesBase<T> {
// <input/> is root element
id?: string;
iconStyle?: React.CSSProperties;
@@ -412,7 +412,7 @@ declare namespace __MaterialUI {
}
// non generally overridden elements of EnhancedButton
interface SharedEnhancedButtonProps<T> extends React.HTMLAttributes, React.Props<T> {
interface SharedEnhancedButtonProps<T> extends React.HTMLAttributesBase<T> {
centerRipple?: boolean;
containerElement?: string | React.ReactElement<any>;
disabled?: boolean;
material-ui/legacy/material-ui-0.12.1-tests .tsx → material-ui/legacy/material-ui-0.12.1-tests.tsx
+2 -2
View File
@@ -1,4 +1,4 @@
///<reference path='../../react/react.d.ts' />
///<reference path='../../react/react-0.13.3.d.ts' />
///<reference path='material-ui-0.12.1.d.ts' />
import * as React from "react/addons";
@@ -465,4 +465,4 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
return element;
}
}
}
material-ui/legacy/material-ui-0.12.1.d.ts
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// Definitions by: Nathan Brown <https://github.com/ngbrown>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
///<reference path='../../react/react.d.ts' />
///<reference path='../../react/react-0.13.3.d.ts' />
declare module "material-ui" {
export import AppBar = __MaterialUI.AppBar; // require('material-ui/lib/app-bar');