Skip to content
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

Jump to bottom

Rich workspace polishing #5021

Merged
merged 4 commits into from
Nov 23, 2023
Merged

Rich workspace polishing #5021

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
a5f1bab
fix: Avoid having multiple rich workspace instances active
juliushaertl Nov 22, 2023
add9034
fix: Keep track of local state of the rich workspace separately
juliushaertl Nov 22, 2023
40dc5a2
fix: Make loading of rich workspace pixel perfect
juliushaertl Nov 22, 2023
d50cf6e
fix: Remove minimum height to only use needed space
juliushaertl Nov 22, 2023
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
12 changes: 12 additions & 0 deletions src/helpers/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,17 @@ export const FilesWorkspaceHeader = new Header({
},

render(el, folder, view) {
if (vm) {
// Enforce destroying of the old rendering and rerender as the FilesListHeader calls render on every folder change
vm.$destroy()
vm = null
}
const hasRichWorkspace = !!folder.attributes['rich-workspace-file'] || !!newWorkspaceCreated
const path = newWorkspaceCreated ? dirname(newWorkspaceCreated.path) : folder.path
const content = newWorkspaceCreated ? '' : folder.attributes['rich-workspace']

newWorkspaceCreated = false

import('vue').then((module) => {
el.id = 'files-workspace-wrapper'

Expand All @@ -239,6 +246,11 @@ export const FilesWorkspaceHeader = new Header({

updated(folder, view) {
newWorkspaceCreated = false

// Currently there is not much use in updating the vue instance props since render is called on every folder change
// removing the rendered element from the DOM
// This is only relevant if switching to a folder that has no content as then the render function is not called

const hasRichWorkspace = !!folder.attributes['rich-workspace-file']
vm.path = folder.path
vm.hasRichWorkspace = hasRichWorkspace
Expand Down
24 changes: 18 additions & 6 deletions src/views/RichWorkspace.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<div v-if="enabled && file !== null"
<div v-if="enabled && localHasRichWorkspace"
id="rich-workspace"
:class="{'focus': focus, 'dark': darkTheme }">
<RichTextReader v-if="!loaded || !ready" :content="content" class="rich-workspace--preview" />
Expand Down Expand Up @@ -80,6 +80,8 @@ export default {
},
data() {
return {
// Keep track of a local copy of the hasRichWorkspace state as it might change after intitial rendering (e.g. when adding/removing the readme)
localHasRichWorkspace: false,
focus: false,
folder: null,
file: null,
Expand All @@ -105,8 +107,12 @@ export default {
document.querySelector('#rich-workspace .text-editor__main').scrollTo(0, 0)
}
},
hasRichWorkspace(value) {
this.localHasRichWorkspace = value
},
},
mounted() {
this.localHasRichWorkspace = this.hasRichWorkspace
if (this.enabled && this.hasRichWorkspace) {
this.getFileInfo()
}
Expand Down Expand Up @@ -137,6 +143,7 @@ export default {
this.unlistenKeydownEvents()
},
reset() {
this.localHasRichWorkspace = false
this.file = null
this.focus = false
this.$nextTick(() => {
Expand Down Expand Up @@ -164,6 +171,7 @@ export default {
this.editing = true
this.loaded = true
this.autofocus = autofocus || false
this.localHasRichWorkspace = true
return true
})
.catch((error) => {
Expand Down Expand Up @@ -212,19 +220,20 @@ export default {
},
onFileCreated(node) {
if (SUPPORTED_STATIC_FILENAMES.includes(node.basename)) {
this.showRichWorkspace()
this.localHasRichWorkspace = true
this.getFileInfo(true)
}
},
onFileDeleted(node) {
if (node.path === this.file.path) {
this.hideRichWorkspace()
this.localHasRichWorkspace = false
}
},
onFileRenamed(node) {
if (SUPPORTED_STATIC_FILENAMES.includes(node.basename)) {
this.showRichWorkspace()
this.localHasRichWorkspace = true
} else if (node.fileid === this.file?.id && node.path !== this.file?.path) {
this.hideRichWorkspace()
this.localHasRichWorkspace = false
}
},
},
Expand All @@ -241,11 +250,14 @@ export default {
transition: max-height 0.5s cubic-bezier(0, 1, 0, 1);
z-index: 61;
position: relative;
min-height: 30vh;
}

.rich-workspace--preview {
margin-top: 44px;

&:deep(div[contenteditable='false']) {
margin: 0;
}
}

/* For subfolders, where there are no Recommendations */
Expand Down