Format

packages/redux-devtools-chart-monitor/src/Chart.tsx

@@ -13,8 +13,7 @@ const wrapperStyle = {
 };
 
 export interface Props<S, A extends Action<string>>
-  extends LiftedState<S, A, ChartMonitorState>,
+  extends LiftedState<S, A, ChartMonitorState>, Options {
-    Options {
   dispatch: Dispatch<LiftedAction<S, A, ChartMonitorState>>;
   preserveScrollTop: boolean;
   select: (state: S) => unknown;

packages/redux-devtools-chart-monitor/src/ChartMonitor.tsx

@@ -41,8 +41,7 @@ function invertColors(theme: Base16Theme) {
 }
 
 export interface ChartMonitorProps<S, A extends Action<string>>
-  extends LiftedState<S, A, ChartMonitorState>,
+  extends LiftedState<S, A, ChartMonitorState>, Options {
-    Options {
   dispatch: Dispatch<LiftedAction<S, A, ChartMonitorState>>;
   preserveScrollTop: boolean;
   select: (state: S) => unknown;

packages/redux-devtools-dock-monitor/src/DockMonitor.tsx

@@ -44,8 +44,10 @@ interface DefaultProps {
   fluid: boolean;
 }
 
-export interface DockMonitorProps<S, A extends Action<string>>
+export interface DockMonitorProps<
-  extends LiftedState<S, A, DockMonitorState> {
+  S,
+  A extends Action<string>,
+> extends LiftedState<S, A, DockMonitorState> {
   defaultPosition: 'left' | 'top' | 'right' | 'bottom';
   defaultIsVisible: boolean;
   defaultSize: number;

packages/redux-devtools-inspector-monitor-test-tab/demo/src/DemoApp.tsx

@@ -48,8 +48,10 @@ const styles: {
 
 const ROOT = '/'; // process.env.NODE_ENV === 'production' ? '/' : '/';
 
-interface Props
+interface Props extends Omit<
-  extends Omit<DemoAppState, 'addFunction' | 'addSymbol' | 'shuffleArray'> {
+  DemoAppState,
+  'addFunction' | 'addSymbol' | 'shuffleArray'
+> {
   toggleTimeoutUpdate: (timeoutUpdateEnabled: boolean) => void;
   timeoutUpdate: () => void;
   increment: () => void;

packages/redux-devtools-inspector-monitor-test-tab/src/TestGenerator.tsx

@@ -59,8 +59,10 @@ export function compare<S>(
   ).forEach(generate);
 }
 
-interface Props<S, A extends Action<string>>
+interface Props<S, A extends Action<string>> extends Omit<
-  extends Omit<TabComponentProps<S, A>, 'monitorState' | 'updateMonitorState'> {
+  TabComponentProps<S, A>,
+  'monitorState' | 'updateMonitorState'
+> {
   name?: string;
   isVanilla?: boolean;
   wrap?: string | ((locals: WrapLocals) => string);

packages/redux-devtools-inspector-monitor/demo/src/DemoApp.tsx

@@ -119,8 +119,10 @@ function buildUrl(options: Options) {
   );
 }
 
-interface Props
+interface Props extends Omit<
-  extends Omit<DemoAppState, 'addFunction' | 'addSymbol' | 'shuffleArray'> {
+  DemoAppState,
+  'addFunction' | 'addSymbol' | 'shuffleArray'
+> {
   toggleTimeoutUpdate: (timeoutUpdateEnabled: boolean) => void;
   timeoutUpdate: () => void;
   increment: () => void;

packages/redux-devtools-inspector-monitor/src/DevtoolsInspector.tsx

@@ -144,8 +144,10 @@ interface DefaultProps {
   invertTheme: boolean;
 }
 
-export interface DevtoolsInspectorProps<S, A extends Action<string>>
+export interface DevtoolsInspectorProps<
-  extends LiftedState<S, A, DevtoolsInspectorState> {
+  S,
+  A extends Action<string>,
+> extends LiftedState<S, A, DevtoolsInspectorState> {
   dispatch: Dispatch<
     DevtoolsInspectorAction | LiftedAction<S, A, DevtoolsInspectorState>
   >;

packages/redux-devtools-log-monitor/src/LogMonitor.tsx

@@ -64,8 +64,10 @@ interface DefaultProps<S> {
   markStateDiff: boolean;
 }
 
-export interface LogMonitorProps<S, A extends Action<string>>
+export interface LogMonitorProps<
-  extends LiftedState<S, A, LogMonitorState> {
+  S,
+  A extends Action<string>,
+> extends LiftedState<S, A, LogMonitorState> {
   dispatch: Dispatch<LogMonitorAction | LiftedAction<S, A, LogMonitorState>>;
 
   preserveScrollTop: boolean;

packages/redux-devtools-rtk-query-monitor/src/components/TreeView.tsx

@@ -6,13 +6,12 @@ import { getJsonTreeTheme, StyleUtilsContext } from '../styles/themes';
 import { getItemString, labelRenderer } from '../styles/tree';
 import { identity } from '../utils/object';
 
-export interface TreeViewProps
+export interface TreeViewProps extends Partial<
-  extends Partial<
+  Pick<
-    Pick<
+    ComponentProps<typeof JSONTree>,
-      ComponentProps<typeof JSONTree>,
+    'keyPath' | 'shouldExpandNodeInitially' | 'hideRoot'
-      'keyPath' | 'shouldExpandNodeInitially' | 'hideRoot'
+  >
-    >
+> {
-  > {
   data: unknown;
   isWideLayout: boolean;
   before?: ReactNode;

packages/redux-devtools-rtk-query-monitor/src/containers/RtkQueryInspector.tsx

@@ -23,8 +23,10 @@ type ForwardedMonitorProps<S, A extends Action<string>> = Pick<
   'monitorState' | 'currentStateIndex' | 'computedStates' | 'actionsById'
 >;
 
-export interface RtkQueryInspectorProps<S, A extends Action<string>>
+export interface RtkQueryInspectorProps<
-  extends ForwardedMonitorProps<S, A> {
+  S,
+  A extends Action<string>,
+> extends ForwardedMonitorProps<S, A> {
   dispatch: Dispatch<LiftedAction<S, A, RtkQueryMonitorState>>;
 }
 

packages/redux-devtools-rtk-query-monitor/src/types.ts

@@ -35,8 +35,10 @@ export interface RtkQueryMonitorState {
   readonly selectedPreviewTab: QueryPreviewTabs;
 }
 
-export interface RtkQueryMonitorProps<S, A extends Action<string>>
+export interface RtkQueryMonitorProps<
-  extends LiftedState<S, A, RtkQueryMonitorState> {
+  S,
+  A extends Action<string>,
+> extends LiftedState<S, A, RtkQueryMonitorState> {
   dispatch: Dispatch<Action | LiftedAction<S, A, RtkQueryMonitorState>>;
   theme: keyof typeof base16Themes | Base16Theme;
   invertTheme: boolean;
@@ -187,8 +189,11 @@ export interface ApiStats {
   }>;
 }
 
-export interface TabOption<S, P, V extends string = 'default'>
+export interface TabOption<
-  extends SelectOption<S, V> {
+  S,
+  P,
+  V extends string = 'default',
+> extends SelectOption<S, V> {
   component: ComponentType<P>;
 }
 

packages/redux-devtools/src/createDevTools.tsx

@@ -47,8 +47,11 @@ export type Monitor<
   }
 >;
 
-export interface DevToolsInstance<S, A extends Action<string>, MonitorState>
+export interface DevToolsInstance<
-  extends Component<Props<S, A, MonitorState>> {
+  S,
+  A extends Action<string>,
+  MonitorState,
+> extends Component<Props<S, A, MonitorState>> {
   liftedStore?: LiftedStore<S, A, MonitorState>;
 }