mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-12-03 04:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tabs): throw error with default slot

Browse Source
This commit is contained in:
07akioni 2021-06-05 00:44:56 +08:00
parent 0e1a483d7a
commit ff4b4a4603
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tabs/src/Tabs.tsx
View File

@ -116,9 +116,8 @@ export default defineComponent({
const barElRef = ref<HTMLElement | null>(null)
const scrollWrapperElRef = ref<HTMLElement | null>(null)
const addTabInstRef = ref<ComponentPublicInstance | null>(null)
const xScrollInstRef = ref<(VXScrollInst & ComponentPublicInstance) | null>(
null
)
const xScrollInstRef =
ref<(VXScrollInst & ComponentPublicInstance) | null>(null)
const leftReachedRef = ref(true)
const rightReachedRef = ref(true)
@ -128,9 +127,11 @@ export default defineComponent({
const uncontrolledValueRef = ref(
compitableValueRef.value ??
props.defaultValue ??
((flatten((slots as any).default())[0] as any).props.name as
| string
| number)
(slots.default
? ((flatten((slots as any).default())[0] as any).props.name as
| string
| number)
: null)
)
const mergedValueRef = useMergedState(
compitableValueRef,
@ -492,7 +493,7 @@ export default defineComponent({
function filterMapTabPanes (
tabPaneVNodes: VNode[],
value: string | number | undefined
value: string | number | null
): VNode[] {
const children: VNode[] = []
tabPaneVNodes.forEach((vNode) => {