From 0a85cc37cde20944dcee2cf1a3d6df1c4f57a120 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 13 Sep 2024 18:23:02 +0800 Subject: [PATCH 1/3] fix: lint --- src/locales/base.ts | 4 ++ src/locales/en-US.ts | 4 ++ src/locales/id-ID.ts | 4 ++ src/locales/tr-TR.ts | 4 ++ src/locales/zh-CN.ts | 4 ++ src/locales/zh-TW.ts | 4 ++ src/locales/zh-UG.ts | 4 ++ src/packages/address/address.taro.tsx | 2 - src/packages/address/address.tsx | 2 - src/packages/address/customRender.taro.tsx | 2 +- src/packages/address/customRender.tsx | 2 +- src/packages/address/types.ts | 1 - src/packages/avatar/avatar.tsx | 3 +- .../avatarcropper/avatarcropper.taro.tsx | 44 ++++++++----------- src/packages/avatarcropper/avatarcropper.tsx | 40 ++++++++--------- src/packages/cascader/cascader.taro.tsx | 6 ++- src/packages/cascader/cascader.tsx | 6 ++- .../collapseitem/collapseitem.taro.tsx | 1 - src/packages/collapseitem/collapseitem.tsx | 1 - .../configprovider/configprovider.taro.tsx | 1 - .../configprovider/configprovider.tsx | 1 - src/packages/countdown/countdown.taro.tsx | 5 +-- src/packages/countdown/countdown.tsx | 3 -- src/packages/elevator/elevator.taro.tsx | 1 - src/packages/elevator/elevator.tsx | 1 - src/packages/ellipsis/ellipsis.taro.tsx | 4 +- src/packages/ellipsis/ellipsis.tsx | 4 +- src/packages/empty/empty.taro.tsx | 2 - src/packages/empty/empty.tsx | 2 - src/packages/griditem/griditem.taro.tsx | 2 - src/packages/griditem/griditem.tsx | 2 - src/packages/image/image.taro.tsx | 2 - src/packages/image/image.tsx | 2 - src/packages/notify/notify.taro.tsx | 2 +- src/packages/notify/notify.tsx | 2 +- src/packages/pagination/pagination.taro.tsx | 1 - src/packages/pagination/pagination.tsx | 1 - src/packages/picker/picker.tsx | 1 - src/packages/searchbar/searchbar.taro.tsx | 14 ------ src/packages/searchbar/searchbar.tsx | 14 ------ src/packages/signature/signature.taro.tsx | 2 +- src/packages/timeselect/timeselect.taro.tsx | 1 - src/packages/timeselect/timeselect.tsx | 1 - src/packages/uploader/file-item.ts | 2 +- src/packages/uploader/uploader.taro.tsx | 9 +--- src/packages/uploader/uploader.tsx | 2 +- src/sites/assets/styles/variables.scss | 2 +- src/sites/doc/components/header/header.scss | 3 -- 48 files changed, 88 insertions(+), 139 deletions(-) diff --git a/src/locales/base.ts b/src/locales/base.ts index 928595adf0..bc4e0010c5 100644 --- a/src/locales/base.ts +++ b/src/locales/base.ts @@ -6,6 +6,8 @@ export interface BaseLang { noData: string placeholder: string select: string + edit: string + reset: string video: { errorTip: string clickRetry: string @@ -44,6 +46,7 @@ export interface BaseLang { tips: string } uploader: { + list: string ready: string readyUpload: string waitingUpload: string @@ -112,6 +115,7 @@ export interface BaseLang { mute: string tips: string } + avatarCropper: { rotate: string; selectImage: string } datepicker: { year: string month: string diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index f07ffe0a15..e812d330ae 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -8,6 +8,8 @@ const enUS: BaseLang = { noData: 'No Data', placeholder: 'Placeholder', select: 'Select', + edit: 'Edit', + reset: 'Reset', video: { errorTip: 'Error Tip', clickRetry: 'Click Retry', @@ -44,6 +46,7 @@ const enUS: BaseLang = { tips: 'Forget password', }, uploader: { + list: 'Upload Files', ready: 'Ready', readyUpload: 'Ready to upload', waitingUpload: 'Waiting for upload', @@ -111,6 +114,7 @@ const enUS: BaseLang = { mute: 'mute', tips: 'The onplayend event will only be triggered when loop = false', }, + avatarCropper: { rotate: 'Rotate', selectImage: 'Select Image' }, datepicker: { year: 'Year', month: 'Month', diff --git a/src/locales/id-ID.ts b/src/locales/id-ID.ts index 9a629d9f8e..7ba1328ad0 100644 --- a/src/locales/id-ID.ts +++ b/src/locales/id-ID.ts @@ -8,6 +8,8 @@ const idID: BaseLang = { noData: 'Tidak Ada Data', placeholder: 'Kolom Input', select: 'Pilih', + edit: 'Sunting', + reset: 'Mengatur Ulang', video: { errorTip: 'Terjadi Kesalahan', clickRetry: 'Coba Lagi', @@ -45,6 +47,7 @@ const idID: BaseLang = { tips: 'Lupa Kata Sandi', }, uploader: { + list: 'Unggah file', ready: 'File berhasil diunggah', readyUpload: 'Siap untuk mengunggah', waitingUpload: 'Menunggu untuk diunggah', @@ -112,6 +115,7 @@ const idID: BaseLang = { mute: 'bisu', tips: 'Acara Onplayend hanya akan dipicu saat loop = false', }, + avatarCropper: { rotate: 'Memutar', selectImage: 'Pilih gambar' }, datepicker: { year: 'Tahun', month: 'Bulan', diff --git a/src/locales/tr-TR.ts b/src/locales/tr-TR.ts index 78f97d4428..cc13028177 100644 --- a/src/locales/tr-TR.ts +++ b/src/locales/tr-TR.ts @@ -8,6 +8,8 @@ const trTR: BaseLang = { noData: 'Veri Yok', placeholder: 'Placeholder', select: 'Seçiniz', + edit: 'düzenlemek', + reset: 'sıfırlama', video: { errorTip: 'Video yüklenemedi', clickRetry: 'Yeniden Tıklayın', @@ -53,6 +55,7 @@ const trTR: BaseLang = { tips: 'Şifrenizi mi unuttunuz', }, uploader: { + list: 'Dosyaları yükle', ready: 'Tamamlamaya hazır', readyUpload: 'Yüklemeye hazır', waitingUpload: 'Yükleme için bekleniyor', @@ -120,6 +123,7 @@ const trTR: BaseLang = { mute: 'sessiz', tips: 'onPlayEnd olayı loop=false olduğunda ateşlenir', }, + avatarCropper: { rotate: 'döndürmek', selectImage: 'Resim seç' }, datepicker: { year: 'yıl', month: 'ay', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2748470119..896064def4 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -8,6 +8,8 @@ const zhCN: BaseLang = { noData: '暂无数据', placeholder: '请输入内容', select: '请选择', + edit: '编辑', + reset: '重置', video: { errorTip: '视频加载失败', clickRetry: '点击重试', @@ -46,6 +48,7 @@ const zhCN: BaseLang = { tips: '忘记密码', }, uploader: { + list: '上传文件', ready: '准备完成', readyUpload: '准备上传', waitingUpload: '等待上传', @@ -112,6 +115,7 @@ const zhCN: BaseLang = { mute: '静音', tips: 'onPlayEnd事件在loop=false时才会触发', }, + avatarCropper: { rotate: '旋转', selectImage: '选择图片' }, datepicker: { year: '年', month: '月', diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts index 6411f416ee..1aff33151e 100644 --- a/src/locales/zh-TW.ts +++ b/src/locales/zh-TW.ts @@ -8,6 +8,8 @@ const zhCN: BaseLang = { noData: '暫無數據', placeholder: '請輸入內容', select: '請選擇', + edit: '編輯', + reset: '重置', video: { errorTip: '視頻加載失敗', clickRetry: '點擊重試', @@ -46,6 +48,7 @@ const zhCN: BaseLang = { tips: '忘記密碼', }, uploader: { + list: '上傳文件', ready: '準備完成', readyUpload: '準備上傳', waitingUpload: '等待上傳', @@ -112,6 +115,7 @@ const zhCN: BaseLang = { mute: '靜音', tips: 'onPlayEnd事件在loop=false時才會觸發', }, + avatarCropper: { rotate: '旋轉', selectImage: '選擇圖片' }, datepicker: { year: '年', month: '月', diff --git a/src/locales/zh-UG.ts b/src/locales/zh-UG.ts index 0e7cb7c54d..62dc80c998 100644 --- a/src/locales/zh-UG.ts +++ b/src/locales/zh-UG.ts @@ -8,6 +8,8 @@ const zhUG: BaseLang = { noData: 'مەزمۇن يوق', placeholder: 'كىرگۈزۈڭ', select: 'تاللاڭ', + edit: 'يحرر', + reset: 'إعادة ضبط', video: { errorTip: 'فىلىمنى قويۇش مەغلۇپ بولدى', clickRetry: 'قايتا سىناش', @@ -44,6 +46,7 @@ const zhUG: BaseLang = { tips: 'ئۇنتۇپ قاپتىمەن', }, uploader: { + list: 'تحميل الملفات', ready: 'تاماملىنىۋاتىدۇ', readyUpload: 'يوللاش ئالدىدا', waitingUpload: 'ساقلاۋاتىدۇ', @@ -110,6 +113,7 @@ const zhUG: BaseLang = { mute: 'جىم', tips: 'onPlayEnd بولسا loop=false بولغاندا ئىشلەيدۇ', }, + avatarCropper: { rotate: 'تناوب', selectImage: 'حدد الصورة' }, datepicker: { year: 'يىل', month: 'ئاي', diff --git a/src/packages/address/address.taro.tsx b/src/packages/address/address.taro.tsx index 146bb660d9..62d3bfdaeb 100644 --- a/src/packages/address/address.taro.tsx +++ b/src/packages/address/address.taro.tsx @@ -40,7 +40,6 @@ export interface AddressProps extends CascaderProps { selectIcon: React.ReactNode backIcon: React.ReactNode onSwitch?: (data: { type: string }) => void - // 仅用于选择已有地址 onExistSelect?: (data: AddressList) => void } @@ -142,7 +141,6 @@ const InternalAddress: ForwardRefRenderFunction< handleClose() } - // 切换地址选择模式 const onSwitchModule = () => { if (currentType === 'exist') { setCurrentType('custom') diff --git a/src/packages/address/address.tsx b/src/packages/address/address.tsx index fc810fa05f..901c982475 100644 --- a/src/packages/address/address.tsx +++ b/src/packages/address/address.tsx @@ -40,7 +40,6 @@ export interface AddressProps extends CascaderProps { selectIcon: React.ReactNode backIcon: React.ReactNode onSwitch?: (data: { type: string }) => void - // 仅用于选择已有地址 onExistSelect?: (data: AddressList) => void } @@ -142,7 +141,6 @@ export const InternalAddress: ForwardRefRenderFunction< handleClose() } - // 切换地址选择模式 const onSwitchModule = () => { if (currentType === 'exist') { setCurrentType('custom') diff --git a/src/packages/address/customRender.taro.tsx b/src/packages/address/customRender.taro.tsx index 77e8f7f80b..b72e290d04 100644 --- a/src/packages/address/customRender.taro.tsx +++ b/src/packages/address/customRender.taro.tsx @@ -8,7 +8,7 @@ import Cascader, { import { ComponentDefaults } from '@/utils/typings' export interface AddressProps extends CascaderProps { - visible: boolean // popup 显示状态 + visible: boolean // popup visible type: string options: CascaderOption[] value?: CascaderValue diff --git a/src/packages/address/customRender.tsx b/src/packages/address/customRender.tsx index cbd12a95db..b5e22b5cb3 100644 --- a/src/packages/address/customRender.tsx +++ b/src/packages/address/customRender.tsx @@ -8,7 +8,7 @@ import Cascader, { import { ComponentDefaults } from '@/utils/typings' export interface AddressProps extends CascaderProps { - visible: boolean // popup 显示状态 + visible: boolean // popup visible type: string options: CascaderOption[] value?: CascaderValue diff --git a/src/packages/address/types.ts b/src/packages/address/types.ts index 2a999a5598..94c120549b 100644 --- a/src/packages/address/types.ts +++ b/src/packages/address/types.ts @@ -35,7 +35,6 @@ export interface CurrentData { custom: string selectedRegion?: Regions } -// 已选地址 export interface Regions { province: RegionData city: RegionData diff --git a/src/packages/avatar/avatar.tsx b/src/packages/avatar/avatar.tsx index c20bf285e8..3bceaffa4a 100644 --- a/src/packages/avatar/avatar.tsx +++ b/src/packages/avatar/avatar.tsx @@ -66,7 +66,7 @@ export const Avatar: FunctionComponent< const [maxSum, setMaxSum] = useState(0) // avatarGroup里的avatar的个数 const [showMax, setShowMax] = useState(false) // 是否显示的最大头像个数 - const [avatarIndex, setAvatarIndex] = useState(1) // avatar的索引 + const [avatarIndex, setAvatarIndex] = useState(1) const avatarRef = useRef(null) const parent: any = useContext(AvatarContext) const sizeValue = ['large', 'normal', 'small'] @@ -172,7 +172,6 @@ export const Avatar: FunctionComponent< {!src && !icon && !children && } )} - {/* 折叠头像 */} {showMax && (
{parent?.propAvatarGroup?.maxContent diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx index 8840b88063..ab8cccd068 100644 --- a/src/packages/avatarcropper/avatarcropper.taro.tsx +++ b/src/packages/avatarcropper/avatarcropper.taro.tsx @@ -9,6 +9,8 @@ import Taro, { useReady, createSelectorQuery } from '@tarojs/taro' import classNames from 'classnames' import { Canvas } from '@tarojs/components' import { Button } from '@/packages/button/button.taro' +import { useConfig } from '@/packages/configprovider/configprovider.taro' + import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { useTouch } from '@/utils/use-touch' import { clamp, preventDefault } from '@/utils' @@ -37,16 +39,16 @@ const defaultProps = { space: 10, toolbar: [ , - , - , + , + , , ], toolbarPosition: 'bottom', - editText: '编辑', + editText: 'Edit', sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], shape: 'square', @@ -56,6 +58,18 @@ const classPrefix = `nut-avatar-cropper` export const AvatarCropper: FunctionComponent> = ( props ) => { + const { locale } = useConfig() + defaultProps.toolbar = [ + , + , + , + , + ] + defaultProps.editText = locale.edit const { children, toolbar, @@ -104,7 +118,6 @@ export const AvatarCropper: FunctionComponent> = ( const [moving, setMoving] = useState(false) const [zooming, setZooming] = useState(false) - // 获取系统信息 const systemInfo: Taro.getSystemInfoSync.Result = Taro.getSystemInfoSync() // 支付宝基础库2.7.0以上支持,需要开启支付宝小程序canvas2d const showAlipayCanvas2D = useMemo(() => { @@ -162,10 +175,8 @@ export const AvatarCropper: FunctionComponent> = ( }) }, []) - // 触摸 const touch = useTouch() - // 高亮框样式 const highlightStyle = useMemo(() => { const width = `${state.cropperWidth / pixelRatio}px` const height = width @@ -251,13 +262,9 @@ export const AvatarCropper: FunctionComponent> = ( cropperWidth ) - // 绘制偏移量 ctx.translate(displayWidth / 2 + moveX, displayHeight / 2 + moveY) - // 绘制旋转角度 ctx.rotate((Math.PI / 180) * angle) - // 绘制缩放 ctx.scale(scale, scale) - // 绘制图片 ctx.drawImage(src as HTMLImageElement, x, y, width, height) }, [drawImage, state] @@ -330,11 +337,8 @@ export const AvatarCropper: FunctionComponent> = ( // 绘制偏移量 ctx.translate(displayWidth / 2 + moveX, displayHeight / 2 + moveY) - // 绘制旋转角度 ctx.rotate((Math.PI / 180) * angle) - // 绘制缩放 ctx.scale(scale, scale) - // 绘制图片 ctx.drawImage(src as string, x, y, width, height) ctx.draw() }, [drawImage, state.scale, state.angle, state.moveX, state.moveY]) @@ -383,7 +387,6 @@ export const AvatarCropper: FunctionComponent> = ( resetScale(scale) } - // 选择图片 const chooseImage = () => { Taro.chooseImage({ count: 1, @@ -405,7 +408,6 @@ export const AvatarCropper: FunctionComponent> = ( path: string } - // 选择图片后回调 const imageChange = async (file: TFileType) => { Taro.getImageInfo({ src: file.path, @@ -415,7 +417,6 @@ export const AvatarCropper: FunctionComponent> = ( }) } - // 重设缩放 const resetScale = (scale?: number) => { setState({ ...state, @@ -427,7 +428,6 @@ export const AvatarCropper: FunctionComponent> = ( }) } - // 设置缩放 const setScale = (scale: number) => { scale = clamp(scale, +0.3, +maxZoom + 1) if (scale !== state.scale) { @@ -449,7 +449,6 @@ export const AvatarCropper: FunctionComponent> = ( }) const { startMoveX, startMoveY, startScale, startDistance } = startMove - // 触摸开始 const onTouchStart = (event: React.TouchEvent) => { const { touches } = event const { offsetX } = touch @@ -473,7 +472,6 @@ export const AvatarCropper: FunctionComponent> = ( } } - // 触摸移动 const onTouchMove = (event: React.TouchEvent) => { const { touches } = event @@ -502,7 +500,6 @@ export const AvatarCropper: FunctionComponent> = ( } } - // 触摸结束 const onTouchEnd = (event: React.TouchEvent) => { let stopPropagation = false @@ -547,12 +544,10 @@ export const AvatarCropper: FunctionComponent> = ( touch.reset() } - // 重置角度 const reset = () => { setState({ ...state, angle: 0 }) } - // 设置角度 const rotate = () => { if (state.angle === 270) { setState({ ...state, angle: 0 }) @@ -561,7 +556,6 @@ export const AvatarCropper: FunctionComponent> = ( setState({ ...state, angle: state.angle + 90 }) } - // 关闭 const cancel = (isEmit = true) => { setVisible(false) resetScale() diff --git a/src/packages/avatarcropper/avatarcropper.tsx b/src/packages/avatarcropper/avatarcropper.tsx index dd9a902283..eecf16d357 100644 --- a/src/packages/avatarcropper/avatarcropper.tsx +++ b/src/packages/avatarcropper/avatarcropper.tsx @@ -12,6 +12,7 @@ import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { useTouch } from '@/utils/use-touch' import { clamp, preventDefault } from '@/utils' import { getRect } from '@/utils/use-client-rect' +import { useConfig } from '@/packages/configprovider/configprovider.taro' export type AvatarCropperToolbarPosition = 'top' | 'bottom' export type AvatarCropperShape = 'square' | 'round' @@ -32,16 +33,16 @@ const defaultProps = { space: 10, toolbar: [ , - , - , + , + , , ], toolbarPosition: 'bottom', - editText: '编辑', + editText: 'Edit', shape: 'square', } as AvatarCropperProps @@ -49,11 +50,23 @@ const classPrefix = `nut-avatar-cropper` export const AvatarCropper: FunctionComponent> = ( props ) => { + const { locale } = useConfig() + defaultProps.toolbar = [ + , + , + , + , + ] + const { children, - toolbar, maxZoom, space, + toolbar, toolbarPosition, editText, shape, @@ -100,13 +113,8 @@ export const AvatarCropper: FunctionComponent> = ( height: 0, // 要使用的图像的高度 } const [drawImage, setDrawImg] = useState({ ...defDrawImage }) - // 设备像素比 const devicePixelRatio = window.devicePixelRatio || 1 - - // 触摸 const touch = useTouch() - - // 高亮框样式 const highlightStyle = useMemo(() => { const width = `${drawImage.swidth / devicePixelRatio}px` const height = width @@ -241,7 +249,6 @@ export const AvatarCropper: FunctionComponent> = ( setDrawImgs(image) } - // 重设缩放 const resetScale = (scale?: number) => { setState({ ...state, @@ -253,7 +260,6 @@ export const AvatarCropper: FunctionComponent> = ( }) } - // 设置缩放 const setScale = (scale: number) => { scale = clamp(scale, +0.3, +maxZoom + 1) if (scale !== state.scale) { @@ -275,7 +281,6 @@ export const AvatarCropper: FunctionComponent> = ( }) const { startMoveX, startMoveY, startScale, startDistance } = startMove - // 触摸开始 const onTouchStart = (event: React.TouchEvent) => { const { touches } = event const { offsetX } = touch @@ -299,7 +304,6 @@ export const AvatarCropper: FunctionComponent> = ( } } - // 触摸移动 const onTouchMove = (event: React.TouchEvent) => { const { touches } = event @@ -328,7 +332,6 @@ export const AvatarCropper: FunctionComponent> = ( } } - // 触摸结束 const onTouchEnd = (event: React.TouchEvent) => { let stopPropagation = false @@ -373,12 +376,10 @@ export const AvatarCropper: FunctionComponent> = ( touch.reset() } - // 重置角度 const reset = () => { setState({ ...state, angle: 0 }) } - // 设置角度 const rotate = () => { if (state.angle === 270) { setState({ ...state, angle: 0 }) @@ -387,7 +388,6 @@ export const AvatarCropper: FunctionComponent> = ( setState({ ...state, angle: state.angle + 90 }) } - // 关闭 const cancel = (isEmit: boolean = true) => { setVisible(false) resetScale() @@ -470,7 +470,7 @@ export const AvatarCropper: FunctionComponent> = ( accept="image/*" className={`${classPrefix}-input`} onChange={(e: any) => inputImageChange(e)} - aria-label="选择图片" + aria-label={locale.avatarCropper.selectImage} />
{editText}
diff --git a/src/packages/cascader/cascader.taro.tsx b/src/packages/cascader/cascader.taro.tsx index 51e5541966..fb84efdbeb 100644 --- a/src/packages/cascader/cascader.taro.tsx +++ b/src/packages/cascader/cascader.taro.tsx @@ -23,6 +23,7 @@ import { import Tree from './tree' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' +import { useConfig } from '@/packages/configprovider/configprovider.taro' export interface CascaderProps extends Pick< @@ -48,7 +49,7 @@ export interface CascaderProps | 'onClose' > > - visible: boolean // popup 显示状态 + visible: boolean // popup visible activeColor: string activeIcon: string options: CascaderOption[] @@ -91,6 +92,7 @@ const InternalCascader: ForwardRefRenderFunction< unknown, PropsWithChildren> > = (props, ref) => { + const { locale } = useConfig() const { className, style, @@ -447,7 +449,7 @@ const InternalCascader: ForwardRefRenderFunction< {!state.initLoading && state.panes.length && !pane?.selectedNode?.text && - '请选择'} + `${locale.select}`} {!(!state.initLoading && state.panes.length) && 'Loading...'} diff --git a/src/packages/cascader/cascader.tsx b/src/packages/cascader/cascader.tsx index 79d03f9d25..fc973d9ddc 100644 --- a/src/packages/cascader/cascader.tsx +++ b/src/packages/cascader/cascader.tsx @@ -22,6 +22,7 @@ import { import Tree from './tree' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' +import { useConfig } from '@/packages/configprovider/configprovider.taro' export interface CascaderProps extends Pick< @@ -47,7 +48,7 @@ export interface CascaderProps | 'onClose' > > - visible: boolean // popup 显示状态 + visible: boolean // popup visible activeColor: string activeIcon: string options: CascaderOption[] @@ -90,6 +91,7 @@ const InternalCascader: ForwardRefRenderFunction< unknown, PropsWithChildren> > = (props, ref) => { + const { locale } = useConfig() const { className, style, @@ -446,7 +448,7 @@ const InternalCascader: ForwardRefRenderFunction< {!state.initLoading && state.panes.length && !pane?.selectedNode?.text && - '请选择'} + `${locale.select}`} {!(!state.initLoading && state.panes.length) && 'Loading...'} diff --git a/src/packages/collapseitem/collapseitem.taro.tsx b/src/packages/collapseitem/collapseitem.taro.tsx index fd9af4ec9c..e7fcea4c14 100644 --- a/src/packages/collapseitem/collapseitem.taro.tsx +++ b/src/packages/collapseitem/collapseitem.taro.tsx @@ -51,7 +51,6 @@ export const CollapseItem: FunctionComponent< const classPrefix = 'nut-collapse-item' const context = useContext(CollapseContext) - // 获取 Dom 元素 const wrapperRef: any = useRef(null) const contentRef: any = useRef(null) const [refRandomId] = useState(() => Math.random().toString(36).slice(-8)) diff --git a/src/packages/collapseitem/collapseitem.tsx b/src/packages/collapseitem/collapseitem.tsx index 386af9a854..672e5e0055 100644 --- a/src/packages/collapseitem/collapseitem.tsx +++ b/src/packages/collapseitem/collapseitem.tsx @@ -49,7 +49,6 @@ export const CollapseItem: FunctionComponent< const classPrefix = 'nut-collapse-item' const context = useContext(CollapseContext) - // 获取 Dom 元素 const wrapperRef: any = useRef(null) const contentRef: any = useRef(null) diff --git a/src/packages/configprovider/configprovider.taro.tsx b/src/packages/configprovider/configprovider.taro.tsx index e0a71bbf52..569856aba5 100644 --- a/src/packages/configprovider/configprovider.taro.tsx +++ b/src/packages/configprovider/configprovider.taro.tsx @@ -35,7 +35,6 @@ export const getDefaultConfig = () => { return defaultConfigRef.current } -// 创建一个 Context 对象 const ConfigContext = createContext(null) export const useConfig = () => { diff --git a/src/packages/configprovider/configprovider.tsx b/src/packages/configprovider/configprovider.tsx index 1d2c5a7680..03ea6946f3 100644 --- a/src/packages/configprovider/configprovider.tsx +++ b/src/packages/configprovider/configprovider.tsx @@ -35,7 +35,6 @@ export const getDefaultConfig = () => { return defaultConfigRef.current } -// 创建一个 Context 对象 const ConfigContext = createContext(null) export const useConfig = () => { diff --git a/src/packages/countdown/countdown.taro.tsx b/src/packages/countdown/countdown.taro.tsx index 0704ab9fb0..0ec32168b8 100644 --- a/src/packages/countdown/countdown.taro.tsx +++ b/src/packages/countdown/countdown.taro.tsx @@ -6,7 +6,6 @@ import React, { ForwardRefRenderFunction, useImperativeHandle, } from 'react' -import { useConfig } from '@/packages/configprovider/configprovider.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' @@ -44,7 +43,6 @@ const InternalCountDown: ForwardRefRenderFunction< unknown, Partial > = (props, ref) => { - const { locale } = useConfig() const { paused, startTime, @@ -72,7 +70,7 @@ const InternalCountDown: ForwardRefRenderFunction< isPaused: paused, isIninted: false, timer: 0, - restTime: 0, // 倒计时剩余时间时间 + restTime: 0, counting: !paused && autoStart, // 是否处于倒计时中 handleEndTime: Date.now(), // 最终截止时间 diffTime: 0, // 设置了 startTime 时,与 date.now() 的差异 @@ -196,7 +194,6 @@ const InternalCountDown: ForwardRefRenderFunction< } return formatCache } - // 暂定 const pause = () => { cancelAnimationFrame(stateRef.current.timer) stateRef.current.counting = false diff --git a/src/packages/countdown/countdown.tsx b/src/packages/countdown/countdown.tsx index c9a4184fa0..0042dd330c 100644 --- a/src/packages/countdown/countdown.tsx +++ b/src/packages/countdown/countdown.tsx @@ -6,7 +6,6 @@ import React, { ForwardRefRenderFunction, useImperativeHandle, } from 'react' -import { useConfig } from '@/packages/configprovider' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { padZero } from '@/utils/pad-zero' @@ -44,7 +43,6 @@ const InternalCountDown: ForwardRefRenderFunction< unknown, Partial > = (props, ref) => { - const { locale } = useConfig() const { paused, startTime, @@ -197,7 +195,6 @@ const InternalCountDown: ForwardRefRenderFunction< return formatCache } - // 暂定 const pause = () => { cancelAnimationFrame(stateRef.current.timer) stateRef.current.counting = false diff --git a/src/packages/elevator/elevator.taro.tsx b/src/packages/elevator/elevator.taro.tsx index 354aee0bd7..ab9db66d27 100644 --- a/src/packages/elevator/elevator.taro.tsx +++ b/src/packages/elevator/elevator.taro.tsx @@ -88,7 +88,6 @@ export const Elevator: FunctionComponent< const scrolling = useRef(false) const [scrollTop, setScrollTop] = useState(0) const [scrollY, setScrollY] = useState(0) - // 重置滚动参数 const resetScrollState = () => { setScrollStart(false) } diff --git a/src/packages/elevator/elevator.tsx b/src/packages/elevator/elevator.tsx index c4ba21f134..0c30b54d05 100644 --- a/src/packages/elevator/elevator.tsx +++ b/src/packages/elevator/elevator.tsx @@ -80,7 +80,6 @@ export const Elevator: FunctionComponent< const [codeIndex, setCodeIndex] = useState(0) const [scrollStart, setScrollStart] = useState(false) const state = useRef(initData) - // 重置滚动参数 const resetScrollState = () => { setScrollStart(false) } diff --git a/src/packages/ellipsis/ellipsis.taro.tsx b/src/packages/ellipsis/ellipsis.taro.tsx index 2636686296..88e2e1c2df 100644 --- a/src/packages/ellipsis/ellipsis.taro.tsx +++ b/src/packages/ellipsis/ellipsis.taro.tsx @@ -58,7 +58,7 @@ export const Ellipsis: FunctionComponent< onChange, ...rest } = { ...defaultProps, ...props } - const maxHeight = useRef(0) // 当行的最大高度 + const maxHeight = useRef(0) const [exceeded, setExceeded] = useState(false) const [expanded, setExpanded] = useState(false) const [cacled, setCacled] = useState(false) @@ -290,7 +290,6 @@ export const Ellipsis: FunctionComponent< return match ? Number(match[0]) : 0 } - // 展开收起 const clickHandle = (type: number) => { if (type === 1) { setExpanded(true) @@ -301,7 +300,6 @@ export const Ellipsis: FunctionComponent< } } - // 文本点击 const handleClick = () => { onClick && onClick() } diff --git a/src/packages/ellipsis/ellipsis.tsx b/src/packages/ellipsis/ellipsis.tsx index c5c118a85f..a32dce929d 100644 --- a/src/packages/ellipsis/ellipsis.tsx +++ b/src/packages/ellipsis/ellipsis.tsx @@ -54,7 +54,7 @@ export const Ellipsis: FunctionComponent< } = { ...defaultProps, ...props } const rtl = useRtl() let container: any = null - let maxHeight = 0 // 当行的最大高度 + let maxHeight = 0 const [exceeded, setExceeded] = useState(false) const [expanded, setExpanded] = useState(false) const ellipsis = useRef() @@ -198,7 +198,6 @@ export const Ellipsis: FunctionComponent< return match ? Number(match[0]) : 0 } - // 展开收起 const clickHandle = (type: number) => { if (type === 1) { setExpanded(true) @@ -209,7 +208,6 @@ export const Ellipsis: FunctionComponent< } } - // 文本点击 const handleClick = () => { onClick && onClick() } diff --git a/src/packages/empty/empty.taro.tsx b/src/packages/empty/empty.taro.tsx index cb1d7d3284..fc7d63d680 100644 --- a/src/packages/empty/empty.taro.tsx +++ b/src/packages/empty/empty.taro.tsx @@ -1,6 +1,5 @@ import React, { FunctionComponent, useEffect, useState, ReactNode } from 'react' import classNames from 'classnames' -import { useConfig } from '@/packages/configprovider/configprovider.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import type { EmptyAction } from './types' import { Button } from '@/packages/button/button.taro' @@ -41,7 +40,6 @@ const classPrefix = `nut-empty` export const Empty: FunctionComponent< Partial & Omit, 'title'> > = (props) => { - const { locale } = useConfig() const { image, imageSize, diff --git a/src/packages/empty/empty.tsx b/src/packages/empty/empty.tsx index 5100f7e091..ea95ce36f1 100644 --- a/src/packages/empty/empty.tsx +++ b/src/packages/empty/empty.tsx @@ -1,6 +1,5 @@ import React, { FunctionComponent, useEffect, useState, ReactNode } from 'react' import classNames from 'classnames' -import { useConfig } from '@/packages/configprovider' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { EmptyAction } from '@/packages/empty/index' @@ -42,7 +41,6 @@ const classPrefix = `nut-empty` export const Empty: FunctionComponent< Partial & Omit, 'title'> > = (props) => { - const { locale } = useConfig() const { image, imageSize, diff --git a/src/packages/griditem/griditem.taro.tsx b/src/packages/griditem/griditem.taro.tsx index ba3a110210..3b0568b76f 100644 --- a/src/packages/griditem/griditem.taro.tsx +++ b/src/packages/griditem/griditem.taro.tsx @@ -5,7 +5,6 @@ import React, { useContext, } from 'react' import classNames from 'classnames' -import { useConfig } from '@/packages/configprovider/index.taro' import GridContext from '../grid/grid.taro.context' import { BasicComponent } from '@/utils/typings' import { pxCheck } from '@/utils/px-check' @@ -35,7 +34,6 @@ const defaultProps = { export const GridItem: FunctionComponent< Partial & React.HTMLAttributes > = (props) => { - const { locale } = useConfig() const { children, style, diff --git a/src/packages/griditem/griditem.tsx b/src/packages/griditem/griditem.tsx index adb20987c4..2e1f30cfe7 100644 --- a/src/packages/griditem/griditem.tsx +++ b/src/packages/griditem/griditem.tsx @@ -5,7 +5,6 @@ import React, { useContext, } from 'react' import classNames from 'classnames' -import { useConfig } from '@/packages/configprovider' import GridContext from '../grid/grid.context' import { BasicComponent } from '@/utils/typings' import { pxCheck } from '@/utils/px-check' @@ -35,7 +34,6 @@ const defaultProps = { export const GridItem: FunctionComponent< Partial & React.HTMLAttributes > = (props) => { - const { locale } = useConfig() const { children, style, diff --git a/src/packages/image/image.taro.tsx b/src/packages/image/image.taro.tsx index 6769952bef..8e30c55cd7 100644 --- a/src/packages/image/image.taro.tsx +++ b/src/packages/image/image.taro.tsx @@ -45,13 +45,11 @@ export const Image: FunctionComponent> = (props) => { const [innerLoading, setInnerLoading] = useState(true) const [isError, setIsError] = useState(false) - // 图片加载 const handleLoad = (e: BaseEventOrig) => { setIsError(false) setInnerLoading(false) onLoad && onLoad(e) } - // 图片加载失败 const handleError = (e: BaseEventOrig) => { if (src) { setIsError(true) diff --git a/src/packages/image/image.tsx b/src/packages/image/image.tsx index d606aa4a93..e5c4322d56 100644 --- a/src/packages/image/image.tsx +++ b/src/packages/image/image.tsx @@ -100,7 +100,6 @@ export const Image: FunctionComponent< setComplete(false) }, [src]) - // 图片加载 const handleLoad = () => { if (!complete) { setIsError(false) @@ -109,7 +108,6 @@ export const Image: FunctionComponent< setComplete(true) } } - // 图片加载失败 const handleError = () => { if (!complete) { setIsError(true) diff --git a/src/packages/notify/notify.taro.tsx b/src/packages/notify/notify.taro.tsx index 4adb1c55b6..66980d3fe0 100644 --- a/src/packages/notify/notify.taro.tsx +++ b/src/packages/notify/notify.taro.tsx @@ -25,7 +25,7 @@ export interface NotifyProps extends BasicComponent { const defaultProps = { ...ComponentDefaults, id: '', - duration: 3000, // 时长 + duration: 3000, type: 'danger', position: 'top', visible: false, diff --git a/src/packages/notify/notify.tsx b/src/packages/notify/notify.tsx index 38dbf0d265..afd4eeaf44 100644 --- a/src/packages/notify/notify.tsx +++ b/src/packages/notify/notify.tsx @@ -15,7 +15,7 @@ export interface NotifyProps extends BasicComponent { const options: NotifyProps = { ...ComponentDefaults, id: '', - duration: 3000, // 时长 + duration: 3000, type: 'danger', position: 'top', onClose: () => {}, diff --git a/src/packages/pagination/pagination.taro.tsx b/src/packages/pagination/pagination.taro.tsx index 18509c0d4b..fbda12692c 100644 --- a/src/packages/pagination/pagination.taro.tsx +++ b/src/packages/pagination/pagination.taro.tsx @@ -98,7 +98,6 @@ export const Pagination: FunctionComponent< return items }, [currentPage, itemSize, pageCount]) - // 点击选择 page const handleSelectPage = (curPage: number) => { if (curPage > pageCount || curPage < 1) return setCurrentPage(curPage) diff --git a/src/packages/pagination/pagination.tsx b/src/packages/pagination/pagination.tsx index 5dad4ff529..fafad72a7d 100644 --- a/src/packages/pagination/pagination.tsx +++ b/src/packages/pagination/pagination.tsx @@ -98,7 +98,6 @@ export const Pagination: FunctionComponent< return items }, [currentPage, itemSize, pageCount]) - // 点击选择 page const handleSelectPage = (curPage: number) => { if (curPage > pageCount || curPage < 1) return setCurrentPage(curPage) diff --git a/src/packages/picker/picker.tsx b/src/packages/picker/picker.tsx index 28516ba2be..2c780b6a96 100644 --- a/src/packages/picker/picker.tsx +++ b/src/packages/picker/picker.tsx @@ -267,7 +267,6 @@ const InternalPicker: ForwardRefRenderFunction< } } } - // 点击确定 const confirm = () => { let moving = false refs.forEach((ref: any) => { diff --git a/src/packages/searchbar/searchbar.taro.tsx b/src/packages/searchbar/searchbar.taro.tsx index 87690c1eed..0e3892f4cf 100644 --- a/src/packages/searchbar/searchbar.taro.tsx +++ b/src/packages/searchbar/searchbar.taro.tsx @@ -5,38 +5,24 @@ import { useConfig } from '@/packages/configprovider/configprovider.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface SearchBarProps extends BasicComponent { - /** 文本值 */ value?: number | string - /** 输入框占位提示文字 */ placeholder?: string - /** 搜索框形状,可选值为 round */ shape?: 'square' | 'round' - /** 是否禁用输入框 */ disabled?: boolean - /** 最大输入长度 */ maxLength?: number - /** 是否启用清除图标,点击清除图标后会清空输入框 */ clearable?: boolean - /** 是否将输入框设为只读状态,只读状态下无法输入内容 */ readOnly?: boolean - /** 是否自动聚焦,iOS 系统不支持该属性 */ autoFocus?: boolean backable: boolean left: React.ReactNode right: React.ReactNode leftIn: React.ReactNode rightIn: React.ReactNode - /** 确定搜索时触发 */ onSearch?: (val: string) => void - /** 输入框内容变化时触发 */ onChange?: (value: string, event?: ChangeEvent) => void - /** 输入框获得焦点时触发 */ onFocus?: (value: string, event: FocusEvent) => void - /** 输入框失去焦点时触发 */ onBlur?: (value: string, event: FocusEvent) => void - /** 点击清除按钮后触发 */ onClear?: (event: MouseEvent) => void - /** 点击输入区域时触发 */ onInputClick?: (event: MouseEvent) => void } diff --git a/src/packages/searchbar/searchbar.tsx b/src/packages/searchbar/searchbar.tsx index 81822e56de..9901b7b5f9 100644 --- a/src/packages/searchbar/searchbar.tsx +++ b/src/packages/searchbar/searchbar.tsx @@ -5,38 +5,24 @@ import { useConfig } from '@/packages/configprovider' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface SearchBarProps extends BasicComponent { - /** 文本值 */ value?: number | string - /** 输入框占位提示文字 */ placeholder?: string - /** 搜索框形状,可选值为 round */ shape?: 'square' | 'round' - /** 是否禁用输入框 */ disabled?: boolean - /** 最大输入长度 */ maxLength?: number - /** 是否启用清除图标,点击清除图标后会清空输入框 */ clearable?: boolean - /** 是否将输入框设为只读状态,只读状态下无法输入内容 */ readOnly?: boolean - /** 是否自动聚焦,iOS 系统不支持该属性 */ autoFocus?: boolean backable: boolean left: React.ReactNode right: React.ReactNode leftIn: React.ReactNode rightIn: React.ReactNode - /** 确定搜索时触发 */ onSearch?: (val: string) => void - /** 输入框内容变化时触发 */ onChange?: (value: string, event?: ChangeEvent) => void - /** 输入框获得焦点时触发 */ onFocus?: (value: string, event: FocusEvent) => void - /** 输入框失去焦点时触发 */ onBlur?: (value: string, event: FocusEvent) => void - /** 点击清除按钮后触发 */ onClear?: (event: MouseEvent) => void - /** 点击输入区域时触发 */ onInputClick?: (event: MouseEvent) => void } diff --git a/src/packages/signature/signature.taro.tsx b/src/packages/signature/signature.taro.tsx index 5db5e7833c..573db93b35 100644 --- a/src/packages/signature/signature.taro.tsx +++ b/src/packages/signature/signature.taro.tsx @@ -119,7 +119,7 @@ const InternalSignature: ForwardRefRenderFunction< onConfirm && onConfirm(res.tempFilePath, isSignedRef.current) }, fail: (res) => { - console.warn('保存失败') + console.warn('保存失败', res) }, }) }) diff --git a/src/packages/timeselect/timeselect.taro.tsx b/src/packages/timeselect/timeselect.taro.tsx index f3bfe88d37..88f5f2eaca 100644 --- a/src/packages/timeselect/timeselect.taro.tsx +++ b/src/packages/timeselect/timeselect.taro.tsx @@ -86,7 +86,6 @@ export const TimeSelect: FunctionComponent> = ( const closeFun = () => { onSelect && onSelect(activeTime) } - // 选择配送时间回调 const handleSelectTime = (selectTime: TimeType) => { let newActiveTime = [...activeTime] const date = newActiveTime.find((item: DateType) => { diff --git a/src/packages/timeselect/timeselect.tsx b/src/packages/timeselect/timeselect.tsx index 835a4bfd7d..a0ad3b94b8 100644 --- a/src/packages/timeselect/timeselect.tsx +++ b/src/packages/timeselect/timeselect.tsx @@ -86,7 +86,6 @@ export const TimeSelect: FunctionComponent> = ( const closeFun = () => { onSelect && onSelect(activeTime) } - // 选择配送时间回调 const handleSelectTime = (selectTime: TimeType) => { let newActiveTime = [...activeTime] const date = newActiveTime.find((item: DateType) => { diff --git a/src/packages/uploader/file-item.ts b/src/packages/uploader/file-item.ts index 9ea3afdebb..258a17b20b 100644 --- a/src/packages/uploader/file-item.ts +++ b/src/packages/uploader/file-item.ts @@ -3,7 +3,7 @@ import { ReactNode } from 'react' export class FileItem { status: FileItemStatus = 'ready' - message = '准备中..' + message = '' uid: string = new Date().getTime().toString() diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx index 68362d5909..d8bd7adc70 100644 --- a/src/packages/uploader/uploader.taro.tsx +++ b/src/packages/uploader/uploader.taro.tsx @@ -29,7 +29,6 @@ import { FileItem } from './file-item' import { usePropsValue } from '@/utils/use-props-value' import { Preview } from '@/packages/uploader/preview.taro' -/** 图片的尺寸 */ interface sizeType { /** 原图 */ original: string @@ -37,7 +36,6 @@ interface sizeType { compressed: string } -/** 图片的来源 */ interface sourceType { /** 从相册选图 */ album: string @@ -45,7 +43,6 @@ interface sourceType { camera: string } -/** 视频的来源 */ interface mediaType { /** 只能拍摄图片或从相册选择图片 */ image: string @@ -263,7 +260,6 @@ const InternalUploader: ForwardRefRenderFunction< if ((getEnv() === 'WEAPP' || getEnv() === 'JD') && chooseMedia) { // 其余端全部使用 chooseImage API chooseMedia({ - /** 最多可以选择的文件个数 */ count: multiple ? (maxCount as number) * 1 - fileList.length : 1, /** 文件类型 */ mediaType: mediaType as any, @@ -275,16 +271,13 @@ const InternalUploader: ForwardRefRenderFunction< sizeType, /** 仅在 sourceType 为 camera 时生效,使用前置或后置摄像头 */ camera, - /** 接口调用失败的回调函数 */ fail: (res: any) => { onFailure && onFailure(res) }, - /** 接口调用成功的回调函数 */ success: onChangeMedia, }) } else { chooseImage({ - // 选择数量 count: multiple ? (maxCount as number) * 1 - fileList.length : 1, // 可以指定是原图还是压缩图,默认二者都有 sizeType, @@ -515,7 +508,7 @@ const InternalUploader: ForwardRefRenderFunction< <> {children || ( )} {Number(maxCount) > fileList.length && ( diff --git a/src/packages/uploader/uploader.tsx b/src/packages/uploader/uploader.tsx index a5caa2184c..aecf48d3f6 100644 --- a/src/packages/uploader/uploader.tsx +++ b/src/packages/uploader/uploader.tsx @@ -383,7 +383,7 @@ const InternalUploader: ForwardRefRenderFunction<
{children || ( )} {Number(maxCount) > fileList.length && ( diff --git a/src/sites/assets/styles/variables.scss b/src/sites/assets/styles/variables.scss index 874280d95f..2023733734 100644 --- a/src/sites/assets/styles/variables.scss +++ b/src/sites/assets/styles/variables.scss @@ -8,7 +8,7 @@ $doc-default-primary-bg: linear-gradient( rgba(250, 63, 25, 1) 100% ); -// clolr +// color // 红色 $theme-red: #fa2c19; $theme-red-word: #fff; diff --git a/src/sites/doc/components/header/header.scss b/src/sites/doc/components/header/header.scss index 39118c9e26..c72ce4fb98 100644 --- a/src/sites/doc/components/header/header.scss +++ b/src/sites/doc/components/header/header.scss @@ -156,7 +156,6 @@ } // 颜色 .doc-header { - // 红色 &-red { background-image: $theme-red-header-bg; color: $theme-red-word; @@ -234,7 +233,6 @@ } } } - // 白色 &-white { background: $white; color: $theme-white-word; @@ -313,7 +311,6 @@ } } } - // 黑色 &-black { background: $black; color: $theme-black-word; From 147bc3f496f3c2c9bd88953cb760dd0eb2a2c847 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 13 Sep 2024 22:12:45 +0800 Subject: [PATCH 2/3] fix: test --- .../__tests__/__snapshots__/avatarcropper.spec.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/avatarcropper/__tests__/__snapshots__/avatarcropper.spec.tsx.snap b/src/packages/avatarcropper/__tests__/__snapshots__/avatarcropper.spec.tsx.snap index 6d5e204533..7cb3753e03 100644 --- a/src/packages/avatarcropper/__tests__/__snapshots__/avatarcropper.spec.tsx.snap +++ b/src/packages/avatarcropper/__tests__/__snapshots__/avatarcropper.spec.tsx.snap @@ -17,7 +17,7 @@ exports[`layout default slot 1`] = `
- 编辑 + Edit
`; From dda26fa2a30d5bcc743169dd62bcf71c81fc6bb3 Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 13 Sep 2024 22:29:06 +0800 Subject: [PATCH 3/3] fix: test import --- src/packages/imagepreview/__test__/imagepreview.spec.tsx | 3 +-- src/packages/swiper/__tests__/swiper.spec.tsx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/packages/imagepreview/__test__/imagepreview.spec.tsx b/src/packages/imagepreview/__test__/imagepreview.spec.tsx index 2bfe860157..aa6429bf81 100644 --- a/src/packages/imagepreview/__test__/imagepreview.spec.tsx +++ b/src/packages/imagepreview/__test__/imagepreview.spec.tsx @@ -1,7 +1,6 @@ import * as React from 'react' -import { render, waitFor } from '@testing-library/react' +import { render, waitFor, act } from '@testing-library/react' import '@testing-library/jest-dom' -import { act } from 'react-dom/test-utils' import { ImagePreview } from '../imagepreview' const images = [ diff --git a/src/packages/swiper/__tests__/swiper.spec.tsx b/src/packages/swiper/__tests__/swiper.spec.tsx index f5915cd6a2..9831778b3f 100644 --- a/src/packages/swiper/__tests__/swiper.spec.tsx +++ b/src/packages/swiper/__tests__/swiper.spec.tsx @@ -1,7 +1,6 @@ import React, { useRef } from 'react' -import { fireEvent, render, waitFor } from '@testing-library/react' +import { fireEvent, render, waitFor, act } from '@testing-library/react' import '@testing-library/jest-dom' -import { act } from 'react-dom/test-utils' import Swiper, { SwiperRef } from '../index' import { triggerDrag } from '@/utils/test/event'