From 6a97d84bc6a520464344c88f1d1d60949da1ac4e Mon Sep 17 00:00:00 2001
From: YarikMix <43493788+YarikMix@users.noreply.github.com>
Date: Sun, 26 May 2024 16:47:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B7=D0=B0=D0=BC=D0=B5=D1=82=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D1=88=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=82=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/src/components/Editor/Plugin.ts                    | 6 ++++--
 .../{Editor => EditorWrapper}/EditorWrapper.tsx           | 8 ++++----
 public/src/components/NoteEditor/NoteEditor.tsx           | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename public/src/components/{Editor => EditorWrapper}/EditorWrapper.tsx (97%)

diff --git a/public/src/components/Editor/Plugin.ts b/public/src/components/Editor/Plugin.ts
index c4a7723c..17fa9923 100644
--- a/public/src/components/Editor/Plugin.ts
+++ b/public/src/components/Editor/Plugin.ts
@@ -1,7 +1,7 @@
 import {AppUserStore} from "../../modules/stores/UserStore";
 import {parseNoteTitle, setCursorAtNodePosition, truncate} from "../../modules/utils";
 import {AppNotesStore, NotesActions} from "../../modules/stores/NotesStore";
-import {AppNoteRequests} from "../../modules/api";
+import {AppNoteRequests, AppSharedNoteRequests} from '../../modules/api';
 import {AppDispatcher} from "../../modules/dispatcher";
 import {AppToasts} from "../../modules/toasts";
 import {AppNoteStore, NoteStoreActions} from "../../modules/stores/NoteStore";
@@ -1108,7 +1108,9 @@ const RenderSubNote = (subNoteId:string) => {
         subNoteTitle.innerHTML = AppNoteStore.state.cache[subNoteId]
         loaded = true
     } else {
-        AppNoteRequests.Get(subNoteId, AppUserStore.state.JWT).then(result => {
+
+        const request = pluginSettings.isEditable ? AppNoteRequests.Get(subNoteId, AppUserStore.state.JWT) : AppSharedNoteRequests.Get(subNoteId)
+        request.then(result => {
             if (result.data.title == null) {
                 subNoteTitle.innerHTML = 'Подзаметка'
             }
diff --git a/public/src/components/Editor/EditorWrapper.tsx b/public/src/components/EditorWrapper/EditorWrapper.tsx
similarity index 97%
rename from public/src/components/Editor/EditorWrapper.tsx
rename to public/src/components/EditorWrapper/EditorWrapper.tsx
index 8c127468..aafe6487 100644
--- a/public/src/components/Editor/EditorWrapper.tsx
+++ b/public/src/components/EditorWrapper/EditorWrapper.tsx
@@ -1,13 +1,13 @@
 import {Component} from "@veglem/screact/dist/component";
 import {VDomNode} from "@veglem/screact/dist/vdom";
-import "./Editor.sass"
-import {Editor} from "./Editor";
+import "../Editor/Editor.sass"
+import {Editor} from "../Editor/Editor";
 import {AppNoteStore, NoteStoreState} from "../../modules/stores/NoteStore";
 import {Tippy} from "../Tippy/Tippy";
 import {isEqual} from "@veglem/screact/dist/isEqual";
-import {Viewer} from "./Viewer";
+import {Viewer} from "../Editor/Viewer";
 import {NoteType} from "../../utils/types";
-import {PluginProps} from "./Plugin";
+import {PluginProps} from "../Editor/Plugin";
 import {parseNoteTitle} from "../../modules/utils";
 
 window['mobileCheck'] = function() {
diff --git a/public/src/components/NoteEditor/NoteEditor.tsx b/public/src/components/NoteEditor/NoteEditor.tsx
index b11a302e..a834199a 100644
--- a/public/src/components/NoteEditor/NoteEditor.tsx
+++ b/public/src/components/NoteEditor/NoteEditor.tsx
@@ -10,7 +10,7 @@ import {DeleteNoteDialog} from '../DeleteNoteDialog/DeleteNoteDialog';
 import NoteMenu from "../NoteMenu/NoteMenu";
 import {Tooltip} from "../Tooltip/Tooltip";
 import {TagList} from "../TagList/TagList";
-import {EditorWrapper} from "../Editor/EditorWrapper";
+import {EditorWrapper} from "../EditorWrapper/EditorWrapper";
 import {AppUserStore} from "../../modules/stores/UserStore";
 import {Collaborators} from "../Collaborators/Collaborators";
 import {EmojiPicker} from "../EmojiPicker/EmojiPicker";