Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

port !1488 to vue3

Browse source
This commit is contained in:
Henry Jameson 2022-03-27 12:58:28 +03:00
parent d6bbccdd71
commit 87d420a92b
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/settings_modal/settings_modal.vue
View file

@ -113,9 +113,9 @@
<Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)"> <Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)">
{{ $t("settings.expert_mode") }} {{ $t("settings.expert_mode") }}
</Checkbox> </Checkbox>
<portal-target <span
class="extra-content" class="extra-content"
name="unscrolled-content" id="unscrolled-content"
/> />
</div> </div>
</div> </div>

6
src/components/settings_modal/tabs/theme_tab/theme_tab.vue
View file

@ -1018,9 +1018,9 @@
</tab-switcher> </tab-switcher>
</keep-alive> </keep-alive>
<portal <teleport
v-if="isActive" v-if="isActive"
to="unscrolled-content" to="#unscrolled-content"
> >
<div class="apply-container"> <div class="apply-container">
<button <button
@ -1037,7 +1037,7 @@
{{ $t('settings.style.switcher.reset') }} {{ $t('settings.style.switcher.reset') }}
</button> </button>
</div> </div>
</portal> </teleport>
</div> </div>
</template> </template>

4
src/components/tab_switcher/tab_switcher.jsx
View file

@ -50,7 +50,7 @@ export default {
activeIndex () { activeIndex () {
// In case of controlled component // In case of controlled component
if (this.activeTab) { if (this.activeTab) {
return this.slots().findIndex(slot => this.activeTab === slot.key) return this.slots().findIndex(slot => this.activeTab === slot.props.key)
} else { } else {
return this.active return this.active
} }
@ -58,7 +58,7 @@ export default {
isActive () { isActive () {
return tabName => { return tabName => {
const isWanted = slot => slot.props && slot.props['data-tab-name'] === 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 () { settingsModalVisible () {