From a99266669ec3cec79e8e2c31ea3b9843a608bd55 Mon Sep 17 00:00:00 2001 From: plouc Date: Sat, 1 Jan 2022 15:40:25 +0900 Subject: [PATCH] feat(chord): fix static mapping used for the http API --- packages/chord/package.json | 4 +--- packages/static/src/mappings/chord.ts | 9 ++++----- packages/static/src/samples/index.ts | 2 +- website/src/pages/chord/api.tsx | 4 ++-- website/src/pages/chord/canvas.tsx | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/chord/package.json b/packages/chord/package.json index 865ec52129..e86badc6a5 100644 --- a/packages/chord/package.json +++ b/packages/chord/package.json @@ -35,9 +35,7 @@ "@nivo/tooltip": "0.77.0", "@react-spring/web": "9.3.1", "d3-chord": "^1.0.6", - "d3-shape": "^1.3.5", - "lodash": "^4.17.21", - "react-motion": "^0.5.2" + "d3-shape": "^1.3.5" }, "devDependencies": { "@nivo/core": "0.77.0", diff --git a/packages/static/src/mappings/chord.ts b/packages/static/src/mappings/chord.ts index 4132f2c24d..6954a89e6e 100644 --- a/packages/static/src/mappings/chord.ts +++ b/packages/static/src/mappings/chord.ts @@ -1,7 +1,7 @@ import { FunctionComponent } from 'react' import Joi from 'joi' import { Dimensions } from '@nivo/core' -import { Chord, ChordProps } from '@nivo/chord' +import { Chord, ChordSvgProps } from '@nivo/chord' import { custom } from './common' import { ordinalColors, inheritedColor } from './commons/colors' import { dimensions } from './commons/dimensions' @@ -9,11 +9,10 @@ import { OmitStrict } from '../types' // filter out all dynamic properties export type ChordApiProps = OmitStrict< - ChordProps & Dimensions, + ChordSvgProps & Dimensions, | 'isInteractive' | 'animate' - | 'motionStiffness' - | 'motionDamping' + | 'motionConfig' | 'onRibbonMouseEnter' | 'onRibbonMouseMove' | 'onRibbonMouseLeave' @@ -38,7 +37,7 @@ export const chordMapping = { height: dimensions.height, margin: dimensions.margin, - matrix: custom.array().required(), + data: custom.array().required(), keys: Joi.array().required(), padAngle: Joi.number(), diff --git a/packages/static/src/samples/index.ts b/packages/static/src/samples/index.ts index d1bcf84d73..89287c98ec 100644 --- a/packages/static/src/samples/index.ts +++ b/packages/static/src/samples/index.ts @@ -46,7 +46,7 @@ export const samples: Record< props: { width: 800, height: 800, - matrix: [ + data: [ [11975, 5871, 8916, 2868, 1967, 2987, 4300], [1951, 10048, 2060, 6171, 1967, 2987, 4300], [8010, 16145, 8090, 8045, 1967, 2987, 4300], diff --git a/website/src/pages/chord/api.tsx b/website/src/pages/chord/api.tsx index 5a2098e0d4..1454983ede 100644 --- a/website/src/pages/chord/api.tsx +++ b/website/src/pages/chord/api.tsx @@ -34,13 +34,13 @@ const ChordApi = () => { chartClass="chord" apiPath="/charts/chord" flavors={meta.flavors} - dataProperty="matrix" + //dataProperty="matrix" controlGroups={groups} propsMapper={mapper} defaultProps={{ width: 800, height: 800, - matrix: JSON.stringify(data.matrix, null, ' '), + data: JSON.stringify(data.matrix, null, ' '), keys: data.keys, margin: { top: 40, diff --git a/website/src/pages/chord/canvas.tsx b/website/src/pages/chord/canvas.tsx index 8c23c21d34..0309b5bfc4 100644 --- a/website/src/pages/chord/canvas.tsx +++ b/website/src/pages/chord/canvas.tsx @@ -49,7 +49,7 @@ const initialProperties = { modifiers: [['darker', 1]], }, - colors: { scheme: 'paired' }, + colors: { scheme: 'red_blue' }, isInteractive: true, arcHoverOpacity: 1,