refactor(Calendar): 重构Calendar 日历,移除Icon依赖 (#901,#845)

uiwjs · Aug 6, 2022 · fb96d53 · fb96d53
1 parent d4e707a
commit fb96d53
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/react-calendar/src/index.tsx b/packages/react-calendar/src/index.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { DatePickerDay, DatePickerDayProps, DatePickerDayDateSource } from '@uiw/react-date-picker';
-import Icon from '@uiw/react-icon';
+import { IconStyleBase } from '@uiw/react-icon';
+import { Down } from '@uiw/icons/lib/Down';
 import formatter from '@uiw/formatter';
 import { IProps } from '@uiw/utils';
 import RenderDay from './DayLabel';
@@ -122,11 +123,11 @@ export default function Calendar(props: CalendarProps) {
   const btngroup = useMemo(
     () => (
       <CalendarBtnGroupStyleWrap className={`${prefixCls}-btn-group`}>
-        <Icon type="down" onClick={() => handlePaging('prev')} />
+        <IconStyleBase as={Down} onClick={() => handlePaging('prev')} style={{ width: 18 }} />
         <CalendarBtnStyleWrap className={`${prefixCls}-btn`} onClick={() => handlePaging('today')}>
           {todayLabel}
         </CalendarBtnStyleWrap>
-        <Icon type="down" onClick={() => handlePaging('next')} />
+        <IconStyleBase as={Down} onClick={() => handlePaging('next')} style={{ width: 18 }} />
       </CalendarBtnGroupStyleWrap>
     ),
     [prefixCls, todayLabel],

diff --git a/packages/react-calendar/src/style/index.ts b/packages/react-calendar/src/style/index.ts
@@ -1,3 +1,4 @@
+import { IconStyleBase } from '@uiw/react-icon';
 import { ThemeVariantValueOptions, getThemeVariantValue } from '@uiw/utils';
 import styled, { css } from 'styled-components';
 
@@ -27,8 +28,7 @@ export const CalendarBtnGroupStyleWrap = styled.div<CalendarBtnGroupStyleWrapPro
       position: relative;
       top: -3px;
     }
-    & > .w-icon,
-    & > ${CalendarBtnStyleWrap} {
+    & > ${IconStyleBase}, & > ${CalendarBtnStyleWrap} {
       cursor: pointer;
       border-radius: 3px;
       transition: all 0.3s;
@@ -39,8 +39,7 @@ export const CalendarBtnGroupStyleWrap = styled.div<CalendarBtnGroupStyleWrapPro
         background-color: ${getThemeVariantValue(props, 'backgroundColorCalendarActive')};
       }
     }
-    & > .w-icon,
-    & > ${CalendarBtnStyleWrap} {
+    & > ${IconStyleBase}, & > ${CalendarBtnStyleWrap} {
       vertical-align: middle;
       margin-top: -6px;
       > svg {

diff --git a/packages/react-transfer/src/style/index.ts b/packages/react-transfer/src/style/index.ts
@@ -13,9 +13,9 @@ export const TransferChekedContentWrap = styled.div`
   overflow-y: auto;
 `;
 
-interface TransferArrowProps extends ThemeVariantValueOptions {}
+interface TransferArrowProps extends ThemeVariantValueOptions { }
 
-export const TransferArrow = styled(IconStyleBase)<TransferArrowProps>`
+export const TransferArrow = styled(IconStyleBase) <TransferArrowProps>`
   transition: all 0.3s;
   border-radius: 3px;