fix: missing types for slots

SK-ERIC · Jan 1, 2025 · 942de11 · 942de11
1 parent 3cb6a61
commit 942de11
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/src/_utils/index.ts b/src/_utils/index.ts
@@ -36,7 +36,6 @@ export {
   omit,
   render,
   resolveSlot,
-  resolveSlotWithProps,
   resolveSlotWithTypedProps,
   resolveWrappedSlot,
   resolveWrappedSlotWithProps,

diff --git a/src/_utils/vue/index.ts b/src/_utils/vue/index.ts
@@ -19,7 +19,6 @@ export { render } from './render'
 export {
   isSlotEmpty,
   resolveSlot,
-  resolveSlotWithProps,
   resolveSlotWithTypedProps,
   resolveWrappedSlot,
   resolveWrappedSlotWithProps

diff --git a/src/_utils/vue/resolve-slot.ts b/src/_utils/vue/resolve-slot.ts
@@ -39,14 +39,6 @@ export function resolveSlot(
   return (slot && ensureValidVNode(slot())) || fallback()
 }
 
-export function resolveSlotWithProps<T>(
-  slot: Slot | undefined,
-  props: T,
-  fallback: (props: T) => VNodeArrayChildren
-): VNodeArrayChildren {
-  return (slot && ensureValidVNode(slot(props))) || fallback(props)
-}
-
 export function resolveSlotWithTypedProps<T>(
   slot: Slot<T> | undefined,
   props: T,

diff --git a/src/collapse/src/CollapseItem.tsx b/src/collapse/src/CollapseItem.tsx
@@ -23,7 +23,7 @@ import {
 import { useConfig } from '../../_mixins'
 import { useRtl } from '../../_mixins/use-rtl'
 import {
-  resolveSlotWithProps,
+  resolveSlotWithTypedProps,
   resolveWrappedSlotWithProps,
   throwError
 } from '../../_utils'
@@ -129,7 +129,7 @@ export default defineComponent({
       disabled,
       triggerAreas
     } = this
-    const headerNode = resolveSlotWithProps(
+    const headerNode = resolveSlotWithTypedProps(
       $slots.header,
       { collapsed },
       () => [this.title]
@@ -165,7 +165,7 @@ export default defineComponent({
               key={this.rtlEnabled ? 0 : 1}
               data-arrow
             >
-              {resolveSlotWithProps(arrowSlot, { collapsed }, () => [
+              {resolveSlotWithTypedProps(arrowSlot, { collapsed }, () => [
                 <NBaseIcon clsPrefix={mergedClsPrefix}>
                   {{
                     default: () =>

diff --git a/src/date-picker/src/panel/date.tsx b/src/date-picker/src/panel/date.tsx
@@ -10,7 +10,11 @@ import {
   FastForwardIcon,
   ForwardIcon
 } from '../../../_internal/icons'
-import { resolveSlot, resolveSlotWithProps, warnOnce } from '../../../_utils'
+import {
+  resolveSlot,
+  resolveSlotWithTypedProps,
+  warnOnce
+} from '../../../_utils'
 import { NButton, NxButton } from '../../../button'
 import PanelHeader from './panelHeader'
 import { useCalendar, useCalendarProps } from './use-calendar'
@@ -194,7 +198,7 @@ export default defineComponent({
             </div>
             <div class={`${mergedClsPrefix}-date-panel-actions__suffix`}>
               {this.actions?.includes('clear')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     this.$slots.clear,
                     {
                       onClear: this.handleClearClick,
@@ -213,7 +217,7 @@ export default defineComponent({
                   )
                 : null}
               {this.actions?.includes('now')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     this.$slots.now,
                     {
                       onNow: this.handleNowClick,

diff --git a/src/date-picker/src/panel/daterange.tsx b/src/date-picker/src/panel/daterange.tsx
@@ -10,7 +10,11 @@ import {
   FastForwardIcon,
   ForwardIcon
 } from '../../../_internal/icons'
-import { resolveSlot, resolveSlotWithProps, warnOnce } from '../../../_utils'
+import {
+  resolveSlot,
+  resolveSlotWithTypedProps,
+  warnOnce
+} from '../../../_utils'
 import { NButton, NxButton } from '../../../button'
 import PanelHeader from './panelHeader'
 import { useDualCalendar, useDualCalendarProps } from './use-dual-calendar'
@@ -283,7 +287,7 @@ export default defineComponent({
             </div>
             <div class={`${mergedClsPrefix}-date-panel-actions__suffix`}>
               {this.actions?.includes('clear')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.clear,
                     {
                       onClear: this.handleClearClick,
@@ -302,7 +306,7 @@ export default defineComponent({
                   )
                 : null}
               {this.actions?.includes('confirm')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.confirm,
                     {
                       onConfirm: this.handleConfirmClick,

diff --git a/src/date-picker/src/panel/datetime.tsx b/src/date-picker/src/panel/datetime.tsx
@@ -11,7 +11,7 @@ import {
   FastForwardIcon,
   ForwardIcon
 } from '../../../_internal/icons'
-import { resolveSlot, resolveSlotWithProps } from '../../../_utils'
+import { resolveSlot, resolveSlotWithTypedProps } from '../../../_utils'
 import { NButton, NxButton } from '../../../button'
 import { NInput } from '../../../input'
 import { NTimePicker } from '../../../time-picker'
@@ -206,7 +206,7 @@ export default defineComponent({
             </div>
             <div class={`${mergedClsPrefix}-date-panel-actions__suffix`}>
               {this.actions?.includes('clear')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     this.datePickerSlots.clear,
                     {
                       onClear: this.clearSelectedDateTime,
@@ -225,7 +225,7 @@ export default defineComponent({
                   )
                 : null}
               {this.actions?.includes('now')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.now,
                     {
                       onNow: this.handleNowClick,
@@ -244,7 +244,7 @@ export default defineComponent({
                   )
                 : null}
               {this.actions?.includes('confirm')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.confirm,
                     {
                       onConfirm: this.handleConfirmClick,

diff --git a/src/date-picker/src/panel/datetimerange.tsx b/src/date-picker/src/panel/datetimerange.tsx
@@ -10,7 +10,11 @@ import {
   FastForwardIcon,
   ForwardIcon
 } from '../../../_internal/icons'
-import { resolveSlot, resolveSlotWithProps, warnOnce } from '../../../_utils'
+import {
+  resolveSlot,
+  resolveSlotWithTypedProps,
+  warnOnce
+} from '../../../_utils'
 import { NButton, NxButton } from '../../../button'
 import { NInput } from '../../../input'
 import { NTimePicker } from '../../../time-picker'
@@ -372,7 +376,7 @@ export default defineComponent({
             </div>
             <div class={`${mergedClsPrefix}-date-panel-actions__suffix`}>
               {this.actions?.includes('clear')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.clear,
                     {
                       onClear: this.handleClearClick,
@@ -391,7 +395,7 @@ export default defineComponent({
                   )
                 : null}
               {this.actions?.includes('confirm')
-                ? resolveSlotWithProps(
+                ? resolveSlotWithTypedProps(
                     datePickerSlots.confirm,
                     {
                       onConfirm: this.handleConfirmClick,

diff --git a/src/input/src/WordCount.tsx b/src/input/src/WordCount.tsx
@@ -1,5 +1,5 @@
 import { computed, defineComponent, h, inject } from 'vue'
-import { resolveSlotWithProps } from '../../_utils'
+import { resolveSlotWithTypedProps } from '../../_utils'
 import { inputInjectionKey } from './interface'
 import { len } from './utils'
 
@@ -23,7 +23,7 @@ export default defineComponent({
       const { value: mergedValue } = mergedValueRef
       return (
         <span class={`${mergedClsPrefixRef.value}-input-word-count`}>
-          {resolveSlotWithProps(
+          {resolveSlotWithTypedProps(
             slots.default,
             {
               value: