From d59dae429eb2730a78790e7a441a24548c766efd Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Mon, 8 Jul 2024 11:38:08 +0200
Subject: [PATCH 1/2] fix(Editor): use setup function with useElementSize

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Editor.vue | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index f186120b044..3f26860214b 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -5,6 +5,7 @@
 
 <template>
 	<div id="editor-container"
+		ref="el"
 		data-text-el="editor-container"
 		class="text-editor"
 		tabindex="-1"
@@ -69,7 +70,7 @@
 </template>
 
 <script>
-import Vue, { set } from 'vue'
+import Vue, { ref, set, watch } from 'vue'
 import { mapState } from 'vuex'
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
@@ -77,7 +78,7 @@ import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { Collaboration } from '@tiptap/extension-collaboration'
 import Autofocus from '../extensions/Autofocus.js'
 import { Doc } from 'yjs'
-import { useResizeObserver } from '@vueuse/core'
+import { useElementSize } from '@vueuse/core'
 
 import {
 	EDITOR,
@@ -135,6 +136,7 @@ export default {
 		setContent,
 		store,
 	],
+
 	provide() {
 		const val = {}
 
@@ -219,6 +221,17 @@ export default {
 			default: false,
 		},
 	},
+
+	setup() {
+		const el = ref(null)
+		const { width } = useElementSize(el)
+		watch(width, value => {
+			const maxWidth = Math.floor(value) - 36
+			el.value.style.setProperty('--widget-full-width', `${maxWidth}px`)
+		})
+		return { el, width }
+	},
+
 	data() {
 		return {
 			IDLE_TIMEOUT,
@@ -324,14 +337,6 @@ export default {
 		subscribe('text:image-node:add', this.onAddImageNode)
 		subscribe('text:image-node:delete', this.onDeleteImageNode)
 		this.emit('update:loaded', true)
-		useResizeObserver(this.$el, (entries) => {
-			window.requestAnimationFrame(() => {
-				const entry = entries[0]
-				const { width } = entry.contentRect
-				const maxWidth = width - 36
-				this.$el.style.setProperty('--widget-full-width', `${maxWidth}px`)
-			})
-		})
 		subscribe('text:translate-modal:show', this.showTranslateModal)
 	},
 	created() {

From fc02a50d6faf3f20146af27a8fcb06b9c39472f7 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Mon, 8 Jul 2024 17:43:24 +0200
Subject: [PATCH 2/2] fix(menu): compute number of icons with css var

* The size of the icons is now based on `--default-clickable-area`.
* Use `useElementSize` instead of `useResizeObserver`.
* Compute the width in a `setup()` function.

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Menu/MenuBar.vue | 44 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/components/Menu/MenuBar.vue b/src/components/Menu/MenuBar.vue
index a7adb95edee..584e1547e56 100644
--- a/src/components/Menu/MenuBar.vue
+++ b/src/components/Menu/MenuBar.vue
@@ -59,9 +59,10 @@
 </template>
 
 <script>
+import { ref } from 'vue'
 import { NcActionSeparator, NcActionButton } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
-import { useResizeObserver } from '@vueuse/core'
+import { useElementSize } from '@vueuse/core'
 import { emit } from '@nextcloud/event-bus'
 
 import ActionFormattingHelp from './ActionFormattingHelp.vue'
@@ -116,6 +117,13 @@ export default {
 			default: false,
 		},
 	},
+
+	setup() {
+		const menubar = ref()
+		const { width } = useElementSize(menubar)
+		return { menubar, width }
+	},
+
 	data() {
 		return {
 			entries: [...actionsFullEntries],
@@ -124,7 +132,6 @@ export default {
 			isReady: false,
 			canTranslate: loadState('text', 'translation_languages', []).length > 0,
 			resize: null,
-			iconsLimit: 4,
 		}
 	},
 	computed: {
@@ -164,33 +171,30 @@ export default {
 				children: entries,
 			}
 		},
+		iconWidth() {
+			const style = this.menubar && getComputedStyle(this.menubar)
+			const clickableArea = style?.getPropertyValue('--default-clickable-area')
+			return parseInt(clickableArea) || 34
+		},
+		iconsLimit() {
+			// leave some buffer - this is necessary so the bar does not wrap during resizing
+			const spaceToFill = this.width - 4
+			const spacePerSlot = this.$isMobile
+				? this.iconWidth
+				: this.iconWidth + 2
+			const slots = Math.floor(spaceToFill / spacePerSlot)
+			// Leave one slot empty for the three dot menu
+			return slots - 1
+		},
 	},
 	mounted() {
-		this.resize = useResizeObserver(this.$refs.menubar, this.onResize)
-
 		this.$nextTick(() => {
 			this.isReady = true
 			this.$emit('update:loaded', true)
 		})
 	},
-	beforeDestroy() {
-		this.resize?.stop()
-	},
 	methods: {
-		onResize(entries) {
-			window.requestAnimationFrame(() => {
-				const entry = entries[0]
-				const { width } = entry.contentRect
-
-				// leave some buffer - this is necessary so the bar does not wrap during resizing
-				const spaceToFill = width - 4
-				const spacePerSlot = this.$isMobile ? 44 : 46
-				const slots = Math.floor(spaceToFill / spacePerSlot)
 
-				// Leave one slot empty for the three dot menu
-				this.iconsLimit = slots - 1
-			})
-		},
 		showHelp() {
 			this.displayHelp = true
 		},