Merge pull request #2289 from nextcloud/fix/2267-table-tweaks

Fix/2267 table tweaks
nextcloud · Apr 11, 2022 · 5219dab · 5219dab
2 parents 8f2e26d + 1c3d0d8
commit 5219dab
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 19 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/nodes/TableCellView.vue b/src/nodes/TableCellView.vue
@@ -24,7 +24,7 @@
 	<NodeViewWrapper as="td">
 		<div class="container">
 			<NodeViewContent class="content" />
-			<Actions>
+			<Actions v-if="editor.isEditable">
 				<ActionButton icon="icon-add_row_before"
 					:close-after-click="true"
 					@click="addRowBefore">

diff --git a/src/nodes/TableHeaderView.vue b/src/nodes/TableHeaderView.vue
@@ -24,7 +24,7 @@
 	<NodeViewWrapper as="th">
 		<div>
 			<NodeViewContent class="content" />
-			<Actions>
+			<Actions v-if="editor.isEditable">
 				<ActionButton icon="icon-add_col_before"
 					:close-after-click="true"
 					@click="addColumnBefore">

diff --git a/src/nodes/TableView.vue b/src/nodes/TableView.vue
@@ -21,9 +21,10 @@
   -->
 
 <template>
-	<NodeViewWrapper>
+	<NodeViewWrapper class="table-wrapper">
 		<NodeViewContent class="content" as="table" />
-		<Actions :force-menu="true"
+		<Actions v-if="editor.isEditable"
+			:force-menu="true"
 			class="table-settings"
 			default-icon="icon-table_settings">
 			<ActionButton icon="icon-delete"
@@ -32,6 +33,7 @@
 				{{ t('text', 'Delete this table') }}
 			</ActionButton>
 		</Actions>
+		<div class="clearfix" />
 	</NodeViewWrapper>
 </template>
 
@@ -66,6 +68,10 @@ export default {
 
 <style scoped lang="scss">
 
+.clearfix {
+	clear: both;
+}
+
 table {
 	float: left;
 }
@@ -78,4 +84,5 @@ table {
 		opacity: 1;
 	}
 }
+
 </style>