From 18a09cf66b96cb9c4c1f7e456eed09cb67c729ef Mon Sep 17 00:00:00 2001 From: Alex Kaminskii Date: Thu, 19 May 2022 17:52:49 +0200 Subject: [PATCH] fix(frontend/player): codefix --- .../MessageDistributor/MessageDistributor.ts | 2 +- .../managers/PagesManager.ts | 2 +- .../managers/ReduxStateManager.ts | 96 +++++++++---------- frontend/package.json | 2 +- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/frontend/app/player/MessageDistributor/MessageDistributor.ts b/frontend/app/player/MessageDistributor/MessageDistributor.ts index cdcb1cd8b..0de7d5e27 100644 --- a/frontend/app/player/MessageDistributor/MessageDistributor.ts +++ b/frontend/app/player/MessageDistributor/MessageDistributor.ts @@ -426,7 +426,7 @@ export default class MessageDistributor extends StatedScreen { this.performanceTrackManager.setCurrentNodesCount(this.windowNodeCounter.count); break; } - this.pagesManager.append(msg); + this.pagesManager.appendMessage(msg); break; } } diff --git a/frontend/app/player/MessageDistributor/managers/PagesManager.ts b/frontend/app/player/MessageDistributor/managers/PagesManager.ts index 2431183dd..7c6095b1e 100644 --- a/frontend/app/player/MessageDistributor/managers/PagesManager.ts +++ b/frontend/app/player/MessageDistributor/managers/PagesManager.ts @@ -20,7 +20,7 @@ export default class PagesManager extends ListWalker { /* Assumed that messages added in a correct time sequence. */ - add(m: Message): void { + appendMessage(m: Message): void { if (m.tp === "create_document") { super.append(new DOMManager(this.screen, this.isMobile, m.time)) } diff --git a/frontend/app/player/MessageDistributor/managers/ReduxStateManager.ts b/frontend/app/player/MessageDistributor/managers/ReduxStateManager.ts index 691d84c15..727ae82ea 100644 --- a/frontend/app/player/MessageDistributor/managers/ReduxStateManager.ts +++ b/frontend/app/player/MessageDistributor/managers/ReduxStateManager.ts @@ -1,53 +1,53 @@ -import { applyChange, revertChange } from 'deep-diff'; -import ListWalker from './ListWalker'; -import type { Redux } from '../messages'; +// import { applyChange, revertChange } from 'deep-diff'; +// import ListWalker from './ListWalker'; +// import type { Redux } from '../messages'; -export default class ReduxStateManager extends ListWalker { - private state: Object = {} - private finalStates: Object[] = [] +// export default class ReduxStateManager extends ListWalker { +// private state: Object = {} +// private finalStates: Object[] = [] - moveWasUpdated(time, index) { - super.moveApply( - time, - this.onIncrement, - this.onDecrement, - ) - } +// moveWasUpdated(time, index) { +// super.moveApply( +// time, +// this.onIncrement, +// this.onDecrement, +// ) +// } - onIncrement = (item) => { - this.processRedux(item, true); - } +// onIncrement = (item) => { +// this.processRedux(item, true); +// } - onDecrement = (item) => { - this.processRedux(item, false); - } +// onDecrement = (item) => { +// this.processRedux(item, false); +// } - private processRedux(action, forward) { - if (forward) { - if (!!action.state) { - this.finalStates.push(this.state); - this.state = JSON.parse(JSON.stringify(action.state)); // Deep clone :( - } else { - action.diff.forEach(d => { - try { - applyChange(this.state, d); - } catch (e) { - //console.warn("Deepdiff error") - } - }); - } - } else { - if (!!action.state) { - this.state = this.finalStates.pop(); - } else { - action.diff.forEach(d => { - try { - revertChange(this.state, 1, d); // bad lib :( TODO: write our own diff - } catch (e) { - //console.warn("Deepdiff error") - } - }); - } - } - } -} \ No newline at end of file +// private processRedux(action, forward) { +// if (forward) { +// if (!!action.state) { +// this.finalStates.push(this.state); +// this.state = JSON.parse(JSON.stringify(action.state)); // Deep clone :( +// } else { +// action.diff.forEach(d => { +// try { +// applyChange(this.state, d); +// } catch (e) { +// //console.warn("Deepdiff error") +// } +// }); +// } +// } else { +// if (!!action.state) { +// this.state = this.finalStates.pop(); +// } else { +// action.diff.forEach(d => { +// try { +// revertChange(this.state, 1, d); // bad lib :( TODO: write our own diff +// } catch (e) { +// //console.warn("Deepdiff error") +// } +// }); +// } +// } +// } +// } \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 6a8b35749..3ad6c1505 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,7 @@ "mobx-react-lite": "^3.1.6", "moment": "^2.29.2", "moment-range": "^4.0.2", - "peerjs": "^1.3.2", + "peerjs": "1.3.2", "rc-time-picker": "^3.7.3", "react": "^16.13.1", "react-circular-progressbar": "^2.0.3",