Skip to content

refactor(whiteboard): change the way to update the scenesLength value #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2022
Merged

refactor(whiteboard): change the way to update the scenesLength value #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/renderer-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions desktop/renderer-app/src/components/Whiteboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export const Whiteboard = observer<WhiteboardProps>(function Whiteboard({

whiteboardStore.updateWindowManager(windowManager);
whiteboardStore.onMainViewSceneChange();
whiteboardStore.onMainViewSceneLengthChange();
whiteboardStore.onMainViewRedoUndoStepsChange();
whiteboardStore.onWindowManagerBoxStateChange(
whiteboardStore.windowManager?.boxState,
Expand Down
7 changes: 6 additions & 1 deletion desktop/renderer-app/src/stores/whiteboard-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion web/flat-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions web/flat-web/src/components/Whiteboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export const Whiteboard = observer<WhiteboardProps>(function Whiteboard({

whiteboardStore.updateWindowManager(windowManager);
whiteboardStore.onMainViewSceneChange();
whiteboardStore.onMainViewSceneLengthChange();
whiteboardStore.onMainViewRedoUndoStepsChange();
whiteboardStore.onWindowManagerBoxStateChange(
whiteboardStore.windowManager?.boxState,
Expand Down
7 changes: 6 additions & 1 deletion web/flat-web/src/stores/whiteboard-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].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/[email protected].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"
Expand Down