From 0296c4a00b46cce00adbdaed20fc1f9d78d231e4 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Sun, 18 Jun 2023 19:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20add=20layout-sider=20compon?=
 =?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gh-pages/src/components/mod.rs         |  3 ++
 gh-pages/src/components/site_header.rs | 24 +++++++++++++++
 gh-pages/src/main.rs                   |  1 +
 gh-pages/src/pages/components.rs       | 42 ++++++++++++++------------
 gh-pages/src/pages/home.rs             | 12 ++------
 src/layout/layout-sider.css            |  4 +++
 src/layout/layout_sider.rs             | 15 +++++++++
 src/layout/mod.rs                      | 11 +++++++
 8 files changed, 83 insertions(+), 29 deletions(-)
 create mode 100644 gh-pages/src/components/mod.rs
 create mode 100644 gh-pages/src/components/site_header.rs
 create mode 100644 src/layout/layout-sider.css
 create mode 100644 src/layout/layout_sider.rs

diff --git a/gh-pages/src/components/mod.rs b/gh-pages/src/components/mod.rs
new file mode 100644
index 0000000..92a8adb
--- /dev/null
+++ b/gh-pages/src/components/mod.rs
@@ -0,0 +1,3 @@
+mod site_header;
+
+pub use site_header::*;
diff --git a/gh-pages/src/components/site_header.rs b/gh-pages/src/components/site_header.rs
new file mode 100644
index 0000000..193d54c
--- /dev/null
+++ b/gh-pages/src/components/site_header.rs
@@ -0,0 +1,24 @@
+use leptos::*;
+use leptos_router::use_navigate;
+use melt_ui::*;
+
+#[component]
+pub fn SiteHeader(cx: Scope) -> impl IntoView {
+    view! { cx,
+        <LayoutHeader
+            style="height: 54px; display: flex; align-items: center; justify-content: space-between; padding: 0 20px; border-bottom: 1px solid #efeff6"
+        >
+            <span style="cursor: pointer" on:click=move |_| {
+                let navigate = use_navigate(cx);
+                _ = navigate("/", Default::default());
+            }>
+                "Melt UI"
+            </span>
+            <Button type_=ButtonType::TEXT on:click=move |_| {
+                _ = window().open_with_url("http://github.com/luoxiaozero/melt-ui");
+            }>
+                "Github"
+            </Button>
+        </LayoutHeader>
+    }
+}
diff --git a/gh-pages/src/main.rs b/gh-pages/src/main.rs
index 38ab1fd..23e4aca 100644
--- a/gh-pages/src/main.rs
+++ b/gh-pages/src/main.rs
@@ -1,4 +1,5 @@
 mod app;
+mod components;
 mod pages;
 
 use app::*;
diff --git a/gh-pages/src/pages/components.rs b/gh-pages/src/pages/components.rs
index 235e705..066ca97 100644
--- a/gh-pages/src/pages/components.rs
+++ b/gh-pages/src/pages/components.rs
@@ -1,3 +1,4 @@
+use crate::components::SiteHeader;
 use leptos::*;
 use leptos_router::{use_location, use_navigate, Outlet};
 use melt_ui::*;
@@ -30,24 +31,27 @@ pub fn ComponentsPage(cx: Scope) -> impl IntoView {
         selected
     });
     view! {cx,
-        <div class="components-page-box">
-            <aside>
-                <Menu selected>
-                    <MenuItem key="menu" label="menu" />
-                    <MenuItem key="slider" label="slider" />
-                    <MenuItem key="tabbar" label="tabbar" />
-                    <MenuItem key="input" label="input" />
-                    <MenuItem key="image" label="image" />
-                    <MenuItem key="modal" label="modal" />
-                    <MenuItem key="nav-bar" label="nav-bar" />
-                    <MenuItem key="button" label="button" />
-                    <MenuItem key="checkbox" label="checkbox" />
-                    <MenuItem key="toast" label="toast" />
-                </Menu>
-            </aside>
-            <main>
-                <Outlet />
-            </main>
-        </div>
+        <Layout position=LayoutPosition::ABSOLUTE>
+            <SiteHeader />
+            <Layout has_sider=true position=LayoutPosition::ABSOLUTE style="top: 54px;">
+                <LayoutSider>
+                    <Menu selected>
+                        <MenuItem key="menu" label="menu" />
+                        <MenuItem key="slider" label="slider" />
+                        <MenuItem key="tabbar" label="tabbar" />
+                        <MenuItem key="input" label="input" />
+                        <MenuItem key="image" label="image" />
+                        <MenuItem key="modal" label="modal" />
+                        <MenuItem key="nav-bar" label="nav-bar" />
+                        <MenuItem key="button" label="button" />
+                        <MenuItem key="checkbox" label="checkbox" />
+                        <MenuItem key="toast" label="toast" />
+                    </Menu>
+                </LayoutSider>
+                <Layout>
+                    <Outlet />
+                </Layout>
+            </Layout>
+        </Layout>
     }
 }
