UI fixes for public share links

css/style.scss

@@ -2,9 +2,9 @@
   position: absolute;
 }
 
-.ProseMirror-hideselection *::selection { background: transparent; }
-.ProseMirror-hideselection *::-moz-selection { background: transparent; }
-.ProseMirror-hideselection { caret-color: transparent; }
+.ProseMirror-hideselection *::selection { background: transparent; color: var(--color-main-text); }
+.ProseMirror-hideselection *::-moz-selection { background: transparent; color: var(--color-main-text); }
+.ProseMirror-hideselection { caret-color: transparent; color: var(--color-main-text); }
 
 .ProseMirror-selectednode {
   outline: 2px solid #8cf;

cypress/integration/share.spec.js

@@ -34,6 +34,8 @@ describe('Open test.md in viewer', function() {
 		// Upload test files
 		cy.uploadFile('test.md', 'text/markdown')
 		cy.uploadFile('test.md', 'text/markdown', 'test2.md')
+		cy.createFolder('folder')
+		cy.uploadFile('test.md', 'text/markdown', 'folder/test.md')
 		cy.visit('/apps/files')
 		cy.get('#fileList tr[data-file="test.md"]', {timeout: 10000})
 			.should('contain', 'test.md')
@@ -51,7 +53,8 @@ describe('Open test.md in viewer', function() {
 	})
 
 	it('Shares the file as a public read only link', function () {
-		cy.visit('/apps/files')
+		cy.visit('/apps/files', { timeout: 10000 })
+		cy.wait(1000)
 		cy.get('#fileList tr[data-file="test.md"] a.action-share', {timeout: 10000}).trigger('click')
 		cy.get('#app-sidebar')
 			.should('be.visible')
@@ -73,6 +76,7 @@ describe('Open test.md in viewer', function() {
 
 	it('Shares the file as a public link with write permissions', function () {
 		cy.visit('/apps/files')
+		cy.wait(1000)
 		cy.get('#fileList tr[data-file="test2.md"] a.action-share', {timeout: 10000}).trigger('click')
 		cy.get('#app-sidebar')
 			.should('be.visible')
@@ -100,6 +104,7 @@ describe('Open test.md in viewer', function() {
 
 	it('Opens the editor as guest', function () {
 		cy.visit('/apps/files')
+		cy.wait(1000)
 		cy.get('#fileList tr[data-file="test2.md"] a.action-share', {timeout: 10000}).trigger('click')
 		cy.get('#app-sidebar')
 			.should('be.visible')
@@ -122,5 +127,28 @@ describe('Open test.md in viewer', function() {
 			})
 	})
 
+	it('Shares a folder as a public read only link', function () {
+		cy.visit('/apps/files', { timeout: 10000 })
+		cy.wait(1000)
+		cy.get('#fileList tr[data-file="folder"] a.action-share', {timeout: 10000}).trigger('click')
+		cy.get('#app-sidebar')
+			.should('be.visible')
+		cy.get('#app-sidebar a#sharing').trigger('click')
+		cy.get('#app-sidebar button.new-share-link').trigger('click')
+		cy.get('#app-sidebar a.sharing-entry__copy')
+			.should('have.attr', 'href').and('include', '/s/')
+			.then((href) => {
+				cy.visit(href)
+				cy.window().then(win => {
+					win.OC.appswebroots['files_texteditor'] = true
+					cy.wait(1000)
+					cy.openFile('test.md')
+					cy.get('#editor-container', { timeout: 4000 }).should('be.visible')
+					cy.get('#editor .ProseMirror').should('contain', 'Hello world')
+					cy.get('#editor .ProseMirror h2').should('contain', 'Hello world')
+				})
+			})
+	})
+
 
 })

lib/Service/DocumentService.php

@@ -148,9 +148,9 @@ public function createDocument(File $file): Document {
 		}
 
 		try {
-			$documentBaseFile = $this->appData->getFolder('documents')->getFile($file->getFileInfo()->getId());
+			$documentBaseFile = $this->appData->getFolder('documents')->getFile((string)$file->getFileInfo()->getId());
 		} catch (NotFoundException $e) {
-			$documentBaseFile = $this->appData->getFolder('documents')->newFile($file->getFileInfo()->getId());
+			$documentBaseFile = $this->appData->getFolder('documents')->newFile((string)$file->getFileInfo()->getId());
 		}
 		$documentBaseFile->putContent($file->fopen('r'));
 
@@ -302,7 +302,7 @@ public function resetDocument($documentId, $force = false): void {
 				$this->documentMapper->delete($document);
 
 				try {
-					$this->appData->getFolder('documents')->getFile($documentId)->delete();
+					$this->appData->getFolder('documents')->getFile((string)$documentId)->delete();
 				} catch (NotFoundException $e) {
 				} catch (NotPermittedException $e) {
 				}

src/EditorFactory.js

@@ -75,7 +75,9 @@ const createEditor = ({ content, onInit, onUpdate, extensions, enableRichEditing
 			new Blockquote(),
 			new CodeBlock(),
 			new ListItem(),
-			new Link(),
+			new Link({
+				openOnClick: true,
+			}),
 			new Image(),
 			new Placeholder({
 				emptyNodeClass: 'is-empty',

src/components/EditorWrapper.vue

@@ -478,6 +478,7 @@ export default {
 		max-width: 100%;
 		height: 100%;
 		left: 0;
+		top: 50px;
 		margin: 0 auto;
 		position: relative;
 		background-color: var(--color-main-background);

src/components/MenuBar.vue

@@ -32,7 +32,7 @@
 						:class="getIconClasses(isActive, icon)"
 						@click="clickIcon(commands, icon)" />
 					<template v-else>
-						<div v-show="$index < iconCount"
+						<div v-show="$index < iconCount || !icon.class"
 							:key="icon.label"
 							v-click-outside="() => hideChildMenu(icon)"
 							class="submenu">
@@ -53,14 +53,14 @@
 							@click="clickIcon(commands, icon)">
 							{{ icon.label }}
 						</ActionButton>
-						<template v-else-if="!icon.class && isHiddenInMenu($index)">
+						<!--<template v-else-if="!icon.class && isHiddenInMenu($index)">
 							<ActionButton v-for="childIcon in icon.children"
 								:key="childIcon.class"
 								:icon="childIcon.class"
 								@click="clickIcon(commands, childIcon)">
 								{{ childIcon.label }}
 							</ActionButton>
-						</template>
+						</template>-->
 					</template>
 				</Actions>
 			</div>

src/nodes/ListItem.js

@@ -154,7 +154,7 @@ export default class ListItem extends TiptapListItem {
 						})
 						const isListClicked = event.target.tagName.toLowerCase() === 'li'
 						if (typeof parentList === 'undefined' || parentList.node.attrs.type !== TYPES.CHECKBOX || !isListClicked) {
-							return true
+							return
 						}
 
 						const tr = state.tr

src/views/DirectEditing.vue

@@ -104,6 +104,9 @@ export default {
 	beforeMount() {
 		callMobileMessage('loading')
 	},
+	mounted() {
+		document.querySelector('meta[name="viewport"]').setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0')
+	},
 	methods: {
 		async close() {
 			this.saving = true
@@ -123,9 +126,20 @@ export default {
 </script>
 
 <style scoped lang="scss">
+	body {
+		position: fixed;
+	}
+
 	#direct-editor {
 		width: 100%;
-		height: 100vh;
+		height: 100%;
+		position: fixed;
+		overflow: hidden;
+
+		&::v-deep #editor-container {
+			height: 100%;
+			top: 0;
+		}
 		&::v-deep #editor-wrapper div.ProseMirror {
 			margin-top: 0;
 		}

src/views/FilesSettings.vue

@@ -20,7 +20,7 @@
   -
   -->
 <template>
-	<div id="files-setting-showhidden">
+	<div id="files-setting-richworkspace">
 		<input id="showRichWorkspacesToggle"
 			v-model="showWorkspace"
 			class="checkbox"

src/views/RichWorkspace.vue

@@ -122,10 +122,12 @@ export default {
 				this.file = data.file
 				this.editing = true
 				this.loaded = true
+				this.creating = false
 			}).catch(() => {
 				this.file = null
 				this.loaded = true
 				this.ready = true
+				this.creating = false
 			})
 		},
 		createNew() {
@@ -136,7 +138,6 @@ export default {
 			window.FileList.createFile('Readme.md', { scrollTo: false, animate: false }).then((status, data) => {
 				this.getFileInfo()
 				this.autofocus = true
-				this.creating = false
 			})
 		},
 	},
@@ -193,7 +194,7 @@ export default {
 	}
 
 	#rich-workspace::v-deep .menubar {
-		z-index: 90;
+		z-index: 50;
 		/* Slightly reduce vertical space */
 		margin-bottom: -10px;
 	}