From b8e3faa1b59edf5ebf055d74ba16498badde500c Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Mon, 2 Jan 2023 11:25:22 -0500 Subject: [PATCH] Update --- .../monitors/ChartMonitorWrapper.tsx | 5 ++- .../monitors/InspectorWrapper/ChartTab.tsx | 39 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/redux-devtools-app/src/containers/monitors/ChartMonitorWrapper.tsx b/packages/redux-devtools-app/src/containers/monitors/ChartMonitorWrapper.tsx index 7f6c451b..7639c32b 100644 --- a/packages/redux-devtools-app/src/containers/monitors/ChartMonitorWrapper.tsx +++ b/packages/redux-devtools-app/src/containers/monitors/ChartMonitorWrapper.tsx @@ -4,7 +4,10 @@ import { ChartMonitor } from '@redux-devtools/chart-monitor'; import type { HierarchyPointNode, Node } from 'd3-state-visualizer'; import { selectMonitorWithState } from '../../actions'; -export function getPath(obj: HierarchyPointNode, inspectedStatePath: string[]) { +export function getPath( + obj: HierarchyPointNode, + inspectedStatePath: string[] +) { const parent = obj.parent; if (!parent) return; getPath(parent, inspectedStatePath); diff --git a/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/ChartTab.tsx b/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/ChartTab.tsx index c9b91f38..7009069b 100644 --- a/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/ChartTab.tsx +++ b/packages/redux-devtools-app/src/containers/monitors/InspectorWrapper/ChartTab.tsx @@ -1,7 +1,8 @@ import React, { Component, RefCallback } from 'react'; import { connect, ResolveThunks } from 'react-redux'; import { withTheme } from 'styled-components'; -import { InputOptions, NodeWithId, tree } from 'd3-state-visualizer'; +import { tree } from 'd3-state-visualizer'; +import type { HierarchyPointNode, Node, Options } from 'd3-state-visualizer'; import { getPath } from '../ChartMonitorWrapper'; import { updateMonitorState } from '../../../actions'; import { ThemeFromProvider } from '@redux-devtools/ui'; @@ -54,12 +55,12 @@ class ChartTab extends Component { this.renderChart(props.data as {} | null | undefined); } - getChartTheme(theme: ThemeFromProvider): Partial { + getChartTheme(theme: ThemeFromProvider): Partial { return { heightBetweenNodesCoeff: 1, widthBetweenNodesCoeff: 1.3, tooltipOptions: { - style: { + styles: { color: theme.base06, 'background-color': theme.base01, opacity: '0.9', @@ -69,29 +70,29 @@ class ChartTab extends Component { offset: { left: 30, top: 10 }, indentationSize: 2, }, - style: { + chartStyles: { width: '100%', height: '100%', - node: { - colors: { - default: theme.base0B, - collapsed: theme.base0B, - parent: theme.base0E, - }, - radius: 7, - } as unknown as string, - text: { - colors: { - default: theme.base0D, - hover: theme.base06, - }, - } as unknown as string, + }, + nodeStyleOptions: { + colors: { + default: theme.base0B, + collapsed: theme.base0B, + parent: theme.base0E, + }, + radius: 7, + }, + textStyleOptions: { + colors: { + default: theme.base0D, + hover: theme.base06, + }, }, onClickText: this.onClickText, }; } - onClickText = (data: NodeWithId) => { + onClickText = (data: HierarchyPointNode) => { const inspectedStatePath: string[] = []; getPath(data, inspectedStatePath); this.props.updateMonitorState({