fix(calendar): demo拆解与规范 (#2137)

* fix(calendar): demo拆解与规范 * fix(calendar): 修改demo规范,抽离公共类型 * chore: update * chore: update --------- Co-authored-by: oasis-cloud <[email protected]>
jdf2e · Mar 28, 2024 · e9928f5 · e9928f5
1 parent 9d60842
commit e9928f5
Show file tree

Hide file tree

Showing 32 changed files with 1,533 additions and 3,405 deletions.
diff --git a/src/packages/calendar/__tests__/calendar.spec.tsx b/src/packages/calendar/__tests__/calendar.spec.tsx
@@ -1,14 +1,10 @@
 import * as React from 'react'
 import { render, fireEvent } from '@testing-library/react'
 import '@testing-library/jest-dom'
+import { CalendarDay } from '@/packages/calendar/types'
 
 import { Calendar } from '../calendar'
 
-interface Day {
-  day: string | number
-  type: string
-}
-
 test('show-title prop', async () => {
   const { container, rerender } = render(
     <Calendar
@@ -93,11 +89,11 @@ test('should render slot correctly', async () => {
     return <div className="d_div"> 最近七天</div>
   }
 
-  const renderDay = (date: Day) => {
+  const renderDay = (date: CalendarDay) => {
     return <span>custom{date.day}</span>
   }
 
-  const renderDayBottom = (date: Day) => {
+  const renderDayBottom = (date: CalendarDay) => {
     return <span>{Number(date.day) <= 10 ? '上旬' : '下旬'}</span>
   }
 

diff --git a/src/packages/calendar/calendar.taro.tsx b/src/packages/calendar/calendar.taro.tsx
@@ -3,13 +3,9 @@ import Popup from '@/packages/popup/index.taro'
 import CalendarItem from '@/packages/calendaritem/index.taro'
 import { Utils } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
-import type { CalendarDay, CalendarType } from './types'
+import type { CalendarDay, CalendarType, CalendarRef } from './types'
 import { ComponentDefaults } from '@/utils/typings'
 
-type CalendarRef = {
-  scrollToDate: (date: string) => void
-}
-
 export interface CalendarProps {
   type?: CalendarType
   autoBackfill?: boolean

diff --git a/src/packages/calendar/calendar.tsx b/src/packages/calendar/calendar.tsx
@@ -3,13 +3,9 @@ import Popup from '@/packages/popup'
 import CalendarItem from '@/packages/calendaritem'
 import { Utils } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider'
-import type { CalendarDay, CalendarType } from './types'
+import type { CalendarDay, CalendarType, CalendarRef } from './types'
 import { ComponentDefaults } from '@/utils/typings'
 
-type CalendarRef = {
-  scrollToDate: (date: string) => void
-}
-
 export interface CalendarProps {
   type?: CalendarType
   autoBackfill?: boolean