diff --git a/desktop/renderer-app/package.json b/desktop/renderer-app/package.json index 0bb2f1b7884..38bf846b13a 100644 --- a/desktop/renderer-app/package.json +++ b/desktop/renderer-app/package.json @@ -17,7 +17,7 @@ "@netless/redo-undo": "^0.1.9", "@netless/tool-box": "^0.1.6", "@netless/video-js-plugin": "^0.3.6", - "@netless/window-manager": "0.4.0-canary.26", + "@netless/window-manager": "0.4.0-canary.27", "@videojs/vhs-utils": "^2.3.0", "agora-rtm-sdk": "^1.4.3", "antd": "^4.15.4", diff --git a/desktop/renderer-app/src/components/Whiteboard.tsx b/desktop/renderer-app/src/components/Whiteboard.tsx index 9f1f916e515..2146f2c7f67 100644 --- a/desktop/renderer-app/src/components/Whiteboard.tsx +++ b/desktop/renderer-app/src/components/Whiteboard.tsx @@ -63,6 +63,7 @@ export const Whiteboard = observer(function Whiteboard({ whiteboardStore.updateWindowManager(windowManager); whiteboardStore.onMainViewSceneChange(); + whiteboardStore.onMainViewSceneLengthChange(); whiteboardStore.onMainViewRedoUndoStepsChange(); whiteboardStore.onWindowManagerBoxStateChange( whiteboardStore.windowManager?.boxState, diff --git a/desktop/renderer-app/src/stores/whiteboard-store.ts b/desktop/renderer-app/src/stores/whiteboard-store.ts index 326d949d692..d7e2d7562d1 100644 --- a/desktop/renderer-app/src/stores/whiteboard-store.ts +++ b/desktop/renderer-app/src/stores/whiteboard-store.ts @@ -270,11 +270,16 @@ export class WhiteboardStore { this.windowManager?.emitter.on("mainViewSceneIndexChange", scene => { if (this.room) { this.updateCurrentSceneIndex(scene); - this.updateScenesCount(this.room.entireScenes()["/"].length); } }); }; + public onMainViewSceneLengthChange = (): void => { + this.windowManager?.emitter.on("mainViewScenesLengthChange", length => { + this.updateScenesCount(length); + }); + }; + public onMainViewRedoUndoStepsChange = (): void => { this.windowManager?.mainView.callbacks.on("onCanUndoStepsUpdate", this.updateUndoSteps); this.windowManager?.mainView.callbacks.on("onCanRedoStepsUpdate", this.updateRedoSteps); diff --git a/web/flat-web/package.json b/web/flat-web/package.json index 6eb6be29111..44ca2e1445f 100644 --- a/web/flat-web/package.json +++ b/web/flat-web/package.json @@ -50,7 +50,7 @@ "@netless/redo-undo": "^0.1.9", "@netless/tool-box": "^0.1.6", "@netless/video-js-plugin": "^0.3.6", - "@netless/window-manager": "0.4.0-canary.26", + "@netless/window-manager": "0.4.0-canary.27", "@videojs/vhs-utils": "^2.3.0", "@zip.js/zip.js": "^2.3.7", "agora-rtc-sdk-ng": "^4.5.0", diff --git a/web/flat-web/src/components/Whiteboard.tsx b/web/flat-web/src/components/Whiteboard.tsx index 312e9ff3a27..ca6db96b209 100644 --- a/web/flat-web/src/components/Whiteboard.tsx +++ b/web/flat-web/src/components/Whiteboard.tsx @@ -63,6 +63,7 @@ export const Whiteboard = observer(function Whiteboard({ whiteboardStore.updateWindowManager(windowManager); whiteboardStore.onMainViewSceneChange(); + whiteboardStore.onMainViewSceneLengthChange(); whiteboardStore.onMainViewRedoUndoStepsChange(); whiteboardStore.onWindowManagerBoxStateChange( whiteboardStore.windowManager?.boxState, diff --git a/web/flat-web/src/stores/whiteboard-store.ts b/web/flat-web/src/stores/whiteboard-store.ts index 588fb067e81..2c6be61d3e6 100644 --- a/web/flat-web/src/stores/whiteboard-store.ts +++ b/web/flat-web/src/stores/whiteboard-store.ts @@ -268,11 +268,16 @@ export class WhiteboardStore { this.windowManager?.emitter.on("mainViewSceneIndexChange", scene => { if (this.room) { this.updateCurrentSceneIndex(scene); - this.updateScenesCount(this.room.entireScenes()["/"].length); } }); }; + public onMainViewSceneLengthChange = (): void => { + this.windowManager?.emitter.on("mainViewScenesLengthChange", length => { + this.updateScenesCount(length); + }); + }; + public onMainViewRedoUndoStepsChange = (): void => { this.windowManager?.mainView.callbacks.on("onCanUndoStepsUpdate", this.updateUndoSteps); this.windowManager?.mainView.callbacks.on("onCanRedoStepsUpdate", this.updateRedoSteps); diff --git a/yarn.lock b/yarn.lock index e607f229963..762160634cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1946,10 +1946,10 @@ resolved "https://registry.yarnpkg.com/@netless/video-js-plugin/-/video-js-plugin-0.3.7.tgz#6c1f174f20e8a93634e1770e7e535c1302bdf22b" integrity sha512-UG1t9464w1bZT9kzdhxj/K7R6jqI9sqYfqfUQJ2w9JRWsNibL6O16OC81iwBJT6nkGXEVN7z2pqHvNg1OhKppw== -"@netless/window-manager@0.4.0-canary.26": - version "0.4.0-canary.26" - resolved "https://registry.npmjs.org/@netless/window-manager/-/window-manager-0.4.0-canary.26.tgz#7be89444e5bfea60104bfac83b2795cee868f0c6" - integrity sha512-q8ksfesJsBgtEhQkJjrcIayKhcsw8OJ/Up/2uHVkm0yqd++RVRT7j0Yu6eSY6AFk3wa6+jYzQmx5h8lTx0vYnw== +"@netless/window-manager@0.4.0-canary.27": + version "0.4.0-canary.27" + resolved "https://registry.npmjs.org/@netless/window-manager/-/window-manager-0.4.0-canary.27.tgz#67ff060e0605af203380f2b65a269f6b8893031e" + integrity sha512-bfku4CfNsDmlszuooeakmPyS3hRcRsefIwrTZp2AM7atzouutNA1Of4g+8YEM9EVhZiXAMaBQCT7KT1iqrKaZA== dependencies: "@juggle/resize-observer" "^3.3.1" emittery "^0.9.2"