fix: 修复PasswordInput组件阻止默认事件问题 (#60)

windole · pengjin · web-flow · commit ccce405b5a66 · 2023-08-04T16:08:26.000+08:00
* chore: 更改release-it版本

* fix: 修复PasswordInput组件阻止默认事件问题

* fix(date-picker): 修改confirm时拿不到最新值的问题

* fix: 更新form组件的Snapshots

---------

Co-authored-by: pengjin &lt;pengjin@vcredit.com&gt;
diff --git a/packages/rc-cli/site/mobile/routes.js b/packages/rc-cli/site/mobile/routes.js
@@ -19,7 +19,6 @@ export function getLangFromRoute(pathname) {
 }
 
 function getRoutes() {
-  console.log(demos);
   const routes = [];
   const names = Object.keys(demos);
   const langs = locales ? Object.keys(locales) : [];
@@ -82,7 +81,6 @@ function getRoutes() {
       meta: {},
     });
   }
-  console.log(routes);
 
   return routes;
 }
diff --git a/packages/rc-ui-lib/src/datetime-picker/DatePicker.tsx b/packages/rc-ui-lib/src/datetime-picker/DatePicker.tsx
@@ -44,7 +44,6 @@ const DatePicker = forwardRef<DateTimePickerInstance, DatePickerProps>((props, r
   const pickerRef = useRef<PickerInstance>(null);
   const [currentDate, setCurrentDate, currentDateRef] = useRefState(formatValue(value));
 
-
   const getBoundary = (type: 'max' | 'min', dateValue: Date) => {
     const boundary = props[`${type}Date`];
     const year = boundary.getFullYear();
@@ -243,7 +242,12 @@ const DatePicker = forwardRef<DateTimePickerInstance, DatePickerProps>((props, r
   };
 
   const onConfirm = () => {
-    props.onConfirm?.(currentDate);
+    if (pickerRef.current) {
+      const indexes = pickerRef.current?.getIndexes();
+      const nextValue = updateInnerValue(indexes);
+      setCurrentDate(nextValue);
+      props.onConfirm?.(nextValue);
+    }
   };
 
   // useMount(() => {
diff --git a/packages/rc-ui-lib/src/datetime-picker/__test__/date-picker.spec.tsx b/packages/rc-ui-lib/src/datetime-picker/__test__/date-picker.spec.tsx
@@ -73,6 +73,8 @@ describe('DatePicker', () => {
       onConfirm,
     });
 
+    await sleep(400);
+
     const confirmBtn = container.querySelector('.rc-picker__confirm');
     fireEvent.click(confirmBtn);
 
@@ -83,7 +85,7 @@ describe('DatePicker', () => {
     await sleep(400);
 
     fireEvent.click(confirmBtn);
-    // expect(onConfirm.mock.calls[1][0].getMonth()).toEqual(11);
+    expect(onConfirm.mock.calls[1][0].getMonth()).toEqual(11);
     expect(onConfirm.mock.calls[1][0].getDate()).toEqual(1);
   });
 
@@ -100,9 +102,10 @@ describe('DatePicker', () => {
       onConfirm,
     });
 
+    await sleep(100);
+
     const confirmBtn = container.querySelector('.rc-picker__confirm');
     fireEvent.click(confirmBtn);
-    await sleep(100);
     expect(onConfirm.mock.calls[0][0].getFullYear()).toEqual(2020);
     expect(onConfirm.mock.calls[0][0].getMonth()).toEqual(10);
 
@@ -154,6 +157,8 @@ describe('DatePicker', () => {
       onConfirm,
     });
 
+    await sleep(400);
+
     const confirmBtn = container.querySelector('.rc-picker__confirm');
     fireEvent.click(confirmBtn);
 
@@ -184,6 +189,8 @@ describe('DatePicker', () => {
       onConfirm,
     });
 
+    await sleep(400);
+
     const confirmBtn = container.querySelector('.rc-picker__confirm');
     fireEvent.click(confirmBtn);
 
diff --git a/packages/rc-ui-lib/src/datetime-picker/__test__/index.spec.tsx b/packages/rc-ui-lib/src/datetime-picker/__test__/index.spec.tsx
@@ -110,6 +110,8 @@ describe('DateTimePicker', () => {
       onConfirm,
     });
 
+    await sleep(100);
+
     act(() => {
       pickerRef.current.getPicker().setColumnIndex(2, 14);
     });
@@ -132,6 +134,8 @@ describe('DateTimePicker', () => {
       onConfirm,
     });
 
+    await sleep(100);
+
     act(() => {
       pickerRef.current.getPicker().setColumnValue(2, '15');
     });
diff --git a/packages/rc-ui-lib/src/form/__test__/__snapshots__/index.spec.tsx.snap b/packages/rc-ui-lib/src/form/__test__/__snapshots__/index.spec.tsx.snap
@@ -99,6 +99,7 @@ exports[`Form basic usage 1`] = `
                     "validateTrigger": "onChange",
                   }
                 }
+                isListField={false}
                 key="_username"
                 name={
                   Array [
@@ -130,6 +131,7 @@ exports[`Form basic usage 1`] = `
                         "username",
                       ],
                       "touched": false,
+                      "validated": false,
                       "validating": false,
                       "warnings": Array [],
                     }
@@ -457,6 +459,7 @@ exports[`Form when name props is set without shouldUpdate or dependencies 1`] =
                     "validateTrigger": "onChange",
                   }
                 }
