Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Commit aabe0c1

Browse files
Ari ChivukulaMatt Goo
Ari Chivukula
authored and
Matt Goo
committed
fix(ripple): broken relative imports (#953)
1 parent f307c6c commit aabe0c1

File tree

12 files changed

+63
-15
lines changed

12 files changed

+63
-15
lines changed

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ build
1212
dist
1313
packages/**/CHANGELOG.md
1414
.vscode/
15+
test/types/index.ts
16+
test/types/tsconfig.json

Diff for: .travis.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ matrix:
2222
install: npm i
2323
script: npm run lint
2424

25-
#TODO(issues/936): Fix existing errors before requiring this to pass
26-
#- node_js: 10
27-
# env: TEST_SUITE=types
28-
# install: npm i
29-
# script: npm run test:types
25+
- node_js: 10
26+
env: TEST_SUITE=types
27+
install: npm i
28+
script: npm run test:types
3029

3130
- node_js: 10
3231
install: npm i

Diff for: packages/button/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
import React from 'react';
2424
import classnames from 'classnames';
25-
import {withRipple, InjectedProps} from '@material/react-ripple';
25+
import {
26+
withRipple,
27+
InjectedProps,
28+
// @ts-ignore TODO(issues/955) Remove once possible
29+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
} from '@material/react-ripple';
2631

2732
import {CSS_CLASSES} from './constant';
2833

Diff for: packages/card/PrimaryContent.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
import React from 'react';
2424
import classnames from 'classnames';
25-
import {withRipple, InjectedProps} from '@material/react-ripple';
25+
import {
26+
withRipple,
27+
InjectedProps,
28+
// @ts-ignore TODO(issues/955) Remove once possible
29+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
} from '@material/react-ripple';
2631

2732
import {CSS_CLASSES} from './constant';
2833

Diff for: packages/checkbox/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ import classnames from 'classnames';
2525
import {MDCCheckboxFoundation} from '@material/checkbox/foundation';
2626
import {MDCCheckboxAdapter} from '@material/checkbox/adapter';
2727
import {cssClasses} from '@material/checkbox/constants';
28-
import {withRipple, InjectedProps} from '@material/react-ripple';
28+
import {
29+
withRipple,
30+
InjectedProps,
31+
// @ts-ignore TODO(issues/955) Remove once possible
32+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
33+
} from '@material/react-ripple';
2934

3035
import NativeControl from './NativeControl';
3136

Diff for: packages/chips/Chip.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
// THE SOFTWARE.
2222
import React from 'react';
2323
import classnames from 'classnames';
24-
import {withRipple, InjectedProps} from '@material/react-ripple';
24+
import {
25+
withRipple,
26+
InjectedProps,
27+
// @ts-ignore TODO(issues/955) Remove once possible
28+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
29+
} from '@material/react-ripple';
2530
import {MDCChipFoundation} from '@material/chips/chip/foundation';
2631
import {MDCChipAdapter} from '@material/chips/chip/adapter';
2732

Diff for: packages/fab/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
import React from 'react';
2424
import classnames from 'classnames';
25-
import {withRipple, InjectedProps} from '@material/react-ripple';
25+
import {
26+
withRipple,
27+
InjectedProps,
28+
// @ts-ignore TODO(issues/955) Remove once possible
29+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
} from '@material/react-ripple';
2631

2732
import {CSS_CLASSES} from './constant';
2833

Diff for: packages/icon-button/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
import React from 'react';
2424
import classnames from 'classnames';
25-
import {withRipple, InjectedProps} from '@material/react-ripple';
25+
import {
26+
withRipple,
27+
InjectedProps,
28+
// @ts-ignore TODO(issues/955) Remove once possible
29+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
} from '@material/react-ripple';
2631
import {MDCIconButtonToggleAdapter} from '@material/icon-button/adapter';
2732
import {MDCIconButtonToggleFoundation} from '@material/icon-button/foundation';
2833
import {MDCIconButtonToggleEventDetail} from '@material/icon-button/types';

Diff for: packages/list/ListItem.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
import React from 'react';
2424
import classnames from 'classnames';
2525
import {closest} from '@material/dom/ponyfill';
26-
import {withRipple, InjectedProps} from '@material/react-ripple';
26+
import {
27+
withRipple,
28+
InjectedProps,
29+
// @ts-ignore TODO(issues/955) Remove once possible
30+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
31+
} from '@material/react-ripple';
2732
import {MDCListFoundation} from '@material/list/foundation';
2833

2934
import {ListItemContext, ListItemContextShape} from './index';

Diff for: packages/material-icon/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@
2222

2323
import React from 'react';
2424
import classnames from 'classnames';
25-
import {withRipple, InjectedProps} from '@material/react-ripple';
25+
import {
26+
withRipple,
27+
InjectedProps,
28+
// @ts-ignore TODO(issues/955) Remove once possible
29+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
} from '@material/react-ripple';
2631

2732
export interface MaterialIconDefaultProps
2833
extends React.HTMLAttributes<HTMLElement> {

Diff for: packages/radio/index.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ import React from 'react';
2424
import classnames from 'classnames';
2525
import {MDCRadioFoundation} from '@material/radio/foundation';
2626
import {MDCRadioAdapter} from '@material/radio/adapter';
27-
import {withRipple, InjectedProps} from '@material/react-ripple';
27+
import {
28+
withRipple,
29+
InjectedProps,
30+
// @ts-ignore TODO(issues/955) Remove once possible
31+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
32+
} from '@material/react-ripple';
2833
import NativeControl, {NativeControlProps} from './NativeControl'; // eslint-disable-line @typescript-eslint/no-unused-vars
2934

3035
export interface RadioProps

Diff for: packages/tab/TabRipple.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ import {
2727
withRipple,
2828
InjectedProps,
2929
RippledComponentInterface,
30-
RippledComponentState, // eslint-disable-line @typescript-eslint/no-unused-vars
30+
// @ts-ignore TODO(issues/955) Remove once possible
31+
RippledComponentProps, // eslint-disable-line @typescript-eslint/no-unused-vars
32+
RippledComponentState,
3133
} from '@material/react-ripple';
3234

3335
export interface TabRippleProps

0 commit comments

Comments
 (0)