fix(scatterplot): adjust type/proptype of data[].id prop

Close #943
plouc · Oct 2, 2020 · 71efd78 · 71efd78
1 parent 7d52c07
commit 71efd78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/scatterplot/index.d.ts b/packages/scatterplot/index.d.ts
@@ -34,7 +34,7 @@ declare module '@nivo/scatterplot' {
     export type DerivedDatumProp<T> = (node: Datum) => T
 
     export interface Serie {
-        id: string
+        id: string | number
         data: Datum[]
     }
 
@@ -48,6 +48,7 @@ declare module '@nivo/scatterplot' {
             color: string
         }
         data: {
+            id: string | number
             serieId: string
             x: Value
             formattedX: string | number

diff --git a/packages/scatterplot/src/props.js b/packages/scatterplot/src/props.js
@@ -19,7 +19,7 @@ import Tooltip from './Tooltip'
 const commonPropTypes = {
     data: PropTypes.arrayOf(
         PropTypes.shape({
-            id: PropTypes.string.isRequired,
+            id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
             data: PropTypes.arrayOf(
                 PropTypes.shape({
                     x: PropTypes.oneOfType([
@@ -162,7 +162,7 @@ export const NodePropType = PropTypes.shape({
     size: PropTypes.number.isRequired,
     data: PropTypes.shape({
         id: PropTypes.string.isRequired,
-        serieId: PropTypes.string.isRequired,
+        serieId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
         x: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.instanceOf(Date)])
             .isRequired,
         formattedX: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,