fix - other lint errors

FormidableLabs · Oct 7, 2020 · f49661e · f49661e
1 parent 69cb715
commit f49661e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
     },
     "import/resolver": {
       node: {
-        extensions: [".js", ".tsx"]
+        extensions: [".js", ".ts", ".tsx"]
       }
     }
   },

diff --git a/demo/js/components/accessibility-demo.js b/demo/js/components/accessibility-demo.js
@@ -1,6 +1,5 @@
+/*eslint-disable no-magic-numbers */
 import React from "react";
-import { Curve } from "Packages/victory-line";
-import { VictoryLine } from "Packages/victory-line";
 import { VictoryGroup } from "Packages/victory-group";
 import { VictoryStack } from "Packages/victory-stack";
 import { VictoryChart } from "Packages/victory-chart";
@@ -9,6 +8,7 @@ import { VictoryBoxPlot } from "Packages/victory-box-plot";
 import { VictoryBar, Bar } from "Packages/victory-bar";
 import { VictoryPie, Slice } from "Packages/victory-pie";
 import { VictoryArea, Area } from "Packages/victory-area";
+import { VictoryLine, Curve } from "Packages/victory-line";
 import { VictoryVoronoi, Voronoi } from "Packages/victory-voronoi";
 import { ErrorBar, VictoryErrorBar } from "Packages/victory-errorbar";
 import { Candle, VictoryCandlestick } from "Packages/victory-candlestick";
@@ -205,8 +205,10 @@ export default class App extends React.Component {
                   <Curve
                     ariaLabel={({ data }) =>
                       data.map(
-                        (data, i) =>
-                          `data point ${i + 1} x value is ${data.x} and y value is ${data.y}`
+                        (dataPoint, i) =>
+                          `data point ${i + 1} x value is ${dataPoint.x} and y value is ${
+                            dataPoint.y
+                          }`
                       )
                     }
                   />

diff --git a/demo/ts/components/accessibility-demo.tsx b/demo/ts/components/accessibility-demo.tsx
@@ -1,15 +1,15 @@
+/*eslint-disable no-magic-numbers */
 import React from "react";
 import { isNumber } from "lodash";
-import { Curve } from "@packages/victory-line";
 import { VictoryGroup } from "@packages/victory-group";
 import { VictoryStack } from "@packages/victory-stack";
-import { VictoryLine } from "@packages/victory-line";
-import { VictoryBar, Bar } from "@packages/victory-bar";
-import { VictoryPie, Slice } from "@packages/victory-pie";
-import { VictoryArea, Area } from "@packages/victory-area";
 import { VictoryChart } from "@packages/victory-chart";
 import { VictoryScatter } from "@packages/victory-scatter";
 import { VictoryBoxPlot } from "@packages/victory-box-plot";
+import { VictoryBar, Bar } from "@packages/victory-bar";
+import { VictoryPie, Slice } from "@packages/victory-pie";
+import { VictoryArea, Area } from "@packages/victory-area";
+import { VictoryLine, Curve } from "@packages/victory-line";
 import { VictoryVoronoi, Voronoi } from "@packages/victory-voronoi";
 import { ErrorBar, VictoryErrorBar } from "@packages/victory-errorbar";
 import { Candle, VictoryCandlestick } from "@packages/victory-candlestick";
@@ -102,7 +102,7 @@ export default class VictoryAccessibilityDemo extends React.Component<any> {
                 minLabels
                 maxLabels
                 data={accessibilityBoxData}
-                /** datum props available ex:
+                /* datum props available ex:
                  * x: "green"
                  * xName: "green"
                  * y: (4) [3, 5, 6, 9]

diff --git a/demo/ts/components/victory-brush-line-demo.tsx b/demo/ts/components/victory-brush-line-demo.tsx
@@ -102,15 +102,13 @@ class App extends React.Component<any, BrushLineDemoState> {
           point && Math.max(...filters[name]) >= point.y && Math.min(...filters[name]) <= point.y
         );
       }, true);
-
-      return this.state.datasets
-        .map((dataset: DataSet) => {
-          return isActive(dataset, filters) && dataset ? dataset.name : null;
-        })
-        .filter(Boolean);
     };
 
-    return [];
+    return this.state.datasets
+      .map((dataset: DataSet) => {
+        return isActive(dataset, filters) && dataset ? dataset.name : null;
+      })
+      .filter(Boolean);
   }
 
   onDomainChange(domain: DomainPropType, props: any) {

diff --git a/packages/victory-bar/src/index.d.ts b/packages/victory-bar/src/index.d.ts
@@ -2,7 +2,6 @@ import * as React from "react";
 import {
   EventPropTypeInterface,
   NumberOrCallback,
-  StringOrCallback,
   StringOrNumberOrCallback,
   VictoryCommonProps,
   VictoryCommonPrimitiveProps,

diff --git a/packages/victory-core/src/victory-accessible-group/victory-accessible-group.js b/packages/victory-core/src/victory-accessible-group/victory-accessible-group.js
@@ -6,9 +6,9 @@ class VictoryAccessibleGroup extends React.Component {
   static propTypes = {
     "aria-describedby": PropTypes.string,
     "aria-label": PropTypes.string,
-    desc: PropTypes.string,
     children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
     className: PropTypes.string,
+    desc: PropTypes.string,
     tabIndex: PropTypes.number
   };
 

diff --git a/packages/victory-core/src/victory-label/victory-label.js b/packages/victory-core/src/victory-label/victory-label.js
@@ -517,8 +517,8 @@ VictoryLabel.role = "label";
 VictoryLabel.defaultStyles = defaultStyles;
 VictoryLabel.propTypes = {
   active: PropTypes.bool,
-  ariaLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   angle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  ariaLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   backgroundComponent: PropTypes.element,
   backgroundPadding: PropTypes.oneOfType([PropTypes.number, PropTypes.object, PropTypes.array]),
   backgroundStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),