Merge pull request #60 from kstep/leptos-0.7

leptos 0.7 and leptos-use 0.15 compatibility

Author: maccesch

Cargo.toml

@@ -12,9 +12,9 @@ readme = "README.md"
 repository = "https://github.com/Synphonyte/leptos-struct-table"
 
 [dependencies]
-leptos = { version = "0.7.0-beta" }
+leptos = { version = "0.7.0" }
 leptos-struct-table-macro = { version = "0.11.2" }
-leptos-use = "0.14.0-beta"
+leptos-use = "0.15.0"
 rust_decimal = { version = "1.35", optional = true }
 chrono = { version = "0.4", optional = true }
 send_wrapper = "0.6"

examples/editable/src/main.rs

@@ -63,9 +63,7 @@ fn main() {
         ]);
 
         let on_change = move |evt: ChangeEvent<Book>| {
-            rows.update(|rows| {
-                rows[evt.row_index] = evt.changed_row;
-            });
+            rows.write()[evt.row_index] = evt.changed_row;
         };
 
         view! {

examples/selectable/src/main.rs

@@ -1,6 +1,6 @@
 mod tailwind;
 
-use ::chrono::NaiveDate;
+use chrono::NaiveDate;
 use leptos::prelude::*;
 use leptos_struct_table::*;
 use tailwind::TailwindClassesPreset;
@@ -66,9 +66,7 @@ fn main() {
                         selection=Selection::Single(selected_index)
                         row_class="select-none"
                         on_selection_change={move |evt: SelectionChangeEvent<Book>| {
-                            set_selected_row.update(|selected_row| {
-                                *selected_row = Some(evt.row);
-                            })
+                            set_selected_row.write().replace(evt.row);
                         }}
                         sorting_mode=SortingMode::SingleColumn
                     />

src/cell_value.rs

@@ -1,6 +1,6 @@
 use leptos::prelude::*;
 
-#[derive(Default)]
+#[derive(Default, Clone, Copy)]
 pub struct NumberRenderOptions {
     /// Specifies the number of digits to display after the decimal point
     pub precision: Option<usize>,

src/components/cell/mod.rs

@@ -12,7 +12,7 @@ pub fn DefaultTableCellRenderer<T, F, M>(
     class: String,
     /// The value to display.
     #[prop(into)]
-    value: MaybeSignal<T>,
+    value: Signal<T>,
     /// Event handler called when the cell is changed. In this default renderer this will never happen.
     on_change: F,
     /// The index of the column. Starts at 0.
@@ -23,6 +23,7 @@ pub fn DefaultTableCellRenderer<T, F, M>(
 where
     T: CellValue<M> + Send + Sync + Clone + 'static,
     F: Fn(T) + 'static,
+    M: 'static,
 {
     view! {
         <td class=class>{move || value.get().render_value(options.clone())}</td>

src/components/mod.rs

@@ -29,7 +29,7 @@ macro_rules! wrapper_render_fn {
         /// * `class` - The class attribute that is passed to the root element
         $(#[$additional_doc])*
         #[allow(non_snake_case)]
-        pub fn $name(content: View, class: Signal<String>) -> impl IntoView {
+        pub fn $name(content: AnyView, class: Signal<String>) -> impl IntoView {
             view! {
                 <$tag class=class>
                     {content}

src/components/renderer_fn.rs

@@ -5,27 +5,27 @@ macro_rules! renderer_fn {
     ) => {
         #[derive(Clone)]
         pub struct $name<$($ty),*> (
-            Rc<dyn Fn($($arg_ty),*) -> AnyView<Dom>>,
+            Arc<dyn Fn($($arg_ty),*) -> AnyView + Sync + Send + 'static>,
         )
         where $($clause)*;
 
         impl<F, Ret, $($ty),*> From<F> for $name<$($ty),*>
         where
-            F: Fn($($arg_ty),*) -> Ret + 'static,
-            Ret: IntoView,
+            F: Fn($($arg_ty),*) -> Ret + Sync + Send + 'static,
+            Ret: IntoView + 'static,
             $($clause)*
         {
             fn from(f: F) -> Self {
-                Self(Rc::new(move |$($arg_name),*| {
-                    f($($arg_name),*).into_view()
+                Self(Arc::new(move |$($arg_name),*| {
+                    f($($arg_name),*).into_any()
                 }))
             }
         }
 
         impl<$($ty),*> $name <$($ty),*>
         where $($clause)*
         {
-            pub fn run(&self, $($arg_name: $arg_ty),*) -> AnyView<Dom> {
+            pub fn run(&self, $($arg_name: $arg_ty),*) -> AnyView {
                 (self.0)($($arg_name),*)
             }
         }
@@ -45,8 +45,8 @@ macro_rules! renderer_fn {
         where $($clause)*
         {
             fn default() -> Self {
-                Self(Rc::new(move |$($arg_name),*| {
-                    $default($($arg_name),*).into_view()
+                Self(Arc::new(move |$($arg_name),*| {
+                    $default($($arg_name),*).into_any()
                 }))
             }
         }

src/components/row.rs

@@ -56,8 +56,8 @@ pub fn DefaultLoadingRowRenderer(
         <tr class=class>
             {
                 (0..col_count).map(|col_index| view! {
-                    <td class=get_cell_class.call(col_index)>
-                        <div class=get_inner_cell_class.call(col_index)></div>
+                    <td class=get_cell_class.run(col_index)>
+                        <div class=get_inner_cell_class.run(col_index)></div>
                         " "
                     </td>
                 }).collect_view()