Merge remote-tracking branch 'origin/vls-65' into vls-65

frontend-park-mail-ru · May 31, 2024 · fa0cc90 · fa0cc90
2 parents 6b18f7d + aade028
commit fa0cc90
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/public/src/components/EditorWrapper/EditorWrapper.tsx b/public/src/components/EditorWrapper/EditorWrapper.tsx
@@ -61,7 +61,7 @@ export class EditorWrapper extends Component<EditorProps, EditorState> {
     updateState = (store:NoteStoreState) => {
         this.syncTitle(store.note.title)
 
-        if (!this.props.isOwner && this.props.note?.public) {
+        if (!this.props.isOwner && this.props.note?.public && !this.props.isEditable) {
             this.self.innerHTML = ""
             new Viewer(
                 store.note.blocks,

diff --git a/public/src/components/SharePanel/SharePanel.tsx b/public/src/components/SharePanel/SharePanel.tsx
@@ -1,5 +1,4 @@
 import {ScReact} from "@veglem/screact";
-import {Button} from "../Button/Button";
 import "./SharePanel.sass"
 import {ToggleButton} from "../ToggleButton/ToggleButton";
 import {Img} from "../Image/Image";

diff --git a/public/src/modules/stores/NotesStore.ts b/public/src/modules/stores/NotesStore.ts
@@ -120,6 +120,8 @@ class NotesStore extends BaseStore<NotesStoreState> {
         AppNotesStore.ClearCallbacks()
         AppNoteStore.ClearCallbacks()
 
+        this.invitesWS?.close();
+
         this.SetState(state => ({
             ...state,
             notes: [],