diff --git a/.eslintignore b/.eslintignore index c480142f07..fb70e24272 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,5 @@ src/sites +src/packages/nutui.react.build.rn.ts scripts site_docs coverage diff --git a/.prettierignore b/.prettierignore index 944b17479e..e5704e112b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,3 +6,4 @@ **/*.eot package.json node_modules +src/packages/nutui.react.build.rn.ts \ No newline at end of file diff --git a/package.json b/package.json index afbfccd367..7c406a46bf 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "generate:file:taro": "node scripts/taro/generate-nutui-taro.js", "generate:file:taro:pages": "node scripts/taro/generate-taro-pages.js", "gulp:watch": "gulp watch --environment", - "lint": "eslint ./src/packages", + "lint": "eslint ./src/packages/*/", "lint:fix": "eslint --fix ./src/packages", "postpublish": "node scripts/postpublish.js", "prepare": "husky && npm run generate:file && npm run generate:file:taro && npm run generate:file:taro:pages", diff --git a/src/packages/avatar/avatar.taro.tsx b/src/packages/avatar/avatar.taro.tsx index 981645455e..d62751f851 100644 --- a/src/packages/avatar/avatar.taro.tsx +++ b/src/packages/avatar/avatar.taro.tsx @@ -54,7 +54,6 @@ export const Avatar: FunctionComponent< background, color, src, - alt, icon, fit, avatarIndex, diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx index dfa1dc2d53..20f0b83f2e 100644 --- a/src/packages/avatarcropper/avatarcropper.taro.tsx +++ b/src/packages/avatarcropper/avatarcropper.taro.tsx @@ -7,7 +7,7 @@ import React, { } from 'react' import Taro, { useReady, createSelectorQuery } from '@tarojs/taro' import classNames from 'classnames' -import { Canvas, View } from '@tarojs/components' +import { Canvas, CommonEventFunction, View } from '@tarojs/components' import { Button } from '@/packages/button/button.taro' import { useConfig } from '@/packages/configprovider/configprovider.taro' @@ -449,7 +449,7 @@ export const AvatarCropper: FunctionComponent> = ( }) const { startMoveX, startMoveY, startScale, startDistance } = startMove - const onTouchStart = (event: React.TouchEvent) => { + const onTouchStart: CommonEventFunction = (event: any) => { const { touches } = event const { offsetX } = touch @@ -472,7 +472,7 @@ export const AvatarCropper: FunctionComponent> = ( } } - const onTouchMove = (event: React.TouchEvent) => { + const onTouchMove: CommonEventFunction = (event: any) => { const { touches } = event touch.move(event) @@ -500,7 +500,7 @@ export const AvatarCropper: FunctionComponent> = ( } } - const onTouchEnd = (event: React.TouchEvent) => { + const onTouchEnd: CommonEventFunction = (event: any) => { let stopPropagation = false if (moving || zooming) { diff --git a/src/packages/configprovider/types.ts b/src/packages/configprovider/types.ts index 4fdbd06888..72e9ed07bc 100644 --- a/src/packages/configprovider/types.ts +++ b/src/packages/configprovider/types.ts @@ -4,7 +4,7 @@ export type NutCSSVariables = | 'nutuiColorPrimaryStop2' | 'nutuiColorPrimaryPressed' | 'nutuiColorPrimaryDisabled' - | 'nutuiColorPrimaryLight' + | 'nutuiColorPrimaryDisabledSpecial' | 'nutuiColorPrimaryLightPressed' | 'nutuiColorDefault' | 'nutuiColorDefaultPressed' @@ -30,51 +30,51 @@ export type NutCSSVariables = | 'nutuiColorDangerDisabled' | 'nutuiColorDangerLight' | 'nutuiColorDangerBackground' - | 'nutuiGray12' - | 'nutuiGray0' - | 'nutuiGray1' - | 'nutuiWhite12' - | 'nutuiBlack8' - | 'nutuiBlack3' - | 'nutuiGray4' - | 'nutuiGray7' - | 'nutuiGray6' - | 'nutuiGray5' + | 'nutuiColorBackground' + | 'nutuiColorBackgroundOverlay' + | 'nutuiColorBackgroundSunken' + | 'nutuiColorMask' + | 'nutuiColorMaskPart' + | 'nutuiColorMaskFaultToleran' + | 'nutuiColorBorder' + | 'nutuiColorBorderDisabled' + | 'nutuiColorTitle' + | 'nutuiColorText' + | 'nutuiColorTextHelp' | 'nutuiColorTextDisabled' + | 'nutuiWhite12' + | 'nutuiColorPrimaryText' + | 'nutuiFontSizeXxs' + | 'nutuiFontSizeXs' + | 'nutuiFontSizeS' + | 'nutuiFontSizeBase' + | 'nutuiFontSizeL' + | 'nutuiFontSizeXl' + | 'nutuiFontSizeXxl' + | 'nutuiFontSize10' + | 'nutuiFontSize11' + | 'nutuiFontWeightLight' | 'nutuiFontWeight' | 'nutuiFontWeightBold' | 'nutuiLineHeightBase' - | 'nutuiSpacing2' - | 'nutuiSpacing4' - | 'nutuiSpacing6' - | 'nutuiSpacing8' - | 'nutuiSpacing10' - | 'nutuiSpacing12' - | 'nutuiSpacing14' - | 'nutuiSpacing16' - | 'nutuiRadius3' - | 'nutuiRadius4' - | 'nutuiRadius6' - | 'nutuiRadius8' - | 'nutuiRadius12' - | 'nutuiRadius16' - | 'nutuiRadius20' - | 'nutuiRadius24' - | 'nutuiGray3' - | 'nutuiGray2' - | 'nutuiBlack10' - | 'nutuiBlack2' - | 'nutuiFontSize1' - | 'nutuiFontSize2' - | 'nutuiFontSize3' - | 'nutuiFontSize4' - | 'nutuiFontSize6' - | 'nutuiFontSize8' - | 'nutuiFontSize10' - | 'nutuiFontSize11' - | 'nutuiColorPrimaryText' - | 'nutuiColorTextLink' - | 'nutuiPaddingXs' + | 'nutuiSpacingXxxs' + | 'nutuiSpacingXxs' + | 'nutuiSpacingXs' + | 'nutuiSpacingS' + | 'nutuiSpacingBase' + | 'nutuiSpacingL' + | 'nutuiSpacingXl' + | 'nutuiSpacingXxl' + | 'nutuiSpacingXxxl' + | 'nutuiRadiusXxxs' + | 'nutuiRadiusXxs' + | 'nutuiRadiusXs' + | 'nutuiRadiusS' + | 'nutuiRadiusBase' + | 'nutuiRadiusL' + | 'nutuiRadiusXl' + | 'nutuiRadiusXxl' + | 'nutuiRadiusXxxl' | 'nutuiButtonSquareBorderRadius' | 'nutuiButtonBorderRadius' | 'nutuiButtonBorderWidth' @@ -332,13 +332,19 @@ export type NutCSSVariables = | 'nutuiCalendarDayFontWeight' | 'nutuiCalendarDayActiveBorderRadius' | 'nutuiHoverbuttonSpacing' + | 'nutuiSpacing16' | 'nutuiHoverbuttonPositionBottom' | 'nutuiHoverbuttonPositionRight' | 'nutuiHoverbuttonItemBorderColor' + | 'nutuiBlack3' | 'nutuiHoverbuttonItemBackground' + | 'nutuiGray1' | 'nutuiHoverbuttonItemBackgroundActive' + | 'nutuiGray3' | 'nutuiHoverbuttonItemIconColor' + | 'nutuiGray7' | 'nutuiHoverbuttonItemIconColorActive' + | 'nutuiGray6' | 'nutuiOverlayBgColor' | 'nutuiOverlayZIndex' | 'nutuiOverlayContentBgColor' diff --git a/src/packages/hoverbutton/__test__/__snapshots__/hoverbutton.spec.tsx.snap b/src/packages/hoverbutton/__test__/__snapshots__/hoverbutton.spec.tsx.snap index baca15338f..203949b55d 100644 --- a/src/packages/hoverbutton/__test__/__snapshots__/hoverbutton.spec.tsx.snap +++ b/src/packages/hoverbutton/__test__/__snapshots__/hoverbutton.spec.tsx.snap @@ -116,116 +116,6 @@ exports[`emit click event 1`] = ` `; -exports[`prop 1`] = ` -
-
-
-
- URL 跳转 -
-
-
- https://m.jd.com/ -
-
-
-`; - -exports[`prop title extra description test 1`] = ` -
-
-
-
- 我是标题 -
-
- 我是描述 -
-
-
- 描述文字 -
-
-
-`; - -exports[`slot default test 1`] = ` -
-
-
-
-
- 自定义内容 -
-
-
-
- 描述文字 -
-
-
-`; - -exports[`slot extra 1`] = ` -
-
-
-
- Switch -
-
-
-
-
-
-
-
-
-`; - exports[`tabbar height 1`] = `
+ > +
+
`; @@ -127,7 +131,11 @@ exports[`pull base 01 1`] = ` />
+ > +
+
`; @@ -152,7 +160,11 @@ exports[`pull base 03 1`] = ` />
+ > +
+
`; @@ -177,7 +189,11 @@ exports[`pull base 03 2`] = ` />
+ > +
+
`; @@ -202,7 +218,11 @@ exports[`pull base 1`] = ` />
+ > +
+
`; @@ -227,7 +247,11 @@ exports[`pull base 2`] = ` />
+ > +
+
`; diff --git a/src/packages/popup/popup.rn.tsx b/src/packages/popup/popup.rn.tsx index 282a72f375..61510bfafe 100644 --- a/src/packages/popup/popup.rn.tsx +++ b/src/packages/popup/popup.rn.tsx @@ -284,7 +284,7 @@ export const Popup: FunctionComponent< animationType="none" // 使用 slide 动画 transparent // 使背景透明 visible={innerVisible} - onRequestClose={onHandleClickOverlay} // 处理 Android 设备的返回按钮 + // onRequestClose={onHandleClickOverlay} // 处理 Android 设备的返回按钮 > {overlay ? ( diff --git a/src/packages/range/range.taro.tsx b/src/packages/range/range.taro.tsx index dc504e9c69..9e5144fed7 100644 --- a/src/packages/range/range.taro.tsx +++ b/src/packages/range/range.taro.tsx @@ -98,7 +98,7 @@ export const Range: FunctionComponent< [vertical] ) const [buttonIndex, setButtonIndex] = useState(0) - const [dragStatus, setDragStatus] = useState('start' || 'draging' || '') + const [dragStatus, setDragStatus] = useState('start') const touch = useTouch() const root = useRef(null) const [marksList, setMarksList] = useState([]) diff --git a/src/packages/range/range.tsx b/src/packages/range/range.tsx index 5ef2cfc296..4e47827ce0 100644 --- a/src/packages/range/range.tsx +++ b/src/packages/range/range.tsx @@ -93,7 +93,7 @@ export const Range: FunctionComponent< [vertical] ) const [buttonIndex, setButtonIndex] = useState(0) - const [dragStatus, setDragStatus] = useState('start' || 'draging' || '') + const [dragStatus, setDragStatus] = useState('start') const touch = useTouch() const root = useRef(null) const [marksList, setMarksList] = useState([]) diff --git a/src/packages/uploader/__tests__/uploader.spec.tsx b/src/packages/uploader/__tests__/uploader.spec.tsx index 589c0ed84d..cd839c2bdd 100644 --- a/src/packages/uploader/__tests__/uploader.spec.tsx +++ b/src/packages/uploader/__tests__/uploader.spec.tsx @@ -89,14 +89,8 @@ test('should render base uploader other props', () => { expect(container.querySelectorAll('.nut-uploader-preview').length).toBe(3) fireEvent.click(container.querySelectorAll('.close')[0]) expect(onDelete).toBeCalled() - - const toast2 = container.querySelector('.nut-uploader-preview-img-c .nut-img') - expect(toast2).toBeTruthy() fireEvent.click(container.querySelectorAll('.nut-uploader-preview-img-c')[0]) expect(fileItemClick).toBeCalled() - expect(toast2?.getAttribute('src')).toBe( - 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif' - ) }) test('should render base uploader list', () => { diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx index d300bd0c6b..cf2521b4ab 100644 --- a/src/packages/uploader/uploader.taro.tsx +++ b/src/packages/uploader/uploader.taro.tsx @@ -505,7 +505,7 @@ const InternalUploader: ForwardRefRenderFunction< <> {children || ( - )}