fix: update

hla-mg · Nov 5, 2019 · bc18894 · bc18894
1 parent 3418020
commit bc18894
Show file tree

Hide file tree

Showing 17 changed files with 143 additions and 303 deletions.
diff --git a/src/cartesian/CartesianAxis.tsx b/src/cartesian/CartesianAxis.tsx
@@ -15,15 +15,15 @@ import Label from '../component/Label';
 import { isSsr, filterEventsOfChild } from '../util/ReactUtils';
 // @ts-ignore
 import { isNumber, mathSign } from '../util/DataUtils';
-import { ViewBox, PresentationAttributes, filterProps, TickItem } from '../util/types';
+import { ViewBox, PresentationAttributes, filterProps, TickItem, BaseAxisProps } from '../util/types';
 
 interface CartesianTickItem extends TickItem {
   tickCoord?: number;
   tickSize?: number;
   isShow?: boolean;
 }
 
-interface CartesianAxisProps {
+export interface CartesianAxisProps {
   className?: string;
   x?: number;
   y?: number;

diff --git a/src/chart/AreaChart.tsx b/src/chart/AreaChart.tsx
@@ -6,7 +6,7 @@ import Area from '../cartesian/Area';
 import XAxis from '../cartesian/XAxis';
 import YAxis from '../cartesian/YAxis';
 import { formatAxisMap } from '../util/CartesianUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'AreaChart',
@@ -16,4 +16,4 @@ export default generateCategoricalChart({
     { axisType: 'yAxis', AxisComp: YAxis },
   ],
   formatAxisMap,
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/BarChart.tsx b/src/chart/BarChart.tsx
@@ -6,7 +6,7 @@ import Bar from '../cartesian/Bar';
 import XAxis from '../cartesian/XAxis';
 import YAxis from '../cartesian/YAxis';
 import { formatAxisMap } from '../util/CartesianUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'BarChart',
@@ -16,4 +16,4 @@ export default generateCategoricalChart({
     { axisType: 'yAxis', AxisComp: YAxis },
   ],
   formatAxisMap,
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/ComposedChart.tsx b/src/chart/ComposedChart.tsx
@@ -10,7 +10,7 @@ import XAxis from '../cartesian/XAxis';
 import YAxis from '../cartesian/YAxis';
 import ZAxis from '../cartesian/ZAxis';
 import { formatAxisMap } from '../util/CartesianUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'ComposedChart',
@@ -21,4 +21,4 @@ export default generateCategoricalChart({
     { axisType: 'zAxis', AxisComp: ZAxis },
   ],
   formatAxisMap,
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/FunnelChart.tsx b/src/chart/FunnelChart.tsx
@@ -3,7 +3,7 @@
  */
 import generateCategoricalChart from './generateCategoricalChart';
 import Funnel from '../numberAxis/Funnel';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'FunnelChart',
@@ -13,4 +13,4 @@ export default generateCategoricalChart({
   defaultProps: {
     layout: 'centric',
   },
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/LineChart.tsx b/src/chart/LineChart.tsx
@@ -6,7 +6,7 @@ import Line from '../cartesian/Line';
 import XAxis from '../cartesian/XAxis';
 import YAxis from '../cartesian/YAxis';
 import { formatAxisMap } from '../util/CartesianUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'LineChart',
@@ -16,4 +16,4 @@ export default generateCategoricalChart({
     { axisType: 'yAxis', AxisComp: YAxis },
   ],
   formatAxisMap,
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/PieChart.tsx b/src/chart/PieChart.tsx
@@ -7,7 +7,7 @@ import PolarAngleAxis from '../polar/PolarAngleAxis';
 import PolarRadiusAxis from '../polar/PolarRadiusAxis';
 import { formatAxisMap } from '../util/PolarUtils';
 import Pie from '../polar/Pie';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'PieChart',
@@ -28,4 +28,4 @@ export default generateCategoricalChart({
     innerRadius: 0,
     outerRadius: '80%',
   },
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/RadarChart.tsx b/src/chart/RadarChart.tsx
@@ -6,7 +6,7 @@ import Radar from '../polar/Radar';
 import PolarAngleAxis from '../polar/PolarAngleAxis';
 import PolarRadiusAxis from '../polar/PolarRadiusAxis';
 import { formatAxisMap } from '../util/PolarUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'RadarChart',
@@ -25,4 +25,4 @@ export default generateCategoricalChart({
     innerRadius: 0,
     outerRadius: '80%',
   },
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/RadialBarChart.tsx b/src/chart/RadialBarChart.tsx
@@ -6,7 +6,7 @@ import PolarAngleAxis from '../polar/PolarAngleAxis';
 import PolarRadiusAxis from '../polar/PolarRadiusAxis';
 import { formatAxisMap } from '../util/PolarUtils';
 import RadialBar from '../polar/RadialBar';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'RadialBarChart',
@@ -26,4 +26,4 @@ export default generateCategoricalChart({
     innerRadius: 0,
     outerRadius: '80%',
   },
-} as ICategoricalChart);
+} as CategoricalChart);
diff --git a/src/chart/Sankey.tsx b/src/chart/Sankey.tsx
@@ -11,7 +11,8 @@ import Rectangle from '../shape/Rectangle';
 import { shallowEqual } from '../util/ShallowEqual';
 import { getPresentationAttributes, filterSvgElements, validateWidthHeight, findChildByType } from '../util/ReactUtils';
 import { getValueByDataKey } from '../util/ChartUtils';
-import { IMargin, IPresentationAttributes, IEvent, ISankeyLink, ISankeyNode } from './index.d';
+import { SankeyLink, SankeyNode } from './types';
+import { Margin, DataKey } from '../util/types';
 
 const defaultCoordinateOfTooltip = { x: 0, y: 0 };
 
@@ -20,20 +21,20 @@ const interpolationGenerator = (a: number, b: number) => {
   const kb = b - ka;
   return (t: any) => ka + kb * t;
 };
-const centerY = (node: ISankeyNode) => (node.y + node.dy / 2);
-const getValue = (entry: ISankeyLink) => ((entry && entry.value) || 0);
-const getSumOfIds = (links: ISankeyLink[], ids: number[]) => (
+const centerY = (node: SankeyNode) => (node.y + node.dy / 2);
+const getValue = (entry: SankeyLink) => ((entry && entry.value) || 0);
+const getSumOfIds = (links: SankeyLink[], ids: number[]) => (
   ids.reduce((result: any, id: any) => (result + getValue(links[id])), 0)
 );
-const getSumWithWeightedSource = (tree: any, links: ISankeyLink[], ids: number[]) => (
+const getSumWithWeightedSource = (tree: any, links: SankeyLink[], ids: number[]) => (
   ids.reduce((result: any, id: any) => {
     const link = links[id];
     const sourceNode = tree[link.source];
 
     return result + centerY(sourceNode) * getValue(links[id]);
   }, 0)
 );
-const getSumWithWeightedTarget = (tree: any, links: ISankeyLink[], ids: number[]) => (
+const getSumWithWeightedTarget = (tree: any, links: SankeyLink[], ids: number[]) => (
   ids.reduce((result: number, id: number) => {
     const link = links[id];
     const targetNode = tree[link.target];
@@ -43,7 +44,7 @@ const getSumWithWeightedTarget = (tree: any, links: ISankeyLink[], ids: number[]
 );
 const ascendingY = (a: any, b: any) => (a.y - b.y);
 
-const searchTargetsAndSources = (links: ISankeyLink[], id: number) => {
+const searchTargetsAndSources = (links: SankeyLink[], id: number) => {
   const sourceNodes: number[] = [];
   const sourceLinks: number[] = [];
   const targetNodes: number[] = [];
@@ -102,7 +103,7 @@ const getNodesTree = ({ nodes, links }: any, width: number, nodeWidth: number):
       updateDepthOfTargets(tree, node);
     }
   }
-  const maxDepth = _.maxBy(tree, (entry: ISankeyNode) => entry.depth).depth;
+  const maxDepth = _.maxBy(tree, (entry: SankeyNode) => entry.depth).depth;
 
   if (maxDepth >= 1) {
     const childWidth = (width - nodeWidth) / maxDepth;
@@ -259,8 +260,8 @@ const computeData = ({ data, width, height, iterations, nodeWidth, nodePadding }
   nodeWidth: number,
   nodePadding: number,
 }): {
-  nodes: ISankeyNode[],
-  links: ISankeyLink[]
+  nodes: SankeyNode[],
+  links: SankeyLink[]
 } => {
   const { links } = data;
   const { tree } = getNodesTree(data, width, nodeWidth);
@@ -296,7 +297,7 @@ const getCoordinateOfTooltip = (el: any, type: string) => {
   };
 };
 
-const getPayloadOfTooltip = (el: any, type: string, nameKey: string | number) => {
+const getPayloadOfTooltip = (el: any, type: string, nameKey: DataKey<any>) => {
   const { payload } = el;
   if (type === 'node') {
     return [{
@@ -320,14 +321,13 @@ const getPayloadOfTooltip = (el: any, type: string, nameKey: string | number) =>
 };
 
 class Props implements IPresentationAttributes, IEvent {
-  // TODO nameKey  dataKey 需要支持 func
-  nameKey: string | number = 'name';
-  dataKey: string | number = 'value';
+  nameKey: DataKey<any> = 'name';
+  dataKey: DataKey<any> = 'value';
   width: number;
   height: number;
   data: {
-    node: ISankeyNode[];
-    links: ISankeyLink[];
+    node: SankeyNode[];
+    links: SankeyLink[];
   };
   nodePadding: number = 10;
   nodeWidth: number = 10;
@@ -341,7 +341,7 @@ class Props implements IPresentationAttributes, IEvent {
 
   className: string;
   children: any;
-  margin: IMargin = { top: 5, right: 5, bottom: 5, left: 5 };
+  margin: Margin = { top: 5, right: 5, bottom: 5, left: 5 };
 
   onClick: any;
 
@@ -360,8 +360,8 @@ class State {
   activeElement: any = null;
   activeElementType: any = null;
   isTooltipActive: boolean = false;
-  nodes: ISankeyNode[] = [];
-  links: ISankeyLink[] = [];
+  nodes: SankeyNode[] = [];
+  links: SankeyLink[] = [];
 }
 
 class Sankey extends PureComponent<Props, State> {
@@ -477,15 +477,15 @@ class Sankey extends PureComponent<Props, State> {
     );
   }
 
-  renderLinks(links: ISankeyLink[], nodes: ISankeyNode[]) {
+  renderLinks(links: SankeyLink[], nodes: SankeyNode[]) {
     const { linkCurvature, link: linkContent, margin } = this.props;
     const top = margin.top || 0;
     const left = margin.left || 0;
 
     return (
       <Layer className="recharts-sankey-links" key="recharts-sankey-links">
         {
-          links.map((link: ISankeyLink, i: number) => {
+          links.map((link: SankeyLink, i: number) => {
             const { sy: sourceRelativeY, ty: targetRelativeY, dy: linkWidth } = link;
             const source = nodes[link.source];
             const target = nodes[link.target];
@@ -542,7 +542,7 @@ class Sankey extends PureComponent<Props, State> {
     );
   }
 
-  renderNodes(nodes: ISankeyNode[]) {
+  renderNodes(nodes: SankeyNode[]) {
     const { node: nodeContent, margin } = this.props;
     const top = margin.top || 0;
     const left = margin.left || 0;

diff --git a/src/chart/ScatterChart.tsx b/src/chart/ScatterChart.tsx
@@ -7,7 +7,7 @@ import XAxis from '../cartesian/XAxis';
 import YAxis from '../cartesian/YAxis';
 import ZAxis from '../cartesian/ZAxis';
 import { formatAxisMap } from '../util/CartesianUtils';
-import { ICategoricalChart } from './index.d';
+import { CategoricalChart } from './types';
 
 export default generateCategoricalChart({
   chartName: 'ScatterChart',
@@ -19,4 +19,4 @@ export default generateCategoricalChart({
     { axisType: 'zAxis', AxisComp: ZAxis },
   ],
   formatAxisMap,
-} as ICategoricalChart);
+} as CategoricalChart);