From 87d420a92bdcf9e94923482986ea772bd3753184 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 27 Mar 2022 12:58:28 +0300 Subject: [PATCH] port !1488 to vue3 --- src/components/settings_modal/settings_modal.vue | 4 ++-- src/components/settings_modal/tabs/theme_tab/theme_tab.vue | 6 +++--- src/components/tab_switcher/tab_switcher.jsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue index 28f85423..18dd3d7a 100644 --- a/src/components/settings_modal/settings_modal.vue +++ b/src/components/settings_modal/settings_modal.vue @@ -113,9 +113,9 @@ {{ $t("settings.expert_mode") }} - diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue index 9cdd229a..cf049a70 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -1018,9 +1018,9 @@ -
-
+ diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx index 59ff98df..f5a1e603 100644 --- a/src/components/tab_switcher/tab_switcher.jsx +++ b/src/components/tab_switcher/tab_switcher.jsx @@ -50,7 +50,7 @@ export default { activeIndex () { // In case of controlled component if (this.activeTab) { - return this.slots().findIndex(slot => this.activeTab === slot.key) + return this.slots().findIndex(slot => this.activeTab === slot.props.key) } else { return this.active } @@ -58,7 +58,7 @@ export default { isActive () { return tabName => { const isWanted = slot => slot.props && slot.props['data-tab-name'] === tabName - return this.$slots.default.findIndex(isWanted) === this.activeIndex + return this.$slots.default().findIndex(isWanted) === this.activeIndex } }, settingsModalVisible () {