Skip to content

Commit

Permalink
Merge branch 'pu/sd/rt/244503' into '2024.11'
Browse files Browse the repository at this point in the history
Fixes render issues from deactivated apps in DockState

See merge request tine20/tine20!6328
  • Loading branch information
pschuele committed Dec 13, 2024
2 parents aec56b9 + 54bf8ad commit 7bef24a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions tine20/Tinebase/js/TineDock/TineDock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<script setup>
/* eslint-disable vue/no-mutating-props */
/* eslint-disable */
import {computed, ref, watch, inject, onMounted, onUpdated} from 'vue'
import {computed, ref, watch, inject, onMounted, onUpdated, onBeforeMount} from 'vue'
import {useScroll, useWindowSize} from '@vueuse/core'
import TMenu from "../vue/components/TMenu.vue";

Expand Down Expand Up @@ -129,7 +129,7 @@ const dockedAppsInternal = computed(() => {
return _.find(availableApps.value, availableApp => {
return availableApp.name === appName
})
})
}).filter(app => app)
: []
})

Expand Down Expand Up @@ -182,6 +182,12 @@ const dragEnd = () => {

// hiding the dock for small screen devices
const { width } = useWindowSize()
onBeforeMount(() => {
const diff = _.difference(props.state.dockedApps, dockedAppsInternal.value.map(el => el.name))
if (diff.length) {
_.remove(props.state.dockedApps, (app) => diff.includes(app))
}
})
onMounted(() => {
const t = Tine.Tinebase.MainScreen.getDock()
if(width.value <= 500){
Expand Down

0 comments on commit 7bef24a

Please sign in to comment.