From bb7bcfda487fc1444b1e94efbf40b082501d6dd8 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Tue, 25 Jun 2019 11:17:32 -0700 Subject: [PATCH 01/35] [WIP] Fix ripple imports The issue seems to be at the webpack stage; we need to prevent it looking across packages. This should be the final fix for #936 --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccb987775..1b3b0b93b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,10 @@ matrix: install: npm i script: npm run lint - #TODO(issues/936): Fix existing errors before requiring this to pass - #- node_js: 10 - # env: TEST_SUITE=types - # install: npm i - # script: npm run test:types + - node_js: 10 + env: TEST_SUITE=types + install: npm i + script: npm run test:types - node_js: 10 install: npm i From 6cbf386cba40aed21975943a758dbc7c470c1a4e Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 09:26:00 -0700 Subject: [PATCH 02/35] Update webpack.config.js --- packages/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index f8d41e7bb..9f0476a84 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -99,7 +99,7 @@ function getMaterialExternals() { getReactMaterialExternals().forEach((path) => { externals[`@material/${path}`] = `@material/${path}/dist/index.js`; }); - + console.log(externals); return externals; } From 06e89b69a87d2790ebc9548d33a5d1fa5151c9e7 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 09:26:32 -0700 Subject: [PATCH 03/35] Update webpack.config.js --- packages/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index 9f0476a84..f8d41e7bb 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -99,7 +99,7 @@ function getMaterialExternals() { getReactMaterialExternals().forEach((path) => { externals[`@material/${path}`] = `@material/${path}/dist/index.js`; }); - console.log(externals); + return externals; } From b1b652db06f0fa24c0f3ecb6d0b108c2dc0ec73e Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 09:26:48 -0700 Subject: [PATCH 04/35] Update webpack.config.js --- packages/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index f8d41e7bb..9f0476a84 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -99,7 +99,7 @@ function getMaterialExternals() { getReactMaterialExternals().forEach((path) => { externals[`@material/${path}`] = `@material/${path}/dist/index.js`; }); - + console.log(externals); return externals; } From 38d3763431e5739a9d47f0d8c6dfd766e084ef9c Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 09:34:22 -0700 Subject: [PATCH 05/35] Update webpack.config.js --- packages/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index 9f0476a84..e552f48f3 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -97,7 +97,7 @@ function getMaterialExternals() { }); getReactMaterialExternals().forEach((path) => { - externals[`@material/${path}`] = `@material/${path}/dist/index.js`; + externals[`@material/${path}`] = `@material/${path}`; }); console.log(externals); return externals; From 2f1e82a65ff3a62e89c01200ad63e48117c9077c Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 09:47:48 -0700 Subject: [PATCH 06/35] Update webpack.config.js --- packages/webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index e552f48f3..f8d41e7bb 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -97,9 +97,9 @@ function getMaterialExternals() { }); getReactMaterialExternals().forEach((path) => { - externals[`@material/${path}`] = `@material/${path}`; + externals[`@material/${path}`] = `@material/${path}/dist/index.js`; }); - console.log(externals); + return externals; } From 6d59fa297d7502c33fe3b612a900db216f6f93f3 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 10:04:58 -0700 Subject: [PATCH 07/35] Update webpack.config.js --- packages/webpack.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index f8d41e7bb..a62eb78b6 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -121,6 +121,7 @@ function getJavaScriptWebpackConfig() { { test: /\.ts(x)?$/, loader: 'ts-loader', + exclude: [/node_modules/, /build/, /dist/] }, { test: /\.js$/, From 8322ed571edad60fb38156d0e16511a3b82fb236 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 10:05:29 -0700 Subject: [PATCH 08/35] Update tsconfig.json --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index e68cff2b6..105ab8d2f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,6 +15,7 @@ "compileOnSave": true, "exclude": [ "node_modules", - "build" + "build", + "dist" ] } From 9c77f73b2873db0ae9e800a10fb30fd0ba29a537 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 10:14:55 -0700 Subject: [PATCH 09/35] Update tsconfig.json --- tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 105ab8d2f..e68cff2b6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,6 @@ "compileOnSave": true, "exclude": [ "node_modules", - "build", - "dist" + "build" ] } From 148d46abf7ee50681004edcf9438abf3f268d23b Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 10:15:12 -0700 Subject: [PATCH 10/35] Update webpack.config.js --- packages/webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/webpack.config.js b/packages/webpack.config.js index a62eb78b6..f8d41e7bb 100644 --- a/packages/webpack.config.js +++ b/packages/webpack.config.js @@ -121,7 +121,6 @@ function getJavaScriptWebpackConfig() { { test: /\.ts(x)?$/, loader: 'ts-loader', - exclude: [/node_modules/, /build/, /dist/] }, { test: /\.js$/, From 596f4349dc91bef81f376fbc2096847fb4b55d8c Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Wed, 26 Jun 2019 11:05:02 -0700 Subject: [PATCH 11/35] Update index.tsx --- packages/button/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/button/index.tsx b/packages/button/index.tsx index 82da7c86d..3fc473a33 100644 --- a/packages/button/index.tsx +++ b/packages/button/index.tsx @@ -22,11 +22,13 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import {withRipple, InjectedProps, RippledComponentProps} from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; type ButtonTypes = HTMLAnchorElement | HTMLButtonElement; +// TODO(https://github.com/material-components/material-components-web-react/pull/953) +export type removeOnceTypeResolutionIsFixed = RippledComponentProps; export interface ButtonProps extends InjectedProps, From 31b951e4a366cbf25857f37c367773bdae482394 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 10:56:57 -0700 Subject: [PATCH 12/35] Update index.tsx --- packages/button/index.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/button/index.tsx b/packages/button/index.tsx index 3fc473a33..2c8c74ea9 100644 --- a/packages/button/index.tsx +++ b/packages/button/index.tsx @@ -22,13 +22,18 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps, RippledComponentProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, +} from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; type ButtonTypes = HTMLAnchorElement | HTMLButtonElement; -// TODO(https://github.com/material-components/material-components-web-react/pull/953) -export type removeOnceTypeResolutionIsFixed = RippledComponentProps; + +// TODO(issues/955) Remove once possible +export type TemporaryTypescriptFix = RippledComponentProps; export interface ButtonProps extends InjectedProps, From a4a0faea3c5a53e7894cfecb22219b043742e155 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 10:59:38 -0700 Subject: [PATCH 13/35] Update TabRipple.tsx --- packages/tab/TabRipple.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/tab/TabRipple.tsx b/packages/tab/TabRipple.tsx index b4a640543..bd8b0f786 100644 --- a/packages/tab/TabRipple.tsx +++ b/packages/tab/TabRipple.tsx @@ -27,7 +27,8 @@ import { withRipple, InjectedProps, RippledComponentInterface, - RippledComponentState, // eslint-disable-line @typescript-eslint/no-unused-vars + RippledComponentProps, + RippledComponentState, } from '@material/react-ripple'; export interface TabRippleProps @@ -37,6 +38,9 @@ export interface TabRippleProps ref?: React.RefObject; } +// TODO(issues/955) Remove once possible +export type TemporaryTypescriptFix = RippledComponentProps; + class TabRippleBase extends React.Component { get classes() { return classnames('mdc-tab__ripple', this.props.className); From 38ae6fc1ca737b08d94795a7250c7245e21240cf Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:00:21 -0700 Subject: [PATCH 14/35] Update TabRipple.tsx --- packages/tab/TabRipple.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/tab/TabRipple.tsx b/packages/tab/TabRipple.tsx index bd8b0f786..fb10c6f7c 100644 --- a/packages/tab/TabRipple.tsx +++ b/packages/tab/TabRipple.tsx @@ -27,7 +27,7 @@ import { withRipple, InjectedProps, RippledComponentInterface, - RippledComponentProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible RippledComponentState, } from '@material/react-ripple'; @@ -38,9 +38,6 @@ export interface TabRippleProps ref?: React.RefObject; } -// TODO(issues/955) Remove once possible -export type TemporaryTypescriptFix = RippledComponentProps; - class TabRippleBase extends React.Component { get classes() { return classnames('mdc-tab__ripple', this.props.className); From af65676b14f475dba4dc9724ccd79d8036bad487 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:00:50 -0700 Subject: [PATCH 15/35] Update index.tsx --- packages/button/index.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/button/index.tsx b/packages/button/index.tsx index 2c8c74ea9..d6e102ff7 100644 --- a/packages/button/index.tsx +++ b/packages/button/index.tsx @@ -25,16 +25,13 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible } from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; type ButtonTypes = HTMLAnchorElement | HTMLButtonElement; -// TODO(issues/955) Remove once possible -export type TemporaryTypescriptFix = RippledComponentProps; - export interface ButtonProps extends InjectedProps, React.AnchorHTMLAttributes, From 5ff00d961740e255d6161d48d0c63c601c75af24 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:01:32 -0700 Subject: [PATCH 16/35] Update index.tsx --- packages/radio/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/radio/index.tsx b/packages/radio/index.tsx index 27bfbf789..3b9051ba8 100644 --- a/packages/radio/index.tsx +++ b/packages/radio/index.tsx @@ -24,7 +24,11 @@ import React from 'react'; import classnames from 'classnames'; import {MDCRadioFoundation} from '@material/radio/foundation'; import {MDCRadioAdapter} from '@material/radio/adapter'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import NativeControl, {NativeControlProps} from './NativeControl'; // eslint-disable-line @typescript-eslint/no-unused-vars export interface RadioProps From fd6c24b71eb9f8d48ece96f564799eb9d748b498 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:01:53 -0700 Subject: [PATCH 17/35] Update index.tsx --- packages/material-icon/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/material-icon/index.tsx b/packages/material-icon/index.tsx index 1c79df8f9..33ce7852e 100644 --- a/packages/material-icon/index.tsx +++ b/packages/material-icon/index.tsx @@ -22,7 +22,11 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; export interface MaterialIconDefaultProps extends React.HTMLAttributes { From 4d327f685252a6045f487cb9cfe5df70c95a4be5 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:02:18 -0700 Subject: [PATCH 18/35] Update ListItem.tsx --- packages/list/ListItem.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/list/ListItem.tsx b/packages/list/ListItem.tsx index fd534683c..df6355d5f 100644 --- a/packages/list/ListItem.tsx +++ b/packages/list/ListItem.tsx @@ -23,7 +23,11 @@ import React from 'react'; import classnames from 'classnames'; import {closest} from '@material/dom/ponyfill'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import {MDCListFoundation} from '@material/list/foundation'; import {ListItemContext, ListItemContextShape} from './index'; From 07f890bc6546f504909ac710f67921225c44f476 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:02:39 -0700 Subject: [PATCH 19/35] Update index.tsx --- packages/icon-button/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/icon-button/index.tsx b/packages/icon-button/index.tsx index 28ca4514a..92792af82 100644 --- a/packages/icon-button/index.tsx +++ b/packages/icon-button/index.tsx @@ -22,7 +22,11 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import {MDCIconButtonToggleAdapter} from '@material/icon-button/adapter'; import {MDCIconButtonToggleFoundation} from '@material/icon-button/foundation'; import {MDCIconButtonToggleEventDetail} from '@material/icon-button/types'; From 1024811e6cb9c00542c653d7252502d5f303da75 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:02:56 -0700 Subject: [PATCH 20/35] Update index.tsx --- packages/fab/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/fab/index.tsx b/packages/fab/index.tsx index c05b8eddf..a7b700463 100644 --- a/packages/fab/index.tsx +++ b/packages/fab/index.tsx @@ -22,7 +22,11 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; From 404420230022aa70554db40a024b702164b87de1 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:03:24 -0700 Subject: [PATCH 21/35] Update Chip.tsx --- packages/chips/Chip.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/chips/Chip.tsx b/packages/chips/Chip.tsx index 6b02f1a9c..da0cc2f9f 100644 --- a/packages/chips/Chip.tsx +++ b/packages/chips/Chip.tsx @@ -21,7 +21,11 @@ // THE SOFTWARE. import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import {MDCChipFoundation} from '@material/chips/chip/foundation'; import {MDCChipAdapter} from '@material/chips/chip/adapter'; From e0c77c929e4903046eb9d3f4f56093ea60131368 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:03:45 -0700 Subject: [PATCH 22/35] Update index.tsx --- packages/checkbox/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/checkbox/index.tsx b/packages/checkbox/index.tsx index 02043e783..0f5457adc 100644 --- a/packages/checkbox/index.tsx +++ b/packages/checkbox/index.tsx @@ -25,7 +25,11 @@ import classnames from 'classnames'; import {MDCCheckboxFoundation} from '@material/checkbox/foundation'; import {MDCCheckboxAdapter} from '@material/checkbox/adapter'; import {cssClasses} from '@material/checkbox/constants'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import NativeControl from './NativeControl'; From 232816a80d34ae2c4b31639e03b655b1a25fe3b7 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:04:13 -0700 Subject: [PATCH 23/35] Update PrimaryContent.tsx --- packages/card/PrimaryContent.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/card/PrimaryContent.tsx b/packages/card/PrimaryContent.tsx index 53f1d5e8c..68703e2f0 100644 --- a/packages/card/PrimaryContent.tsx +++ b/packages/card/PrimaryContent.tsx @@ -22,7 +22,11 @@ import React from 'react'; import classnames from 'classnames'; -import {withRipple, InjectedProps} from '@material/react-ripple'; +import { + withRipple, + InjectedProps, + RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible +} from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; From f6172baecdd3dd26c63287b185ed1f719558c61a Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:17:18 -0700 Subject: [PATCH 24/35] Update index.tsx --- packages/button/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/button/index.tsx b/packages/button/index.tsx index d6e102ff7..2b96675a4 100644 --- a/packages/button/index.tsx +++ b/packages/button/index.tsx @@ -22,10 +22,11 @@ import React from 'react'; import classnames from 'classnames'; +// @ts-ignore TODO(issues/955) Remove once possible import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; From 22dc7ba6ffe73a7c426279bc7aed8b3434a60286 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:23:46 -0700 Subject: [PATCH 25/35] Update index.tsx --- packages/button/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/button/index.tsx b/packages/button/index.tsx index 2b96675a4..a4341c91f 100644 --- a/packages/button/index.tsx +++ b/packages/button/index.tsx @@ -22,10 +22,10 @@ import React from 'react'; import classnames from 'classnames'; -// @ts-ignore TODO(issues/955) Remove once possible import { withRipple, InjectedProps, + // @ts-ignore TODO(issues/955) Remove once possible RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; From 0095694499ea7d6fb44a96b4d3c2ced650da46b1 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:28:07 -0700 Subject: [PATCH 26/35] Update PrimaryContent.tsx --- packages/card/PrimaryContent.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/card/PrimaryContent.tsx b/packages/card/PrimaryContent.tsx index 68703e2f0..fdd5c621b 100644 --- a/packages/card/PrimaryContent.tsx +++ b/packages/card/PrimaryContent.tsx @@ -25,7 +25,8 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; From 62c3aca4349a93f8bed2a03cae5bb3e629cee337 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:28:53 -0700 Subject: [PATCH 27/35] Update index.tsx --- packages/checkbox/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/checkbox/index.tsx b/packages/checkbox/index.tsx index 0f5457adc..0c9babad0 100644 --- a/packages/checkbox/index.tsx +++ b/packages/checkbox/index.tsx @@ -28,7 +28,8 @@ import {cssClasses} from '@material/checkbox/constants'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import NativeControl from './NativeControl'; From a26c647e78348b32739517e5491d2d99a98eeff9 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:29:13 -0700 Subject: [PATCH 28/35] Update Chip.tsx --- packages/chips/Chip.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/chips/Chip.tsx b/packages/chips/Chip.tsx index da0cc2f9f..ed3404b3e 100644 --- a/packages/chips/Chip.tsx +++ b/packages/chips/Chip.tsx @@ -24,7 +24,8 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {MDCChipFoundation} from '@material/chips/chip/foundation'; import {MDCChipAdapter} from '@material/chips/chip/adapter'; From 49003300343307166aa6210a83a36d0978b2c842 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:29:26 -0700 Subject: [PATCH 29/35] Update TabRipple.tsx --- packages/tab/TabRipple.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tab/TabRipple.tsx b/packages/tab/TabRipple.tsx index fb10c6f7c..6166b6417 100644 --- a/packages/tab/TabRipple.tsx +++ b/packages/tab/TabRipple.tsx @@ -27,7 +27,8 @@ import { withRipple, InjectedProps, RippledComponentInterface, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars RippledComponentState, } from '@material/react-ripple'; From 1714d839e3abf22cf44779b9b03d78fa0e185696 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:29:38 -0700 Subject: [PATCH 30/35] Update index.tsx --- packages/radio/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/radio/index.tsx b/packages/radio/index.tsx index 3b9051ba8..a37795a10 100644 --- a/packages/radio/index.tsx +++ b/packages/radio/index.tsx @@ -27,7 +27,8 @@ import {MDCRadioAdapter} from '@material/radio/adapter'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import NativeControl, {NativeControlProps} from './NativeControl'; // eslint-disable-line @typescript-eslint/no-unused-vars From 23bc294e7a918d52e29098a3f77a57fd6b36e8f6 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:29:53 -0700 Subject: [PATCH 31/35] Update index.tsx --- packages/material-icon/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/material-icon/index.tsx b/packages/material-icon/index.tsx index 33ce7852e..05e9a85f7 100644 --- a/packages/material-icon/index.tsx +++ b/packages/material-icon/index.tsx @@ -25,7 +25,8 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; export interface MaterialIconDefaultProps From 7d2b9e94990f7d5191090dd68019c04409a4abd8 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:30:08 -0700 Subject: [PATCH 32/35] Update ListItem.tsx --- packages/list/ListItem.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/list/ListItem.tsx b/packages/list/ListItem.tsx index df6355d5f..63654d477 100644 --- a/packages/list/ListItem.tsx +++ b/packages/list/ListItem.tsx @@ -26,7 +26,8 @@ import {closest} from '@material/dom/ponyfill'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {MDCListFoundation} from '@material/list/foundation'; From 215378bda82196222a3a143c87e742f8aeae3bb1 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:30:25 -0700 Subject: [PATCH 33/35] Update index.tsx --- packages/icon-button/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/icon-button/index.tsx b/packages/icon-button/index.tsx index 92792af82..739e5bb1c 100644 --- a/packages/icon-button/index.tsx +++ b/packages/icon-button/index.tsx @@ -25,7 +25,8 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {MDCIconButtonToggleAdapter} from '@material/icon-button/adapter'; import {MDCIconButtonToggleFoundation} from '@material/icon-button/foundation'; From 868c1d22749c47454d24330411246256f1b900a8 Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Fri, 28 Jun 2019 11:30:38 -0700 Subject: [PATCH 34/35] Update index.tsx --- packages/fab/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/fab/index.tsx b/packages/fab/index.tsx index a7b700463..4fa69992e 100644 --- a/packages/fab/index.tsx +++ b/packages/fab/index.tsx @@ -25,7 +25,8 @@ import classnames from 'classnames'; import { withRipple, InjectedProps, - RippledComponentProps, // @ts-ignore TODO(issues/955) Remove once possible + // @ts-ignore TODO(issues/955) Remove once possible + RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars } from '@material/react-ripple'; import {CSS_CLASSES} from './constant'; From 42c948992569340e53b51e8383c9ddf17b26794f Mon Sep 17 00:00:00 2001 From: Ari Chivukula Date: Tue, 2 Jul 2019 11:30:04 -0700 Subject: [PATCH 35/35] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1ba4483e4..2215b0e74 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ build dist packages/**/CHANGELOG.md .vscode/ +test/types/index.ts +test/types/tsconfig.json