Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1170: upgrade typescript version to 2.6.2 (closes #1170) #1171

Merged
merged 5 commits into from
Jan 24, 2018
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
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
"tcomb": "3.2.22",
"tcomb-react": "0.9.3",
"tlds": "1.194.0",
"typelevel-ts": "0.1.2"
"typelevel-ts": "0.2.3"
},
"devDependencies": {
"@types/classnames": "2.2.3",
"@types/enzyme": "2.8.6",
"@types/faker": "4.1.2",
"@types/fixed-data-table": "0.6.32",
"@types/jest": "20.0.7",
"@types/linkify-it": "2.0.1",
"@types/lodash": "4.14.74",
"@types/node": "8.0.25",
"@types/classnames": "2.2.3",
"@types/fixed-data-table": "0.6.32",
"@types/linkify-it": "2.0.1",
"@types/prop-types": "15.5.2",
"@types/react": "^15.6.1",
"@types/react-dates": "12.1.2",
Expand Down Expand Up @@ -95,7 +95,7 @@
"style-loader": "0.17.0",
"ts-jest": "20.0.10",
"ts-loader": "2.3.4",
"typescript": "2.4.2",
"typescript": "2.6.2",
"webpack": "3.5.5"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/FocusableView/FocusableView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class FocusableView extends React.Component<FocusableView.Props> {
}
}

onFocusBlurEventDebounced = debounce(this._onFocusBlurEvent, this.defaultedProps().debounce)
onFocusBlurEventDebounced: ((type: string) => void) & _.Cancelable = debounce(this._onFocusBlurEvent, this.defaultedProps().debounce)

onFocusBlurEvent = ({ type }: React.FocusEvent<HTMLElement>) => (
!t.Nil.is(this.defaultedProps().debounce) ? this.onFocusBlurEventDebounced(type) : this._onFocusBlurEvent(type)
Expand Down
2 changes: 1 addition & 1 deletion src/Tablo/Column/columnUtility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const getColumnList = <T, K extends string>(children: TabloChildren<T, K>
return thereAreGroups ? flatMap(chArray, ch => Children.toArray(ch.props.children)) : chArray;
};

export const updateColumns = curry(<T, K extends string>(children: TabloChildren<T, K>, update: UpdateColumnsHandler<T, K>): JSX.Element[] => {
export const updateColumns: _.CurriedFunction2<{}, {}, JSX.Element[]> = curry(<T, K extends string>(children: TabloChildren<T, K>, update: UpdateColumnsHandler<T, K>): JSX.Element[] => {
const updateIfColumn = (colGroup?: React.ReactElement<ColumnGroup.Props<T, K>>) => (col: React.ReactElement<Column.Props<T, K>>, index: number) => col.type === Column ? update({ col , index, colGroup }) : col;
const chArray = Children.toArray(children) as React.ReactElement<Column.Props<T, K> | ColumnGroup.Props<T, K>>[];
const thereAreGroups = chArray.filter(ch => ch.type === ColumnGroup).length > 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Tablo/plugins/columnsReorder/htmlBackend.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import HTML5Backend from 'react-dnd-html5-backend';
import { DragDropContext } from 'react-dnd';

const dragDropContextHTML5Backend = DragDropContext(HTML5Backend);
const dragDropContextHTML5Backend: <P>(componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => __ReactDnd.ContextComponentClass<P> = DragDropContext(HTML5Backend);
export default dragDropContextHTML5Backend;
2 changes: 1 addition & 1 deletion src/Tablo/plugins/columnsResize/columnsResizeGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const getLocals = <T, K extends string>({ onColumnResize, ...props }: Tablo.Prop
isColumnResizing: false,
children: __children,
...gridProps
};
} as Tablo.Props<T, K>; // TODO: remove cast -> error on `onColumnsResizeEndCallback`

};

Expand Down
2 changes: 1 addition & 1 deletion src/Tablo/utils.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const getArrayChildren = (maybeArrayChildren?: React.ReactElement<any> | React.ReactElement<any>[]): React.ReactElement<any>[] | undefined => maybeArrayChildren ? Array.isArray(maybeArrayChildren) ? maybeArrayChildren : [maybeArrayChildren] : undefined;
export const getArrayChildren: (maybeArrayChildren?: React.ReactElement<any> | React.ReactElement<any>[] | undefined) => React.ReactElement<any>[] | undefined = maybeArrayChildren => maybeArrayChildren ? Array.isArray(maybeArrayChildren) ? maybeArrayChildren : [maybeArrayChildren] : undefined;
2 changes: 1 addition & 1 deletion src/TextOverflow/TextOverflow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class TextOverflow extends React.Component<TextOverflow.Props, State> {

_onMouseEvent = (type: string) => (type === 'mouseenter') && this.onMouseEnter();

onMouseEventDebounced = debounce(this._onMouseEvent, this.props.delayWhenLazy);
onMouseEventDebounced: ((type: string) => false | void) & _.Cancelable = debounce(this._onMouseEvent, this.props.delayWhenLazy);

onMouseEvent: React.MouseEventHandler<Element> = ({ type }) => {
this.props.delayWhenLazy ? this.onMouseEventDebounced(type) : this._onMouseEvent(type)
Expand Down
3 changes: 2 additions & 1 deletion typings/css-element-queries.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
declare module 'css-element-queries/src/ResizeSensor' {
export = class ResizeSensor {
class ResizeSensor {
constructor(element: (Element | Element[]), callback: Function);
}
export = ResizeSensor
}