From d5efb315ccd07e10a33220f7bb6b3d35ab0acaea Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 13 Feb 2025 22:19:32 +0100 Subject: [PATCH 01/11] fix(ui): move document status to the bottom Signed-off-by: Max --- src/components/CollisionResolveDialog.vue | 10 ++++++++-- src/components/Editor.vue | 21 +++++++++------------ src/components/Editor/DocumentStatus.vue | 12 +++++------- src/components/Editor/Wrapper.vue | 1 + src/components/ViewerComponent.vue | 1 - 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/components/CollisionResolveDialog.vue b/src/components/CollisionResolveDialog.vue index dc98afed6a7..898ebb3735d 100644 --- a/src/components/CollisionResolveDialog.vue +++ b/src/components/CollisionResolveDialog.vue @@ -5,10 +5,16 @@ @@ -43,13 +41,11 @@ import { ERROR_TYPE, IDLE_TIMEOUT } from './../../services/SyncService.js' import Lock from 'vue-material-design-icons/Lock.vue' import { NcNoteCard } from '@nextcloud/vue' -import CollisionResolveDialog from '../CollisionResolveDialog.vue' export default { name: 'DocumentStatus', components: { - CollisionResolveDialog, Lock, NcNoteCard, }, @@ -110,12 +106,14 @@ export default { diff --git a/src/components/Editor/Wrapper.vue b/src/components/Editor/Wrapper.vue index 01a03c53e5f..d12e098781d 100644 --- a/src/components/Editor/Wrapper.vue +++ b/src/components/Editor/Wrapper.vue @@ -135,6 +135,7 @@ export default { display: flex; width: 100%; height: 100%; + overflow: auto; .ProseMirror { margin-top: 0 !important; diff --git a/src/components/ViewerComponent.vue b/src/components/ViewerComponent.vue index 6ca4db648f2..16dd94371ce 100644 --- a/src/components/ViewerComponent.vue +++ b/src/components/ViewerComponent.vue @@ -148,7 +148,6 @@ export default { From 7895ad7ad09a0685ef96f560fb7989f6b7d1b9c5 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 4 Mar 2025 14:54:07 +0100 Subject: [PATCH 06/11] chore(components): split DocumentStatus in smaller components Signed-off-by: Max --- src/components/Editor/DocumentStatus.vue | 66 ++----------- .../Editor/DocumentStatus/SyncStatus.vue | 98 +++++++++++++++++++ src/tests/components/SyncStatus.spec.js | 40 ++++++++ .../__snapshots__/SyncStatus.spec.js.snap | 49 ++++++++++ 4 files changed, 196 insertions(+), 57 deletions(-) create mode 100644 src/components/Editor/DocumentStatus/SyncStatus.vue create mode 100644 src/tests/components/SyncStatus.spec.js create mode 100644 src/tests/components/__snapshots__/SyncStatus.spec.js.snap diff --git a/src/components/Editor/DocumentStatus.vue b/src/components/Editor/DocumentStatus.vue index 5a1005aeded..cbb5d4a8179 100644 --- a/src/components/Editor/DocumentStatus.vue +++ b/src/components/Editor/DocumentStatus.vue @@ -6,26 +6,11 @@