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

Commit bdb3f43

Browse files
Ari ChivukulaMatt Goo
Ari Chivukula
authored and
Matt Goo
committed
chore: Re-Build Lock File (#939)
1 parent e222e94 commit bdb3f43

File tree

18 files changed

+5046
-9251
lines changed

18 files changed

+5046
-9251
lines changed

‎package-lock.json‎

Lines changed: 5005 additions & 9206 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"@types/mocha": "^5.2.7",
101101
"@types/prop-types": "^15.5.6",
102102
"@types/puppeteer": "^1.11.1",
103-
"@types/react": "^16.4.4",
104-
"@types/react-dom": "^16.0.11",
103+
"@types/react": "~16.7.22",
104+
"@types/react-dom": "~16.0.11",
105105
"@types/react-is": "^16.7.1",
106106
"@types/react-router-dom": "^4.3.1",
107107
"@types/uuid": "^3.4.4",
@@ -153,8 +153,8 @@
153153
"postcss-loader": "^3.0.0",
154154
"prettier": "^1.17.1",
155155
"puppeteer": "^1.17.0",
156-
"react": "^16.4.2",
157-
"react-dom": "^16.4.2",
156+
"react": "~16.7.0",
157+
"react-dom": "~16.7.0",
158158
"react-router-dom": "^4.3.1",
159159
"remap-istanbul": "^0.12.0",
160160
"resemblejs": "^3.0.1",

‎packages/button/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export const Button = <T extends ButtonTypes>({
7676

7777
if (href) {
7878
return (
79-
<a {...props as React.HTMLProps<HTMLAnchorElement>} href={href}>
79+
<a {...(props as React.HTMLProps<HTMLAnchorElement>)} href={href}>
8080
{!trailingIcon ? renderIcon(icon) : null}
8181
<span className={CSS_CLASSES.LABEL}>{children}</span>
8282
{trailingIcon ? renderIcon(trailingIcon) : null}
@@ -85,7 +85,7 @@ export const Button = <T extends ButtonTypes>({
8585
}
8686

8787
return (
88-
<button {...props as React.HTMLProps<HTMLButtonElement>}>
88+
<button {...(props as React.HTMLProps<HTMLButtonElement>)}>
8989
{!trailingIcon ? renderIcon(icon) : null}
9090
<span className={CSS_CLASSES.LABEL}>{children}</span>
9191
{trailingIcon ? renderIcon(trailingIcon) : null}

‎packages/chips/Chip.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class Chip extends React.Component<ChipProps, ChipState> {
6969
shouldRemoveOnTrailingIconClick: true,
7070
};
7171

72-
state = {
72+
state: ChipState = {
7373
classList: new Set(),
7474
leadingIconClassList: new Set(),
7575
};

‎packages/icon-button/index.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,12 @@ class IconButtonBase<T extends IconButtonTypes> extends React.Component<
134134
...otherProps,
135135
};
136136
if (isLink) {
137-
return <a {...props as IconButtonProps<HTMLAnchorElement>}>{children}</a>;
137+
return (
138+
<a {...(props as IconButtonProps<HTMLAnchorElement>)}>{children}</a>
139+
);
138140
}
139141
return (
140-
<button {...props as IconButtonProps<HTMLButtonElement>}>
142+
<button {...(props as IconButtonProps<HTMLButtonElement>)}>
141143
{children}
142144
</button>
143145
);

‎packages/layout-grid/Cell.tsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,9 @@ const Cell: <T extends {} = HTMLDivElement>(
5959
[`${CSS_CLASSES.CELL_ALIGN}-${align}`]: !!align,
6060
[`${CSS_CLASSES.CELL_ORDER}-${order}`]: !!order,
6161
[`${CSS_CLASSES.CELL_SPAN}-${columns}`]: !!columns,
62-
[`${CSS_CLASSES.CELL_SPAN}-${desktopColumns}-${
63-
DEVICE_TYPE.DESKTOP
64-
}`]: !!desktopColumns,
65-
[`${CSS_CLASSES.CELL_SPAN}-${phoneColumns}-${
66-
DEVICE_TYPE.PHONE
67-
}`]: !!phoneColumns,
68-
[`${CSS_CLASSES.CELL_SPAN}-${tabletColumns}-${
69-
DEVICE_TYPE.TABLET
70-
}`]: !!tabletColumns,
62+
[`${CSS_CLASSES.CELL_SPAN}-${desktopColumns}-${DEVICE_TYPE.DESKTOP}`]: !!desktopColumns,
63+
[`${CSS_CLASSES.CELL_SPAN}-${phoneColumns}-${DEVICE_TYPE.PHONE}`]: !!phoneColumns,
64+
[`${CSS_CLASSES.CELL_SPAN}-${tabletColumns}-${DEVICE_TYPE.TABLET}`]: !!tabletColumns,
7165
});
7266

7367
return (

‎packages/ripple/index.tsx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {Subtract} from 'utility-types'; // eslint-disable-line @typescript-eslin
2626
import {MDCRippleFoundation} from '@material/ripple/foundation';
2727
import {MDCRippleAdapter} from '@material/ripple/adapter';
2828
import {supportsCssVariables, applyPassive} from '@material/ripple/util';
29-
import {SpecificEventListener} from '@material/base/types';
29+
import {EventType, SpecificEventListener} from '@material/base/types';
3030
import {matches} from '@material/dom/ponyfill';
3131

3232
export interface RippledComponentProps<T> {
@@ -197,18 +197,18 @@ export function withRipple<
197197
classList.delete(className);
198198
this.setState({classList});
199199
},
200-
registerDocumentInteractionHandler: (
201-
evtType: string,
202-
handler: EventListener
200+
registerDocumentInteractionHandler: <K extends EventType>(
201+
evtType: K,
202+
handler: SpecificEventListener<K>
203203
) =>
204204
document.documentElement.addEventListener(
205205
evtType,
206206
handler,
207207
applyPassive()
208208
),
209-
deregisterDocumentInteractionHandler: (
210-
evtType: string,
211-
handler: EventListener
209+
deregisterDocumentInteractionHandler: <K extends EventType>(
210+
evtType: K,
211+
handler: SpecificEventListener<K>
212212
) =>
213213
document.documentElement.removeEventListener(
214214
evtType,
@@ -324,6 +324,7 @@ export function withRipple<
324324
if (value === null) {
325325
delete updatedStyle[varName as keyof React.CSSProperties];
326326
} else {
327+
// @ts-ignore CSS values now strongly typed
327328
updatedStyle[varName as keyof React.CSSProperties] = value;
328329
}
329330

‎packages/select/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export default class Select<
379379
foundation={this.state.foundation}
380380
className={selectClassName}
381381
{...(enhanced ? enhancedProps : {})}
382-
{...otherProps as BaseSelectProps<T>}
382+
{...(otherProps as BaseSelectProps<T>)}
383383
>
384384
{this.renderOptions()}
385385
</BaseSelect>

‎packages/snackbar/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class Snackbar extends React.Component<Props, State> {
5959
constructor(props: Props) {
6060
super(props);
6161
const {timeoutMs, closeOnEscape, leading, stacked} = this.props;
62-
const classes = new Set();
62+
const classes = new Set<string>();
6363
if (leading) {
6464
classes.add('mdc-snackbar--leading');
6565
}

‎packages/tab-indicator/index.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ export default class TabIndicator extends React.Component<
187187
}
188188

189189
addContentClassesToChildren = () => {
190-
const child = React.Children.only(this.props.children);
190+
const child = React.Children.only(
191+
this.props.children
192+
) as React.ReactElement<any>;
191193
const className = classnames(child.props.className, this.contentClasses);
192194
const props = Object.assign({}, child.props, {className});
193195
return React.cloneElement(child, props);

0 commit comments

Comments
 (0)