From 1320e7a3157a9d81deed360d9b1a2ee9af226354 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Mon, 2 Jan 2023 11:44:12 -0500 Subject: [PATCH] Update prop types --- .../src/Chart.tsx | 19 ++---------- .../src/ChartMonitor.tsx | 29 ++----------------- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/packages/redux-devtools-chart-monitor/src/Chart.tsx b/packages/redux-devtools-chart-monitor/src/Chart.tsx index 85e82702..3ea4ada8 100644 --- a/packages/redux-devtools-chart-monitor/src/Chart.tsx +++ b/packages/redux-devtools-chart-monitor/src/Chart.tsx @@ -1,6 +1,6 @@ import React, { Component, createRef } from 'react'; import { tree } from 'd3-state-visualizer'; -import type { HierarchyPointNode, Node, StyleValue } from 'd3-state-visualizer'; +import type { Options } from 'd3-state-visualizer'; import { Action, Dispatch } from 'redux'; import { LiftedAction, LiftedState } from '@redux-devtools/core'; import * as themes from 'redux-devtools-themes'; @@ -12,7 +12,8 @@ const wrapperStyle = { }; export interface Props> - extends LiftedState { + extends LiftedState, + Options { dispatch: Dispatch>; preserveScrollTop: boolean; select: (state: S) => unknown; @@ -20,20 +21,6 @@ export interface Props> invertTheme: boolean; state: S | null; - isSorted: boolean; - heightBetweenNodesCoeff: number; - widthBetweenNodesCoeff: number; - onClickText: (datum: HierarchyPointNode) => void; - tooltipOptions: { - disabled: boolean; - offset: { - left: number; - top: number; - }; - indentationSize: number; - styles: { [key: string]: StyleValue } | undefined; - }; - chartStyles: { [key: string]: StyleValue } | undefined; defaultIsVisible?: boolean; } diff --git a/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx b/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx index 6af797a2..660c29a5 100644 --- a/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx +++ b/packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx @@ -7,7 +7,7 @@ import { } from '@redux-devtools/core'; import deepmerge from 'deepmerge'; import { Action, Dispatch } from 'redux'; -import type { HierarchyPointNode, Node } from 'd3-state-visualizer'; +import type { Options } from 'd3-state-visualizer'; import reducer, { ChartMonitorState } from './reducers'; import Chart, { Props } from './Chart'; @@ -40,37 +40,14 @@ function invertColors(theme: themes.Base16Theme) { } export interface ChartMonitorProps> - extends LiftedState { + extends LiftedState, + Options { dispatch: Dispatch>; preserveScrollTop: boolean; select: (state: S) => unknown; theme: keyof typeof themes | themes.Base16Theme; invertTheme: boolean; - state: S | null; - isSorted: boolean; - heightBetweenNodesCoeff: number; - widthBetweenNodesCoeff: number; - onClickText: (datum: HierarchyPointNode) => void; - tooltipOptions: unknown; - style: { - width: number; - height: number; - node: { - colors: { - default: string; - collapsed: string; - parent: string; - }; - radius: number; - }; - text: { - colors: { - default: string; - hover: string; - }; - }; - }; defaultIsVisible?: boolean; }