+                isListField={false}
                 key="_name"
                 name={
                   Array [
@@ -476,6 +479,7 @@ exports[`Form when name props is set without shouldUpdate or dependencies 1`] =
                         "name",
                       ],
                       "touched": false,
+                      "validated": false,
                       "validating": false,
                       "warnings": Array [],
                     }
@@ -824,6 +828,7 @@ exports[`Form when shouldUpdate and dependencies are not set 1`] = `
                     "validateTrigger": "onChange",
                   }
                 }
+                isListField={false}
                 key="_"
                 trigger="onChange"
                 validateTrigger="onChange"
@@ -836,6 +841,7 @@ exports[`Form when shouldUpdate and dependencies are not set 1`] = `
                       "errors": Array [],
                       "name": Array [],
                       "touched": false,
+                      "validated": false,
                       "validating": false,
                       "warnings": Array [],
                     }
@@ -948,6 +954,7 @@ exports[`Form when shouldUpdate props is set 1`] = `
                     "validateTrigger": "onChange",
                   }
                 }
+                isListField={false}
                 key="_"
                 shouldUpdate={true}
                 trigger="onChange"
@@ -961,6 +968,7 @@ exports[`Form when shouldUpdate props is set 1`] = `
                       "errors": Array [],
                       "name": Array [],
                       "touched": false,
+                      "validated": false,
                       "validating": false,
                       "warnings": Array [],
                     }
diff --git a/packages/rc-ui-lib/src/password-input/PasswordInput.tsx b/packages/rc-ui-lib/src/password-input/PasswordInput.tsx
@@ -68,11 +68,6 @@ const PasswordInput = forwardRef<PasswordInputInstance, PasswordInputProps>((pro
     },
   }));
 
