diff --git a/package.json b/package.json index 3c87dec7..413a9800 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,8 @@ "packages/redux-devtools/examples/counter", "packages/redux-devtools/examples/todomvc", "packages/redux-devtools/examples/rtk-query-polling", - "packages/redux-devtools-slider-monitor/examples/todomvc" + "packages/redux-devtools-slider-monitor/examples/todomvc", + "packages/redux-devtools-rtk-query-inspector-monitor/demo" ], "engines": { "node": ">=10.13.0" diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json b/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json index aecab493..87eaf29c 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json +++ b/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json @@ -25,7 +25,7 @@ "@types/react": "17.0.0", "@types/react-dom": "17.0.0", "@types/react-redux": "7.1.9", - "typescript": "4.1.3" + "typescript": "^3.9.7" }, "eslintConfig": { "extends": [ diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock b/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock index 79f7b06a..c4c025a1 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock +++ b/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock @@ -13331,7 +13331,7 @@ resolve@^2.0.0-next.3: react-scripts: 4.0.2 redux: ^4.0.5 redux-devtools-themes: ^1.0.0 - typescript: 4.1.3 + typescript: 4.3.2 languageName: unknown linkType: soft @@ -14913,23 +14913,23 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -typescript@4.1.3: - version: 4.1.3 - resolution: "typescript@npm:4.1.3" +typescript@4.3.2: + version: 4.3.2 + resolution: "typescript@npm:4.3.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 4f7ab1506ea22c7a1c313ec5b4285e93ce08d709ad6086d02d3096adb399ca339972ee56d1e578213c51dd0fb7b0fad50283c2d3c39642405644458ae29774f8 + checksum: 21e1285402e32fd240f6ad3f97b6fea81b90d2591f412677d01b570a8bd93151d1e08460d58f43689fc758671a5baaebb16fa93d3c8260181612c8e619bd24f7 languageName: node linkType: hard -"typescript@patch:typescript@4.1.3#builtin": - version: 4.1.3 - resolution: "typescript@patch:typescript@npm%3A4.1.3#builtin::version=4.1.3&hash=ddfc1b" +"typescript@patch:typescript@4.3.2#builtin": + version: 4.3.2 + resolution: "typescript@patch:typescript@npm%3A4.3.2#builtin::version=4.3.2&hash=ddfc1b" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 28f0f616bf6284543bb14d4bfe0e1a74963e5df0396ebccfc6a57bfd4ab70b4284e51b3a2045ed2466151a4a58c8a549edb886a2f7a2232cf08fcf73496592e6 + checksum: 68d48dc86dacfeab59a22414ff061c976c46b679a9717a3a710051ea7bab779fd23f4edb856434da8155e8e8646c90b3912e342cc0010dfd15ed321a42cb0578 languageName: node linkType: hard diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/package.json b/packages/redux-devtools-rtk-query-inspector-monitor/package.json index f35148f2..96712054 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/package.json +++ b/packages/redux-devtools-rtk-query-inspector-monitor/package.json @@ -29,7 +29,7 @@ "scripts": { "build": "npm run build:types && npm run build:js", "build:types": "tsc --emitDeclarationOnly", - "start:dev": "tsc -p ./tsconfig.dev.json --watch", + "start": "tsc -p ./tsconfig.dev.json --watch", "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", "clean": "rimraf lib", "lint": "eslint . --ext .ts,.tsx", @@ -54,7 +54,8 @@ "@reduxjs/toolkit": "^1.6.0", "@types/react": "^16.9.46", "react": "^16.13.1", - "redux": "^4.0.5" + "redux": "^4.0.5", + "typescript": "4.3.2" }, "peerDependencies": { "@redux-devtools/core": "^3.7.0", diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx b/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx index 1e2adbbc..9b2d81c2 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx +++ b/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx @@ -93,7 +93,7 @@ class RtkQueryInspector> extends Component< componentDidMount(): void { this.updateSizeMode(); - this.isWideIntervalRef = setInterval(this.updateSizeMode, 200); + this.isWideIntervalRef = setInterval(this.updateSizeMode, 300); } componentWillUnmount(): void { diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx b/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx index cd43c572..40c958cf 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx +++ b/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx @@ -2,9 +2,35 @@ import React, { ReactNode, PureComponent } from 'react'; import { QueryPreviewTabProps } from '../types'; import { TreeView } from './TreeView'; +export interface QueryPreviewSubscriptionsState { + data: { subscriptions: QueryPreviewTabProps['querySubscriptions'] }; +} + export class QueryPreviewSubscriptions extends PureComponent< - QueryPreviewTabProps + QueryPreviewTabProps, + QueryPreviewSubscriptionsState > { + static getDerivedStateFromProps( + props: QueryPreviewTabProps, + state: QueryPreviewSubscriptionsState + ): Partial | null { + if (props.querySubscriptions !== state.data.subscriptions) { + return { + data: { subscriptions: props.querySubscriptions }, + }; + } + + return null; + } + + constructor(props: QueryPreviewTabProps) { + super(props); + + this.state = { + data: { subscriptions: props.querySubscriptions }, + }; + } + render(): ReactNode { const { queryInfo, @@ -22,7 +48,7 @@ export class QueryPreviewSubscriptions extends PureComponent< return ( <> ": + version: 4.3.2 + resolution: "typescript@patch:typescript@npm%3A4.3.2#builtin::version=4.3.2&hash=ddfc1b" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 68d48dc86dacfeab59a22414ff061c976c46b679a9717a3a710051ea7bab779fd23f4edb856434da8155e8e8646c90b3912e342cc0010dfd15ed321a42cb0578 + languageName: node + linkType: hard + +"typescript@patch:typescript@^3.9.7#builtin": + version: 3.9.10 + resolution: "typescript@patch:typescript@npm%3A3.9.10#builtin::version=3.9.10&hash=ddfc1b" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 744dab471ae59659b1618be636ab56b9c0afbca801e0640c3cdfad0a894315c87d30a290b7063c6a3f1860bf47fe44d9188cb85e46b2bdadda7f207d67e6b4e1 + languageName: node + linkType: hard + "typescript@patch:typescript@^4.3.4#builtin": version: 4.3.4 resolution: "typescript@patch:typescript@npm%3A4.3.4#builtin::version=4.3.4&hash=ddfc1b"