From 59ceae1b082a411ca361bb84185b7882138ea524 Mon Sep 17 00:00:00 2001 From: Per Svensson Date: Mon, 28 May 2018 20:21:01 +0200 Subject: [PATCH 1/7] Definitions for Pie component --- packages/nivo-pie/index.d.ts | 78 ++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 packages/nivo-pie/index.d.ts diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/index.d.ts new file mode 100644 index 000000000..e3ba2a4cd --- /dev/null +++ b/packages/nivo-pie/index.d.ts @@ -0,0 +1,78 @@ +declare module '@nivo/pie' { + + interface INivoLegendItem { + + data: Array<{ label: string | number; fill: string; }>; + + // position & layout + anchor: 'top' | 'top-right' | 'right' | 'bottom-right' | 'bottom' | 'bottom-left' | 'left' | 'top-left' | 'center'; + + translateX?: number; + translateY?: number; + direction: 'row' | 'column'; + + // items + itemWidth: number; + itemHeight: number; + itemDirection?: 'left-to-right' | 'right-to-left' | 'top-to-bottom' | 'bottom-to-top', + itemsSpacing?: number; + symbolSize?: number; + symbolSpacing?: number; + symbolShape: "circle" | "diamond" | "square" | "triangle", //Proptypes specifies this as string | func but source implements it as string only. + textColor?: string; + } + + interface IPieDataItem { + id: string; + value: string; + } + + type SettingsGetterFunc = (dataSlize: IPieDataITem) => string; + + interface IPieProps { + data: Array; + sortByValue: bool; + innerRadius: number; + padAngle: number; + cornerRadius: number; + + // border + borderWidth: number; + borderColor?: string | SettingsGetterFunc; + + // radial labels + enableRadialLabels: bool; + radialLabel?: string | SettingsGetterFunc; + radialLabelsSkipAngle?: number; + radialLabelsTextXOffset?: number; + radialLabelsTextColor?: string | SettingsGetterFunc; + radialLabelsLinkOffset?: number; + radialLabelsLinkDiagonalLength?: number; + radialLabelsLinkHorizontalLength?: number; + radialLabelsLinkStrokeWidth?: number; + radialLabelsLinkColor?: string | SettingsGetterFunc; + + // slices labels + enableSlicesLabels: bool; + sliceLabel?: string | SettingsGetterFunc; + slicesLabelsSkipAngle?: number; + slicesLabelsTextColor?: string | SettingsGetterFunc; + + // styling + + + isInteractive?: bool; + onClick: (dataSlize: IPieDataITem, event: React.MouseEvent) => void; + //tooltipFormat?: string | SettingsGetterFunc; No docs, no usage in source + + legends: Array; + } + + export class Pie extends React.Component{ + + } + + export class ResponsivePie extends Pie { + + } +} \ No newline at end of file From 7a5752bf829cf80b67a124de3329b0eb68266349 Mon Sep 17 00:00:00 2001 From: Per Svensson Date: Mon, 28 May 2018 20:53:37 +0200 Subject: [PATCH 2/7] Aligning with bar-package, adding correct class defs., adding dimensions to Pie class --- packages/nivo-pie/index.d.ts | 38 ++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/index.d.ts index e3ba2a4cd..21f3600e8 100644 --- a/packages/nivo-pie/index.d.ts +++ b/packages/nivo-pie/index.d.ts @@ -1,27 +1,48 @@ declare module '@nivo/pie' { + export class Pie extends React.Component{} + export class ResponsivePie extends React.Component{} + + type LegendItemDirection = + | 'left-to-right' + | 'right-to-left' + | 'top-to-bottom' + | 'bottom-to-top'; + + type Anchor = + | 'top' + | 'top-right' + | 'right' + | 'bottom-right' + | 'bottom' + | 'bottom-left' + | 'left' + | 'top-left' + | 'center'; + + type LegendDirection = 'row' | 'column'; interface INivoLegendItem { data: Array<{ label: string | number; fill: string; }>; // position & layout - anchor: 'top' | 'top-right' | 'right' | 'bottom-right' | 'bottom' | 'bottom-left' | 'left' | 'top-left' | 'center'; + anchor: Anchor; translateX?: number; translateY?: number; - direction: 'row' | 'column'; + direction: LegendDirection; // items itemWidth: number; itemHeight: number; - itemDirection?: 'left-to-right' | 'right-to-left' | 'top-to-bottom' | 'bottom-to-top', + itemDirection?: LegendItemDirection; itemsSpacing?: number; symbolSize?: number; symbolSpacing?: number; symbolShape: "circle" | "diamond" | "square" | "triangle", //Proptypes specifies this as string | func but source implements it as string only. textColor?: string; } - + interface IPieDataItem { id: string; value: string; @@ -68,11 +89,8 @@ declare module '@nivo/pie' { legends: Array; } - export class Pie extends React.Component{ - - } - - export class ResponsivePie extends Pie { - + interface IDimensions{ + height: number; + width: number; } } \ No newline at end of file From c91ff67b5ecea0973dd1b10eee1ac946c833a7fe Mon Sep 17 00:00:00 2001 From: Per Svensson Date: Mon, 28 May 2018 20:56:53 +0200 Subject: [PATCH 3/7] exporting sub-types --- packages/nivo-pie/index.d.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/index.d.ts index 21f3600e8..a72e10360 100644 --- a/packages/nivo-pie/index.d.ts +++ b/packages/nivo-pie/index.d.ts @@ -2,13 +2,13 @@ declare module '@nivo/pie' { export class Pie extends React.Component{} export class ResponsivePie extends React.Component{} - type LegendItemDirection = + export type LegendItemDirection = | 'left-to-right' | 'right-to-left' | 'top-to-bottom' | 'bottom-to-top'; - type Anchor = + export type Anchor = | 'top' | 'top-right' | 'right' @@ -19,9 +19,9 @@ declare module '@nivo/pie' { | 'top-left' | 'center'; - type LegendDirection = 'row' | 'column'; + export type LegendDirection = 'row' | 'column'; - interface INivoLegendItem { + export interface INivoLegendItem { data: Array<{ label: string | number; fill: string; }>; @@ -43,14 +43,14 @@ declare module '@nivo/pie' { textColor?: string; } - interface IPieDataItem { + export interface IPieDataItem { id: string; value: string; } - type SettingsGetterFunc = (dataSlize: IPieDataITem) => string; + export type SettingsGetterFunc = (dataSlize: IPieDataITem) => string; - interface IPieProps { + export interface IPieProps { data: Array; sortByValue: bool; innerRadius: number; @@ -89,7 +89,7 @@ declare module '@nivo/pie' { legends: Array; } - interface IDimensions{ + export interface IDimensions{ height: number; width: number; } From fc0774223c4e1dfd2fdeda9fb69392354262ac29 Mon Sep 17 00:00:00 2001 From: Svensson Date: Tue, 29 May 2018 09:45:03 +0200 Subject: [PATCH 4/7] aligning naming, adding Partial and adding missing enhanced props --- packages/nivo-pie/index.d.ts | 104 ++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/index.d.ts index a72e10360..d050b7c47 100644 --- a/packages/nivo-pie/index.d.ts +++ b/packages/nivo-pie/index.d.ts @@ -1,6 +1,6 @@ declare module '@nivo/pie' { - export class Pie extends React.Component{} - export class ResponsivePie extends React.Component{} + export class Pie extends React.Component{} + export class ResponsivePie extends React.Component{} export type LegendItemDirection = | 'left-to-right' @@ -21,76 +21,104 @@ declare module '@nivo/pie' { export type LegendDirection = 'row' | 'column'; - export interface INivoLegendItem { + export type Legend = { data: Array<{ label: string | number; fill: string; }>; // position & layout anchor: Anchor; - translateX?: number; - translateY?: number; + translateX: number; // default 0 + translateY: number; // default 0 direction: LegendDirection; // items itemWidth: number; itemHeight: number; - itemDirection?: LegendItemDirection; - itemsSpacing?: number; - symbolSize?: number; - symbolSpacing?: number; - symbolShape: "circle" | "diamond" | "square" | "triangle", //Proptypes specifies this as string | func but source implements it as string only. - textColor?: string; + itemDirection?: LegendItemDirection; // default left-to-right + itemsSpacing?: number; // default 0 + symbolSize?: number; // default 16 + symbolSpacing?: number; // default 8 + symbolShape?: "circle" | "diamond" | "square" | "triangle", // default square + textColor?: string; // default black } - export interface IPieDataItem { + export interface PieDataItem { id: string; value: string; } - export type SettingsGetterFunc = (dataSlize: IPieDataITem) => string; + export type SettingsGetterFunc = (dataSlize: PieDataItem) => string; - export interface IPieProps { - data: Array; - sortByValue: bool; + export type PieProps = Partial<{ + data: Array; + sortByValue: boolean; innerRadius: number; padAngle: number; cornerRadius: number; // border borderWidth: number; - borderColor?: string | SettingsGetterFunc; + borderColor: string | SettingsGetterFunc; // radial labels - enableRadialLabels: bool; - radialLabel?: string | SettingsGetterFunc; - radialLabelsSkipAngle?: number; - radialLabelsTextXOffset?: number; - radialLabelsTextColor?: string | SettingsGetterFunc; - radialLabelsLinkOffset?: number; - radialLabelsLinkDiagonalLength?: number; - radialLabelsLinkHorizontalLength?: number; - radialLabelsLinkStrokeWidth?: number; - radialLabelsLinkColor?: string | SettingsGetterFunc; + enableRadialLabels: boolean; + radialLabel: string | SettingsGetterFunc; + radialLabelsSkipAngle: number; + radialLabelsTextXOffset: number; + radialLabelsTextColor: string | SettingsGetterFunc; + radialLabelsLinkOffset: number; + radialLabelsLinkDiagonalLength: number; + radialLabelsLinkHorizontalLength: number; + radialLabelsLinkStrokeWidth: number; + radialLabelsLinkColor: string | SettingsGetterFunc; // slices labels - enableSlicesLabels: bool; - sliceLabel?: string | SettingsGetterFunc; - slicesLabelsSkipAngle?: number; - slicesLabelsTextColor?: string | SettingsGetterFunc; + enableSlicesLabels: boolean; + sliceLabel: string | SettingsGetterFunc; + slicesLabelsSkipAngle: number; + slicesLabelsTextColor: string | SettingsGetterFunc; - // styling + + colors: string | string[] | Function; + colorBy: string | Function; + margin: Box; - isInteractive?: bool; - onClick: (dataSlize: IPieDataITem, event: React.MouseEvent) => void; - //tooltipFormat?: string | SettingsGetterFunc; No docs, no usage in source - legends: Array; - } + isInteractive: boolean; + onClick: (dataSlize: PieDataItem, event: React.MouseEvent) => void; + // tooltipFormat?: string | SettingsGetterFunc; No docs, no usage in source + + theme: Theme; - export interface IDimensions{ + legends: Array; + }>; + + export interface Dimensions{ height: number; width: number; } + + export type Theme = Partial<{ + axis: React.CSSProperties; + grid: React.CSSProperties; + markers: React.CSSProperties; + dots: React.CSSProperties; + tooltip: Partial<{ + basic: React.CSSProperties; + container: React.CSSProperties; + table: React.CSSProperties; + tableCell: React.CSSProperties; + }>; + labels: React.CSSProperties; + sankey: Partial<{ label: React.CSSProperties }>; + }> + + export type Box = Partial<{ + bottom: number; + left: number; + right: number; + top: number; + }> } \ No newline at end of file From 21bcb8e14257a9b9ab60f6f4e36f9ff6af99ca50 Mon Sep 17 00:00:00 2001 From: Svensson Date: Tue, 29 May 2018 10:01:37 +0200 Subject: [PATCH 5/7] Adding data as optional (external type) --- packages/nivo-pie/index.d.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/index.d.ts index d050b7c47..0095a4c20 100644 --- a/packages/nivo-pie/index.d.ts +++ b/packages/nivo-pie/index.d.ts @@ -1,12 +1,12 @@ declare module '@nivo/pie' { - export class Pie extends React.Component{} - export class ResponsivePie extends React.Component{} + export class Pie extends React.Component{ } + export class ResponsivePie extends React.Component{ } export type LegendItemDirection = - | 'left-to-right' - | 'right-to-left' - | 'top-to-bottom' - | 'bottom-to-top'; + | 'left-to-right' + | 'right-to-left' + | 'top-to-bottom' + | 'bottom-to-top'; export type Anchor = | 'top' @@ -42,7 +42,7 @@ declare module '@nivo/pie' { symbolShape?: "circle" | "diamond" | "square" | "triangle", // default square textColor?: string; // default black } - + export interface PieDataItem { id: string; value: string; @@ -50,8 +50,9 @@ declare module '@nivo/pie' { export type SettingsGetterFunc = (dataSlize: PieDataItem) => string; + export type Data = { data: Array }; + export type PieProps = Partial<{ - data: Array; sortByValue: boolean; innerRadius: number; padAngle: number; @@ -79,7 +80,7 @@ declare module '@nivo/pie' { slicesLabelsSkipAngle: number; slicesLabelsTextColor: string | SettingsGetterFunc; - + colors: string | string[] | Function; colorBy: string | Function; @@ -95,7 +96,7 @@ declare module '@nivo/pie' { legends: Array; }>; - export interface Dimensions{ + export interface Dimensions { height: number; width: number; } From ea89050c082b29d1d6de3012faaf08be08a97604 Mon Sep 17 00:00:00 2001 From: Svensson Date: Fri, 1 Jun 2018 08:47:24 +0200 Subject: [PATCH 6/7] Resolves #215 --- packages/nivo-pie/package.json | 3 + packages/nivo-pie/{ => types}/index.d.ts | 73 ++++++++--- packages/nivo-pie/types/typescript-tests.tsx | 128 +++++++++++++++++++ packages/nivo-pie/yarn.lock | 112 ++++++++++++++++ 4 files changed, 300 insertions(+), 16 deletions(-) rename packages/nivo-pie/{ => types}/index.d.ts (60%) create mode 100644 packages/nivo-pie/types/typescript-tests.tsx diff --git a/packages/nivo-pie/package.json b/packages/nivo-pie/package.json index ff5eb3ece..caf84b69a 100644 --- a/packages/nivo-pie/package.json +++ b/packages/nivo-pie/package.json @@ -9,15 +9,18 @@ "index.d.ts", "cjs/" ], + "types": "index.d.ts", "dependencies": { "@nivo/core": "0.36.0", "@nivo/legends": "0.35.2", + "@types/react": "^16.3.16", "d3-shape": "^1.2.0", "lodash": "^4.17.4", "react-motion": "^0.5.2", "recompose": "^0.26.0" }, "peerDependencies": { + "@types/react": ">=16.3.16 < 17.0.0", "prop-types": "^15.5.10", "react": ">= 16.2.0 < 17.0.0" }, diff --git a/packages/nivo-pie/index.d.ts b/packages/nivo-pie/types/index.d.ts similarity index 60% rename from packages/nivo-pie/index.d.ts rename to packages/nivo-pie/types/index.d.ts index e80f59656..894f20360 100644 --- a/packages/nivo-pie/index.d.ts +++ b/packages/nivo-pie/types/index.d.ts @@ -1,4 +1,7 @@ declare module '@nivo/pie' { + import * as React from 'react'; + import * as CSS from 'csstype'; + export class Pie extends React.Component{ } export class ResponsivePie extends React.Component{ } @@ -23,13 +26,13 @@ declare module '@nivo/pie' { export type Legend = { - data: Array<{ label: string | number; fill: string; }>; + data?: Array<{ id: string | number; value: number; }>; //injected // position & layout anchor: Anchor; - translateX: number; // default 0 - translateY: number; // default 0 + translateX?: number; // default 0 + translateY?: number; // default 0 direction: LegendDirection; // items @@ -45,9 +48,9 @@ declare module '@nivo/pie' { export interface PieDataItem { id: string; - value: string; + value: number; } - + export type SettingsGetterFunc = (dataSlize: PieDataItem) => string; export type Data = { data: Array }; @@ -95,6 +98,11 @@ declare module '@nivo/pie' { theme: Theme; legends: Array; + + // motion + animate: boolean; + motionDamping: number; + motionStiffness: number; }>; export interface Dimensions { @@ -103,18 +111,51 @@ declare module '@nivo/pie' { } export type Theme = Partial<{ - axis: React.CSSProperties; - grid: React.CSSProperties; - markers: React.CSSProperties; - dots: React.CSSProperties; + axis: Partial<{ + textColor: CSS.ColorProperty; + fontSize: CSS.FontSizeProperty; + tickColor: CSS.ColorProperty; + legendColor: CSS.ColorProperty; + legendFontSize: CSS.FontSizeProperty; + }>, + grid: Partial<{ + stroke: CSS.ColorProperty; + strokeWidth: number + strokeDasharray: string; + }>, + markers: Partial<{ + lineColor: CSS.ColorProperty; + lineStrokeWidth: number; + textColor: CSS.ColorProperty; + fontSize: CSS.FontSizeProperty; + }>, + dots: Partial<{ + textColor: CSS.ColorProperty; + fontSize: CSS.FontSizeProperty; + }>, tooltip: Partial<{ - basic: React.CSSProperties; - container: React.CSSProperties; - table: React.CSSProperties; - tableCell: React.CSSProperties; - }>; - labels: React.CSSProperties; - sankey: Partial<{ label: React.CSSProperties }>; + container: Partial<{ + background: CSS.ColorProperty; + color: CSS.ColorProperty; + fontSize: CSS.FontSizeProperty; + borderRadius: CSS.BorderRadiusProperty; + boxShadow: CSS.BoxShadowProperty; + padding: CSS.PaddingProperty; + }>, + basic: Partial<{ + whiteSpace: CSS.WhiteSpaceProperty; + display: CSS.DisplayProperty; + alignItems: CSS.AlignItemsProperty; + }>, + table: any; + tableCell: { + padding: CSS.PaddingProperty; + } + }>, + labels: { textColor: CSS.ColorProperty; }; + sankey: { + label: any + } }> export type Box = Partial<{ diff --git a/packages/nivo-pie/types/typescript-tests.tsx b/packages/nivo-pie/types/typescript-tests.tsx new file mode 100644 index 000000000..84010a86e --- /dev/null +++ b/packages/nivo-pie/types/typescript-tests.tsx @@ -0,0 +1,128 @@ +import { Pie, ResponsivePie } from "@nivo/pie"; + +const data = [ + { + id: "stylus", + label: "stylus", + value: 38, + color: "hsl(26, 70%, 50%)" + }, + { + id: "javascript", + label: "javascript", + value: 159, + color: "hsl(94, 70%, 50%)" + }, + { + id: "go", + label: "go", + value: 120, + color: "hsl(36, 70%, 50%)" + } +]; +const PieComponent = ( + +); + +const ResponsivePieComponent = \ No newline at end of file diff --git a/packages/nivo-pie/yarn.lock b/packages/nivo-pie/yarn.lock index 2b30ccd45..ee39d7c75 100644 --- a/packages/nivo-pie/yarn.lock +++ b/packages/nivo-pie/yarn.lock @@ -2,6 +2,35 @@ # yarn lockfile v1 +"@nivo/core@0.36.0": + version "0.36.0" + resolved "https://registry.yarnpkg.com/@nivo/core/-/core-0.36.0.tgz#f111071790aa258bd7a035cf27646caf58a69567" + dependencies: + d3-color "^1.0.3" + d3-format "^1.2.0" + d3-hierarchy "^1.1.5" + d3-interpolate "^1.1.5" + d3-scale "^1.0.6" + d3-scale-chromatic "^1.1.1" + d3-shape "^1.2.0" + lodash "^4.17.4" + react-measure "^2.0.2" + react-motion "^0.5.2" + recompose "^0.26.0" + +"@nivo/legends@0.35.2": + version "0.35.2" + resolved "https://registry.yarnpkg.com/@nivo/legends/-/legends-0.35.2.tgz#7b7866eb7ca0522cbe6ffd1355813c3ec4eaaf68" + dependencies: + lodash "^4.17.4" + recompose "^0.26.0" + +"@types/react@^16.3.16": + version "16.3.16" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.16.tgz#78fc44a90b45701f50c8a7008f733680ba51fc86" + dependencies: + csstype "^2.2.0" + asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -14,16 +43,75 @@ core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" +csstype@^2.2.0: + version "2.5.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.3.tgz#2504152e6e1cc59b32098b7f5d6a63f16294c1f7" + +d3-array@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz#d1ca33de2f6ac31efadb8e050a021d7e2396d5dc" + +d3-collection@1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz#342dfd12837c90974f33f1cc0a785aea570dcdc2" + +d3-color@1, d3-color@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.0.tgz#d1ea19db5859c86854586276ec892cf93148459a" + +d3-format@1, d3-format@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.0.tgz#a3ac44269a2011cdb87c7b5693040c18cddfff11" + +d3-hierarchy@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.6.tgz#842c1372090f870b7ea013ebae5c0c8d9f56229c" + +d3-interpolate@1, d3-interpolate@^1.1.5: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.2.0.tgz#40d81bd8e959ff021c5ea7545bc79b8d22331c41" + dependencies: + d3-color "1" + d3-path@1: version "1.0.5" resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz#241eb1849bd9e9e8021c0d0a799f8a0e8e441764" +d3-scale-chromatic@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.0.tgz#7ee38ffcaa7ad55cfed83a6a668aac5570c653c4" + dependencies: + d3-color "1" + d3-interpolate "1" + +d3-scale@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz#fa90324b3ea8a776422bd0472afab0b252a0945d" + dependencies: + d3-array "^1.2.0" + d3-collection "1" + d3-color "1" + d3-format "1" + d3-interpolate "1" + d3-time "1" + d3-time-format "2" + d3-shape@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777" dependencies: d3-path "1" +d3-time-format@2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz#85b7cdfbc9ffca187f14d3c456ffda268081bb31" + dependencies: + d3-time "1" + +d3-time@1: + version "1.0.8" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84" + encoding@^0.1.11: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" @@ -42,6 +130,10 @@ fbjs@^0.8.1, fbjs@^0.8.16: setimmediate "^1.0.5" ua-parser-js "^0.7.9" +get-node-dimensions@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz#fb7b4bb57060fb4247dd51c9d690dfbec56b0823" + hoist-non-react-statics@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -100,6 +192,14 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.5.10: + version "15.6.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.3.1" + object-assign "^4.1.1" + prop-types@^15.5.8: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" @@ -114,6 +214,14 @@ raf@^3.1.0: dependencies: performance-now "^2.1.0" +react-measure@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/react-measure/-/react-measure-2.0.2.tgz#072a9a5fafc01dfbadc1fa5fb09fc351037f636c" + dependencies: + get-node-dimensions "^1.2.0" + prop-types "^15.5.10" + resize-observer-polyfill "^1.4.2" + react-motion@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316" @@ -131,6 +239,10 @@ recompose@^0.26.0: hoist-non-react-statics "^2.3.1" symbol-observable "^1.0.4" +resize-observer-polyfill@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69" + setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" From 4453f742139910c18768ea1ea4499620443da4f6 Mon Sep 17 00:00:00 2001 From: Svensson Date: Fri, 1 Jun 2018 09:15:07 +0200 Subject: [PATCH 7/7] removing @types/react double entry dependency --- packages/nivo-pie/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/nivo-pie/package.json b/packages/nivo-pie/package.json index caf84b69a..6d178fd8c 100644 --- a/packages/nivo-pie/package.json +++ b/packages/nivo-pie/package.json @@ -9,11 +9,10 @@ "index.d.ts", "cjs/" ], - "types": "index.d.ts", + "types": "./types/index.d.ts", "dependencies": { "@nivo/core": "0.36.0", "@nivo/legends": "0.35.2", - "@types/react": "^16.3.16", "d3-shape": "^1.2.0", "lodash": "^4.17.4", "react-motion": "^0.5.2",