-  const onTouchStart = (event) => {
-    event.stopPropagation();
-    props.onFocus?.();
-  };
-
   const renderPoints = () => {
     const Points: JSX.Element[] = [];
     const { mask, gutter } = props;
@@ -114,7 +109,6 @@ const PasswordInput = forwardRef<PasswordInputInstance, PasswordInputProps>((pro
       >
         <ul
           className={classNames(bem('security'), { [BORDER_SURROUND]: !props.gutter })}
-          onTouchStart={onTouchStart}
         >
           {renderPoints()}
         </ul>
diff --git a/packages/rc-ui-lib/src/password-input/__test__/index.spec.tsx b/packages/rc-ui-lib/src/password-input/__test__/index.spec.tsx
@@ -34,18 +34,18 @@ describe('PasswordInput', () => {
     jest.restoreAllMocks();
   });
 
-  it('should emit onFocus event when security is touched', async () => {
-    const onFocus = jest.fn();
-    const props = {
-      ...$props,
-      onFocus,
-    };
-
-    const { container } = createPasswordInput(props);
-    const wrapper = container.querySelector('.rc-password-input__security');
-    await TestsEvent.triggerTouch(wrapper, 'touchstart', [[0, 0]]);
-    expect(onFocus).toHaveBeenCalled();
-  });
+  // it('should emit onFocus event when security is touched', async () => {
+  //   const onFocus = jest.fn();
+  //   const props = {
+  //     ...$props,
+  //     onFocus,
+  //   };
+
+  //   const { container } = createPasswordInput(props);
+  //   const wrapper = container.querySelector('.rc-password-input__security');
+  //   await TestsEvent.triggerTouch(wrapper, 'touchstart', [[0, 0]]);
+  //   expect(onFocus).toHaveBeenCalled();
+  // });
 
   it('should emit onFocus event when wrapper is focused', async () => {
     const onFocus = jest.fn();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ export function getLangFromRoute(pathname) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`function getRoutes() {`
`22`		`- console.log(demos);`
`23`	`22`	`const routes = [];`
`24`	`23`	`const names = Object.keys(demos);`
`25`	`24`	`const langs = locales ? Object.keys(locales) : [];`
`@@ -82,7 +81,6 @@ function getRoutes() {`
`82`	`81`	`meta: {},`
`83`	`82`	`});`
`84`	`83`	`}`
`85`		`- console.log(routes);`
`86`	`84`
`87`	`85`	`return routes;`
`88`	`86`	`}`
Original file line number	Diff line number	Diff line change
@@ -99,6 +99,7 @@ exports[`Form basic usage 1`] = `
`99`	`99`	`"validateTrigger": "onChange",`
`100`	`100`	`}`
`101`	`101`	`}`
	`102`	`+ isListField={false}`
`102`	`103`	`key="_username"`
`103`	`104`	`name={`
`104`	`105`	`Array [`
@@ -130,6 +131,7 @@ exports[`Form basic usage 1`] = `
`130`	`131`	`"username",`
`131`	`132`	`],`
`132`	`133`	`"touched": false,`
	`134`	`+ "validated": false,`
`133`	`135`	`"validating": false,`
`134`	`136`	`"warnings": Array [],`
`135`	`137`	`}`
@@ -457,6 +459,7 @@ exports[`Form when name props is set without shouldUpdate or dependencies 1`] =
`457`	`459`	`"validateTrigger": "onChange",`
`458`	`460`	`}`
`459`	`461`	`}`
	`462`	`+ isListField={false}`
`460`	`463`	`key="_name"`
`461`	`464`	`name={`
`462`	`465`	`Array [`
@@ -476,6 +479,7 @@ exports[`Form when name props is set without shouldUpdate or dependencies 1`] =
`476`	`479`	`"name",`
`477`	`480`	`],`
`478`	`481`	`"touched": false,`
	`482`	`+ "validated": false,`
`479`	`483`	`"validating": false,`
`480`	`484`	`"warnings": Array [],`
`481`	`485`	`}`
@@ -824,6 +828,7 @@ exports[`Form when shouldUpdate and dependencies are not set 1`] = `
`824`	`828`	`"validateTrigger": "onChange",`
`825`	`829`	`}`
`826`	`830`	`}`
	`831`	`+ isListField={false}`
`827`	`832`	`key="_"`
`828`	`833`	`trigger="onChange"`
`829`	`834`	`validateTrigger="onChange"`
@@ -836,6 +841,7 @@ exports[`Form when shouldUpdate and dependencies are not set 1`] = `
`836`	`841`	`"errors": Array [],`
`837`	`842`	`"name": Array [],`
`838`	`843`	`"touched": false,`
	`844`	`+ "validated": false,`
`839`	`845`	`"validating": false,`
`840`	`846`	`"warnings": Array [],`
`841`	`847`	`}`
@@ -948,6 +954,7 @@ exports[`Form when shouldUpdate props is set 1`] = `
`948`	`954`	`"validateTrigger": "onChange",`
`949`	`955`	`}`
`950`	`956`	`}`
	`957`	`+ isListField={false}`
`951`	`958`	`key="_"`
`952`	`959`	`shouldUpdate={true}`
`953`	`960`	`trigger="onChange"`
@@ -961,6 +968,7 @@ exports[`Form when shouldUpdate props is set 1`] = `
`961`	`968`	`"errors": Array [],`
`962`	`969`	`"name": Array [],`
`963`	`970`	`"touched": false,`
	`971`	`+ "validated": false,`
`964`	`972`	`"validating": false,`
`965`	`973`	`"warnings": Array [],`
`966`	`974`	`}`