diff --git a/gh-pages/src/pages/home.rs b/gh-pages/src/pages/home.rs
index 7e7cdab..0947368 100644
--- a/gh-pages/src/pages/home.rs
+++ b/gh-pages/src/pages/home.rs
@@ -1,3 +1,4 @@
+use crate::components::*;
 use leptos::*;
 use leptos_router::{use_navigate, use_query_map};
 use melt_ui::*;
@@ -14,16 +15,7 @@ pub fn Home(cx: Scope) -> impl IntoView {
     }
     view! { cx,
         <Layout position=LayoutPosition::ABSOLUTE>
-            <LayoutHeader
-                style="height: 54px; display: flex; align-items: center; justify-content: space-between; padding: 0 20px; border-bottom: 1px solid #efeff6"
-                >
-                "Melt UI"
-                <Button type_=ButtonType::TEXT on:click=move |_| {
-                    _ = window().open_with_url("http://github.com/luoxiaozero/melt-ui");
-                }>
-                    "Github"
-                </Button>
-            </LayoutHeader>
+            <SiteHeader />
             <Layout position=LayoutPosition::ABSOLUTE style="top: 54px; display: flex; align-items: center; justify-content: center; flex-direction: column;">
                 <p>"A Leptos UI Library"</p>
                 <Button on:click=move |_| {
diff --git a/src/layout/layout-sider.css b/src/layout/layout-sider.css
new file mode 100644
index 0000000..29bc589
--- /dev/null
+++ b/src/layout/layout-sider.css
@@ -0,0 +1,4 @@
+.melt-layout-sider {
+    position: relative;
+    min-width: 260px;
+}
diff --git a/src/layout/layout_sider.rs b/src/layout/layout_sider.rs
new file mode 100644
index 0000000..41bcb9d
--- /dev/null
+++ b/src/layout/layout_sider.rs
@@ -0,0 +1,15 @@
+use crate::utils::mount_style::mount_style;
+use leptos::*;
+use stylers::style_sheet_str;
+
+#[component]
+pub fn LayoutSider(cx: Scope, children: Children) -> impl IntoView {
+    let class_name = mount_style("layout-sider", || {
+        style_sheet_str!("./src/layout/layout-sider.css")
+    });
+    view! { cx, class=class_name,
+        <div class="melt-layout-sider">
+            { children(cx) }
+        </div>
+    }
+}
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index a04215d..7828754 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -1,7 +1,9 @@
 mod layout_header;
+mod layout_sider;
 
 use crate::utils::mount_style::mount_style;
 pub use layout_header::*;
+pub use layout_sider::*;
 use leptos::*;
 use stylers::style_sheet_str;
 
@@ -26,9 +28,18 @@ pub fn Layout(
     cx: Scope,
     #[prop(optional, into)] style: MaybeSignal<String>,
     #[prop(optional)] position: LayoutPosition,
+    #[prop(optional, into)] has_sider: MaybeSignal<bool>,
     children: Children,
 ) -> impl IntoView {
     let class_name = mount_style("layout", || style_sheet_str!("./src/layout/layout.css"));
+
+    let style = create_memo(cx, move |_| {
+        let mut style = style.get();
+        if has_sider.get() {
+            style.push_str("display: flex; flex-wrap: nowrap; flex-direction: row; width: 100;%")
+        }
+        style
+    });
     view! { cx, class=class_name,
         <div class="melt-layout" class=("melt-layout--absolute-positioned", position == LayoutPosition::ABSOLUTE) style=move || style.get()>
             { children(cx) }