♻️ Rename models.

packages/components/Cargo.toml

@@ -30,7 +30,7 @@ yew = { workspace = true }
 yew-router = { workspace = true }
 
 html5ever = { version = "^0.29", optional = true }
-comrak = { version = "^0.29", optional = true }
+markdown = { version = "1.0.0-alpha.21", optional = true }
 parse-wiki-text-2 = { version = "^0.2", optional = true }
 
 egui = { version = "^0.29", optional = true }
@@ -56,7 +56,7 @@ form-input-rich = [
     "form-input-rich-mediawiki",
 ]
 form-input-rich-html = ["dep:html5ever"]
-form-input-rich-markdown = ["dep:comrak"]
+form-input-rich-markdown = ["dep:markdown"]
 form-input-rich-mediawiki = ["dep:parse-wiki-text-2"]
 
 data-canvas = ["data-canvas-charts", "data-canvas-scene"]

packages/components/src/data/canvas/charts/mod.rs

@@ -1,2 +1,2 @@
 // https://echarts.apache.org/
-// https://egui.rs/
+// https://github.com/emilk/egui_plot/

packages/components/src/data/canvas/mod.rs

@@ -1,4 +1,4 @@
-#[cfg(features = "data-canvas-charts")]
+#[cfg(feature = "data-canvas-charts")]
 pub mod charts;
-#[cfg(features = "data-canvas-scene")]
+#[cfg(feature = "data-canvas-scene")]
 pub mod scene;

packages/components/src/data/paragraph/mod.rs

@@ -1,6 +1,8 @@
 mod affix;
 mod badge;
 mod chip;
+
+mod rich;
 mod typography;
 
 mod avatar;
@@ -10,6 +12,8 @@ mod image;
 pub use affix::Affix;
 pub use badge::Badge;
 pub use chip::Chip;
+
+pub use rich::Rich;
 pub use typography::Typography;
 
 pub use avatar::Avatar;

packages/components/src/data/paragraph/rich/markdown/mod.rs

@@ -0,0 +1,20 @@
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test() {
+        use markdown::{to_mdast, ParseOptions};
+
+        let input = r#"
+```rust;ignored
+fn main() {
+    println!("Hello, world!");
+}
+```
+
+<SomeComponent />
+
+{a + b} // inline code
+        "#;
+        println!("{:?}", to_mdast(input, &ParseOptions::mdx()).unwrap());
+    }
+}

packages/components/src/form/input/rich/mod.rs → packages/components/src/data/paragraph/rich/mod.rs

@@ -9,13 +9,13 @@ use stylist::yew::styled_component;
 use yew::prelude::*;
 
 #[derive(Properties, Debug, PartialEq)]
-pub struct RichTextInputProps {
+pub struct RichProps {
     #[prop_or_default]
     pub children: Children,
 }
 
 #[styled_component]
-pub fn RichTextInput(props: &RichTextInputProps) -> Html {
+pub fn Rich(props: &RichProps) -> Html {
     html! {
         <div
             class={css!(r#"

packages/components/src/form/input/mod.rs

@@ -1,13 +1,7 @@
-pub mod rich;
+mod rich;
+mod text;
+mod text_area;
 
-mod char_input;
-mod markdown_input;
-mod password_input;
-mod text_area_input;
-mod text_input;
-
-pub use char_input::CharInput;
-pub use markdown_input::MarkdownInput;
-pub use password_input::PasswordInput;
-pub use text_area_input::TextAreaInput;
-pub use text_input::TextInput;
+pub use rich::RichInput;
+pub use text::TextInput;
+pub use text_area::TextAreaInput;

packages/components/src/form/input/char_input.rs → packages/components/src/form/input/rich.rs

@@ -2,13 +2,13 @@ use stylist::yew::styled_component;
 use yew::prelude::*;
 
 #[derive(Properties, Debug, PartialEq)]
-pub struct CharInputProps {
+pub struct RichInputProps {
     #[prop_or_default]
     pub children: Children,
 }
 
 #[styled_component]
-pub fn CharInput(props: &CharInputProps) -> Html {
+pub fn RichInput(props: &RichInputProps) -> Html {
     html! {
         <div
             class={css!(r#"

packages/components/src/form/picker/mod.rs

@@ -1,9 +1,9 @@
-mod color_picker;
-mod date_picker;
-mod date_time_picker;
-mod time_picker;
+mod color;
+mod date;
+mod date_time;
+mod time;
 
-pub use color_picker::ColorPicker;
-pub use date_picker::DatePicker;
-pub use date_time_picker::DateTimePicker;
-pub use time_picker::TimePicker;
+pub use color::ColorPicker;
+pub use date::DatePicker;
+pub use date_time::DateTimePicker;
+pub use time::TimePicker;