From db45df899af948721439b7b7fb14d0c9db1e8cc2 Mon Sep 17 00:00:00 2001 From: oasis Date: Thu, 28 Nov 2024 14:39:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A43D=E7=8E=AF?= =?UTF-8?q?=E7=BB=95=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datepicker/__test__/datepicker.spec.tsx | 7 --- src/packages/datepicker/datepicker.taro.tsx | 5 -- src/packages/datepicker/datepicker.tsx | 5 -- src/packages/datepicker/demos/h5/demo1.tsx | 1 - src/packages/datepicker/demos/taro/demo1.tsx | 1 - src/packages/datepicker/doc.en-US.md | 1 - src/packages/datepicker/doc.md | 1 - src/packages/datepicker/doc.taro.md | 1 - src/packages/datepicker/doc.zh-TW.md | 1 - src/packages/picker/demo.taro.tsx | 6 -- src/packages/picker/demo.tsx | 6 -- src/packages/picker/demos/h5/demo5.tsx | 1 - src/packages/picker/demos/taro/demo5.tsx | 1 - src/packages/picker/doc.en-US.md | 11 ---- src/packages/picker/doc.md | 11 ---- src/packages/picker/doc.taro.md | 11 ---- src/packages/picker/doc.zh-TW.md | 11 ---- src/packages/picker/picker.taro.tsx | 4 -- src/packages/picker/picker.tsx | 4 -- src/packages/picker/pickerpanel.taro.tsx | 60 ++++++------------- src/packages/picker/pickerpanel.tsx | 50 +++++----------- 21 files changed, 32 insertions(+), 167 deletions(-) diff --git a/src/packages/datepicker/__test__/datepicker.spec.tsx b/src/packages/datepicker/__test__/datepicker.spec.tsx index 2bfbba3dcc..7e2073b54b 100644 --- a/src/packages/datepicker/__test__/datepicker.spec.tsx +++ b/src/packages/datepicker/__test__/datepicker.spec.tsx @@ -12,7 +12,6 @@ test('Show Chinese', async () => { visible defaultValue={new Date(currentYear - 10, 0, 1)} showChinese - threeDimensional={false} onConfirm={(options) => confirm(options)} /> ) @@ -35,7 +34,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} /> ) @@ -55,7 +53,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} /> ) @@ -67,7 +64,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} /> ) @@ -79,7 +75,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} /> ) @@ -91,7 +86,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} /> ) @@ -124,7 +118,6 @@ test('Min date & Max date', async () => { defaultValue={new Date(2022, 0, 1)} startDate={new Date(2020, 0, 1)} endDate={new Date(2022, 0, 1)} - threeDimensional={false} onConfirm={confirm} formatter={formatter} /> diff --git a/src/packages/datepicker/datepicker.taro.tsx b/src/packages/datepicker/datepicker.taro.tsx index 2d14f28e42..7ee201a0d1 100644 --- a/src/packages/datepicker/datepicker.taro.tsx +++ b/src/packages/datepicker/datepicker.taro.tsx @@ -24,12 +24,10 @@ export interface DatePickerProps extends BasicComponent { minuteStep: number startDate: Date endDate: Date - threeDimensional: boolean pickerProps: Partial< Omit< PickerProps, | 'defaultValue' - | 'threeDimensional' | 'title' | 'value' | 'onConfirm' @@ -60,7 +58,6 @@ const defaultProps = { title: '', type: 'date', showChinese: false, - threeDimensional: true, minuteStep: 1, startDate: new Date(currentYear - 10, 0, 1), endDate: new Date(currentYear + 10, 11, 31), @@ -86,7 +83,6 @@ export const DatePicker: FunctionComponent< onConfirm, filter, onChange, - threeDimensional, className, style, ...rest @@ -420,7 +416,6 @@ export const DatePicker: FunctionComponent< value: (number | string)[], index: number ) => handlePickerChange(options, value, index)} - threeDimensional={threeDimensional} /> )} diff --git a/src/packages/datepicker/datepicker.tsx b/src/packages/datepicker/datepicker.tsx index 7a7f818b20..1745085f8e 100644 --- a/src/packages/datepicker/datepicker.tsx +++ b/src/packages/datepicker/datepicker.tsx @@ -24,12 +24,10 @@ export interface DatePickerProps extends BasicComponent { minuteStep: number startDate: Date endDate: Date - threeDimensional: boolean pickerProps: Partial< Omit< PickerProps, | 'defaultValue' - | 'threeDimensional' | 'title' | 'value' | 'onConfirm' @@ -60,7 +58,6 @@ const defaultProps = { title: '', type: 'date', showChinese: false, - threeDimensional: true, minuteStep: 1, startDate: new Date(currentYear - 10, 0, 1), endDate: new Date(currentYear + 10, 11, 31), @@ -86,7 +83,6 @@ export const DatePicker: FunctionComponent< onConfirm, filter, onChange, - threeDimensional, className, style, ...rest @@ -415,7 +411,6 @@ export const DatePicker: FunctionComponent< value: (number | string)[], index: number ) => handlePickerChange(options, value, index)} - threeDimensional={threeDimensional} /> )} diff --git a/src/packages/datepicker/demos/h5/demo1.tsx b/src/packages/datepicker/demos/h5/demo1.tsx index f227a06824..ed5b640b3a 100644 --- a/src/packages/datepicker/demos/h5/demo1.tsx +++ b/src/packages/datepicker/demos/h5/demo1.tsx @@ -53,7 +53,6 @@ const Demo1 = () => { value={new Date(value)} showChinese onClose={() => setShow2(false)} - threeDimensional={false} onChange={(options, values) => change(options, values)} /> diff --git a/src/packages/datepicker/demos/taro/demo1.tsx b/src/packages/datepicker/demos/taro/demo1.tsx index dadd406cb0..60ec212606 100644 --- a/src/packages/datepicker/demos/taro/demo1.tsx +++ b/src/packages/datepicker/demos/taro/demo1.tsx @@ -53,7 +53,6 @@ const Demo1 = () => { value={new Date(value)} showChinese onClose={() => setShow2(false)} - threeDimensional={false} onChange={(options, values) => change(options, values)} /> diff --git a/src/packages/datepicker/doc.en-US.md b/src/packages/datepicker/doc.en-US.md index 03fa3aff30..37460d93a8 100644 --- a/src/packages/datepicker/doc.en-US.md +++ b/src/packages/datepicker/doc.en-US.md @@ -90,7 +90,6 @@ import { DatePicker } from '@nutui/nutui' | pickerProps | picker props | `object` | `-` | | formatter | Option text formatter | `(type: string, option: PickerOption) => PickerOption` | `-` | | filter | Option filter | `(type: string, option: PickerOption) => PickerOption[]` | `-` | -| threeDimensional | Turn on 3D effects | `boolean` | `true` | | onConfirm | Emitted when click confirm button. | `(options, value) => void` | `-` | | onCancel | Emitted when click cancel button. | `() => void` | `-` | | onClose | Emitted when click confirm and cancel button. | `(options, value) => void` | `-` | diff --git a/src/packages/datepicker/doc.md b/src/packages/datepicker/doc.md index c7b3d741cd..4a1101e575 100644 --- a/src/packages/datepicker/doc.md +++ b/src/packages/datepicker/doc.md @@ -100,7 +100,6 @@ DatetimePicker 通过 type 属性来定义需要选择的时间类型。将 type | pickerProps | 透传picker属性 | `object` | `-` | | formatter | 选项格式化函数 | `(type: string, option: PickerOption) => PickerOption` | `-` | | filter | 选项过滤函数 | `(type: string, option: PickerOption) => PickerOption[]` | `-` | -| threeDimensional | 是否开启3D效果 | `boolean` | `true` | | onConfirm | 点击确定按钮时触发 | `(options, value) => void` | `-` | | onCancel | 点击取消按钮时触发 | `() => void` | `-` | | onClose | 确定和取消时,都触发 | `(options, value) => void` | `-` | diff --git a/src/packages/datepicker/doc.taro.md b/src/packages/datepicker/doc.taro.md index 766a1230b4..961a11b92e 100644 --- a/src/packages/datepicker/doc.taro.md +++ b/src/packages/datepicker/doc.taro.md @@ -100,7 +100,6 @@ DatetimePicker 通过 type 属性来定义需要选择的时间类型。将 type | formatter | 选项格式化函数 | `(type: string, option: PickerOption) => PickerOption` | `-` | | pickerProps | 透传picker属性 | `object` | `-` | | filter | 选项过滤函数 | `(type: string, option: PickerOption) => PickerOption[]` | `-` | -| threeDimensional | 是否开启3D效果 | `boolean` | `true` | | onConfirm | 点击确定按钮时触发 | `(options, value) => void` | `-` | | onCancel | 点击取消按钮时触发 | `() => void` | `-` | | onClose | 确定和取消时,都触发 | `(options, value) => void` | `-` | diff --git a/src/packages/datepicker/doc.zh-TW.md b/src/packages/datepicker/doc.zh-TW.md index c364f20277..29351d7075 100644 --- a/src/packages/datepicker/doc.zh-TW.md +++ b/src/packages/datepicker/doc.zh-TW.md @@ -100,7 +100,6 @@ DatetimePicker 通過 type 屬性來定義需要選擇的時間類型。將 type | formatter | 選項格式化函數 | `(type: string, option: PickerOption) => PickerOption` | `-` | | pickerProps | 透传 picker 屬性 | `object` | `-` | | filter | 選項過濾函數 | `(type: string, option: PickerOption) => PickerOption[]` | `-` | -| threeDimensional | 是否開啟3D效果 | `boolean` | `true` | | onConfirm | 點擊確定按鈕時觸發 | `(options, value) => void` | `-` | | onCancel | 點擊取消按鈕時觸發 | `() => void` | `-` | | onClose | 確定和取消時,都觸發 | `(options, value) => void` | `-` | diff --git a/src/packages/picker/demo.taro.tsx b/src/packages/picker/demo.taro.tsx index c6e2310161..9bd6e97669 100644 --- a/src/packages/picker/demo.taro.tsx +++ b/src/packages/picker/demo.taro.tsx @@ -7,7 +7,6 @@ import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' import Demo4 from './demos/taro/demo4' -import Demo5 from './demos/taro/demo5' import Demo6 from './demos/taro/demo6' import Demo7 from './demos/taro/demo7' import Demo8 from './demos/taro/demo8' @@ -18,7 +17,6 @@ const PickerDemo = () => { basic: '基础用法', defaultSelected: '默认选中项', controlled: '受控', - tileDesc: '平铺展示', multipleColumns: '多列样式', cascade: '多级联动', async: '异步获取', @@ -28,7 +26,6 @@ const PickerDemo = () => { basic: '基础用法', defaultSelected: '默認選中項', controlled: '受控', - tileDesc: '平鋪展示', multipleColumns: '多列樣式', cascade: '多級聯動', async: '異步獲取', @@ -38,7 +35,6 @@ const PickerDemo = () => { basic: 'Basic Usage', defaultSelected: 'Default Index', controlled: 'Controlled', - tileDesc: 'Tile', multipleColumns: 'Multiple Columns', cascade: 'Cascade', async: 'Async', @@ -58,8 +54,6 @@ const PickerDemo = () => { {translated.multipleColumns} - {translated.tileDesc} - {translated.cascade} {translated.async} diff --git a/src/packages/picker/demo.tsx b/src/packages/picker/demo.tsx index 9bc11fc9ff..45c0e7c667 100644 --- a/src/packages/picker/demo.tsx +++ b/src/packages/picker/demo.tsx @@ -4,7 +4,6 @@ import Demo1 from './demos/h5/demo1' import Demo2 from './demos/h5/demo2' import Demo3 from './demos/h5/demo3' import Demo4 from './demos/h5/demo4' -import Demo5 from './demos/h5/demo5' import Demo6 from './demos/h5/demo6' import Demo7 from './demos/h5/demo7' import Demo8 from './demos/h5/demo8' @@ -15,7 +14,6 @@ const PickerDemo = () => { basic: '基础用法', defaultSelected: '默认选中项', controlled: '受控', - tileDesc: '平铺展示', multipleColumns: '多列样式', cascade: '多级联动', async: '异步获取', @@ -25,7 +23,6 @@ const PickerDemo = () => { basic: '基础用法', defaultSelected: '默認選中項', controlled: '受控', - tileDesc: '平鋪展示', multipleColumns: '多列樣式', cascade: '多級聯動', async: '異步獲取', @@ -35,7 +32,6 @@ const PickerDemo = () => { basic: 'Basic Usage', defaultSelected: 'Default Index', controlled: 'Controlled', - tileDesc: 'Tile', multipleColumns: 'Multiple Columns', cascade: 'Cascade', async: 'Async', @@ -54,8 +50,6 @@ const PickerDemo = () => {

{translated.multipleColumns}

-

{translated.tileDesc}

-

{translated.cascade}

{translated.async}

diff --git a/src/packages/picker/demos/h5/demo5.tsx b/src/packages/picker/demos/h5/demo5.tsx index aeb6a2f1e0..75fa662f94 100644 --- a/src/packages/picker/demos/h5/demo5.tsx +++ b/src/packages/picker/demos/h5/demo5.tsx @@ -49,7 +49,6 @@ const Demo5 = () => { options={listData1} onConfirm={(list, values) => confirmPicker(list, values)} defaultValue={[2]} - threeDimensional={false} duration={1000} onClose={() => setIsVisible(false)} /> diff --git a/src/packages/picker/demos/taro/demo5.tsx b/src/packages/picker/demos/taro/demo5.tsx index df1c6c3d36..36bcf4f868 100644 --- a/src/packages/picker/demos/taro/demo5.tsx +++ b/src/packages/picker/demos/taro/demo5.tsx @@ -52,7 +52,6 @@ const Demo5 = () => { options={listData1} onConfirm={(list, values) => confirmPicker(list, values)} defaultValue={[2]} - threeDimensional={false} duration={1000} onClose={() => setIsVisible(false)} onChange={changePicker} diff --git a/src/packages/picker/doc.en-US.md b/src/packages/picker/doc.en-US.md index 53c7004f06..8e256a791d 100644 --- a/src/packages/picker/doc.en-US.md +++ b/src/packages/picker/doc.en-US.md @@ -42,16 +42,6 @@ import { Picker } from '@nutui/nutui-react' ::: -### Tile - -Cancel the 3D display effect by setting `threeDimensional`, and control the duration of fast scrolling by setting `duration`. - -:::demo - - - -::: - ### Cascade :::demo @@ -87,7 +77,6 @@ Cancel the 3D display effect by setting `threeDimensional`, and control the dura | options | Columns data | `Array` | `[]` | | value | Controlled Value | `Array` | `[]` | | defaultValue | Default Index | `Array` | `[]` | -| threeDimensional | Turn on 3D effects | `boolean` | `true` | | duration | move animation duration, ms | `string` \| `number` | `1000` | | popupProps | popup props | `object` | `-` | | closeOnOverlayClick | Tap Mask off | `boolean` | `true` | diff --git a/src/packages/picker/doc.md b/src/packages/picker/doc.md index 38554d701e..d9ac77f873 100644 --- a/src/packages/picker/doc.md +++ b/src/packages/picker/doc.md @@ -42,16 +42,6 @@ import { Picker } from '@nutui/nutui-react' ::: -### 平铺展示 - -通过设置 `threeDimensional` 取消 3D 展示效果,并且通过设置 `duration` 可以控制快速滚动的时长。 - -:::demo - - - -::: - ### 多级联动 :::demo @@ -87,7 +77,6 @@ import { Picker } from '@nutui/nutui-react' | options | 列表数据 | `Array` | `[]` | | value | 选中值,受控 | `Array` | `[]` | | defaultValue | 默认选中 | `Array` | `[]` | -| threeDimensional | 是否开启3D效果 | `boolean` | `true` | | duration | 快速滑动时惯性滚动的时长,单位 ms | `string` \| `number` | `1000` | | popupProps | 透传popup属性 | `object` | `-` | | closeOnOverlayClick | 是否点击遮罩关闭 | `boolean` | `true` | diff --git a/src/packages/picker/doc.taro.md b/src/packages/picker/doc.taro.md index 6d07ec41cb..da58ee9683 100644 --- a/src/packages/picker/doc.taro.md +++ b/src/packages/picker/doc.taro.md @@ -42,16 +42,6 @@ import { Picker } from '@nutui/nutui-react-taro' ::: -### 平铺展示 - -通过设置 `threeDimensional` 取消 3D 展示效果,并且通过设置 `duration` 可以控制快速滚动的时长。 - -:::demo - - - -::: - ### 多级联动 :::demo @@ -87,7 +77,6 @@ import { Picker } from '@nutui/nutui-react-taro' | options | 列表数据 | `Array` | `[]` | | value | 选中值,受控 | `Array` | `[]` | | defaultValue | 默认选中 | `Array` | `[]` | -| threeDimensional | 是否开启3D效果 | `boolean` | `true` | | duration | 快速滑动时惯性滚动的时长,单位 ms | `string` \| `number` | `1000` | | popupProps | 透传popup属性 | `object` | `-` | | closeOnOverlayClick | 是否点击遮罩关闭 | `boolean` | `true` | diff --git a/src/packages/picker/doc.zh-TW.md b/src/packages/picker/doc.zh-TW.md index 354e679eb9..ce18e3b79f 100644 --- a/src/packages/picker/doc.zh-TW.md +++ b/src/packages/picker/doc.zh-TW.md @@ -42,16 +42,6 @@ import { Picker } from '@nutui/nutui-react' ::: -### 平鋪展示 - -通過設置 `threeDimensional` 取消 3D 展示效果,並且通過設置 `duration` 可以控製快速滾動的時長。 - -:::demo - - - -::: - ### 多級聯動 :::demo @@ -87,7 +77,6 @@ import { Picker } from '@nutui/nutui-react' | options | 列表數據 | `Array` | `[]` | | value | 選中值,受控 | `Array` | `[]` | | defaultValue | 默認選中 | `Array` | `[]` | -| threeDimensional | 是否開啟3D效果 | `boolean` | `true` | | duration | 快速滑動時慣性滾動的時長,單位 ms | `string` \| `number` | `1000` | | popupProps | 透傳popup屬性 | `object` | `-` | | closeOnOverlayClick | 是否點擊遮罩關閉 | `boolean` | `true` | diff --git a/src/packages/picker/picker.taro.tsx b/src/packages/picker/picker.taro.tsx index 824dbc4102..e317343c1d 100644 --- a/src/packages/picker/picker.taro.tsx +++ b/src/packages/picker/picker.taro.tsx @@ -28,7 +28,6 @@ export interface PickerProps extends Omit { options: (PickerOption | PickerOption[])[] value?: (number | string)[] defaultValue?: (number | string)[] - threeDimensional?: boolean duration: number | string closeOnOverlayClick: boolean popupProps: Partial< @@ -63,7 +62,6 @@ const defaultProps = { options: [], value: [], defaultValue: [], - threeDimensional: true, closeOnOverlayClick: true, duration: 1000, } as unknown as PickerProps @@ -82,7 +80,6 @@ const InternalPicker: ForwardRefRenderFunction< defaultValue = [], className, style, - threeDimensional, duration, onConfirm, onCancel, @@ -397,7 +394,6 @@ const InternalPicker: ForwardRefRenderFunction< ref={setRefs(index)} defaultValue={innerValue?.[index]} options={item} - threeDimensional={threeDimensional} chooseItem={(value: PickerOption, index: number) => chooseItem(value, index) } diff --git a/src/packages/picker/picker.tsx b/src/packages/picker/picker.tsx index 2c780b6a96..9f6243d00d 100644 --- a/src/packages/picker/picker.tsx +++ b/src/packages/picker/picker.tsx @@ -27,7 +27,6 @@ export interface PickerProps extends Omit { options: (PickerOption | PickerOption[])[] value?: (number | string)[] defaultValue?: (number | string)[] - threeDimensional?: boolean duration: number | string closeOnOverlayClick: boolean popupProps: Partial< @@ -61,7 +60,6 @@ const defaultProps = { options: [], value: [], defaultValue: [], - threeDimensional: true, closeOnOverlayClick: true, duration: 1000, } as unknown as PickerProps @@ -80,7 +78,6 @@ const InternalPicker: ForwardRefRenderFunction< defaultValue = [], className, style, - threeDimensional, duration, onConfirm, onCancel, @@ -338,7 +335,6 @@ const InternalPicker: ForwardRefRenderFunction< ref={setRefs(index)} defaultValue={innerValue?.[index]} options={item} - threeDimensional={threeDimensional} chooseItem={(value: PickerOption, index: number) => chooseItem(value, index) } diff --git a/src/packages/picker/pickerpanel.taro.tsx b/src/packages/picker/pickerpanel.taro.tsx index 8a5975c1c6..f3fe1d85c6 100644 --- a/src/packages/picker/pickerpanel.taro.tsx +++ b/src/packages/picker/pickerpanel.taro.tsx @@ -1,9 +1,9 @@ import React, { - useState, - useEffect, - useRef, ForwardRefRenderFunction, + useEffect, useImperativeHandle, + useRef, + useState, } from 'react' import { View } from '@tarojs/components' import { PickerOption } from './types' @@ -15,7 +15,6 @@ interface PickerPanelProps { keyIndex?: number defaultValue?: string | number options?: PickerOption[] - threeDimensional: boolean duration: number | string itemShow: boolean chooseItem?: (val: PickerOption, idx: number) => void @@ -29,7 +28,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< keyIndex = 0, defaultValue, options = [], - threeDimensional = true, duration = 1000, itemShow = false, chooseItem, @@ -269,46 +267,24 @@ const InternalPickerPanel: ForwardRefRenderFunction< - {/* 3D 效果 */} - {threeDimensional && - options.map((item, index) => { - return ( - - <>{item.text} - - ) - })} {/* 平铺 */} - {!threeDimensional && - options.map((item, index) => { - return ( - - <>{item.text} - - ) - })} + {options.map((item, index) => { + return ( + + <>{item.text} + + ) + })} diff --git a/src/packages/picker/pickerpanel.tsx b/src/packages/picker/pickerpanel.tsx index 15e66ce773..395cb9e206 100644 --- a/src/packages/picker/pickerpanel.tsx +++ b/src/packages/picker/pickerpanel.tsx @@ -1,9 +1,9 @@ import React, { - useState, - useEffect, - useRef, ForwardRefRenderFunction, + useEffect, useImperativeHandle, + useRef, + useState, } from 'react' import { PickerOption } from './types' import { useTouch } from '@/utils/use-touch' @@ -13,7 +13,6 @@ interface PickerPanelProps { keyIndex?: number defaultValue?: string | number options?: PickerOption[] - threeDimensional: boolean duration: number | string chooseItem?: (val: PickerOption, idx: number) => void } @@ -26,7 +25,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< keyIndex = 0, defaultValue, options = [], - threeDimensional = true, duration = 1000, chooseItem, } = props @@ -258,40 +256,20 @@ const InternalPickerPanel: ForwardRefRenderFunction<
- {/* 3D 效果 */} - {threeDimensional && - options.map((item, index) => { - return ( -
- <>{item.text} -
- ) - })} {/* 平铺 */} - {!threeDimensional && - options.map((item, index) => { - return ( -
- <>{item.text} -
- ) - })} + {options.map((item, index) => { + return ( +
+ <>{item.text} +
+ ) + })}
From de7badebff828d003eecf362a12db2dfb569274f Mon Sep 17 00:00:00 2001 From: oasis Date: Tue, 3 Dec 2024 10:36:00 +0800 Subject: [PATCH 2/3] test: update --- src/packages/datepicker/__test__/datepicker.spec.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/datepicker/__test__/datepicker.spec.tsx b/src/packages/datepicker/__test__/datepicker.spec.tsx index 7e2073b54b..eb4222b88a 100644 --- a/src/packages/datepicker/__test__/datepicker.spec.tsx +++ b/src/packages/datepicker/__test__/datepicker.spec.tsx @@ -160,7 +160,7 @@ test('Increment step setting', async () => { ) const columns = container.querySelectorAll('.nut-picker-list')[1] - const lists = columns.querySelectorAll('.nut-picker-roller-item') + const lists = columns.querySelectorAll('.nut-picker-roller-item-title') expect(lists.length).toBe(12) }) @@ -183,6 +183,6 @@ test('Filter Time', async () => { ) const columns = container.querySelectorAll('.nut-picker-list')[3] - const lists = columns.querySelectorAll('.nut-picker-roller-item') + const lists = columns.querySelectorAll('.nut-picker-roller-item-title') expect(lists.length).toBe(4) }) From 76788d06b3013a6bfb3591dda21628251324e906 Mon Sep 17 00:00:00 2001 From: oasis Date: Thu, 5 Dec 2024 17:07:11 +0800 Subject: [PATCH 3/3] fix: review --- migrate-from-v2.md | 8 +------- src/packages/picker/pickerpanel.taro.tsx | 13 ------------- src/packages/picker/pickerpanel.tsx | 13 ------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/migrate-from-v2.md b/migrate-from-v2.md index 5bd3f8ec5e..e0cd4ddc2d 100644 --- a/migrate-from-v2.md +++ b/migrate-from-v2.md @@ -441,13 +441,7 @@ plugins: [ #### Picker -- `isVisible` 重命名为 `visible` -- `listData` 重命名为 `options` -- `defaultValueData` 重命名为 `defaultValue` -- 增加受控 `value` -- `swipeDuration` 重命名为 `duration` -- `onCloseUpdate` 重命名为 `afterClose` -- 方法 `onConfirm`、`onClose`、`afterClose`、`onChange`的参数进行了调整,从`(selectedValue, selectedOptions)` 改为 `(selectedOptions, selectedValue)`。 +- 废弃 3D 动效 #### Radio diff --git a/src/packages/picker/pickerpanel.taro.tsx b/src/packages/picker/pickerpanel.taro.tsx index f3fe1d85c6..33842b7ca3 100644 --- a/src/packages/picker/pickerpanel.taro.tsx +++ b/src/packages/picker/pickerpanel.taro.tsx @@ -58,13 +58,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< const transformY = useRef(0) const [scrollDistance, setScrollDistance] = useState(0) - const isHidden = (index: number) => { - if (index >= currIndex + 8 || index <= currIndex - 8) { - return true - } - return false - } - const setTransform = ( type: string, deg: string, @@ -212,12 +205,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< lineSpacing.current = refe.height ? refe.height : 36 } - const touchRollerStyle = () => { - return { - transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`, - transform: `rotate3d(1, 0, 0, ${touchDeg})`, - } - } const touchTileStyle = () => { return { transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`, diff --git a/src/packages/picker/pickerpanel.tsx b/src/packages/picker/pickerpanel.tsx index 395cb9e206..959125ccf8 100644 --- a/src/packages/picker/pickerpanel.tsx +++ b/src/packages/picker/pickerpanel.tsx @@ -53,13 +53,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< const transformY = useRef(0) const [scrollDistance, setScrollDistance] = useState(0) - const isHidden = (index: number) => { - if (index >= currIndex + 8 || index <= currIndex - 8) { - return true - } - return false - } - const setTransform = ( type: string, deg: string, @@ -206,12 +199,6 @@ const InternalPickerPanel: ForwardRefRenderFunction< } } - const touchRollerStyle = () => { - return { - transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`, - transform: `rotate3d(1, 0, 0, ${touchDeg})`, - } - } const touchTileStyle = () => { return { transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`,