Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

refactor(nuxt): use unref in layout.ts #7818

Merged
merged 1 commit into from Sep 26, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/nuxt/src/app/components/layout.ts
@@ -1,4 +1,4 @@
import { defineComponent, isRef, nextTick, onMounted, Ref, Transition, VNode } from 'vue'
import { defineComponent, unref, nextTick, onMounted, Ref, Transition, VNode } from 'vue'
import { _wrapIf } from './utils'
import { useRoute } from '#app'
// @ts-ignore
Expand Down Expand Up @@ -29,7 +29,7 @@ export default defineComponent({
}

return () => {
const layout = (isRef(props.name) ? props.name.value : props.name) ?? route.meta.layout as string ?? 'default'
const layout = unref(props.name) ?? route.meta.layout as string ?? 'default'

const hasLayout = layout && layout in layouts
if (process.dev && layout && !hasLayout && layout !== 'default') {
Expand Down