From db41f5ad44d83a8dc632860faa79888ecb5bda8e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 18 May 2021 10:09:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(Calendar):=20add=20top-info=E3=80=81bottom?=
 =?UTF-8?q?-info=20slot=20(#8716)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/calendar/Calendar.tsx                     |  1 +
 src/calendar/CalendarDay.tsx                  | 38 ++++++++++++++-----
 src/calendar/CalendarMonth.tsx                |  5 ++-
 src/calendar/README.md                        | 14 ++++---
 src/calendar/README.zh-CN.md                  | 10 +++--
 .../test/__snapshots__/index.spec.ts.snap     | 15 ++++++++
 src/calendar/test/index.spec.ts               | 20 ++++++++++
 7 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/src/calendar/Calendar.tsx b/src/calendar/Calendar.tsx
index d95ef1255..e808814fa 100644
--- a/src/calendar/Calendar.tsx
+++ b/src/calendar/Calendar.tsx
@@ -416,6 +416,7 @@ export default defineComponent({
       const showMonthTitle = index !== 0 || !props.showSubtitle;
       return (
         <CalendarMonth
+          v-slots={pick(slots, ['top-info', 'bottom-info'])}
           ref={setMonthRefs(index)}
           date={date}
           currentDate={state.currentDate}
diff --git a/src/calendar/CalendarDay.tsx b/src/calendar/CalendarDay.tsx
index 6fcc0567e..c533a9a2a 100644
--- a/src/calendar/CalendarDay.tsx
+++ b/src/calendar/CalendarDay.tsx
@@ -44,7 +44,7 @@ export default defineComponent({
 
   emits: ['click'],
 
-  setup(props, { emit }) {
+  setup(props, { emit, slots }) {
     const style = computed(() => {
       const { item, index, color, offset, rowHeight } = props;
       const style: CSSProperties = {
@@ -84,17 +84,37 @@ export default defineComponent({
       }
     };
 
+    const renderTopInfo = () => {
+      const { topInfo } = props.item;
+
+      if (topInfo || slots['top-info']) {
+        return (
+          <div class={bem('top-info')}>
+            {slots['top-info'] ? slots['top-info'](props.item) : topInfo}
+          </div>
+        );
+      }
+    };
+
+    const renderBottomInfo = () => {
+      const { bottomInfo } = props.item;
+
+      if (bottomInfo || slots['bottom-info']) {
+        return (
+          <div class={bem('bottom-info')}>
+            {slots['bottom-info']
+              ? slots['bottom-info'](props.item)
+              : bottomInfo}
+          </div>
+        );
+      }
+    };
+
     const renderContent = () => {
       const { item, color, rowHeight } = props;
-      const { type, text, topInfo, bottomInfo } = item;
+      const { type, text } = item;
 
-      const TopInfo = topInfo && <div class={bem('top-info')}>{topInfo}</div>;
-
-      const BottomInfo = bottomInfo && (
-        <div class={bem('bottom-info')}>{bottomInfo}</div>
-      );
-
-      const Nodes = [TopInfo, text, BottomInfo];
+      const Nodes = [renderTopInfo(), text, renderBottomInfo()];
 
       if (type === 'selected') {
         return (
diff --git a/src/calendar/CalendarMonth.tsx b/src/calendar/CalendarMonth.tsx
index 759e7cc0d..66b59aa0c 100644
--- a/src/calendar/CalendarMonth.tsx
+++ b/src/calendar/CalendarMonth.tsx
@@ -1,7 +1,7 @@
 import { ref, computed, PropType, defineComponent } from 'vue';
 
 // Utils
-import { addUnit, setScrollTop, createNamespace } from '../utils';
+import { addUnit, setScrollTop, createNamespace, pick } from '../utils';
 import { getMonthEndDay } from '../datetime-picker/utils';
 import {
   t,
@@ -55,7 +55,7 @@ export default defineComponent({
 
   emits: ['click', 'update-height'],
 
-  setup(props, { emit }) {
+  setup(props, { emit, slots }) {
     const [visible, setVisible] = useToggle();
     const daysRef = ref<HTMLElement>();
     const monthRef = ref<HTMLElement>();
@@ -230,6 +230,7 @@ export default defineComponent({
 
     const renderDay = (item: CalendarDayItem, index: number) => (
       <CalendarDay
+        v-slots={pick(slots, ['top-info', 'bottom-info'])}
         item={item}
         index={index}
         color={props.color}
diff --git a/src/calendar/README.md b/src/calendar/README.md
index d5eb8f89e..adcd77140 100644
--- a/src/calendar/README.md
+++ b/src/calendar/README.md
@@ -288,7 +288,7 @@ Following props are supported when the type is range
 
 | Attribute | Description | Type | Default |
 | --- | --- | --- | --- |
-| max-range | Number of selectable days | _number \| string_ | Unlimitied |
+| max-range | Number of selectable days | _number \| string_ | Unlimited |
 | range-prompt | Error message when exceeded max range | _string_ | `Choose no more than xx days` |
 | allow-same-day | Whether the start and end time of the range is allowed on the same day | _boolean_ | `false` |
 
@@ -298,7 +298,7 @@ Following props are supported when the type is multiple
 
 | Attribute | Description | Type | Default |
 | --- | --- | --- | --- |
-| max-range | Max count of selectable days | _number \| string_ | Unlimitied |
+| max-range | Max count of selectable days | _number \| string_ | Unlimited |
 | range-prompt | Error message when exceeded max count | _string_ | `Choose no more than xx days` |
 
 ### Data Structure of Day
@@ -327,10 +327,12 @@ Following props are supported when the type is multiple
 
 ### Slots
 
-| Name   | Description   |
-| ------ | ------------- |
-| title  | Custom title  |
-| footer | Custom fotter |
+| Name                  | Description               | SlotProps  |
+| --------------------- | ------------------------- | ---------- |
+| title                 | Custom title              | -          |
+| footer                | Custom footer             | -          |
+| top-info `v3.0.17`    | Custom top info of day    | _day: Day_ |
+| bottom-info `v3.0.17` | Custom bottom info of day | _day: Day_ |
 
 ### Methods
 
diff --git a/src/calendar/README.zh-CN.md b/src/calendar/README.zh-CN.md
index 62c9cf054..53c21a442 100644
--- a/src/calendar/README.zh-CN.md
+++ b/src/calendar/README.zh-CN.md
@@ -333,10 +333,12 @@ export default {
 
 ### Slots
 
-| 名称   | 说明               |
-| ------ | ------------------ |
-| title  | 自定义标题         |
-| footer | 自定义底部区域内容 |
+| 名称                  | 说明                     | 参数       |
+| --------------------- | ------------------------ | ---------- |
+| title                 | 自定义标题               | -          |
+| footer                | 自定义底部区域内容       | -          |
+| top-info `v3.0.17`    | 自定义日期上方的提示信息 | _day: Day_ |
+| bottom-info `v3.0.17` | 自定义日期下方的提示信息 | _day: Day_ |
 
 ### 方法
 
diff --git a/src/calendar/test/__snapshots__/index.spec.ts.snap b/src/calendar/test/__snapshots__/index.spec.ts.snap
index d56d27a99..5adb2195c 100644
--- a/src/calendar/test/__snapshots__/index.spec.ts.snap
+++ b/src/calendar/test/__snapshots__/index.spec.ts.snap
@@ -924,6 +924,21 @@ exports[`row-height prop 1`] = `
 </div>
 `;
 
+exports[`should render top-info and bottom-info slot correctly 1`] = `
+<div role="gridcell"
+     style="margin-left: 71.42857142857143%;"
+     class="van-calendar__day van-calendar__day--disabled"
+>
+  <div class="van-calendar__top-info">
+    top: 1
+  </div>
+  1
+  <div class="van-calendar__bottom-info">
+    bottom: 1
+  </div>
+</div>
+`;
+
 exports[`title & footer slot 1`] = `
 <div class="van-calendar">
   <div class="van-calendar__header">
diff --git a/src/calendar/test/index.spec.ts b/src/calendar/test/index.spec.ts
index b4c6741fc..8a7165e36 100644
--- a/src/calendar/test/index.spec.ts
+++ b/src/calendar/test/index.spec.ts
@@ -533,3 +533,23 @@ test('close event', async () => {
 
   expect(onClose).toHaveBeenCalledTimes(1);
 });
+
+test('should render top-info and bottom-info slot correctly', async () => {
+  const wrapper = mount(Calendar, {
+    props: {
+      minDate,
+      maxDate,
+      poppable: false,
+      defaultDate: minDate,
+      lazyRender: false,
+    },
+    slots: {
+      'top-info': (item) => 'top: ' + item.text,
+      'bottom-info': (item) => 'bottom: ' + item.text,
+    },
+  });
+
+  await later();
+
+  expect(wrapper.find('.van-calendar__day').html()).toMatchSnapshot();
+});