mirror of
https://github.com/adoyle0/thaw.git
synced 2025-01-23 06:19:22 -05:00
feat: Add min/max props into InputNumber (#153)
* feat: Add min/max props into InputNumber Adding range into InputNumber component with min/max props * refactor: InputNumber component * docs: Add Min / Max section into InputNumber * docs: Improvement InputNumber - Change min/max insertion position. - Change the crate that is added to T impl for conciseness. - Uniformity of expression: maximum for minimum.
This commit is contained in:
parent
6088447e21
commit
69ddf6b02f
3 changed files with 41 additions and 4 deletions
|
@ -12,6 +12,16 @@ view! {
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Min / Max
|
||||||
|
|
||||||
|
```rust demo
|
||||||
|
let value = create_rw_signal(0);
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<InputNumber value step=1 min=-1 max=2/>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
### Disabled
|
### Disabled
|
||||||
|
|
||||||
```rust demo
|
```rust demo
|
||||||
|
@ -40,13 +50,15 @@ view! {
|
||||||
| value | `Model<T>` | `T::default()` | Set the input value. |
|
| value | `Model<T>` | `T::default()` | Set the input value. |
|
||||||
| placeholder | `OptionalProp<MaybeSignal<String>>` | `Default::default()` | Placeholder of input number. |
|
| placeholder | `OptionalProp<MaybeSignal<String>>` | `Default::default()` | Placeholder of input number. |
|
||||||
| step | `MaybeSignal<T>` | | The number which the current value is increased or decreased on key or button press. |
|
| step | `MaybeSignal<T>` | | The number which the current value is increased or decreased on key or button press. |
|
||||||
|
| min | `MaybeSignal<T>` | `T::min_value()` | The minimum number that the input value can take. |
|
||||||
|
| max | `MaybeSignal<T>` | `T::max_value()` | The maximum number that the input value can take. |
|
||||||
| disabled | `MaybeSignal<bool>` | `false` | Whether the input is disabled. |
|
| disabled | `MaybeSignal<bool>` | `false` | Whether the input is disabled. |
|
||||||
| invalid | `MaybeSignal<bool>` | `false` | Whether the input is invalid. |
|
| invalid | `MaybeSignal<bool>` | `false` | Whether the input is invalid. |
|
||||||
| attr: | `Vec<(&'static str, Attribute)>` | `Default::default()` | The dom attrs of the input element inside the component. |
|
| attr: | `Vec<(&'static str, Attribute)>` | `Default::default()` | The dom attrs of the input element inside the component. |
|
||||||
|
|
||||||
#### T impl
|
#### T impl
|
||||||
|
|
||||||
`T: Add<Output = T> + Sub<Output = T> + Default + Clone + FromStr + ToString + 'static`
|
`T: Add<Output = T> + Sub<Output = T> + PartialOrd + num::Bounded + Default + Clone + FromStr + ToString + 'static`
|
||||||
|
|
||||||
### InputNumber Ref
|
### InputNumber Ref
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ uuid = { version = "1.7.0", features = ["v4"] }
|
||||||
cfg-if = "1.0.0"
|
cfg-if = "1.0.0"
|
||||||
chrono = "0.4.35"
|
chrono = "0.4.35"
|
||||||
palette = "0.7.5"
|
palette = "0.7.5"
|
||||||
|
num-traits = "0.2.18"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
csr = ["leptos/csr", "thaw_components/csr", "thaw_utils/csr"]
|
csr = ["leptos/csr", "thaw_components/csr", "thaw_utils/csr"]
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
use crate::{Button, ButtonVariant, ComponentRef, Icon, Input, InputRef, InputSuffix};
|
use crate::{Button, ButtonVariant, ComponentRef, Icon, Input, InputRef, InputSuffix};
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
|
use num_traits::Bounded;
|
||||||
use std::ops::{Add, Sub};
|
use std::ops::{Add, Sub};
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use thaw_utils::{Model, OptionalProp, StoredMaybeSignal};
|
use thaw_utils::{Model, OptionalProp, StoredMaybeSignal};
|
||||||
|
@ -14,9 +15,11 @@ pub fn InputNumber<T>(
|
||||||
#[prop(optional, into)] class: OptionalProp<MaybeSignal<String>>,
|
#[prop(optional, into)] class: OptionalProp<MaybeSignal<String>>,
|
||||||
#[prop(optional)] comp_ref: ComponentRef<InputNumberRef>,
|
#[prop(optional)] comp_ref: ComponentRef<InputNumberRef>,
|
||||||
#[prop(attrs)] attrs: Vec<(&'static str, Attribute)>,
|
#[prop(attrs)] attrs: Vec<(&'static str, Attribute)>,
|
||||||
|
#[prop(default = MaybeSignal::Static(T::min_value()), into)] min: MaybeSignal<T>,
|
||||||
|
#[prop(default = MaybeSignal::Static(T::max_value()), into)] max: MaybeSignal<T>,
|
||||||
) -> impl IntoView
|
) -> impl IntoView
|
||||||
where
|
where
|
||||||
T: Add<Output = T> + Sub<Output = T>,
|
T: Add<Output = T> + Sub<Output = T> + PartialOrd + Bounded,
|
||||||
T: Default + Clone + FromStr + ToString + 'static,
|
T: Default + Clone + FromStr + ToString + 'static,
|
||||||
{
|
{
|
||||||
let input_value = create_rw_signal(String::default());
|
let input_value = create_rw_signal(String::default());
|
||||||
|
@ -39,6 +42,8 @@ where
|
||||||
true
|
true
|
||||||
});
|
});
|
||||||
let step: StoredMaybeSignal<_> = step.into();
|
let step: StoredMaybeSignal<_> = step.into();
|
||||||
|
let min: StoredMaybeSignal<_> = min.into();
|
||||||
|
let max: StoredMaybeSignal<_> = max.into();
|
||||||
|
|
||||||
let add = Callback::<ev::MouseEvent>::new(move |e: ev::MouseEvent| {
|
let add = Callback::<ev::MouseEvent>::new(move |e: ev::MouseEvent| {
|
||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
|
@ -54,6 +59,24 @@ where
|
||||||
comp_ref.load(InputNumberRef { input_ref });
|
comp_ref.load(InputNumberRef { input_ref });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let set_within_range = Callback::<ev::FocusEvent>::new(move |_| {
|
||||||
|
let old_value = value.get_untracked();
|
||||||
|
let min = min.get_untracked();
|
||||||
|
let max = max.get_untracked();
|
||||||
|
if old_value < min {
|
||||||
|
value.set(min);
|
||||||
|
} else if old_value > max {
|
||||||
|
value.set(max);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let minus_disabled = create_memo(move |_| disabled.get() || value.get() <= min.get());
|
||||||
|
let plus_disabled = create_memo(move |_| disabled.get() || value.get() >= max.get());
|
||||||
|
let invalid = create_memo(move |_| {
|
||||||
|
let value = value.get();
|
||||||
|
invalid.get() || value < min.get() || value > max.get()
|
||||||
|
});
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Input
|
<Input
|
||||||
attrs
|
attrs
|
||||||
|
@ -64,12 +87,13 @@ where
|
||||||
disabled
|
disabled
|
||||||
invalid
|
invalid
|
||||||
comp_ref=input_ref
|
comp_ref=input_ref
|
||||||
|
on_blur=set_within_range
|
||||||
>
|
>
|
||||||
<InputSuffix slot>
|
<InputSuffix slot>
|
||||||
<Button disabled variant=ButtonVariant::Link on_click=sub>
|
<Button disabled=minus_disabled variant=ButtonVariant::Link on_click=sub>
|
||||||
<Icon icon=icondata_ai::AiMinusOutlined style="font-size: 18px"/>
|
<Icon icon=icondata_ai::AiMinusOutlined style="font-size: 18px"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button disabled variant=ButtonVariant::Link on_click=add>
|
<Button disabled=plus_disabled variant=ButtonVariant::Link on_click=add>
|
||||||
<Icon icon=icondata_ai::AiPlusOutlined style="font-size: 18px"/>
|
<Icon icon=icondata_ai::AiPlusOutlined style="font-size: 18px"/>
|
||||||
</Button>
|
</Button>
|
||||||
</InputSuffix>
|
</InputSuffix>
|
||||||
|
|
Loading…
Add table
Reference in a new issue