From 9fbf507a36e2f1bb61fa2c6abf9e73138f669e1d Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Thu, 22 Aug 2024 16:37:27 +0800
Subject: [PATCH] feat: Slider adds rules prop

---
 thaw/src/field/docs/mod.md  | 16 +++++++++++++
 thaw/src/slider/docs/mod.md | 19 ++++++++-------
 thaw/src/slider/mod.rs      | 47 ++++++++++++++++++++++++++++++++++++-
 thaw/src/time_picker/mod.rs |  8 ++++---
 4 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/thaw/src/field/docs/mod.md b/thaw/src/field/docs/mod.md
index 9d306e4..8341144 100644
--- a/thaw/src/field/docs/mod.md
+++ b/thaw/src/field/docs/mod.md
@@ -71,6 +71,22 @@ view! {
             <Field label="Time" name="time">
                 <TimePicker rules=vec![TimePickerRule::required(true.into())]/>
             </Field>
+            <Field label="Slider" name="slider">
+                <Slider
+                    step=25.0
+                    rules=vec![SliderRule::validator(move |v, _| {
+                        if v % 2.0 == 0.0 {
+                            Err(FieldValidationState::Error("It has to be odd!".to_string()))
+                        } else {
+                            Ok(())
+                        }
+                    })]
+                >
+                    <SliderLabel value=50.0>
+                        "50"
+                    </SliderLabel>
+                </Slider>
+            </Field>
             <div style="margin-top: 8px">
                 <Button
                     button_type=ButtonType::Submit
diff --git a/thaw/src/slider/docs/mod.md b/thaw/src/slider/docs/mod.md
index 735c69d..7dfa59e 100644
--- a/thaw/src/slider/docs/mod.md
+++ b/thaw/src/slider/docs/mod.md
@@ -40,14 +40,17 @@ view! {
 
 ### Slider Props
 
-| Name     | Type                | Default              | Description                                 |
-| -------- | ------------------- | -------------------- | ------------------------------------------- |
-| class    | `MaybeProp<String>` | `Default::default()` |                                             |
-| value    | `MaybeSignal<f64>`  | `0`                  | The current value of the controlled Slider. |
-| min      | `MaybeSignal<f64>`  | `0`                  | Min value of the slider.                    |
-| max      | `MaybeSignal<f64>`  | `100`                | Max value of the slider.                    |
-| step     | `MaybeSignal<f64>`  | `0`                  | The step in which value is incremented.     |
-| children | `Option<Children>`  | `None`               |                                             |
+| Name | Type | Default | Description |
+| --- | --- | --- | --- |
+| class | `MaybeProp<String>` | `Default::default()` |  |
+| id | `MaybeProp<String>` | `Default::default()` |  |
+| name | `MaybeProp<String>` | `Default::default()` | A string specifying a name for the input control. This name is submitted along with the control's value when the form data is submitted. |
+| rules | `Vec<InputRule>` | `vec![]` | The rules to validate Field. |
+| value | `MaybeSignal<f64>` | `0` | The current value of the controlled Slider. |
+| min | `MaybeSignal<f64>` | `0` | Min value of the slider. |
+| max | `MaybeSignal<f64>` | `100` | Max value of the slider. |
+| step | `MaybeSignal<f64>` | `0` | The step in which value is incremented. |
+| children | `Option<Children>` | `None` |  |
 
 ### SliderLabel props
 
diff --git a/thaw/src/slider/mod.rs b/thaw/src/slider/mod.rs
index f7ebf8f..2d6d80e 100644
--- a/thaw/src/slider/mod.rs
+++ b/thaw/src/slider/mod.rs
@@ -2,13 +2,23 @@ mod slider_label;
 
 pub use slider_label::SliderLabel;
 
+use crate::{FieldInjection, FieldValidationState, Rule};
 use leptos::{context::Provider, ev, prelude::*};
+use std::ops::Deref;
 use thaw_components::OptionComp;
 use thaw_utils::{class_list, mount_style, Model};
 
 #[component]
 pub fn Slider(
     #[prop(optional, into)] class: MaybeProp<String>,
+    #[prop(optional, into)] id: MaybeProp<String>,
+    /// A string specifying a name for the input control.
+    /// This name is submitted along with the control's value when the form data is submitted.
+    #[prop(optional, into)]
+    name: MaybeProp<String>,
+    /// The rules to validate Field.
+    #[prop(optional, into)]
+    rules: Vec<SliderRule>,
     /// The current value of the controlled Slider.
     #[prop(optional, into)]
     value: Model<f64>,
@@ -24,7 +34,8 @@ pub fn Slider(
     #[prop(optional)] children: Option<Children>,
 ) -> impl IntoView {
     mount_style("slider", include_str!("./slider.css"));
-
+    let (id, name) = FieldInjection::use_id_and_name(id, name);
+    let validate = Rule::validate(rules, value, name);
     let is_chldren = children.is_some();
     let list_id = is_chldren.then(|| uuid::Uuid::new_v4().to_string());
     let current_value = Memo::new(move |_| {
@@ -43,6 +54,7 @@ pub fn Slider(
     let on_input = move |e: ev::Event| {
         if let Ok(range_value) = event_target_value(&e).parse::<f64>() {
             value.set(range_value);
+            validate.run(Some(SliderRuleTrigger::Input));
         }
     };
 
@@ -83,6 +95,8 @@ pub fn Slider(
                     step=move || step.get()
                     type="range"
                     class="thaw-slider__input"
+                    id=id
+                    name=name
                     on:input=on_input
                     value=current_value.get_untracked()
                     prop:value=move || current_value.get()
@@ -111,3 +125,34 @@ impl SliderInjection {
         expect_context()
     }
 }
+
+#[derive(Debug, Default, PartialEq, Clone, Copy)]
+pub enum SliderRuleTrigger {
+    #[default]
+    Input,
+}
+
+pub struct SliderRule(Rule<f64, SliderRuleTrigger>);
+
+impl SliderRule {
+    pub fn validator(
+        f: impl Fn(&f64, Signal<Option<String>>) -> Result<(), FieldValidationState>
+            + Send
+            + Sync
+            + 'static,
+    ) -> Self {
+        Self(Rule::validator(f))
+    }
+
+    pub fn with_trigger(self, trigger: SliderRuleTrigger) -> Self {
+        Self(Rule::with_trigger(self.0, trigger))
+    }
+}
+
+impl Deref for SliderRule {
+    type Target = Rule<f64, SliderRuleTrigger>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs
index d347420..24e2cd4 100644
--- a/thaw/src/time_picker/mod.rs
+++ b/thaw/src/time_picker/mod.rs
@@ -1,13 +1,15 @@
 use crate::{
-    Button, ButtonSize, ConfigInjection, Icon, Input, InputSuffix, Scrollbar, ScrollbarRef, FieldInjection, FieldValidationState, Rule 
+    Button, ButtonSize, ConfigInjection, FieldInjection, FieldValidationState, Icon, Input,
+    InputSuffix, Rule, Scrollbar, ScrollbarRef,
 };
 use chrono::{Local, NaiveTime, Timelike};
 use leptos::{html, prelude::*};
+use std::ops::Deref;
 use thaw_components::{Binder, CSSTransition, Follower, FollowerPlacement};
 use thaw_utils::{
-    class_list, mount_style, ArcOneCallback, ComponentRef, OptionModel, OptionModelWithValue, SignalWatch
+    class_list, mount_style, ArcOneCallback, ComponentRef, OptionModel, OptionModelWithValue,
+    SignalWatch,
 };
-use std::ops::Deref;
 
 #[component]
 pub fn TimePicker(