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

fix(tab-scroller): upgrade mdc-web to 1.0.0 #743

Merged
merged 6 commits into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 119 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@material/tab": "^0.41.0",
"@material/tab-bar": "^0.41.0",
"@material/tab-indicator": "^1.0.0",
"@material/tab-scroller": "^0.41.0",
"@material/tab-scroller": "^1.0.0",
"@material/textfield": "^0.41.0",
"@material/top-app-bar": "^0.41.0",
"@material/typography": "^0.41.0",
Expand Down Expand Up @@ -162,3 +162,4 @@
"webpack-dev-server": "^2.11.2"
}
}

49 changes: 24 additions & 25 deletions packages/tab-scroller/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@

import * as React from 'react';
import classnames from 'classnames';
import {
MDCTabScrollerFoundation,
util,
// @ts-ignore no .d.ts file
} from '@material/tab-scroller/dist/mdc.tabScroller';
// @ts-ignore no mdc .d.ts file
import {MDCTabScrollerFoundation} from '@material/tab-scroller/foundation';
import {MDCTabScrollerAdapter} from '@material/tab-scroller/adapter';
import * as util from '@material/tab-scroller/util';
import {matches} from '@material/dom/ponyfill';

const convertDashToCamelCase = (propName: string) =>
Expand Down Expand Up @@ -55,7 +52,7 @@ export default class TabScroller extends React.Component<
> {
areaElement: React.RefObject<HTMLDivElement> = React.createRef();
contentElement: React.RefObject<HTMLDivElement> = React.createRef();
foundation?: MDCTabScrollerFoundation;
foundation!: MDCTabScrollerFoundation;

state: TabScrollerState = {
classList: new Set(),
Expand Down Expand Up @@ -113,7 +110,7 @@ export default class TabScroller extends React.Component<
});
};

get adapter() {
get adapter(): MDCTabScrollerAdapter {
return {
eventTargetMatchesSelector: (evtTarget: HTMLDivElement, selector: string) => {
if (selector) {
Expand Down Expand Up @@ -141,25 +138,27 @@ export default class TabScroller extends React.Component<
setScrollContentStyleProperty: (prop: string, value: string) =>
this.setStyleToElement(prop, value, 'scrollContentStyleProperty'),
getScrollContentStyleValue: (propName: string) =>
this.contentElement.current &&
window
.getComputedStyle(this.contentElement.current)
.getPropertyValue(propName),
this.contentElement.current ?
window
.getComputedStyle(this.contentElement.current)
.getPropertyValue(propName) : '',
setScrollAreaScrollLeft: (scrollX: number) => {
if (!this.areaElement.current) return;
this.areaElement.current.scrollLeft = scrollX;
},
getScrollAreaScrollLeft: () =>
this.areaElement.current && this.areaElement.current.scrollLeft,
this.areaElement.current ? this.areaElement.current.scrollLeft : 0,
getScrollContentOffsetWidth: this.getScrollContentWidth,
getScrollAreaOffsetWidth: () =>
this.areaElement.current && this.areaElement.current.offsetWidth,
this.areaElement.current ? this.areaElement.current.offsetWidth : 0,
computeScrollAreaClientRect: () =>
this.areaElement.current &&
this.areaElement.current.getBoundingClientRect(),
this.areaElement.current ?
this.areaElement.current.getBoundingClientRect() :
new ClientRect(),
computeScrollContentClientRect: () =>
this.contentElement.current &&
this.contentElement.current.getBoundingClientRect(),
this.contentElement.current ?
this.contentElement.current.getBoundingClientRect() :
new ClientRect(),
computeHorizontalScrollbarHeight: () =>
util.computeHorizontalScrollbarHeight(document),
};
Expand All @@ -172,7 +171,7 @@ export default class TabScroller extends React.Component<
// needs to be public class method for react tab-bar
getScrollContentWidth = () => {
return (
this.contentElement.current && this.contentElement.current.offsetWidth
this.contentElement.current ? this.contentElement.current.offsetWidth : 0
);
};

Expand All @@ -186,32 +185,32 @@ export default class TabScroller extends React.Component<

handleWheel_ = (evt: React.WheelEvent<HTMLDivElement>) => {
this.props.onWheel && this.props.onWheel(evt);
this.foundation.handleInteraction(evt);
this.foundation.handleInteraction();
};

handleTouchStart_ = (evt: React.TouchEvent<HTMLDivElement>) => {
this.props.onTouchStart && this.props.onTouchStart(evt);
this.foundation.handleInteraction(evt);
this.foundation.handleInteraction();
};

handlePointerDown_ = (evt: React.PointerEvent<HTMLDivElement>) => {
this.props.onPointerDown && this.props.onPointerDown(evt);
this.foundation.handleInteraction(evt);
this.foundation.handleInteraction();
};

handleMouseDown_ = (evt: React.MouseEvent<HTMLDivElement>) => {
this.props.onMouseDown && this.props.onMouseDown(evt);
this.foundation.handleInteraction(evt);
this.foundation.handleInteraction();
};

handleKeyDown_ = (evt: React.KeyboardEvent<HTMLDivElement>) => {
this.props.onKeyDown && this.props.onKeyDown(evt);
this.foundation.handleInteraction(evt);
this.foundation.handleInteraction();
};

handleTransitionEnd_ = (evt: React.TransitionEvent<HTMLDivElement>) => {
this.props.onTransitionEnd && this.props.onTransitionEnd(evt);
this.foundation.handleTransitionEnd(evt);
this.foundation.handleTransitionEnd(evt.nativeEvent);
};

render() {
Expand Down
4 changes: 2 additions & 2 deletions packages/tab-scroller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"url": "https://github.com/material-components/material-components-web-react.git"
},
"dependencies": {
"@material/dom": "^0.41.0",
"@material/tab-scroller": "^0.41.0",
"@material/dom": "^1.0.0",
"@material/tab-scroller": "^1.0.0",
"classnames": "^2.2.5",
"react": "^16.4.2"
},
Expand Down
Loading