Skip to content

Fix editor container height and document status style on mobile #8181

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
max-nextcloud merged 4 commits into from
Jan 23, 2026
+55 −16
Merged

Fix editor container height and document status style on mobile #8181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
939e032
fix(EditorWrapper): make sure editor container takes full size on mobile
mejo- Jan 22, 2026
40dde8d
fix(DocumentStatus): fix styling on mobile
mejo- Jan 22, 2026
7a9be30
chore(vitest): update component snapshots
mejo- Jan 22, 2026
a597a34
chore(cypress): fix selectors for document status button
mejo- Jan 22, 2026
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 cypress/e2e/conflict.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ variants.forEach(function ({ fixture, mime }) {
}).should('contain', 'session has expired')

// Reload button works
cy.get('#editor-container .document-status a.button')
cy.get('#editor-container .document-status button')
.contains('Reload')
.click()
getWrapper().should('not.exist')
Expand Down
8 changes: 4 additions & 4 deletions cypress/e2e/sync.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Sync', () => {
'contain',
'The document could not be loaded.',
)
cy.get('#editor-container .document-status').find('.button.primary').click()
cy.get('#editor-container .document-status').find('button').click()
cy.get('#editor-container .document-status', { timeout: 30000 }).should(
'contain',
'The document could not be loaded.',
Expand All @@ -118,7 +118,7 @@ describe('Sync', () => {
req.continue()
}).as('alive')
cy.intercept('**/apps/text/session/*/create').as('create')
cy.get('#editor-container .document-status').find('.button.primary').click()
cy.get('#editor-container .document-status').find('button').click()
cy.wait('@alive', { timeout: 30000 })
cy.wait('@create', { timeout: 10000 })
.its('request.body')
Expand Down Expand Up @@ -150,7 +150,7 @@ describe('Sync', () => {
)

// Reconnect button works - it closes and reopens the session
cy.get('#editor-container .document-status a.button')
cy.get('#editor-container .document-status button')
.contains('Reconnect')
.click()

Expand Down Expand Up @@ -182,7 +182,7 @@ describe('Sync', () => {
)

// Reload button works
cy.get('#editor-container .document-status a.button')
cy.get('#editor-container .document-status button')
.contains('Reload')
.click()

Expand Down
4 changes: 4 additions & 0 deletions src/components/BaseReader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ export default {
</script>

<style scoped lang="scss">
.editor__content-wrapper {
flex-grow: 1;
}

.editor__content {
max-width: var(--text-editor-max-width);
margin: 0 auto;
Expand Down
4 changes: 4 additions & 0 deletions src/components/Editor/ContentContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ export default {
</script>

<style scoped lang="scss">
.editor__content-wrapper {
flex-grow: 1;
}

.editor__content {
max-width: var(--text-editor-max-width);
margin: 0 auto;
Expand Down
33 changes: 27 additions & 6 deletions src/components/Editor/DocumentStatus/SyncStatus.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,32 @@

<template>
<NcNoteCard v-if="hasWarning || idle" :type="card.type || 'warning'">
<p v-if="card.message">
{{ card.message }}
<a v-if="card.action" class="button primary" @click="card.action">{{
card.actionLabel
}}</a>
</p>
<div v-if="card.message" class="notecard-content">
<div>
{{ card.message }}
</div>
<NcButton
v-if="card.action"
variant="primary"
class="notecard-button"
@click="card.action">
{{ card.actionLabel }}
</NcButton>
</div>
</NcNoteCard>
</template>

<script>
import { t } from '@nextcloud/l10n'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
import { ERROR_TYPE } from '../../../services/SyncService.ts'

export default {
name: 'SyncStatus',

components: {
NcButton,
NcNoteCard,
},

Expand Down Expand Up @@ -109,11 +117,24 @@ export default {
.document-status {
.notecard {
margin-bottom: 0;
padding-block: 0;
}

.notecard-content {
display: flex;
align-items: center;
gap: var(--default-grid-baseline);
}

.notecard-button {
min-width: fit-content;
}
}

.document-status.mobile {
.notecard {
border-radius: 0;
margin-block: 0;
}
}
</style>
20 changes: 15 additions & 5 deletions src/tests/components/__snapshots__/SyncStatus.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,28 @@

exports[`renders hasConnectionIssue 1`] = `
"<ncnotecard-stub data-v-56029fad="" type="warning" heading="" text="">
<p data-v-56029fad=""> The document could not be loaded. Please check your internet connection. <a data-v-56029fad="" class="button primary">Reconnect</a></p>
<div data-v-56029fad="" class="notecard-content">
<div data-v-56029fad=""> The document could not be loaded. Please check your internet connection. </div>
<ncbutton-stub data-v-56029fad="" alignment="center" size="normal" type="secondary" nativetype="button" target="_self" variant="primary" class="notecard-button"> Reconnect </ncbutton-stub>
</div>
</ncnotecard-stub>"
`;

exports[`renders idle 1`] = `
"<ncnotecard-stub data-v-56029fad="" type="info" heading="" text="">
<p data-v-56029fad=""> You've been disconnected from the server. <a data-v-56029fad="" class="button primary">Reconnect</a></p>
<div data-v-56029fad="" class="notecard-content">
<div data-v-56029fad=""> You've been disconnected from the server. </div>
<ncbutton-stub data-v-56029fad="" alignment="center" size="normal" type="secondary" nativetype="button" target="_self" variant="primary" class="notecard-button"> Reconnect </ncbutton-stub>
</div>
</ncnotecard-stub>"
`;

exports[`renders sync error 0 1`] = `
"<ncnotecard-stub data-v-56029fad="" type="warning" heading="" text="">
<p data-v-56029fad=""> The file was overwritten. Your current changes cannot be auto-saved. Please choose how to proceed.
<div data-v-56029fad="" class="notecard-content">
<div data-v-56029fad=""> The file was overwritten. Your current changes cannot be auto-saved. Please choose how to proceed. </div>
<!---->
</p>
</div>
</ncnotecard-stub>"
`;

Expand All @@ -28,7 +35,10 @@ exports[`renders sync error 1 1`] = `

exports[`renders sync error 2 1`] = `
"<ncnotecard-stub data-v-56029fad="" type="warning" heading="" text="">
<p data-v-56029fad=""> Error Message goes here <a data-v-56029fad="" class="button primary">Reload</a></p>
<div data-v-56029fad="" class="notecard-content">
<div data-v-56029fad=""> Error Message goes here </div>
<ncbutton-stub data-v-56029fad="" alignment="center" size="normal" type="secondary" nativetype="button" target="_self" variant="primary" class="notecard-button"> Reload </ncbutton-stub>
</div>
</ncnotecard-stub>"
`;

Expand Down
Loading