diff --git a/packages/d3-state-visualizer/src/charts/index.ts b/packages/d3-state-visualizer/src/charts/index.ts
index 0546c50a..aaf238e0 100644
--- a/packages/d3-state-visualizer/src/charts/index.ts
+++ b/packages/d3-state-visualizer/src/charts/index.ts
@@ -1,2 +1,2 @@
 export { default as tree } from './tree/tree';
-export type { NodeWithId } from './tree/tree';
+export type { InputOptions, NodeWithId } from './tree/tree';
diff --git a/packages/d3-state-visualizer/src/charts/tree/tree.ts b/packages/d3-state-visualizer/src/charts/tree/tree.ts
index 61d7e843..47ae5176 100644
--- a/packages/d3-state-visualizer/src/charts/tree/tree.ts
+++ b/packages/d3-state-visualizer/src/charts/tree/tree.ts
@@ -10,7 +10,7 @@ import {
 } from './utils';
 import d3tooltip from 'd3tooltip';
 
-interface InputOptions {
+export interface InputOptions {
   // eslint-disable-next-line @typescript-eslint/ban-types
   state?: {} | null;
   // eslint-disable-next-line @typescript-eslint/ban-types
diff --git a/packages/d3-state-visualizer/src/index.ts b/packages/d3-state-visualizer/src/index.ts
index ae45f1c2..60b538ee 100644
--- a/packages/d3-state-visualizer/src/index.ts
+++ b/packages/d3-state-visualizer/src/index.ts
@@ -1,6 +1,6 @@
 import * as charts from './charts';
 
 export { tree } from './charts';
-export type { NodeWithId } from './charts';
+export type { InputOptions, NodeWithId } from './charts';
 
 export default charts;
diff --git a/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/ChartTab.tsx b/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/ChartTab.tsx
index 6e6a429f..ff6e3875 100644
--- a/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/ChartTab.tsx
+++ b/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/ChartTab.tsx
@@ -1,10 +1,10 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
+import React, { Component, RefCallback } from 'react';
 import { connect, ResolveThunks } from 'react-redux';
 import { withTheme } from 'styled-components';
-import { tree } from 'd3-state-visualizer';
+import { InputOptions, NodeWithId, tree } from 'd3-state-visualizer';
 import { getPath } from '../ChartMonitorWrapper';
 import { updateMonitorState } from '../../../actions';
+import { ThemeFromProvider } from 'devui';
 
 const style = {
   width: '100%',
@@ -12,9 +12,17 @@ const style = {
 };
 
 type DispatchProps = ResolveThunks<typeof actionCreators>;
-type Props = DispatchProps;
+interface OwnProps {
+  data: unknown;
+  theme: ThemeFromProvider;
+}
+type Props = DispatchProps & OwnProps;
 
 class ChartTab extends Component<Props> {
+  node?: HTMLDivElement | null;
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  renderChart?: (nextState?: {} | null | undefined) => void;
+
   shouldComponentUpdate() {
     return false;
   }
@@ -28,23 +36,25 @@ class ChartTab extends Component<Props> {
       this.props.theme.scheme !== nextProps.theme.scheme ||
       nextProps.theme.light !== this.props.theme.light
     ) {
-      this.node.innerHTML = '';
+      this.node!.innerHTML = '';
       this.createChart(nextProps);
     } else if (nextProps.data !== this.props.data) {
-      this.renderChart(nextProps.data);
+      // eslint-disable-next-line @typescript-eslint/ban-types
+      this.renderChart!(nextProps.data as {} | null | undefined);
     }
   }
 
-  getRef = (node) => {
+  getRef: RefCallback<HTMLDivElement> = (node) => {
     this.node = node;
   };
 
-  createChart(props) {
-    this.renderChart = tree(this.node, this.getChartTheme(props.theme));
-    this.renderChart(props.data);
+  createChart(props: Props) {
+    this.renderChart = tree(this.node!, this.getChartTheme(props.theme));
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    this.renderChart(props.data as {} | null | undefined);
   }
 
-  getChartTheme(theme) {
+  getChartTheme(theme: ThemeFromProvider): Partial<InputOptions> {
     return {
       heightBetweenNodesCoeff: 1,
       widthBetweenNodesCoeff: 1.3,
@@ -81,8 +91,8 @@ class ChartTab extends Component<Props> {
     };
   }
 
-  onClickText = (data) => {
-    const inspectedStatePath = [];
+  onClickText = (data: NodeWithId) => {
+    const inspectedStatePath: string[] = [];
     getPath(data, inspectedStatePath);
     this.props.updateMonitorState({
       inspectedStatePath,
@@ -95,12 +105,6 @@ class ChartTab extends Component<Props> {
   }
 }
 
-ChartTab.propTypes = {
-  data: PropTypes.object,
-  updateMonitorState: PropTypes.func.isRequired,
-  theme: PropTypes.object.isRequired,
-};
-
 const actionCreators = {
   updateMonitorState,
 };
diff --git a/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/VisualDiffTab.tsx b/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/VisualDiffTab.tsx
index 32f80ba4..f48e0c55 100644
--- a/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/VisualDiffTab.tsx
+++ b/packages/redux-devtools-core/src/app/containers/monitors/InspectorWrapper/VisualDiffTab.tsx
@@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { Delta, formatters } from 'jsondiffpatch';
 import styled from 'styled-components';
 import { effects } from 'devui';