diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
index 9dcf1b5ac3..deb7729853 100644
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@@ -1,4 +1,4 @@
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import DataImportExportTab from './tabs/data_import_export_tab.vue'
import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
@@ -53,6 +53,9 @@ const SettingsModalContent = {
},
open () {
return this.$store.state.interface.settingsModalState !== 'hidden'
+ },
+ bodyLock () {
+ return this.$store.state.interface.settingsModalState === 'visible'
}
},
methods: {
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
index c9ed2a3824..0be76d22c4 100644
--- a/src/components/settings_modal/settings_modal_content.vue
+++ b/src/components/settings_modal/settings_modal_content.vue
@@ -4,6 +4,7 @@
class="settings_tab-switcher"
:side-tab-bar="true"
:scrollable-tabs="true"
+ :body-scroll-lock="bodyLock"
>
slots.findIndex(_ => _.data && _.data.attrs)
+
+export default {
name: 'TabSwitcher',
props: {
renderOnlyFocused: {
@@ -31,11 +33,17 @@ export default Vue.component('tab-switcher', {
required: false,
type: Boolean,
default: false
+ },
+ bodyScrollLock: {
+ required: false,
+ type: Boolean,
+ default: false
}
},
data () {
return {
- active: this.$slots.default.findIndex(_ => _.tag)
+ // TODO VUE3: add () after 'default'
+ active: findFirstUsable(this.$slots.default)
}
},
computed: {
@@ -47,17 +55,15 @@ export default Vue.component('tab-switcher', {
return this.active
}
},
- settingsModalVisible () {
- return this.settingsModalState === 'visible'
- },
...mapState({
settingsModalState: state => state.interface.settingsModalState
})
},
beforeUpdate () {
- const currentSlot = this.$slots.default[this.active]
- if (!currentSlot.tag) {
- this.active = this.$slots.default.findIndex(_ => _.tag)
+ const currentSlot = this.slots()[this.active]
+ // TODO VUE3: change data to props
+ if (!currentSlot.data) {
+ this.active = findFirstUsable(this.slots())
}
},
methods: {
@@ -67,9 +73,14 @@ export default Vue.component('tab-switcher', {
this.setTab(index)
}
},
+ // DO NOT put it to computed, it doesn't work (caching?)
+ slots () {
+ // TODO VUE3: add () at the end
+ return this.$slots.default
+ },
setTab (index) {
if (typeof this.onSwitch === 'function') {
- this.onSwitch.call(null, this.$slots.default[index].key)
+ this.onSwitch.call(null, this.slots()[index].key)
}
this.active = index
if (this.scrollableTabs) {
@@ -77,27 +88,30 @@ export default Vue.component('tab-switcher', {
}
}
},
+ // TODO VUE3: remove 'h' here
render (h) {
- const tabs = this.$slots.default
+ const tabs = this.slots()
.map((slot, index) => {
- if (!slot.tag) return
+ // TODO VUE3 change to slot.props
+ const props = slot.data && slot.data.attrs
+ if (!props) return
const classesTab = ['tab', 'button-default']
const classesWrapper = ['tab-wrapper']
if (this.activeIndex === index) {
classesTab.push('active')
classesWrapper.push('active')
}
- if (slot.data.attrs.image) {
+ if (props.image) {
return (
)
@@ -105,25 +119,27 @@ export default Vue.component('tab-switcher', {
return (
)
})
- const contents = this.$slots.default.map((slot, index) => {
- if (!slot.tag) return
+ const contents = this.slots().map((slot, index) => {
+ // TODO VUE3 change to slot.props
+ const props = slot.data && slot.data.attrs
+ if (!props) return
const active = this.activeIndex === index
const classes = [ active ? 'active' : 'hidden' ]
- if (slot.data.attrs.fullHeight) {
+ if (props.fullHeight) {
classes.push('full-height')
}
const renderSlot = (!this.renderOnlyFocused || active)
@@ -134,7 +150,7 @@ export default Vue.component('tab-switcher', {
{
this.sideTabBar
- ?
{slot.data.attrs.label}
+ ?
{props.label}
: ''
}
{renderSlot}
@@ -147,10 +163,14 @@ export default Vue.component('tab-switcher', {
{tabs}
-
)
}
-})
+}
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index c0b55a6cec..c5ccf7478a 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -3,7 +3,7 @@ import UserCard from '../user_card/user_card.vue'
import FollowCard from '../follow_card/follow_card.vue'
import Timeline from '../timeline/timeline.vue'
import Conversation from '../conversation/conversation.vue'
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import List from '../list/list.vue'
import withLoadMore from '../../hocs/with_load_more/with_load_more'
import { library } from '@fortawesome/fontawesome-svg-core'