|
1 | | -import {useMemo} from 'react'; |
| 1 | +import {useMemo, useRef} from 'react'; |
2 | 2 | import React, {useCallback} from 'react'; |
3 | 3 | import {InputDragger} from '../../NewComposition/InputDragger'; |
4 | 4 | import {Fieldset} from './Fieldset'; |
@@ -29,23 +29,45 @@ export const ZodNumberEditor: React.FC<{ |
29 | 29 | readonly onRemove: null | (() => void); |
30 | 30 | readonly mayPad: boolean; |
31 | 31 | }> = ({jsonPath, value, schema, setValue, onRemove, mayPad}) => { |
| 32 | + const valueOnFocus = useRef(value); |
| 33 | + const hasUnsavedChanges = useRef(false); |
| 34 | + const onFocus: React.FocusEventHandler<HTMLInputElement> = useCallback(() => { |
| 35 | + if (!hasUnsavedChanges.current) { |
| 36 | + valueOnFocus.current = value; |
| 37 | + } |
| 38 | + }, [value]); |
| 39 | + |
32 | 40 | const onNumberChange = useCallback( |
33 | | - (newValue: number) => { |
| 41 | + (newValue: number, source: 'input' | 'drag') => { |
| 42 | + if (source === 'drag' && !hasUnsavedChanges.current) { |
| 43 | + valueOnFocus.current = value; |
| 44 | + } |
| 45 | + |
| 46 | + hasUnsavedChanges.current = valueOnFocus.current !== newValue; |
34 | 47 | setValue(() => newValue, {shouldSave: false}); |
35 | 48 | }, |
36 | | - [setValue], |
| 49 | + [setValue, value], |
37 | 50 | ); |
38 | 51 |
|
39 | 52 | const onNumberChangeEnd = useCallback( |
40 | 53 | (newValue: number) => { |
| 54 | + hasUnsavedChanges.current = false; |
| 55 | + if (valueOnFocus.current === newValue) { |
| 56 | + return; |
| 57 | + } |
| 58 | + |
| 59 | + valueOnFocus.current = newValue; |
41 | 60 | setValue(() => newValue, {shouldSave: true}); |
42 | 61 | }, |
43 | 62 | [setValue], |
44 | 63 | ); |
45 | 64 |
|
46 | 65 | const onTextChange = useCallback( |
47 | 66 | (newValue: string) => { |
48 | | - setValue(() => Number(newValue), {shouldSave: true}); |
| 67 | + const number = Number(newValue); |
| 68 | + hasUnsavedChanges.current = false; |
| 69 | + valueOnFocus.current = number; |
| 70 | + setValue(() => number, {shouldSave: true}); |
49 | 71 | }, |
50 | 72 | [setValue], |
51 | 73 | ); |
@@ -75,6 +97,7 @@ export const ZodNumberEditor: React.FC<{ |
75 | 97 | onTextChange={onTextChange} |
76 | 98 | onValueChange={onNumberChange} |
77 | 99 | onValueChangeEnd={onNumberChangeEnd} |
| 100 | + onFocus={onFocus} |
78 | 101 | min={getZodNumberMinimum(schema)} |
79 | 102 | max={getZodNumberMaximum(schema)} |
80 | 103 | step={getZodNumberStep(schema)} |
|
0 commit comments