-
-
Notifications
You must be signed in to change notification settings - Fork 186
feat(spinner): support spinner type #721
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 5 commits
d6cec40
1db7175
71c4bc6
6b2bdec
dfd8e1b
9ec02df
150bd00
8f5de3f
a38ca89
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* eslint no-console:0 */ | ||
| import InputNumber from '@rc-component/input-number'; | ||
| import React from 'react'; | ||
| import '../../assets/index.less'; | ||
|
|
||
| export default () => { | ||
| const [disabled, setDisabled] = React.useState(false); | ||
| const [readOnly, setReadOnly] = React.useState(false); | ||
| const [keyboard, setKeyboard] = React.useState(true); | ||
| const [wheel, setWheel] = React.useState(true); | ||
| const [stringMode, setStringMode] = React.useState(false); | ||
| const [value, setValue] = React.useState<string | number>(93); | ||
|
|
||
| const onChange = (val: number) => { | ||
|
guoyunhe marked this conversation as resolved.
|
||
| console.warn('onChange:', val, typeof val); | ||
| setValue(val); | ||
| }; | ||
|
|
||
| return ( | ||
| <div style={{ margin: 10 }}> | ||
| <h3>Controlled</h3> | ||
| <InputNumber | ||
| type="spinner" | ||
| aria-label="Simple number input example" | ||
| min={-8} | ||
| max={10} | ||
| style={{ width: 100 }} | ||
| value={value} | ||
| onChange={onChange} | ||
| readOnly={readOnly} | ||
| disabled={disabled} | ||
| keyboard={keyboard} | ||
| changeOnWheel={wheel} | ||
| stringMode={stringMode} | ||
| /> | ||
| <p> | ||
| <button type="button" onClick={() => setDisabled(!disabled)}> | ||
| toggle Disabled ({String(disabled)}) | ||
| </button> | ||
| <button type="button" onClick={() => setReadOnly(!readOnly)}> | ||
| toggle readOnly ({String(readOnly)}) | ||
| </button> | ||
| <button type="button" onClick={() => setKeyboard(!keyboard)}> | ||
| toggle keyboard ({String(keyboard)}) | ||
| </button> | ||
| <button type="button" onClick={() => setStringMode(!stringMode)}> | ||
| toggle stringMode ({String(stringMode)}) | ||
| </button> | ||
| <button type="button" onClick={() => setWheel(!wheel)}> | ||
| toggle wheel ({String(wheel)}) | ||
| </button> | ||
| </p> | ||
|
|
||
| <hr /> | ||
| <h3>Uncontrolled</h3> | ||
| <InputNumber | ||
| type="spinner" | ||
| style={{ width: 100 }} | ||
| onChange={onChange} | ||
| min={-99} | ||
| max={99} | ||
| defaultValue={33} | ||
| /> | ||
|
|
||
| <hr /> | ||
| <h3>!changeOnBlur</h3> | ||
| <InputNumber | ||
| type="spinner" | ||
| style={{ width: 100 }} | ||
| min={-9} | ||
| max={9} | ||
| defaultValue={10} | ||
| onChange={onChange} | ||
| changeOnBlur={false} | ||
| /> | ||
| </div> | ||
| ); | ||
| }; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,3 +52,7 @@ nav: | |
| ## focus | ||
|
|
||
| <code src="./demo/focus.tsx"></code> | ||
|
|
||
| ## spinner | ||
|
|
||
| <code src="./demo/spinner.tsx"></code> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,8 @@ export interface InputNumberProps<T extends ValueType = ValueType> | |
| /** value will show as string */ | ||
| stringMode?: boolean; | ||
|
|
||
| type?: 'input' | 'spinner'; | ||
|
|
||
| defaultValue?: T; | ||
| value?: T | null; | ||
|
|
||
|
|
@@ -119,6 +121,7 @@ type InternalInputNumberProps = Omit<InputNumberProps, 'prefix' | 'suffix'> & { | |
| const InternalInputNumber = React.forwardRef( | ||
| (props: InternalInputNumberProps, ref: React.Ref<HTMLInputElement>) => { | ||
| const { | ||
| type, | ||
| prefixCls, | ||
| className, | ||
| style, | ||
|
|
@@ -607,7 +610,7 @@ const InternalInputNumber = React.forwardRef( | |
| onCompositionEnd={onCompositionEnd} | ||
| onBeforeInput={onBeforeInput} | ||
| > | ||
| {controls && ( | ||
| {type === 'input' && controls && ( | ||
| <StepHandler | ||
| prefixCls={prefixCls} | ||
| upNode={upHandler} | ||
|
|
@@ -617,6 +620,17 @@ const InternalInputNumber = React.forwardRef( | |
| onStep={onInternalStep} | ||
| /> | ||
| )} | ||
|
|
||
| {type === 'spinner' && controls && ( | ||
| <StepHandler | ||
|
guoyunhe marked this conversation as resolved.
Outdated
|
||
| prefixCls={prefixCls} | ||
| downNode={downHandler} | ||
| downDisabled={downDisabled} | ||
| upHidden | ||
| onStep={onInternalStep} | ||
| /> | ||
| )} | ||
|
|
||
| <div className={`${inputClassName}-wrap`}> | ||
| <input | ||
| autoComplete="off" | ||
|
|
@@ -634,13 +648,24 @@ const InternalInputNumber = React.forwardRef( | |
| readOnly={readOnly} | ||
| /> | ||
| </div> | ||
|
|
||
| {type === 'spinner' && controls && ( | ||
| <StepHandler | ||
| prefixCls={prefixCls} | ||
| upNode={upHandler} | ||
| upDisabled={upDisabled} | ||
| downHidden | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 耦合度有点太高了,StepHandler 单独拆一个子组件出来消费吧 |
||
| onStep={onInternalStep} | ||
| /> | ||
| )} | ||
| </div> | ||
| ); | ||
| }, | ||
| ); | ||
|
|
||
| const InputNumber = React.forwardRef<InputNumberRef, InputNumberProps>((props, ref) => { | ||
| const { | ||
| type = 'input', | ||
| disabled, | ||
| style, | ||
| prefixCls = 'rc-input-number', | ||
|
|
@@ -675,7 +700,7 @@ const InputNumber = React.forwardRef<InputNumberRef, InputNumberProps>((props, r | |
| return ( | ||
| <SemanticContext.Provider value={memoizedValue}> | ||
| <BaseInput | ||
| className={className} | ||
| className={clsx(`${prefixCls}-type-${type}`, className)} | ||
| triggerFocus={focus} | ||
| prefixCls={prefixCls} | ||
| value={value} | ||
|
|
@@ -696,6 +721,7 @@ const InputNumber = React.forwardRef<InputNumberRef, InputNumberProps>((props, r | |
| ref={holderRef} | ||
| > | ||
| <InternalInputNumber | ||
| type={type} | ||
| prefixCls={prefixCls} | ||
| disabled={disabled} | ||
| ref={inputFocusRef} | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -19,7 +19,9 @@ export interface StepHandlerProps { | |||||||||||||||||
| upNode?: React.ReactNode; | ||||||||||||||||||
| downNode?: React.ReactNode; | ||||||||||||||||||
| upDisabled?: boolean; | ||||||||||||||||||
| upHidden?: boolean; | ||||||||||||||||||
| downDisabled?: boolean; | ||||||||||||||||||
| downHidden?: boolean; | ||||||||||||||||||
| onStep: (up: boolean, emitter: 'handler' | 'keyboard' | 'wheel') => void; | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
|
|
@@ -29,6 +31,8 @@ export default function StepHandler({ | |||||||||||||||||
| downNode, | ||||||||||||||||||
| upDisabled, | ||||||||||||||||||
| downDisabled, | ||||||||||||||||||
| upHidden, | ||||||||||||||||||
| downHidden, | ||||||||||||||||||
| onStep, | ||||||||||||||||||
| }: StepHandlerProps) { | ||||||||||||||||||
| // ======================== Step ======================== | ||||||||||||||||||
|
|
@@ -96,30 +100,47 @@ export default function StepHandler({ | |||||||||||||||||
| onMouseLeave: safeOnStopStep, | ||||||||||||||||||
| }; | ||||||||||||||||||
|
|
||||||||||||||||||
| const upHandle = ( | ||||||||||||||||||
| <span | ||||||||||||||||||
| {...sharedHandlerProps} | ||||||||||||||||||
| onMouseDown={(e) => { | ||||||||||||||||||
| onStepMouseDown(e, true); | ||||||||||||||||||
| }} | ||||||||||||||||||
| aria-label="Increase Value" | ||||||||||||||||||
| aria-disabled={upDisabled} | ||||||||||||||||||
| className={upClassName} | ||||||||||||||||||
| > | ||||||||||||||||||
| {upNode || <span unselectable="on" className={`${prefixCls}-handler-up-inner`} />} | ||||||||||||||||||
| </span> | ||||||||||||||||||
| ); | ||||||||||||||||||
|
|
||||||||||||||||||
| const downHandle = ( | ||||||||||||||||||
| <span | ||||||||||||||||||
| {...sharedHandlerProps} | ||||||||||||||||||
| onMouseDown={(e) => { | ||||||||||||||||||
| onStepMouseDown(e, false); | ||||||||||||||||||
| }} | ||||||||||||||||||
|
Comment on lines
+103
to
+105
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 在交互处理器中检查 disabled 状态。 当 应用此 diff 添加 disabled 检查: <span
{...sharedHandlerProps}
onMouseDown={(e) => {
- onStepMouseDown(e);
+ if (!disabled) {
+ onStepMouseDown(e);
+ }
}}
aria-label={isUpAction ? 'Increase Value' : 'Decrease Value'}📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||
| aria-label="Decrease Value" | ||||||||||||||||||
| aria-disabled={downDisabled} | ||||||||||||||||||
| className={downClassName} | ||||||||||||||||||
| > | ||||||||||||||||||
| {downNode || <span unselectable="on" className={`${prefixCls}-handler-down-inner`} />} | ||||||||||||||||||
| </span> | ||||||||||||||||||
| ); | ||||||||||||||||||
|
|
||||||||||||||||||
| if (upHidden) { | ||||||||||||||||||
| return downHandle; | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| if (downHidden) { | ||||||||||||||||||
| return upHandle; | ||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| return ( | ||||||||||||||||||
| <div className={clsx(`${handlerClassName}-wrap`, classNames?.actions)} style={styles?.actions}> | ||||||||||||||||||
| <span | ||||||||||||||||||
| {...sharedHandlerProps} | ||||||||||||||||||
| onMouseDown={(e) => { | ||||||||||||||||||
| onStepMouseDown(e, true); | ||||||||||||||||||
| }} | ||||||||||||||||||
| aria-label="Increase Value" | ||||||||||||||||||
| aria-disabled={upDisabled} | ||||||||||||||||||
| className={upClassName} | ||||||||||||||||||
| > | ||||||||||||||||||
| {upNode || <span unselectable="on" className={`${prefixCls}-handler-up-inner`} />} | ||||||||||||||||||
| </span> | ||||||||||||||||||
| <span | ||||||||||||||||||
| {...sharedHandlerProps} | ||||||||||||||||||
| onMouseDown={(e) => { | ||||||||||||||||||
| onStepMouseDown(e, false); | ||||||||||||||||||
| }} | ||||||||||||||||||
| aria-label="Decrease Value" | ||||||||||||||||||
| aria-disabled={downDisabled} | ||||||||||||||||||
| className={downClassName} | ||||||||||||||||||
| > | ||||||||||||||||||
| {downNode || <span unselectable="on" className={`${prefixCls}-handler-down-inner`} />} | ||||||||||||||||||
| </span> | ||||||||||||||||||
| {upHandle} | ||||||||||||||||||
|
|
||||||||||||||||||
| {downHandle} | ||||||||||||||||||
| </div> | ||||||||||||||||||
| ); | ||||||||||||||||||
| } | ||||||||||||||||||
Uh oh!
There was an error while loading. Please reload this page.