From 49e315a5d117779c6ee0078c6910d28eae542846 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Sun, 9 Feb 2025 18:26:03 +0100 Subject: [PATCH 1/2] fix(PresenterOverlay): fix RTL check Signed-off-by: Maksim Sukharev --- src/components/CallView/shared/PresenterOverlay.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/CallView/shared/PresenterOverlay.vue b/src/components/CallView/shared/PresenterOverlay.vue index 0bd60a12f47..59033a09e4a 100644 --- a/src/components/CallView/shared/PresenterOverlay.vue +++ b/src/components/CallView/shared/PresenterOverlay.vue @@ -10,7 +10,7 @@ :resizable="false" :h="presenterOverlaySize" :w="presenterOverlaySize" - :x="isRTL ? parentWidth - presenterOverlaySize - 10 : 10" + :x="isDirectionRTL ? parentWidth - presenterOverlaySize - 10 : 10" :y="10" @dragging="isDragging = true" @dragstop="isDragging = false"> @@ -62,6 +62,8 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' import LocalVideo from './LocalVideo.vue' import VideoVue from './VideoVue.vue' +const isDirectionRTL = isRTL() + export default { name: 'PresenterOverlay', @@ -111,7 +113,7 @@ export default { const parentWidth = ref(document.getElementById('videos').getBoundingClientRect().width) return { parentWidth, - isRTL, + isDirectionRTL, } }, @@ -147,6 +149,7 @@ export default { // FIXME: inner method should be triggered to re-parent element this.$refs.presenterOverlay.checkParentSize() // FIXME: if it stays out of bounds (right and bottom), bring it back + // FIXME: should consider RTL if (this.$refs.presenterOverlay.right < 0) { this.$refs.presenterOverlay.moveHorizontally(this.$refs.presenterOverlay.parentWidth - this.presenterOverlaySize) } From ea540460f51202e78798b01d603efbe7ceb4a368 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Sun, 9 Feb 2025 18:18:19 +0100 Subject: [PATCH 2/2] fix: drop redundant resize listeners Signed-off-by: Maksim Sukharev --- src/App.vue | 8 -------- src/components/CallView/shared/PresenterOverlay.vue | 4 ---- src/components/MessagesList/MessagesList.vue | 2 -- 3 files changed, 14 deletions(-) diff --git a/src/App.vue b/src/App.vue index ea799680a58..4cc8676557a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -217,10 +217,6 @@ export default { this.$store.dispatch('joinConversation', { token: this.$route.params.token }) } - window.addEventListener('resize', this.onResize) - - this.onResize() - window.addEventListener('unload', () => { console.info('Navigating away, leaving conversation') if (this.token) { @@ -539,10 +535,6 @@ export default { this.fetchSingleConversation(this.token) }, - onResize() { - this.windowHeight = window.innerHeight - document.getElementById('header').clientHeight - }, - preventUnload(event) { if (!this.warnLeaving && !this.isSendingMessages) { return diff --git a/src/components/CallView/shared/PresenterOverlay.vue b/src/components/CallView/shared/PresenterOverlay.vue index 59033a09e4a..23d682cca28 100644 --- a/src/components/CallView/shared/PresenterOverlay.vue +++ b/src/components/CallView/shared/PresenterOverlay.vue @@ -126,15 +126,11 @@ export default { }, mounted() { - window.addEventListener('resize', this.updateSize) - this.resizeObserver = new ResizeObserver(this.updateSize) this.resizeObserver.observe(this.$refs.presenterOverlay.$el.parentElement) }, beforeDestroy() { - window.removeEventListener('resize', this.updateSize) - if (this.resizeObserver) { this.resizeObserver.disconnect() } diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue index 46160c7dad3..d61a1e678c6 100644 --- a/src/components/MessagesList/MessagesList.vue +++ b/src/components/MessagesList/MessagesList.vue @@ -341,7 +341,6 @@ export default { subscribe('networkOnline', this.handleNetworkOnline) window.addEventListener('focus', this.onWindowFocus) - window.addEventListener('resize', this.updateSize) this.resizeObserver = new ResizeObserver(this.updateSize) this.resizeObserver.observe(this.$refs.scroller) @@ -368,7 +367,6 @@ export default { unsubscribe('networkOffline', this.handleNetworkOffline) unsubscribe('networkOnline', this.handleNetworkOnline) - window.removeEventListener('resize', this.updateSize) if (this.resizeObserver) { this.resizeObserver.disconnect() }