diff --git a/dojo/dojo.d.ts b/dojo/dojo.d.ts index 8a566a46f5..bca5721240 100644 --- a/dojo/dojo.d.ts +++ b/dojo/dojo.d.ts @@ -5686,7 +5686,7 @@ declare namespace dojo { * @param dest The object to which to copy/add all properties contained in source. If dest is falsy, thena new object is manufactured before copying/adding properties begins. * @param sources One of more objects from which to draw all properties to copy into dest. sources are processedleft-to-right and if more than one of these objects contain the same property name, the right-mostvalue "wins". */ - mixin(dest: Object, sources: Object[]): Object; + mixin(dest: Object, source: Object, sources?: Object[]): Object; /** * similar to hitch() except that the scope object is left to be * whatever the execution context eventually becomes. diff --git a/nodemailer/nodemailer.d.ts b/nodemailer/nodemailer.d.ts index 1fb6b0396a..647566437f 100644 --- a/nodemailer/nodemailer.d.ts +++ b/nodemailer/nodemailer.d.ts @@ -46,7 +46,16 @@ declare module "nodemailer" { * @param pluginFunc is a function that takes two arguments: the mail object and a callback function */ use(step: string, plugin: Plugin): void; - + + /** + * Verifies connection with server + */ + verify(callback: (error: Error, success?: boolean) => void): void; + + /** + * Verifies connection with server + */ + verify(): Promise; /** * Close all connections diff --git a/nvd3/nvd3.d.ts b/nvd3/nvd3.d.ts index f0297abcb0..9e9c1fdc24 100644 --- a/nvd3/nvd3.d.ts +++ b/nvd3/nvd3.d.ts @@ -3349,3 +3349,7 @@ id(value: number|string): this; } } declare var nv : nv.Nvd3Static; + +declare module "nvd3" { + export = nv; +} diff --git a/react-bootstrap-table/react-bootstrap-table-tests.tsx b/react-bootstrap-table/react-bootstrap-table-tests.tsx index 9a22bf9df4..a9ae5908df 100644 --- a/react-bootstrap-table/react-bootstrap-table-tests.tsx +++ b/react-bootstrap-table/react-bootstrap-table-tests.tsx @@ -23,7 +23,7 @@ function priceFormatter(cell: any, row: any) { render( Product ID - Product Name + Product Name Product Price , document.getElementById("app") diff --git a/react-bootstrap-table/react-bootstrap-table.d.ts b/react-bootstrap-table/react-bootstrap-table.d.ts index ef71133841..59accd8722 100644 --- a/react-bootstrap-table/react-bootstrap-table.d.ts +++ b/react-bootstrap-table/react-bootstrap-table.d.ts @@ -1,6 +1,6 @@ // Type definitions for react-bootstrap-table v2.3.0 // Project: https://github.com/AllenFang/react-bootstrap-table -// Definitions by: Frank Laub , Michael Scharf +// Definitions by: Frank Laub , Michael Scharf , Ian Ker-Seymer // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /// @@ -556,6 +556,12 @@ declare module "react-bootstrap-table" { */ options?: any; + + /** + Configuration for the textarea editable type + */ + cols?: number; + rows?: number; } export type FilterType = 'TextFilter' | 'RegexFilter' | 'SelectFilter' | 'NumberFilter' | 'DateFilter' | 'CustomFilter'; diff --git a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts index c67f4b9ef5..6a94717e92 100644 --- a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts +++ b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts @@ -14,8 +14,6 @@ import DropTarget = ReactDnd.DropTarget; import DragLayer = ReactDnd.DragLayer; import DragDropContext = ReactDnd.DragDropContext; import HTML5Backend, { getEmptyImage } from 'react-dnd-html5-backend'; -import TestBackend = require('react-dnd/modules/backends/Test'); - // Game Component // ---------------------------------------------------------------------- @@ -285,7 +283,6 @@ namespace Board { } export var createWithHTMLBackend = React.createFactory(DragDropContext(HTML5Backend)(Board)); - export var createWithTestBackend = React.createFactory(DragDropContext(TestBackend)(Board)); } // Render the Board Component @@ -294,8 +291,3 @@ namespace Board { Board.createWithHTMLBackend({ knightPosition: [0, 0] }); - - -Board.createWithTestBackend({ - knightPosition: [0, 0] -}); diff --git a/react-dnd/react-dnd-html5-backend.d.ts b/react-dnd/react-dnd-html5-backend.d.ts new file mode 100644 index 0000000000..3844778b72 --- /dev/null +++ b/react-dnd/react-dnd-html5-backend.d.ts @@ -0,0 +1,16 @@ +// Type definitions for React DnD HTML 5 Backend v2.0.0 +// Project: https://github.com/gaearon/react-dnd +// Definitions by: Asana +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module "react-dnd-html5-backend" { + export namespace NativeTypes { + export const FILE: string; + export const URL: string; + export const TEXT: string; + } + export function getEmptyImage(): any; // Image + export default class HTML5Backend implements __ReactDnd.Backend { } +} diff --git a/react-dnd/react-dnd-test-backend.d.ts b/react-dnd/react-dnd-test-backend.d.ts new file mode 100644 index 0000000000..a4e6ad0cc8 --- /dev/null +++ b/react-dnd/react-dnd-test-backend.d.ts @@ -0,0 +1,22 @@ +// Type definitions for React DnD HTML 5 Backend v2.0.0 +// Project: https://github.com/gaearon/react-dnd +// Definitions by: Asana +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module "react-dnd-test-backend" { + class TestBackend { + setup(): void; + teardown(): void; + connectDragSource(): void; + connectDropTarget(): void; + simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void; + simulatePublishDragSource(): void; + simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void; + simulateDrop(): void; + simulateEndDrag(): void; + } + + export { TestBackend as default }; +} diff --git a/react-dnd/react-dnd-tests.ts b/react-dnd/react-dnd-tests.ts index 59c0566664..b8723a4e7f 100644 --- a/react-dnd/react-dnd-tests.ts +++ b/react-dnd/react-dnd-tests.ts @@ -1,4 +1,6 @@ /// +/// +/// "use strict"; // Test adapted from the ReactDnD chess game tutorial: @@ -13,8 +15,8 @@ import DragSource = ReactDnd.DragSource; import DropTarget = ReactDnd.DropTarget; import DragLayer = ReactDnd.DragLayer; import DragDropContext = ReactDnd.DragDropContext; -import HTML5Backend, { getEmptyImage } from 'react-dnd/modules/backends/HTML5'; -import TestBackend = require('react-dnd/modules/backends/Test'); +import HTML5Backend, { getEmptyImage, NativeTypes } from "react-dnd-html5-backend"; +import TestBackend from "react-dnd-test-backend"; // Game Component // ---------------------------------------------------------------------- @@ -199,6 +201,7 @@ namespace BoardSquare { } export var DndBoardSquare = DropTarget(ItemTypes.KNIGHT, boardSquareTarget, boardSquareCollect)(BoardSquare); + export var fileDropTarget = DropTarget(NativeTypes.FILE, boardSquareTarget, boardSquareCollect)(BoardSquare); export var create = React.createFactory(DndBoardSquare); } diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts index cfe5506afb..6da351d4ff 100644 --- a/react-dnd/react-dnd.d.ts +++ b/react-dnd/react-dnd.d.ts @@ -1,4 +1,4 @@ -// Type definitions for React DnD v1.1.4 +// Type definitions for React DnD v2.0.2 // Project: https://github.com/gaearon/react-dnd // Definitions by: Asana // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -178,25 +178,3 @@ declare module __ReactDnd { declare module "react-dnd" { export = __ReactDnd; } - -declare module "react-dnd/modules/backends/HTML5" { - export enum NativeTypes { FILE, URL, TEXT } - export function getEmptyImage(): any; // Image - export default class HTML5Backend implements __ReactDnd.Backend {} -} - -declare module "react-dnd/modules/backends/Test" { - class TestBackend { - setup(): void; - teardown(): void; - connectDragSource(): void; - connectDropTarget(): void; - simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void; - simulatePublishDragSource(): void; - simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void; - simulateDrop(): void; - simulateEndDrag(): void; - } - - export = TestBackend; -}