From 92060063d559254444c9bdcae6a0ceffdda0a692 Mon Sep 17 00:00:00 2001
From: locknono <guozy0103@outlook.com>
Date: Tue, 5 Mar 2019 11:44:19 +0800
Subject: [PATCH] add types for d3-cloud

---
 types/d3-cloud/d3-cloud-tests.ts |  3 +++
 types/d3-cloud/index.d.ts        | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/types/d3-cloud/d3-cloud-tests.ts b/types/d3-cloud/d3-cloud-tests.ts
index e3bffed4cb..19a140959f 100644
--- a/types/d3-cloud/d3-cloud-tests.ts
+++ b/types/d3-cloud/d3-cloud-tests.ts
@@ -27,8 +27,11 @@ d3.layout.cloud().size([300, 300])
     .font("Impact")
     .fontSize(function(d:ICompTextSize) { return d.size; })
     .on("end", draw)
+    .random()
+    .canvas()
     .start();
 
+
 function draw(words:ICompTextSize[]) {
   d3.select("body").append("svg")
       .attr("width", 300)
diff --git a/types/d3-cloud/index.d.ts b/types/d3-cloud/index.d.ts
index fdf2dbc719..b0a3b8a78c 100644
--- a/types/d3-cloud/index.d.ts
+++ b/types/d3-cloud/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for d3JS cloud layout plugin by Jason Davies v1.2.2
+// Type definitions for d3JS cloud layout plugin by Jason Davies v1.2.5
 // Project: https://github.com/jasondavies/d3-cloud
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>, locknono <https://github.com/locknono>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as d3 from 'd3';
@@ -71,6 +71,24 @@ declare module 'd3' {
             padding(padding: number): Cloud<T>;
             padding(padding: (datum: T, index: number) => number): Cloud<T>;
 
+             /**
+             * If specified, sets the internal random number generator,used for selecting the initial position of each word,
+             * and the clockwise/counterclockwise direction of the spiral for each word.
+             * 
+             * @param randomFunction should return a number in the range [0, 1).The default is Math.random.
+             */
+            random(): Cloud<T>;
+            random(randomFunction: () => number): Cloud<T>;
+
+            /**
+             * If specified, sets the canvas generator function, which is used internally to draw text.
+             * When using Node.js, you will almost definitely override the default, e.g. using the canvas module.
+             * @param canvasGenerator should return a HTMLCanvasElement.The default is:  ()=>{document.createElement("canvas");}
+             * 
+             */
+            canvas():Cloud<T>;
+            canvas(canvasGenerator: () => HTMLCanvasElement): Cloud<T>;
+
             on(type: "word", listener: (word: T) => void): Cloud<T>;
             on(type: "end", listener: (tags: T[], bounds: { x: number; y: number }[]) => void): Cloud<T>;
             on(type: string, listener: (...args: any[]) => void): Cloud<T>;