diff --git a/.github/workflows/all_components.yml b/.github/workflows/all_components.yml index b77a96a47..03b04968a 100644 --- a/.github/workflows/all_components.yml +++ b/.github/workflows/all_components.yml @@ -8,8 +8,8 @@ on: - /** - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -21,8 +21,8 @@ on: - /** - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -61,8 +61,8 @@ jobs: dx components add dialog,input --path .. # Add all components dx components add --all --path .. --force - # Switch to the local version of dioxus-primitives - cargo add dioxus-primitives --path ../primitives + # Switch to the local version of dioxus-kit-core + cargo add dioxus-kit-core --path ../dioxus-kit-core # Make sure it still builds cargo check --all-features add-each-component: @@ -109,8 +109,8 @@ jobs: fi # Add the component dx components add "$file" --path .. - # Switch to the local version of dioxus-primitives - cargo add dioxus-primitives --path ../primitives + # Switch to the local version of dioxus-kit-core + cargo add dioxus-kit-core --path ../dioxus-kit-core # Make sure it still builds cargo check --all-features # Undo changes diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77bcdeb76..379c55cdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,8 @@ on: - /** - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -21,8 +21,8 @@ on: - /** - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 93fd8da3d..5867e02d6 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -10,8 +10,8 @@ on: - preview/**/*.css - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -25,8 +25,8 @@ on: - preview/**/*.css - preview/**/*.rs - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml diff --git a/.github/workflows/stylelint.yml b/.github/workflows/stylelint.yml index 600d6b016..9fdedae0a 100644 --- a/.github/workflows/stylelint.yml +++ b/.github/workflows/stylelint.yml @@ -8,9 +8,13 @@ on: - /** - preview/**/*.css - preview/**/*.rs + - preview/**/*.css - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit/**/*.rs + - dioxus-kit/**/*.css + - dioxus-kit/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -22,9 +26,13 @@ on: - /** - preview/**/*.css - preview/**/*.rs + - preview/**/*.css - preview/**/Cargo.toml - - primitives/**/*.rs - - primitives/**/Cargo.toml + - dioxus-kit/**/*.rs + - dioxus-kit/**/*.css + - dioxus-kit/**/Cargo.toml + - dioxus-kit-core/**/*.rs + - dioxus-kit-core/**/Cargo.toml - .github/** - Cargo.toml @@ -48,4 +56,4 @@ jobs: npm install --save-dev stylelint-config-idiomatic-order npm install -g stylelint stylelint-config-standard - name: Stylelint - run: cd ./preview && npx stylelint "**/*.css" --max-warnings=0 + run: cd ./preview && npx stylelint "**/*.css" "../dioxus-kit/**/*.css" --max-warnings=0 diff --git a/Cargo.lock b/Cargo.lock index 53d54bc94..85d7e5a12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1799,9 +1799,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -2364,6 +2364,37 @@ dependencies = [ "web-sys", ] +[[package]] +name = "dioxus-kit" +version = "0.0.1" +dependencies = [ + "dioxus", + "dioxus-code", + "dioxus-icons", + "dioxus-kit-core", + "dioxus-ssr", + "palette", + "strum", + "time", + "tracing", +] + +[[package]] +name = "dioxus-kit-core" +version = "0.0.1" +dependencies = [ + "dioxus", + "dioxus-attributes", + "dioxus-sdk-time", + "dioxus-ssr", + "lazy-js-bundle", + "num-integer", + "palette", + "serde", + "time", + "tracing", +] + [[package]] name = "dioxus-liveview" version = "0.7.9" @@ -2450,22 +2481,6 @@ dependencies = [ "rustc-hash 2.1.2", ] -[[package]] -name = "dioxus-primitives" -version = "0.0.1" -dependencies = [ - "dioxus", - "dioxus-attributes", - "dioxus-sdk-time", - "dioxus-ssr", - "lazy-js-bundle", - "num-integer", - "palette", - "serde", - "time", - "tracing", -] - [[package]] name = "dioxus-router" version = "0.7.9" @@ -2732,9 +2747,9 @@ dependencies = [ [[package]] name = "dlmalloc" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5b01c17f85ee988d832c40e549a64bd89ab2c9f8d8a613bdf5122ae507e294" +checksum = "ad5208a115eaba24916f7456929832e310a81518c641f93fee4f89aa93aa3675" dependencies = [ "cfg-if", "libc", @@ -5339,9 +5354,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" @@ -5780,9 +5795,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "openssl" -version = "0.10.79" +version = "0.10.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542" +checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" dependencies = [ "bitflags 2.11.1", "cfg-if", @@ -5811,9 +5826,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-sys" -version = "0.9.115" +version = "0.9.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781" +checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", @@ -6124,18 +6139,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9" +checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.12" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389" +checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [ "proc-macro2", "quote", @@ -6285,7 +6300,8 @@ dependencies = [ "dioxus-code", "dioxus-i18n", "dioxus-icons", - "dioxus-primitives", + "dioxus-kit", + "dioxus-kit-core", "dioxus-ssr", "palette", "pulldown-cmark", @@ -8021,14 +8037,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "test-harness" -version = "0.1.0" -dependencies = [ - "dioxus", - "dioxus-primitives", -] - [[package]] name = "thin-vec" version = "0.2.18" @@ -8097,9 +8105,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.47" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" dependencies = [ "deranged", "itoa", @@ -8115,15 +8123,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" dependencies = [ "num-conv", "time-core", @@ -8375,7 +8383,7 @@ dependencies = [ "indexmap", "toml_datetime 1.0.1+spec-1.1.0", "toml_parser", - "winnow 1.0.2", + "winnow 1.0.3", ] [[package]] @@ -8384,7 +8392,7 @@ version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ - "winnow 1.0.2", + "winnow 1.0.3", ] [[package]] @@ -8405,9 +8413,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags 2.11.1", "bytes", @@ -9003,9 +9011,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.3+wasi-0.2.9" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ "wit-bindgen", ] @@ -10166,18 +10174,18 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen" -version = "0.57.1" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "write16" diff --git a/Cargo.toml b/Cargo.toml index 5bed6886b..26b1d744a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,12 @@ [workspace] resolver = "3" -members = ["primitives", "preview", "test-harness", "dioxus-attributes"] +members = ["dioxus-kit-core", "dioxus-kit", "preview", "dioxus-attributes"] +exclude = ["test-harness"] [workspace.dependencies] -dioxus-primitives = { path = "primitives" } +dioxus-kit-core = { path = "dioxus-kit-core" } +dioxus-kit = { path = "dioxus-kit" } + tracing = { version = "0.1", features = ["std"] } dioxus = "0.7.8" diff --git a/README.md b/README.md index f0c68bb91..0b91c2098 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@
- - + Crates.io version - - + Download - + docs.rs docs @@ -25,7 +25,7 @@
-DioxusComponents is a shadcn style component library for Dioxus built on top of the unstyled [Dioxus primitives](https://crates.io/crates/dioxus-primitives) library. The unstyled primitives serve as the foundation for building accessible and customizable UI components in Dioxus applications. The styled versions serve as a starting point to develop your own design system. +Dioxus Components is a shadcn style component library for Dioxus built on top of the unstyled [`dioxus-kit-core`](https://crates.io/crates/dioxus-kit-core) library and shipped as [`dioxus-kit`](https://crates.io/crates/dioxus-kit). The unstyled primitives serve as the foundation for building accessible and customizable UI components in Dioxus applications. The styled versions serve as a starting point to develop your own design system. ## Getting started @@ -49,27 +49,29 @@ This will create a `components` folder in your project (if it doesn't already ex ### Project structure -This repository contains two main crates: -- `dioxus-primitives`: The core unstyled component library. -- `preview`: A Dioxus application that showcases the components from `dioxus-primitives` with shadcn-styled versions. +This repository contains three main crates: +- `dioxus-kit-core`: The core unstyled component library. +- `dioxus-kit`: A shadcn-styled component library built on top of `dioxus-kit-core`. +- `preview`: A Dioxus application that showcases the components from `dioxus-kit` along with documentation and variant demos. ### Adding new components If you want to add a new component, you should: -1. If there is any new interaction logic or accessibility features required, implement an unstyled component in the `dioxus-primitives` crate. When adding components to the primitives library, ensure: +1. If there is any new interaction logic or accessibility features required, implement an unstyled component in the `dioxus-kit-core` crate. When adding components to the core library, ensure: - It adheres to the [WAI-ARIA Authoring Practices for accessibility](https://www.w3.org/WAI/standards-guidelines/aria/). - All styling can be modified via props. Every element should spread attributes and children from the props -2. In the `preview` crate, create a styled version of the component using shadcn styles. This will serve as an example of how to use the unstyled component and serve as the styled version `dx components` will add to projects. -3. Add tests in `playwright` to ensure the component behaves as expected. +2. In the `dioxus-kit` crate, create a styled version of the component using shadcn styles. This will serve as the styled version `dx components` will add to projects. +3. In the `preview` crate, add `docs.md` and one or more `variants/` demos under `src/components//` to showcase the component. +4. Add tests in `playwright` to ensure the component behaves as expected. ### Testing changes The components use a combination of unit tests with cargo, css linting, and end-to-end tests with Playwright. -To run the unit tests for the `dioxus-primitives` crate, use: +To run the unit tests for the `dioxus-kit-core` crate, use: ```sh -cargo test -p dioxus-primitives +cargo test -p dioxus-kit-core ``` To run the CSS linting, use: diff --git a/component.json b/component.json index c09861149..81e91cbcf 100644 --- a/component.json +++ b/component.json @@ -2,49 +2,48 @@ "name": "dioxus-components", "description": "", "members": [ - "preview/src/components/tabs", - "preview/src/components/dropdown_menu", - "preview/src/components/navbar", - "preview/src/components/form", - "preview/src/components/tooltip", - "preview/src/components/calendar", - "preview/src/components/menubar", - "preview/src/components/progress", - "preview/src/components/hover_card", - "preview/src/components/input", - "preview/src/components/accordion", - "preview/src/components/separator", - "preview/src/components/toast", - "preview/src/components/toolbar", - "preview/src/components/checkbox", - "preview/src/components/label", - "preview/src/components/slider", - "preview/src/components/toggle", - "preview/src/components/dialog", - "preview/src/components/alert_dialog", - "preview/src/components/popover", - "preview/src/components/radio_group", - "preview/src/components/virtual_list", - "preview/src/components/button", - "preview/src/components/collapsible", - "preview/src/components/avatar", - "preview/src/components/switch", - "preview/src/components/select", - "preview/src/components/toggle_group", - "preview/src/components/context_menu", - "preview/src/components/aspect_ratio", - "preview/src/components/scroll_area", - "preview/src/components/date_picker", - "preview/src/components/textarea", - "preview/src/components/skeleton", - "preview/src/components/card", - "preview/src/components/sheet", - "preview/src/components/pagination", - "preview/src/components/sidebar", - "preview/src/components/badge", - "preview/src/components/drag_and_drop_list", - "preview/src/components/color_picker", - "preview/src/components/combobox", - "preview/src/components/item" + "dioxus-kit/src/tabs", + "dioxus-kit/src/dropdown_menu", + "dioxus-kit/src/navbar", + "dioxus-kit/src/tooltip", + "dioxus-kit/src/calendar", + "dioxus-kit/src/menubar", + "dioxus-kit/src/progress", + "dioxus-kit/src/hover_card", + "dioxus-kit/src/input", + "dioxus-kit/src/accordion", + "dioxus-kit/src/separator", + "dioxus-kit/src/toast", + "dioxus-kit/src/toolbar", + "dioxus-kit/src/checkbox", + "dioxus-kit/src/label", + "dioxus-kit/src/slider", + "dioxus-kit/src/toggle", + "dioxus-kit/src/dialog", + "dioxus-kit/src/alert_dialog", + "dioxus-kit/src/popover", + "dioxus-kit/src/radio_group", + "dioxus-kit/src/virtual_list", + "dioxus-kit/src/button", + "dioxus-kit/src/collapsible", + "dioxus-kit/src/avatar", + "dioxus-kit/src/switch", + "dioxus-kit/src/select", + "dioxus-kit/src/toggle_group", + "dioxus-kit/src/context_menu", + "dioxus-kit/src/aspect_ratio", + "dioxus-kit/src/scroll_area", + "dioxus-kit/src/date_picker", + "dioxus-kit/src/textarea", + "dioxus-kit/src/skeleton", + "dioxus-kit/src/card", + "dioxus-kit/src/sheet", + "dioxus-kit/src/pagination", + "dioxus-kit/src/sidebar", + "dioxus-kit/src/badge", + "dioxus-kit/src/drag_and_drop_list", + "dioxus-kit/src/color_picker", + "dioxus-kit/src/combobox", + "dioxus-kit/src/item" ] } diff --git a/primitives/Cargo.toml b/dioxus-kit-core/Cargo.toml similarity index 96% rename from primitives/Cargo.toml rename to dioxus-kit-core/Cargo.toml index 655fdcbf3..4273fb423 100644 --- a/primitives/Cargo.toml +++ b/dioxus-kit-core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dioxus-primitives" +name = "dioxus-kit-core" version = "0.0.1" edition = "2021" rust-version = "1.80.0" diff --git a/primitives/README.md b/dioxus-kit-core/README.md similarity index 57% rename from primitives/README.md rename to dioxus-kit-core/README.md index 12bb43912..927fb76ca 100644 --- a/primitives/README.md +++ b/dioxus-kit-core/README.md @@ -1,21 +1,21 @@
-

🎲 Dioxus Primitives 🧱

+

Dioxus Kit Core

Accessible, unstyled, foundational components for Dioxus.

- - + Crates.io version - - + Download - + docs.rs docs @@ -25,7 +25,7 @@
-Dioxus primitives is an ARIA-accessible, unstyled, foundational component library for Dioxus based on Radix Primitives. It defines the structure and behavior of components without imposing any specific styles. You can bring your own design patterns and styles to create a consistent look and feel for your application. +Dioxus Kit Core is an ARIA-accessible, unstyled, foundational component library for Dioxus based on Radix Primitives. It defines the structure and behavior of components without imposing any specific styles. You can bring your own design patterns and styles to create a consistent look and feel for your application. If you are looking for a starting point to develop a styled component library for your application, you can use our shadcn-style [dioxus components](https://dioxuslabs.github.io/components) or a community library. diff --git a/primitives/build.rs b/dioxus-kit-core/build.rs similarity index 100% rename from primitives/build.rs rename to dioxus-kit-core/build.rs diff --git a/primitives/src/accordion.rs b/dioxus-kit-core/src/accordion.rs similarity index 98% rename from primitives/src/accordion.rs rename to dioxus-kit-core/src/accordion.rs index d8e04be5a..a3c2a49f6 100644 --- a/primitives/src/accordion.rs +++ b/dioxus-kit-core/src/accordion.rs @@ -137,7 +137,7 @@ pub struct AccordionProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::accordion::{ +/// use dioxus_kit_core::accordion::{ /// Accordion, AccordionContent, AccordionItem, AccordionTrigger, /// }; /// @@ -249,7 +249,7 @@ pub struct AccordionItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::accordion::{ +/// use dioxus_kit_core::accordion::{ /// Accordion, AccordionContent, AccordionItem, AccordionTrigger, /// }; /// @@ -339,7 +339,7 @@ pub struct AccordionContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::accordion::{ +/// use dioxus_kit_core::accordion::{ /// Accordion, AccordionContent, AccordionItem, AccordionTrigger, /// }; /// @@ -409,7 +409,7 @@ pub struct AccordionTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::accordion::{ +/// use dioxus_kit_core::accordion::{ /// Accordion, AccordionContent, AccordionItem, AccordionTrigger, /// }; /// diff --git a/primitives/src/alert_dialog.rs b/dioxus-kit-core/src/alert_dialog.rs similarity index 98% rename from primitives/src/alert_dialog.rs rename to dioxus-kit-core/src/alert_dialog.rs index a2b8a5e84..988b959ea 100644 --- a/primitives/src/alert_dialog.rs +++ b/dioxus-kit-core/src/alert_dialog.rs @@ -43,7 +43,7 @@ pub struct AlertDialogRootProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -142,7 +142,7 @@ pub struct AlertDialogContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -237,7 +237,7 @@ pub struct AlertDialogTitleProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -294,7 +294,7 @@ pub struct AlertDialogDescriptionProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -351,7 +351,7 @@ pub struct AlertDialogActionsProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -410,7 +410,7 @@ pub struct AlertDialogActionProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { @@ -485,7 +485,7 @@ pub struct AlertDialogCancelProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::alert_dialog::*; +/// use dioxus_kit_core::alert_dialog::*; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/aspect_ratio.rs b/dioxus-kit-core/src/aspect_ratio.rs similarity index 96% rename from primitives/src/aspect_ratio.rs rename to dioxus-kit-core/src/aspect_ratio.rs index 477e1d78b..b7e1ee303 100644 --- a/primitives/src/aspect_ratio.rs +++ b/dioxus-kit-core/src/aspect_ratio.rs @@ -25,7 +25,7 @@ pub struct AspectRatioProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::aspect_ratio::AspectRatio; +/// use dioxus_kit_core::aspect_ratio::AspectRatio; /// fn App() -> Element { /// rsx! { /// AspectRatio { ratio: 16.0 / 9.0, diff --git a/primitives/src/avatar.rs b/dioxus-kit-core/src/avatar.rs similarity index 98% rename from primitives/src/avatar.rs rename to dioxus-kit-core/src/avatar.rs index 73d4c1429..329771e03 100644 --- a/primitives/src/avatar.rs +++ b/dioxus-kit-core/src/avatar.rs @@ -90,7 +90,7 @@ pub struct AvatarProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::avatar::{Avatar, AvatarFallback, AvatarImage}; +/// use dioxus_kit_core::avatar::{Avatar, AvatarFallback, AvatarImage}; /// /// #[component] /// fn Demo() -> Element { @@ -178,7 +178,7 @@ pub struct AvatarFallbackProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::avatar::{Avatar, AvatarFallback, AvatarImage}; +/// use dioxus_kit_core::avatar::{Avatar, AvatarFallback, AvatarImage}; /// /// #[component] /// fn Demo() -> Element { @@ -243,7 +243,7 @@ pub struct AvatarImageProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::avatar::{Avatar, AvatarFallback, AvatarImage}; +/// use dioxus_kit_core::avatar::{Avatar, AvatarFallback, AvatarImage}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/calendar.rs b/dioxus-kit-core/src/calendar.rs similarity index 99% rename from primitives/src/calendar.rs rename to dioxus-kit-core/src/calendar.rs index 615b68064..d128c9d7c 100644 --- a/primitives/src/calendar.rs +++ b/dioxus-kit-core/src/calendar.rs @@ -541,7 +541,7 @@ impl DefaultCalendarProps for CalendarProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -797,7 +797,7 @@ impl DefaultCalendarProps for RangeCalendarProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::*; +/// use dioxus_kit_core::calendar::*; /// use time::{Date, Month, UtcDateTime}; /// #[component] /// fn Demo() -> Element { @@ -1050,7 +1050,7 @@ pub struct CalendarHeaderProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -1120,7 +1120,7 @@ pub struct CalendarNavigationProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -1185,7 +1185,7 @@ pub struct CalendarPreviousMonthButtonProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -1285,7 +1285,7 @@ pub struct CalendarNextMonthButtonProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -1387,7 +1387,7 @@ pub struct CalendarMonthTitleProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::calendar::{ +/// use dioxus_kit_core::calendar::{ /// Calendar, CalendarGrid, CalendarHeader, CalendarMonthTitle, CalendarNavigation, CalendarNextMonthButton, CalendarPreviousMonthButton /// }; /// use time::{Date, Month, UtcDateTime}; @@ -1652,7 +1652,7 @@ fn calendar_grid_weeks(view_date: Date, first_day_of_week: Weekday) -> Vec Element { diff --git a/primitives/src/checkbox.rs b/dioxus-kit-core/src/checkbox.rs similarity index 98% rename from primitives/src/checkbox.rs rename to dioxus-kit-core/src/checkbox.rs index 5c62ff51b..268d9bc4e 100644 --- a/primitives/src/checkbox.rs +++ b/dioxus-kit-core/src/checkbox.rs @@ -103,7 +103,7 @@ pub struct CheckboxProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::checkbox::{Checkbox, CheckboxIndicator}; +/// use dioxus_kit_core::checkbox::{Checkbox, CheckboxIndicator}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -197,7 +197,7 @@ pub fn Checkbox(props: CheckboxProps) -> Element { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::checkbox::{Checkbox, CheckboxIndicator}; +/// use dioxus_kit_core::checkbox::{Checkbox, CheckboxIndicator}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/collapsible.rs b/dioxus-kit-core/src/collapsible.rs similarity index 96% rename from primitives/src/collapsible.rs rename to dioxus-kit-core/src/collapsible.rs index 372410f3b..91e506d09 100644 --- a/primitives/src/collapsible.rs +++ b/dioxus-kit-core/src/collapsible.rs @@ -65,7 +65,7 @@ pub struct CollapsibleProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; +/// use dioxus_kit_core::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -144,7 +144,7 @@ pub struct CollapsibleContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; +/// use dioxus_kit_core::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -214,7 +214,7 @@ pub struct CollapsibleTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; +/// use dioxus_kit_core::collapsible::{Collapsible, CollapsibleContent, CollapsibleTrigger}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/color_picker.rs b/dioxus-kit-core/src/color_picker.rs similarity index 99% rename from primitives/src/color_picker.rs rename to dioxus-kit-core/src/color_picker.rs index 9d9abbc61..2589be0ef 100644 --- a/primitives/src/color_picker.rs +++ b/dioxus-kit-core/src/color_picker.rs @@ -117,7 +117,7 @@ pub struct ColorPickerProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::color_picker::*; +/// use dioxus_kit_core::color_picker::*; /// #[component] /// fn Demo() -> Element { /// use palette::{IntoColor, encoding}; @@ -189,7 +189,7 @@ pub struct ColorAreaProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::color_picker::*; +/// use dioxus_kit_core::color_picker::*; /// #[component] /// fn Demo() -> Element { /// use palette::{IntoColor, encoding}; diff --git a/primitives/src/color_picker/color_naming.rs b/dioxus-kit-core/src/color_picker/color_naming.rs similarity index 100% rename from primitives/src/color_picker/color_naming.rs rename to dioxus-kit-core/src/color_picker/color_naming.rs diff --git a/primitives/src/combobox/components/combobox.rs b/dioxus-kit-core/src/combobox/components/combobox.rs similarity index 100% rename from primitives/src/combobox/components/combobox.rs rename to dioxus-kit-core/src/combobox/components/combobox.rs diff --git a/primitives/src/combobox/components/empty.rs b/dioxus-kit-core/src/combobox/components/empty.rs similarity index 100% rename from primitives/src/combobox/components/empty.rs rename to dioxus-kit-core/src/combobox/components/empty.rs diff --git a/primitives/src/combobox/components/input.rs b/dioxus-kit-core/src/combobox/components/input.rs similarity index 100% rename from primitives/src/combobox/components/input.rs rename to dioxus-kit-core/src/combobox/components/input.rs diff --git a/primitives/src/combobox/components/list.rs b/dioxus-kit-core/src/combobox/components/list.rs similarity index 100% rename from primitives/src/combobox/components/list.rs rename to dioxus-kit-core/src/combobox/components/list.rs diff --git a/primitives/src/combobox/components/mod.rs b/dioxus-kit-core/src/combobox/components/mod.rs similarity index 100% rename from primitives/src/combobox/components/mod.rs rename to dioxus-kit-core/src/combobox/components/mod.rs diff --git a/primitives/src/combobox/components/option.rs b/dioxus-kit-core/src/combobox/components/option.rs similarity index 100% rename from primitives/src/combobox/components/option.rs rename to dioxus-kit-core/src/combobox/components/option.rs diff --git a/primitives/src/combobox/context.rs b/dioxus-kit-core/src/combobox/context.rs similarity index 100% rename from primitives/src/combobox/context.rs rename to dioxus-kit-core/src/combobox/context.rs diff --git a/primitives/src/combobox/mod.rs b/dioxus-kit-core/src/combobox/mod.rs similarity index 100% rename from primitives/src/combobox/mod.rs rename to dioxus-kit-core/src/combobox/mod.rs diff --git a/primitives/src/context_menu.rs b/dioxus-kit-core/src/context_menu.rs similarity index 99% rename from primitives/src/context_menu.rs rename to dioxus-kit-core/src/context_menu.rs index 7d7e497f7..b37c25d8b 100644 --- a/primitives/src/context_menu.rs +++ b/dioxus-kit-core/src/context_menu.rs @@ -97,7 +97,7 @@ pub struct ContextMenuProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::context_menu::{ +/// use dioxus_kit_core::context_menu::{ /// ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger, /// }; /// #[component] @@ -204,7 +204,7 @@ pub struct ContextMenuTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::context_menu::{ +/// use dioxus_kit_core::context_menu::{ /// ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger, /// }; /// #[component] @@ -370,7 +370,7 @@ pub struct ContextMenuContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::context_menu::{ +/// use dioxus_kit_core::context_menu::{ /// ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger, /// }; /// #[component] @@ -551,7 +551,7 @@ pub struct ContextMenuItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::context_menu::{ +/// use dioxus_kit_core::context_menu::{ /// ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger, /// }; /// #[component] diff --git a/primitives/src/date_picker.rs b/dioxus-kit-core/src/date_picker.rs similarity index 98% rename from primitives/src/date_picker.rs rename to dioxus-kit-core/src/date_picker.rs index 19d877d2b..78097b42d 100644 --- a/primitives/src/date_picker.rs +++ b/dioxus-kit-core/src/date_picker.rs @@ -95,7 +95,7 @@ pub struct DatePickerProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; /// use time::Date; /// #[component] /// fn Demo() -> Element { @@ -230,7 +230,7 @@ pub struct DateRangePickerProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; /// #[component] /// fn Demo() -> Element { /// let mut selected_range = use_signal(|| None::); @@ -336,7 +336,7 @@ pub struct DatePickerPopoverProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; /// use time::Date; /// #[component] /// fn Demo() -> Element { @@ -455,7 +455,7 @@ pub struct DatePickerCalendarProps Element { @@ -532,7 +532,7 @@ pub fn DatePickerCalendar(props: DatePickerCalendarProps) -> Elem /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; /// #[component] /// fn Demo() -> Element { /// let mut selected_range = use_signal(|| None::); @@ -1282,7 +1282,7 @@ pub struct DatePickerInputProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::Calendar, date_picker::*, popover::*, ContentAlign}; /// use time::Date; /// #[component] /// fn Demo() -> Element { @@ -1339,7 +1339,7 @@ pub fn DatePickerInput(props: DatePickerInputProps) -> Element { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; +/// use dioxus_kit_core::{calendar::{DateRange, RangeCalendar}, date_picker::*, popover::*, ContentAlign}; /// #[component] /// fn Demo() -> Element { /// let mut selected_range = use_signal(|| None::); diff --git a/primitives/src/dialog.rs b/dioxus-kit-core/src/dialog.rs similarity index 96% rename from primitives/src/dialog.rs rename to dioxus-kit-core/src/dialog.rs index 8959f372a..4ae2a1887 100644 --- a/primitives/src/dialog.rs +++ b/dioxus-kit-core/src/dialog.rs @@ -74,7 +74,7 @@ pub struct DialogRootProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; +/// use dioxus_kit_core::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; /// /// #[component] /// fn Demo() -> Element { @@ -176,7 +176,7 @@ pub struct DialogContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; +/// use dioxus_kit_core::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; /// /// #[component] /// fn Demo() -> Element { @@ -289,7 +289,7 @@ pub struct DialogTitleProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; +/// use dioxus_kit_core::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; /// /// #[component] /// fn Demo() -> Element { @@ -357,7 +357,7 @@ pub struct DialogDescriptionProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; +/// use dioxus_kit_core::dialog::{DialogContent, DialogDescription, DialogRoot, DialogTitle}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/drag_and_drop_list.rs b/dioxus-kit-core/src/drag_and_drop_list.rs similarity index 99% rename from primitives/src/drag_and_drop_list.rs rename to dioxus-kit-core/src/drag_and_drop_list.rs index f5d724ab0..3b5a474fb 100644 --- a/primitives/src/drag_and_drop_list.rs +++ b/dioxus-kit-core/src/drag_and_drop_list.rs @@ -314,7 +314,7 @@ pub struct DragAndDropLiveRegionProps { /// /// ```rust ///use dioxus::prelude::*; -///use dioxus_primitives::drag_and_drop_list::{DragAndDropList, DragAndDropListItem}; +///use dioxus_kit_core::drag_and_drop_list::{DragAndDropList, DragAndDropListItem}; ///#[component] ///pub fn Demo() -> Element { /// let items = ["Item1", "Item2", "Item3"] @@ -516,7 +516,7 @@ pub struct DragAndDropListRenderItem { /// /// ```rust ///use dioxus::prelude::*; -///use dioxus_primitives::drag_and_drop_list::{DragAndDropList, DragAndDropListItem}; +///use dioxus_kit_core::drag_and_drop_list::{DragAndDropList, DragAndDropListItem}; ///#[component] ///pub fn Demo() -> Element { /// let items = ["Item1", "Item2", "Item3"] diff --git a/primitives/src/dropdown_menu.rs b/dioxus-kit-core/src/dropdown_menu.rs similarity index 98% rename from primitives/src/dropdown_menu.rs rename to dioxus-kit-core/src/dropdown_menu.rs index 30efa41ca..d35bafc5f 100644 --- a/primitives/src/dropdown_menu.rs +++ b/dioxus-kit-core/src/dropdown_menu.rs @@ -60,7 +60,7 @@ pub struct DropdownMenuProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dropdown_menu::{ +/// use dioxus_kit_core::dropdown_menu::{ /// DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, /// }; /// #[component] @@ -179,7 +179,7 @@ pub struct DropdownMenuTriggerProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dropdown_menu::{ +/// use dioxus_kit_core::dropdown_menu::{ /// DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, /// }; /// #[component] @@ -294,7 +294,7 @@ pub struct DropdownMenuContentProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dropdown_menu::{ +/// use dioxus_kit_core::dropdown_menu::{ /// DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, /// }; /// #[component] @@ -393,7 +393,7 @@ pub struct DropdownMenuItemProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::dropdown_menu::{ +/// use dioxus_kit_core::dropdown_menu::{ /// DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, /// }; /// #[component] diff --git a/primitives/src/focus.rs b/dioxus-kit-core/src/focus.rs similarity index 100% rename from primitives/src/focus.rs rename to dioxus-kit-core/src/focus.rs diff --git a/primitives/src/hover_card.rs b/dioxus-kit-core/src/hover_card.rs similarity index 99% rename from primitives/src/hover_card.rs rename to dioxus-kit-core/src/hover_card.rs index 22875b468..28c4711e9 100644 --- a/primitives/src/hover_card.rs +++ b/dioxus-kit-core/src/hover_card.rs @@ -50,7 +50,7 @@ pub struct HoverCardProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{ +/// use dioxus_kit_core::{ /// ContentAlign, ContentSide, /// hover_card::{ /// HoverCard, HoverCardContent, HoverCardTrigger, @@ -132,7 +132,7 @@ pub struct HoverCardTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{ +/// use dioxus_kit_core::{ /// ContentAlign, ContentSide, /// hover_card::{ /// HoverCard, HoverCardContent, HoverCardTrigger, @@ -241,7 +241,7 @@ pub struct HoverCardContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{ +/// use dioxus_kit_core::{ /// ContentAlign, ContentSide, /// hover_card::{ /// HoverCard, HoverCardContent, HoverCardTrigger, diff --git a/primitives/src/js/focus-trap.js b/dioxus-kit-core/src/js/focus-trap.js similarity index 100% rename from primitives/src/js/focus-trap.js rename to dioxus-kit-core/src/js/focus-trap.js diff --git a/primitives/src/js/hash.txt b/dioxus-kit-core/src/js/hash.txt similarity index 100% rename from primitives/src/js/hash.txt rename to dioxus-kit-core/src/js/hash.txt diff --git a/primitives/src/label.rs b/dioxus-kit-core/src/label.rs similarity index 96% rename from primitives/src/label.rs rename to dioxus-kit-core/src/label.rs index 9a84377da..c5bc0f2a5 100644 --- a/primitives/src/label.rs +++ b/dioxus-kit-core/src/label.rs @@ -22,7 +22,7 @@ pub struct LabelProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::label::Label; +/// use dioxus_kit_core::label::Label; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/lib.rs b/dioxus-kit-core/src/lib.rs similarity index 100% rename from primitives/src/lib.rs rename to dioxus-kit-core/src/lib.rs diff --git a/primitives/src/listbox.rs b/dioxus-kit-core/src/listbox.rs similarity index 100% rename from primitives/src/listbox.rs rename to dioxus-kit-core/src/listbox.rs diff --git a/primitives/src/menubar.rs b/dioxus-kit-core/src/menubar.rs similarity index 99% rename from primitives/src/menubar.rs rename to dioxus-kit-core/src/menubar.rs index d60bfb666..6da10f9dc 100644 --- a/primitives/src/menubar.rs +++ b/dioxus-kit-core/src/menubar.rs @@ -48,7 +48,7 @@ pub struct MenubarProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::menubar::{ +/// use dioxus_kit_core::menubar::{ /// Menubar, MenubarContent, MenubarItem, MenubarMenu, MenubarTrigger, /// }; /// #[component] @@ -190,7 +190,7 @@ pub struct MenubarMenuProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::menubar::{ +/// use dioxus_kit_core::menubar::{ /// Menubar, MenubarContent, MenubarItem, MenubarMenu, MenubarTrigger, /// }; /// #[component] @@ -336,7 +336,7 @@ pub struct MenubarTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::menubar::{ +/// use dioxus_kit_core::menubar::{ /// Menubar, MenubarContent, MenubarItem, MenubarMenu, MenubarTrigger, /// }; /// #[component] @@ -453,7 +453,7 @@ pub struct MenubarContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::menubar::{ +/// use dioxus_kit_core::menubar::{ /// Menubar, MenubarContent, MenubarItem, MenubarMenu, MenubarTrigger, /// }; /// #[component] @@ -570,7 +570,7 @@ pub struct MenubarItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::menubar::{ +/// use dioxus_kit_core::menubar::{ /// Menubar, MenubarContent, MenubarItem, MenubarMenu, MenubarTrigger, /// }; /// #[component] diff --git a/primitives/src/move_interaction.rs b/dioxus-kit-core/src/move_interaction.rs similarity index 100% rename from primitives/src/move_interaction.rs rename to dioxus-kit-core/src/move_interaction.rs diff --git a/primitives/src/navbar.rs b/dioxus-kit-core/src/navbar.rs similarity index 98% rename from primitives/src/navbar.rs rename to dioxus-kit-core/src/navbar.rs index bbb0f183c..f4a65a60d 100644 --- a/primitives/src/navbar.rs +++ b/dioxus-kit-core/src/navbar.rs @@ -46,7 +46,7 @@ pub struct NavbarProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; +/// use dioxus_kit_core::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -209,7 +209,7 @@ pub struct NavbarNavProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; +/// use dioxus_kit_core::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -367,7 +367,7 @@ pub struct NavbarTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; +/// use dioxus_kit_core::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -485,7 +485,7 @@ pub struct NavbarContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; +/// use dioxus_kit_core::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; /// /// #[component] /// fn Demo() -> Element { @@ -651,7 +651,7 @@ pub struct NavbarItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; +/// use dioxus_kit_core::navbar::{Navbar, NavbarContent, NavbarItem, NavbarNav, NavbarTrigger}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/pointer.rs b/dioxus-kit-core/src/pointer.rs similarity index 100% rename from primitives/src/pointer.rs rename to dioxus-kit-core/src/pointer.rs diff --git a/primitives/src/popover.rs b/dioxus-kit-core/src/popover.rs similarity index 99% rename from primitives/src/popover.rs rename to dioxus-kit-core/src/popover.rs index 4352182ea..83995a1f9 100644 --- a/primitives/src/popover.rs +++ b/dioxus-kit-core/src/popover.rs @@ -61,7 +61,7 @@ pub struct PopoverRootProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::popover::*; +/// use dioxus_kit_core::popover::*; /// /// #[component] /// fn Demo() -> Element { @@ -163,7 +163,7 @@ pub struct PopoverContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::popover::*; +/// use dioxus_kit_core::popover::*; /// /// #[component] /// fn Demo() -> Element { @@ -322,7 +322,7 @@ pub struct PopoverTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::popover::*; +/// use dioxus_kit_core::popover::*; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/portal.rs b/dioxus-kit-core/src/portal.rs similarity index 100% rename from primitives/src/portal.rs rename to dioxus-kit-core/src/portal.rs diff --git a/primitives/src/progress.rs b/dioxus-kit-core/src/progress.rs similarity index 96% rename from primitives/src/progress.rs rename to dioxus-kit-core/src/progress.rs index e2fcf9181..a551b6746 100644 --- a/primitives/src/progress.rs +++ b/dioxus-kit-core/src/progress.rs @@ -28,7 +28,7 @@ pub struct ProgressProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::progress::{Progress, ProgressIndicator}; +/// use dioxus_kit_core::progress::{Progress, ProgressIndicator}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -102,7 +102,7 @@ pub struct ProgressIndicatorProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::progress::{Progress, ProgressIndicator}; +/// use dioxus_kit_core::progress::{Progress, ProgressIndicator}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/radio_group.rs b/dioxus-kit-core/src/radio_group.rs similarity index 98% rename from primitives/src/radio_group.rs rename to dioxus-kit-core/src/radio_group.rs index ea9a2fb73..22dab20e5 100644 --- a/primitives/src/radio_group.rs +++ b/dioxus-kit-core/src/radio_group.rs @@ -119,7 +119,7 @@ pub struct RadioGroupProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::radio_group::{RadioGroup, RadioItem}; +/// use dioxus_kit_core::radio_group::{RadioGroup, RadioItem}; /// /// #[component] /// fn Demo() -> Element { @@ -218,7 +218,7 @@ pub struct RadioItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::radio_group::{RadioGroup, RadioItem}; +/// use dioxus_kit_core::radio_group::{RadioGroup, RadioItem}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/scroll_area.rs b/dioxus-kit-core/src/scroll_area.rs similarity index 98% rename from primitives/src/scroll_area.rs rename to dioxus-kit-core/src/scroll_area.rs index 574569a97..d546685f1 100644 --- a/primitives/src/scroll_area.rs +++ b/dioxus-kit-core/src/scroll_area.rs @@ -58,7 +58,7 @@ pub enum ScrollType { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::scroll_area::{ScrollArea, ScrollDirection}; +/// use dioxus_kit_core::scroll_area::{ScrollArea, ScrollDirection}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/select/components/group.rs b/dioxus-kit-core/src/select/components/group.rs similarity index 98% rename from primitives/src/select/components/group.rs rename to dioxus-kit-core/src/select/components/group.rs index 8dc4fa7ff..642875a58 100644 --- a/primitives/src/select/components/group.rs +++ b/dioxus-kit-core/src/select/components/group.rs @@ -34,7 +34,7 @@ pub struct SelectGroupProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; @@ -122,7 +122,7 @@ pub struct SelectGroupLabelProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/components/list.rs b/dioxus-kit-core/src/select/components/list.rs similarity index 99% rename from primitives/src/select/components/list.rs rename to dioxus-kit-core/src/select/components/list.rs index b04b6426d..f990bb8e2 100644 --- a/primitives/src/select/components/list.rs +++ b/dioxus-kit-core/src/select/components/list.rs @@ -31,7 +31,7 @@ pub struct SelectListProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/components/mod.rs b/dioxus-kit-core/src/select/components/mod.rs similarity index 100% rename from primitives/src/select/components/mod.rs rename to dioxus-kit-core/src/select/components/mod.rs diff --git a/primitives/src/select/components/option.rs b/dioxus-kit-core/src/select/components/option.rs similarity index 99% rename from primitives/src/select/components/option.rs rename to dioxus-kit-core/src/select/components/option.rs index 73ba08339..706e52223 100644 --- a/primitives/src/select/components/option.rs +++ b/dioxus-kit-core/src/select/components/option.rs @@ -65,7 +65,7 @@ pub struct SelectOptionProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; @@ -181,7 +181,7 @@ pub struct SelectItemIndicatorProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/components/select.rs b/dioxus-kit-core/src/select/components/select.rs similarity index 99% rename from primitives/src/select/components/select.rs rename to dioxus-kit-core/src/select/components/select.rs index f6b556190..601e8e597 100644 --- a/primitives/src/select/components/select.rs +++ b/dioxus-kit-core/src/select/components/select.rs @@ -172,7 +172,7 @@ fn use_select_root( /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; @@ -256,7 +256,7 @@ pub fn Select(props: SelectProps) -> Element /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// SelectMulti, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/components/trigger.rs b/dioxus-kit-core/src/select/components/trigger.rs similarity index 99% rename from primitives/src/select/components/trigger.rs rename to dioxus-kit-core/src/select/components/trigger.rs index f1e5b0e30..f43a1448a 100644 --- a/primitives/src/select/components/trigger.rs +++ b/dioxus-kit-core/src/select/components/trigger.rs @@ -23,7 +23,7 @@ pub struct SelectTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/components/value.rs b/dioxus-kit-core/src/select/components/value.rs similarity index 98% rename from primitives/src/select/components/value.rs rename to dioxus-kit-core/src/select/components/value.rs index 8d8c6ed0e..6496c5006 100644 --- a/primitives/src/select/components/value.rs +++ b/dioxus-kit-core/src/select/components/value.rs @@ -24,7 +24,7 @@ pub struct SelectValueProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::select::{ +/// use dioxus_kit_core::select::{ /// Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, SelectList, SelectOption, /// SelectTrigger, SelectValue, /// }; diff --git a/primitives/src/select/context.rs b/dioxus-kit-core/src/select/context.rs similarity index 100% rename from primitives/src/select/context.rs rename to dioxus-kit-core/src/select/context.rs diff --git a/primitives/src/select/mod.rs b/dioxus-kit-core/src/select/mod.rs similarity index 98% rename from primitives/src/select/mod.rs rename to dioxus-kit-core/src/select/mod.rs index c53f718c9..80448ac92 100644 --- a/primitives/src/select/mod.rs +++ b/dioxus-kit-core/src/select/mod.rs @@ -28,7 +28,7 @@ //! //! ```rust //! use dioxus::prelude::*; -//! use dioxus_primitives::select::{ +//! use dioxus_kit_core::select::{ //! Select, SelectGroup, SelectGroupLabel, SelectItemIndicator, //! SelectList, SelectOption, SelectTrigger, SelectValue, //! }; diff --git a/primitives/src/select/text_search.rs b/dioxus-kit-core/src/select/text_search.rs similarity index 100% rename from primitives/src/select/text_search.rs rename to dioxus-kit-core/src/select/text_search.rs diff --git a/primitives/src/selectable.rs b/dioxus-kit-core/src/selectable.rs similarity index 100% rename from primitives/src/selectable.rs rename to dioxus-kit-core/src/selectable.rs diff --git a/primitives/src/selection.rs b/dioxus-kit-core/src/selection.rs similarity index 100% rename from primitives/src/selection.rs rename to dioxus-kit-core/src/selection.rs diff --git a/primitives/src/separator.rs b/dioxus-kit-core/src/separator.rs similarity index 97% rename from primitives/src/separator.rs rename to dioxus-kit-core/src/separator.rs index e0076c7c6..652cb5322 100644 --- a/primitives/src/separator.rs +++ b/dioxus-kit-core/src/separator.rs @@ -31,7 +31,7 @@ pub struct SeparatorProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::separator::Separator; +/// use dioxus_kit_core::separator::Separator; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/slider.rs b/dioxus-kit-core/src/slider.rs similarity index 98% rename from primitives/src/slider.rs rename to dioxus-kit-core/src/slider.rs index 3d266da04..4a52d33b2 100644 --- a/primitives/src/slider.rs +++ b/dioxus-kit-core/src/slider.rs @@ -111,7 +111,7 @@ pub struct SliderProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; +/// use dioxus_kit_core::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; /// /// #[component] /// fn Demo() -> Element { @@ -221,7 +221,7 @@ pub struct RangeSliderProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::slider::{RangeSlider, SliderRange, SliderThumb, SliderTrack}; +/// use dioxus_kit_core::slider::{RangeSlider, SliderRange, SliderThumb, SliderTrack}; /// /// #[component] /// fn Demo() -> Element { @@ -465,7 +465,7 @@ pub struct SliderTrackProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; +/// use dioxus_kit_core::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; /// /// #[component] /// fn Demo() -> Element { @@ -528,7 +528,7 @@ pub struct SliderRangeProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; +/// use dioxus_kit_core::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; /// /// #[component] /// fn Demo() -> Element { @@ -622,7 +622,7 @@ pub struct SliderThumbProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; +/// use dioxus_kit_core::slider::{Slider, SliderRange, SliderThumb, SliderTrack}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/switch.rs b/dioxus-kit-core/src/switch.rs similarity index 97% rename from primitives/src/switch.rs rename to dioxus-kit-core/src/switch.rs index 5f47b4ad7..e75d85e78 100644 --- a/primitives/src/switch.rs +++ b/dioxus-kit-core/src/switch.rs @@ -50,7 +50,7 @@ pub struct SwitchProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::switch::{Switch, SwitchThumb}; +/// use dioxus_kit_core::switch::{Switch, SwitchThumb}; /// #[component] /// fn Demo() -> Element { /// let mut checked = use_signal(|| false); @@ -152,7 +152,7 @@ pub struct SwitchThumbProps { /// ```rust /// /// use dioxus::prelude::*; -/// use dioxus_primitives::switch::{Switch, SwitchThumb}; +/// use dioxus_kit_core::switch::{Switch, SwitchThumb}; /// #[component] /// fn Demo() -> Element { /// let mut checked = use_signal(|| false); diff --git a/primitives/src/tabs.rs b/dioxus-kit-core/src/tabs.rs similarity index 97% rename from primitives/src/tabs.rs rename to dioxus-kit-core/src/tabs.rs index e80285947..bc7acea9f 100644 --- a/primitives/src/tabs.rs +++ b/dioxus-kit-core/src/tabs.rs @@ -67,7 +67,7 @@ pub struct TabsProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::tabs::{TabContent, TabTrigger, Tabs, TabList}; +/// use dioxus_kit_core::tabs::{TabContent, TabTrigger, Tabs, TabList}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -158,7 +158,7 @@ pub struct TabListProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::tabs::{TabContent, TabTrigger, Tabs, TabList}; +/// use dioxus_kit_core::tabs::{TabContent, TabTrigger, Tabs, TabList}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -239,7 +239,7 @@ pub struct TabTriggerProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::tabs::{TabContent, TabTrigger, Tabs, TabList}; +/// use dioxus_kit_core::tabs::{TabContent, TabTrigger, Tabs, TabList}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -383,7 +383,7 @@ pub struct TabContentProps { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::tabs::{TabContent, TabTrigger, Tabs, TabList}; +/// use dioxus_kit_core::tabs::{TabContent, TabTrigger, Tabs, TabList}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/toast.rs b/dioxus-kit-core/src/toast.rs similarity index 99% rename from primitives/src/toast.rs rename to dioxus-kit-core/src/toast.rs index 25ea449d2..5c974dc0b 100644 --- a/primitives/src/toast.rs +++ b/dioxus-kit-core/src/toast.rs @@ -113,7 +113,7 @@ pub struct ToastListItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toast::{ToastOptions, ToastProvider, use_toast}; +/// use dioxus_kit_core::toast::{ToastOptions, ToastProvider, use_toast}; /// use std::time::Duration; /// /// #[component] @@ -417,7 +417,7 @@ struct ToastRenderCtx { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toast::{ToastOptions, ToastProvider, use_toast}; +/// use dioxus_kit_core::toast::{ToastOptions, ToastProvider, use_toast}; /// use std::time::Duration; /// /// #[component] @@ -698,7 +698,7 @@ impl Toasts { /// ## Example /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toast::{ToastOptions, ToastProvider, use_toast}; +/// use dioxus_kit_core::toast::{ToastOptions, ToastProvider, use_toast}; /// use std::time::Duration; /// /// #[component] diff --git a/primitives/src/toggle.rs b/dioxus-kit-core/src/toggle.rs similarity index 98% rename from primitives/src/toggle.rs rename to dioxus-kit-core/src/toggle.rs index 3f221f041..9b94fb657 100644 --- a/primitives/src/toggle.rs +++ b/dioxus-kit-core/src/toggle.rs @@ -49,7 +49,7 @@ pub struct ToggleProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toggle::Toggle; +/// use dioxus_kit_core::toggle::Toggle; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/toggle_group.rs b/dioxus-kit-core/src/toggle_group.rs similarity index 98% rename from primitives/src/toggle_group.rs rename to dioxus-kit-core/src/toggle_group.rs index f2b3e7716..6488f80d8 100644 --- a/primitives/src/toggle_group.rs +++ b/dioxus-kit-core/src/toggle_group.rs @@ -124,7 +124,7 @@ pub struct ToggleGroupProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toggle_group::{ToggleGroup, ToggleItem}; +/// use dioxus_kit_core::toggle_group::{ToggleGroup, ToggleItem}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -203,7 +203,7 @@ pub struct ToggleItemProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toggle_group::{ToggleGroup, ToggleItem}; +/// use dioxus_kit_core::toggle_group::{ToggleGroup, ToggleItem}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/toolbar.rs b/dioxus-kit-core/src/toolbar.rs similarity index 97% rename from primitives/src/toolbar.rs rename to dioxus-kit-core/src/toolbar.rs index 54cd605cb..26486ce81 100644 --- a/primitives/src/toolbar.rs +++ b/dioxus-kit-core/src/toolbar.rs @@ -64,7 +64,7 @@ pub struct ToolbarProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; +/// use dioxus_kit_core::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -145,7 +145,7 @@ pub struct ToolbarButtonProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; +/// use dioxus_kit_core::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; /// #[component] /// fn Demo() -> Element { /// rsx! { @@ -278,7 +278,7 @@ pub struct ToolbarSeparatorProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; +/// use dioxus_kit_core::toolbar::{Toolbar, ToolbarButton, ToolbarSeparator}; /// #[component] /// fn Demo() -> Element { /// rsx! { diff --git a/primitives/src/tooltip.rs b/dioxus-kit-core/src/tooltip.rs similarity index 96% rename from primitives/src/tooltip.rs rename to dioxus-kit-core/src/tooltip.rs index 6ba58039f..52c2a8d19 100644 --- a/primitives/src/tooltip.rs +++ b/dioxus-kit-core/src/tooltip.rs @@ -54,7 +54,7 @@ pub struct TooltipProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; +/// use dioxus_kit_core::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; /// /// #[component] /// fn Demo() -> Element { @@ -130,7 +130,7 @@ pub struct TooltipTriggerProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; +/// use dioxus_kit_core::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; /// /// #[component] /// fn Demo() -> Element { @@ -245,7 +245,7 @@ pub struct TooltipContentProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; +/// use dioxus_kit_core::{tooltip::{Tooltip, TooltipContent, TooltipTrigger}, ContentSide}; /// /// #[component] /// fn Demo() -> Element { diff --git a/primitives/src/ts/focus-trap.ts b/dioxus-kit-core/src/ts/focus-trap.ts similarity index 100% rename from primitives/src/ts/focus-trap.ts rename to dioxus-kit-core/src/ts/focus-trap.ts diff --git a/primitives/src/virtual/mod.rs b/dioxus-kit-core/src/virtual/mod.rs similarity index 100% rename from primitives/src/virtual/mod.rs rename to dioxus-kit-core/src/virtual/mod.rs diff --git a/primitives/src/virtual/types.rs b/dioxus-kit-core/src/virtual/types.rs similarity index 100% rename from primitives/src/virtual/types.rs rename to dioxus-kit-core/src/virtual/types.rs diff --git a/primitives/src/virtual/utils.rs b/dioxus-kit-core/src/virtual/utils.rs similarity index 100% rename from primitives/src/virtual/utils.rs rename to dioxus-kit-core/src/virtual/utils.rs diff --git a/primitives/src/virtual/virtualizer.rs b/dioxus-kit-core/src/virtual/virtualizer.rs similarity index 100% rename from primitives/src/virtual/virtualizer.rs rename to dioxus-kit-core/src/virtual/virtualizer.rs diff --git a/primitives/src/virtual_list.rs b/dioxus-kit-core/src/virtual_list.rs similarity index 99% rename from primitives/src/virtual_list.rs rename to dioxus-kit-core/src/virtual_list.rs index 3a613629b..cee7681ff 100644 --- a/primitives/src/virtual_list.rs +++ b/dioxus-kit-core/src/virtual_list.rs @@ -43,7 +43,7 @@ pub struct VirtualListProps { /// /// ```rust /// use dioxus::prelude::*; -/// use dioxus_primitives::virtual_list::VirtualList; +/// use dioxus_kit_core::virtual_list::VirtualList; /// /// #[derive(Clone, PartialEq)] /// struct Row { diff --git a/dioxus-kit/Cargo.toml b/dioxus-kit/Cargo.toml new file mode 100644 index 000000000..73e529d99 --- /dev/null +++ b/dioxus-kit/Cargo.toml @@ -0,0 +1,30 @@ +[package] +name = "dioxus-kit" +version = "0.0.1" +edition = "2021" +rust-version = "1.85.0" +readme = "../README.md" +keywords = ["gui", "dioxus", "components", "shadcn"] +categories = ["gui", "wasm"] +authors = ["Dioxus Labs"] +license = "MIT OR Apache-2.0" +homepage = "https://dioxuslabs.com" +repository = "https://github.com/DioxusLabs/components" +description = "A shadcn-styled component library for Dioxus, built on top of dioxus-kit-core." + +[dependencies] +dioxus = { workspace = true, features = ["router"] } +dioxus-code = { version = "0.1.0", default-features = false, features = ["macro", "lang-css"] } +dioxus-icons = "0.1.0" +dioxus-kit-core.workspace = true +palette = "0.7.6" +strum = { version = "0.27.2", features = ["derive"] } +tracing.workspace = true +time = { version = "0.3.44", features = ["std", "macros"] } + +[dev-dependencies] +dioxus-ssr = "0.7.0" + +[features] +default = [] +web = ["dioxus/web", "dioxus-kit-core/web"] diff --git a/preview/assets/dx-components-theme.css b/dioxus-kit/assets/dx-components-theme.css similarity index 100% rename from preview/assets/dx-components-theme.css rename to dioxus-kit/assets/dx-components-theme.css diff --git a/preview/src/components/accordion/component.json b/dioxus-kit/src/accordion/component.json similarity index 79% rename from preview/src/components/accordion/component.json rename to dioxus-kit/src/accordion/component.json index 83380a08d..c272ae98b 100644 --- a/preview/src/components/accordion/component.json +++ b/dioxus-kit/src/accordion/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/accordion/component.rs b/dioxus-kit/src/accordion/component.rs similarity index 95% rename from preview/src/components/accordion/component.rs rename to dioxus-kit/src/accordion/component.rs index ded068550..5d7632b5d 100644 --- a/preview/src/components/accordion/component.rs +++ b/dioxus-kit/src/accordion/component.rs @@ -1,10 +1,10 @@ use dioxus::prelude::*; use dioxus_icons::lucide::ChevronDown; -use dioxus_primitives::accordion::{ +use dioxus_kit_core::accordion::{ self, AccordionContentProps, AccordionItemProps, AccordionProps, AccordionTriggerProps, }; -#[css_module("/src/components/accordion/style.css")] +#[css_module("/src/accordion/style.css")] struct Styles; #[component] diff --git a/preview/src/components/combobox/mod.rs b/dioxus-kit/src/accordion/mod.rs similarity index 100% rename from preview/src/components/combobox/mod.rs rename to dioxus-kit/src/accordion/mod.rs diff --git a/preview/src/components/accordion/style.css b/dioxus-kit/src/accordion/style.css similarity index 100% rename from preview/src/components/accordion/style.css rename to dioxus-kit/src/accordion/style.css diff --git a/preview/src/components/alert_dialog/component.json b/dioxus-kit/src/alert_dialog/component.json similarity index 77% rename from preview/src/components/alert_dialog/component.json rename to dioxus-kit/src/alert_dialog/component.json index d92700919..2617f2308 100644 --- a/preview/src/components/alert_dialog/component.json +++ b/dioxus-kit/src/alert_dialog/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/alert_dialog/component.rs b/dioxus-kit/src/alert_dialog/component.rs similarity index 95% rename from preview/src/components/alert_dialog/component.rs rename to dioxus-kit/src/alert_dialog/component.rs index 91c862e7a..204250cee 100644 --- a/preview/src/components/alert_dialog/component.rs +++ b/dioxus-kit/src/alert_dialog/component.rs @@ -1,10 +1,10 @@ use dioxus::prelude::*; -use dioxus_primitives::alert_dialog::{ +use dioxus_kit_core::alert_dialog::{ self, AlertDialogActionProps, AlertDialogActionsProps, AlertDialogCancelProps, AlertDialogDescriptionProps, AlertDialogRootProps, AlertDialogTitleProps, }; -#[css_module("/src/components/alert_dialog/style.css")] +#[css_module("/src/alert_dialog/style.css")] struct Styles; #[component] diff --git a/preview/src/components/item/mod.rs b/dioxus-kit/src/alert_dialog/mod.rs similarity index 100% rename from preview/src/components/item/mod.rs rename to dioxus-kit/src/alert_dialog/mod.rs diff --git a/preview/src/components/alert_dialog/style.css b/dioxus-kit/src/alert_dialog/style.css similarity index 100% rename from preview/src/components/alert_dialog/style.css rename to dioxus-kit/src/alert_dialog/style.css diff --git a/preview/src/components/aspect_ratio/component.json b/dioxus-kit/src/aspect_ratio/component.json similarity index 77% rename from preview/src/components/aspect_ratio/component.json rename to dioxus-kit/src/aspect_ratio/component.json index 7792fdc7e..b1dde868e 100644 --- a/preview/src/components/aspect_ratio/component.json +++ b/dioxus-kit/src/aspect_ratio/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/dioxus-kit/src/aspect_ratio/component.rs b/dioxus-kit/src/aspect_ratio/component.rs new file mode 100644 index 000000000..254cc278c --- /dev/null +++ b/dioxus-kit/src/aspect_ratio/component.rs @@ -0,0 +1,7 @@ +use dioxus::prelude::*; +use dioxus_kit_core::aspect_ratio::AspectRatioProps; + +#[component] +pub fn AspectRatio(props: AspectRatioProps) -> Element { + dioxus_kit_core::aspect_ratio::AspectRatio(props) +} diff --git a/preview/src/components/pagination/mod.rs b/dioxus-kit/src/aspect_ratio/mod.rs similarity index 100% rename from preview/src/components/pagination/mod.rs rename to dioxus-kit/src/aspect_ratio/mod.rs diff --git a/dioxus-kit/src/aspect_ratio/style.css b/dioxus-kit/src/aspect_ratio/style.css new file mode 100644 index 000000000..6bf4b43ee --- /dev/null +++ b/dioxus-kit/src/aspect_ratio/style.css @@ -0,0 +1 @@ +/* Aspect ratio doesn't require any additional styles. */ diff --git a/preview/src/components/avatar/component.json b/dioxus-kit/src/avatar/component.json similarity index 75% rename from preview/src/components/avatar/component.json rename to dioxus-kit/src/avatar/component.json index fbdea025c..c6e95c40b 100644 --- a/preview/src/components/avatar/component.json +++ b/dioxus-kit/src/avatar/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/avatar/component.rs b/dioxus-kit/src/avatar/component.rs similarity index 95% rename from preview/src/components/avatar/component.rs rename to dioxus-kit/src/avatar/component.rs index dea66921d..0a0923b53 100644 --- a/preview/src/components/avatar/component.rs +++ b/dioxus-kit/src/avatar/component.rs @@ -1,9 +1,9 @@ use dioxus::prelude::*; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::avatar::{self, AvatarState}; -use dioxus_primitives::merge_attributes; +use dioxus_kit_core::avatar::{self, AvatarState}; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; -#[css_module("/src/components/avatar/style.css")] +#[css_module("/src/avatar/style.css")] struct Styles; #[derive(Clone, Copy, PartialEq, Default)] @@ -77,9 +77,7 @@ pub fn Avatar(props: AvatarProps) -> Element { props.size.to_class(), props.shape.to_class() ); - let base = attributes!(span { - class - }); + let base = attributes!(span { class }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { diff --git a/preview/src/components/sheet/mod.rs b/dioxus-kit/src/avatar/mod.rs similarity index 100% rename from preview/src/components/sheet/mod.rs rename to dioxus-kit/src/avatar/mod.rs diff --git a/preview/src/components/avatar/style.css b/dioxus-kit/src/avatar/style.css similarity index 87% rename from preview/src/components/avatar/style.css rename to dioxus-kit/src/avatar/style.css index 6a6884c6a..a19cb6a4a 100644 --- a/preview/src/components/avatar/style.css +++ b/dioxus-kit/src/avatar/style.css @@ -1,16 +1,3 @@ -.dx-avatar-item { - display: flex; - flex-direction: column; - align-items: center; - gap: 0.5rem; -} - -.dx-avatar-label { - margin: 0; - color: var(--secondary-color-4); - font-size: 0.875rem; -} - /* Avatar Component Styles */ .dx-avatar { position: relative; diff --git a/preview/src/components/badge/component.json b/dioxus-kit/src/badge/component.json similarity index 78% rename from preview/src/components/badge/component.json rename to dioxus-kit/src/badge/component.json index cbfc84ae2..2ca9e4a78 100644 --- a/preview/src/components/badge/component.json +++ b/dioxus-kit/src/badge/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/badge/component.rs b/dioxus-kit/src/badge/component.rs similarity index 96% rename from preview/src/components/badge/component.rs rename to dioxus-kit/src/badge/component.rs index 6739e1ec9..84a751004 100644 --- a/preview/src/components/badge/component.rs +++ b/dioxus-kit/src/badge/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; use dioxus_icons::lucide::BadgeCheck; -#[css_module("/src/components/badge/style.css")] +#[css_module("/src/badge/style.css")] struct Styles; #[derive(Copy, Clone, PartialEq, Default)] diff --git a/preview/src/components/sidebar/mod.rs b/dioxus-kit/src/badge/mod.rs similarity index 100% rename from preview/src/components/sidebar/mod.rs rename to dioxus-kit/src/badge/mod.rs diff --git a/preview/src/components/badge/style.css b/dioxus-kit/src/badge/style.css similarity index 91% rename from preview/src/components/badge/style.css rename to dioxus-kit/src/badge/style.css index 0b18dc16c..e48531267 100644 --- a/preview/src/components/badge/style.css +++ b/dioxus-kit/src/badge/style.css @@ -1,9 +1,3 @@ -.dx-badge-example { - display: flex; - align-items: center; - gap: 1rem; -} - .dx-badge { display: inline-flex; min-width: 20px; diff --git a/preview/src/components/button/component.json b/dioxus-kit/src/button/component.json similarity index 75% rename from preview/src/components/button/component.json rename to dioxus-kit/src/button/component.json index b6d9b2403..045d6ade4 100644 --- a/preview/src/components/button/component.json +++ b/dioxus-kit/src/button/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/button/component.rs b/dioxus-kit/src/button/component.rs similarity index 94% rename from preview/src/components/button/component.rs rename to dioxus-kit/src/button/component.rs index bbf3b9cdb..fe29d2841 100644 --- a/preview/src/components/button/component.rs +++ b/dioxus-kit/src/button/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::merge_attributes; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; -#[css_module("/src/components/button/style.css")] +#[css_module("/src/button/style.css")] struct Styles; #[derive(Copy, Clone, PartialEq, Default)] diff --git a/preview/src/components/textarea/mod.rs b/dioxus-kit/src/button/mod.rs similarity index 100% rename from preview/src/components/textarea/mod.rs rename to dioxus-kit/src/button/mod.rs diff --git a/preview/src/components/button/style.css b/dioxus-kit/src/button/style.css similarity index 100% rename from preview/src/components/button/style.css rename to dioxus-kit/src/button/style.css diff --git a/preview/src/components/calendar/component.json b/dioxus-kit/src/calendar/component.json similarity index 80% rename from preview/src/components/calendar/component.json rename to dioxus-kit/src/calendar/component.json index 43015e019..f39cfb5f9 100644 --- a/preview/src/components/calendar/component.json +++ b/dioxus-kit/src/calendar/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -17,5 +17,5 @@ "version": "0.3.44" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/calendar/component.rs b/dioxus-kit/src/calendar/component.rs similarity index 99% rename from preview/src/components/calendar/component.rs rename to dioxus-kit/src/calendar/component.rs index 5f994cc10..753c03287 100644 --- a/preview/src/components/calendar/component.rs +++ b/dioxus-kit/src/calendar/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{ChevronDown, ChevronLeft, ChevronRight}; -use dioxus_primitives::calendar::{ +use dioxus_kit_core::calendar::{ self, CalendarDayProps, CalendarGridBodyProps, CalendarGridCellProps, CalendarGridDayHeaderProps, CalendarGridHeadProps, CalendarGridHeaderRowProps, CalendarGridRootProps, CalendarGridWeekProps, CalendarHeaderProps, CalendarNavigationProps, @@ -8,10 +8,10 @@ use dioxus_primitives::calendar::{ CalendarSelectYearProps, CalendarSelectYearSelectProps, CalendarSelectYearValueProps, CalendarViewProps, }; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; use time::{Date, Month, UtcDateTime, Weekday}; -#[css_module("/src/components/calendar/style.css")] +#[css_module("/src/calendar/style.css")] struct Styles; fn fixed_date(year: i32, month: Month, day: u8) -> Date { diff --git a/preview/src/components/virtual_list/mod.rs b/dioxus-kit/src/calendar/mod.rs similarity index 100% rename from preview/src/components/virtual_list/mod.rs rename to dioxus-kit/src/calendar/mod.rs diff --git a/preview/src/components/calendar/style.css b/dioxus-kit/src/calendar/style.css similarity index 100% rename from preview/src/components/calendar/style.css rename to dioxus-kit/src/calendar/style.css diff --git a/preview/src/components/card/component.json b/dioxus-kit/src/card/component.json similarity index 78% rename from preview/src/components/card/component.json rename to dioxus-kit/src/card/component.json index 4aeb91d07..671896fc6 100644 --- a/preview/src/components/card/component.json +++ b/dioxus-kit/src/card/component.json @@ -11,11 +11,11 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/card/component.rs b/dioxus-kit/src/card/component.rs similarity index 97% rename from preview/src/components/card/component.rs rename to dioxus-kit/src/card/component.rs index 499e87dd2..5de643949 100644 --- a/preview/src/components/card/component.rs +++ b/dioxus-kit/src/card/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; -#[css_module("/src/components/card/style.css")] +#[css_module("/src/card/style.css")] struct Styles; #[component] diff --git a/preview/src/components/card/mod.rs b/dioxus-kit/src/card/mod.rs similarity index 97% rename from preview/src/components/card/mod.rs rename to dioxus-kit/src/card/mod.rs index a3527a11b..2590c0132 100644 --- a/preview/src/components/card/mod.rs +++ b/dioxus-kit/src/card/mod.rs @@ -1,3 +1,2 @@ mod component; pub use component::*; - diff --git a/preview/src/components/card/style.css b/dioxus-kit/src/card/style.css similarity index 100% rename from preview/src/components/card/style.css rename to dioxus-kit/src/card/style.css diff --git a/preview/src/components/checkbox/component.json b/dioxus-kit/src/checkbox/component.json similarity index 77% rename from preview/src/components/checkbox/component.json rename to dioxus-kit/src/checkbox/component.json index 13a33aff5..fdfa95d9e 100644 --- a/preview/src/components/checkbox/component.json +++ b/dioxus-kit/src/checkbox/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/checkbox/component.rs b/dioxus-kit/src/checkbox/component.rs similarity index 86% rename from preview/src/components/checkbox/component.rs rename to dioxus-kit/src/checkbox/component.rs index c6ddb90f9..45faad9da 100644 --- a/preview/src/components/checkbox/component.rs +++ b/dioxus-kit/src/checkbox/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; use dioxus_icons::lucide::Check; -use dioxus_primitives::checkbox::{self, CheckboxProps}; +use dioxus_kit_core::checkbox::{self, CheckboxProps}; -#[css_module("/src/components/checkbox/style.css")] +#[css_module("/src/checkbox/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/checkbox/mod.rs b/dioxus-kit/src/checkbox/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/checkbox/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/checkbox/style.css b/dioxus-kit/src/checkbox/style.css similarity index 100% rename from preview/src/components/checkbox/style.css rename to dioxus-kit/src/checkbox/style.css diff --git a/preview/src/components/collapsible/component.json b/dioxus-kit/src/collapsible/component.json similarity index 79% rename from preview/src/components/collapsible/component.json rename to dioxus-kit/src/collapsible/component.json index f93711ed1..c4e84b243 100644 --- a/preview/src/components/collapsible/component.json +++ b/dioxus-kit/src/collapsible/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/collapsible/component.rs b/dioxus-kit/src/collapsible/component.rs similarity index 92% rename from preview/src/components/collapsible/component.rs rename to dioxus-kit/src/collapsible/component.rs index 918f8aa0d..27915e082 100644 --- a/preview/src/components/collapsible/component.rs +++ b/dioxus-kit/src/collapsible/component.rs @@ -1,12 +1,12 @@ use dioxus::prelude::*; use dioxus_icons::lucide::ChevronsUpDown; -use dioxus_primitives::collapsible::{ +use dioxus_kit_core::collapsible::{ self, CollapsibleContentProps, CollapsibleProps, CollapsibleTriggerProps, }; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::merge_attributes; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; -#[css_module("/src/components/collapsible/style.css")] +#[css_module("/src/collapsible/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/collapsible/mod.rs b/dioxus-kit/src/collapsible/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/collapsible/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/collapsible/style.css b/dioxus-kit/src/collapsible/style.css similarity index 100% rename from preview/src/components/collapsible/style.css rename to dioxus-kit/src/collapsible/style.css diff --git a/preview/src/components/color_picker/component.json b/dioxus-kit/src/color_picker/component.json similarity index 80% rename from preview/src/components/color_picker/component.json rename to dioxus-kit/src/color_picker/component.json index 995db2bac..85aa8773e 100644 --- a/preview/src/components/color_picker/component.json +++ b/dioxus-kit/src/color_picker/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -14,5 +14,5 @@ } ], "componentDependencies": ["popover", "input"], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/color_picker/component.rs b/dioxus-kit/src/color_picker/component.rs similarity index 96% rename from preview/src/components/color_picker/component.rs rename to dioxus-kit/src/color_picker/component.rs index ec390e92b..f481a3c53 100644 --- a/preview/src/components/color_picker/component.rs +++ b/dioxus-kit/src/color_picker/component.rs @@ -1,16 +1,14 @@ use dioxus::prelude::*; -use dioxus_primitives::color_picker::{ - self, Color, ColorAreaProps, ColorPickerContext, -}; -use dioxus_primitives::popover; -use dioxus_primitives::use_controlled; -use dioxus_primitives::label::Label; -use dioxus_primitives::slider::*; +use dioxus_kit_core::color_picker::{self, Color, ColorAreaProps, ColorPickerContext}; +use dioxus_kit_core::label::Label; +use dioxus_kit_core::popover; +use dioxus_kit_core::slider::*; +use dioxus_kit_core::use_controlled; use palette::{encoding, FromColor, Hsv, IntoColor, RgbHue, Srgb}; -use crate::components::input::Input; +use crate::input::Input; -#[css_module("/src/components/color_picker/style.css")] +#[css_module("/src/color_picker/style.css")] struct Styles; fn format_color_hex(color: Color) -> String { @@ -204,7 +202,7 @@ pub fn ColorPickerPopover(props: ColorPickerPopoverProps) -> Element { } } -/// The props for the [`ColorField`] component. +/// The props for the color field component. #[derive(Props, Clone, PartialEq)] pub struct ColorFieldProps { /// Optional label above the input field @@ -299,7 +297,7 @@ fn ColorField(props: ColorFieldProps) -> Element { } } -/// The props for the [`ColorSwatch`] component. +/// The props for the color swatch component. #[derive(Props, Clone, PartialEq)] pub struct ColorSwatchProps { /// The selected color @@ -336,7 +334,7 @@ fn ColorSwatch(props: ColorSwatchProps) -> Element { } } -/// The props for the [`ColorSlider`] component. +/// The props for the color slider component. #[derive(Props, Clone, PartialEq)] pub struct ColorSliderProps { pub title: ReadSignal, diff --git a/dioxus-kit/src/color_picker/mod.rs b/dioxus-kit/src/color_picker/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/color_picker/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/color_picker/style.css b/dioxus-kit/src/color_picker/style.css similarity index 100% rename from preview/src/components/color_picker/style.css rename to dioxus-kit/src/color_picker/style.css diff --git a/preview/src/components/combobox/component.json b/dioxus-kit/src/combobox/component.json similarity index 79% rename from preview/src/components/combobox/component.json rename to dioxus-kit/src/combobox/component.json index 3ada82097..6cb74cae9 100644 --- a/preview/src/components/combobox/component.json +++ b/dioxus-kit/src/combobox/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/combobox/component.rs b/dioxus-kit/src/combobox/component.rs similarity index 90% rename from preview/src/components/combobox/component.rs rename to dioxus-kit/src/combobox/component.rs index fe1fa9699..37b836630 100644 --- a/preview/src/components/combobox/component.rs +++ b/dioxus-kit/src/combobox/component.rs @@ -1,11 +1,11 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{Check, ChevronsUpDown}; -use dioxus_primitives::combobox::{ +use dioxus_kit_core::combobox::{ self, default_combobox_filter, ComboboxEmptyProps, ComboboxOptionProps, }; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/combobox/style.css")] +#[css_module("/src/combobox/style.css")] struct Styles; #[derive(Props, Clone, PartialEq)] @@ -63,7 +63,9 @@ pub struct ComboboxProps { #[component] pub fn Combobox(props: ComboboxProps) -> Element { - let base = attributes!(div { class: Styles::dx_combobox }); + let base = attributes!(div { + class: Styles::dx_combobox + }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { @@ -103,7 +105,9 @@ pub fn Combobox(props: ComboboxProps) -> Elem #[component] pub fn ComboboxEmpty(props: ComboboxEmptyProps) -> Element { - let base = attributes!(div { class: Styles::dx_combobox_empty }); + let base = attributes!(div { + class: Styles::dx_combobox_empty + }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { @@ -116,7 +120,9 @@ pub fn ComboboxEmpty(props: ComboboxEmptyProps) -> Element { #[component] pub fn ComboboxOption(props: ComboboxOptionProps) -> Element { - let base = attributes!(div { class: Styles::dx_combobox_option }); + let base = attributes!(div { + class: Styles::dx_combobox_option + }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { diff --git a/dioxus-kit/src/combobox/mod.rs b/dioxus-kit/src/combobox/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/combobox/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/combobox/style.css b/dioxus-kit/src/combobox/style.css similarity index 100% rename from preview/src/components/combobox/style.css rename to dioxus-kit/src/combobox/style.css diff --git a/preview/src/components/context_menu/component.json b/dioxus-kit/src/context_menu/component.json similarity index 77% rename from preview/src/components/context_menu/component.json rename to dioxus-kit/src/context_menu/component.json index 396f6ca96..c060a2ba1 100644 --- a/preview/src/components/context_menu/component.json +++ b/dioxus-kit/src/context_menu/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/context_menu/component.rs b/dioxus-kit/src/context_menu/component.rs similarity index 94% rename from preview/src/components/context_menu/component.rs rename to dioxus-kit/src/context_menu/component.rs index 6ba003afa..f02394c9d 100644 --- a/preview/src/components/context_menu/component.rs +++ b/dioxus-kit/src/context_menu/component.rs @@ -1,9 +1,9 @@ use dioxus::prelude::*; -use dioxus_primitives::context_menu::{ +use dioxus_kit_core::context_menu::{ self, ContextMenuContentProps, ContextMenuItemProps, ContextMenuProps, ContextMenuTriggerProps, }; -#[css_module("/src/components/context_menu/style.css")] +#[css_module("/src/context_menu/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/context_menu/mod.rs b/dioxus-kit/src/context_menu/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/context_menu/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/context_menu/style.css b/dioxus-kit/src/context_menu/style.css similarity index 100% rename from preview/src/components/context_menu/style.css rename to dioxus-kit/src/context_menu/style.css diff --git a/preview/src/components/date_picker/component.json b/dioxus-kit/src/date_picker/component.json similarity index 82% rename from preview/src/components/date_picker/component.json rename to dioxus-kit/src/date_picker/component.json index 5ba9b531a..883bbb225 100644 --- a/preview/src/components/date_picker/component.json +++ b/dioxus-kit/src/date_picker/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -18,5 +18,5 @@ } ], "componentDependencies": ["calendar", "popover"], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/date_picker/component.rs b/dioxus-kit/src/date_picker/component.rs similarity index 99% rename from preview/src/components/date_picker/component.rs rename to dioxus-kit/src/date_picker/component.rs index 9b3137b72..0bb8d15e2 100644 --- a/preview/src/components/date_picker/component.rs +++ b/dioxus-kit/src/date_picker/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; use dioxus_icons::lucide::ChevronDown; -use dioxus_primitives::{ +use dioxus_kit_core::{ calendar::DateRange, date_picker::{ self, DatePickerDaySegmentProps, DatePickerInputProps, DatePickerMonthSegmentProps, @@ -18,7 +18,7 @@ use time::{Date, Month}; use super::super::calendar::*; use super::super::popover::*; -#[css_module("/src/components/date_picker/style.css")] +#[css_module("/src/date_picker/style.css")] struct Styles; fn fixed_date(year: i32, month: Month, day: u8) -> Date { @@ -399,7 +399,7 @@ pub(crate) fn DatePickerPopoverContent(props: PopoverContentProps) -> Element { #[cfg(test)] mod tests { use super::*; - use dioxus_primitives::calendar::DateRange; + use dioxus_kit_core::calendar::DateRange; #[component] fn DatePickerWithDefaultInput() -> Element { @@ -446,5 +446,4 @@ mod tests { assert!(html.contains("11")); assert!(html.contains("Show Calendar")); } - } diff --git a/dioxus-kit/src/date_picker/mod.rs b/dioxus-kit/src/date_picker/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/date_picker/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/date_picker/style.css b/dioxus-kit/src/date_picker/style.css similarity index 100% rename from preview/src/components/date_picker/style.css rename to dioxus-kit/src/date_picker/style.css diff --git a/preview/src/components/dialog/component.json b/dioxus-kit/src/dialog/component.json similarity index 74% rename from preview/src/components/dialog/component.json rename to dioxus-kit/src/dialog/component.json index 76bf0bb01..3a5b878d5 100644 --- a/preview/src/components/dialog/component.json +++ b/dioxus-kit/src/dialog/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/dialog/component.rs b/dioxus-kit/src/dialog/component.rs similarity index 57% rename from preview/src/components/dialog/component.rs rename to dioxus-kit/src/dialog/component.rs index af64ef403..89d16d783 100644 --- a/preview/src/components/dialog/component.rs +++ b/dioxus-kit/src/dialog/component.rs @@ -1,8 +1,38 @@ use dioxus::prelude::*; -use dioxus_primitives::dialog::{self, DialogDescriptionProps, DialogRootProps, DialogTitleProps}; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::dialog::{self, DialogDescriptionProps, DialogRootProps, DialogTitleProps}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/dialog/style.css")] +/// A styled close button intended for use inside a [`Dialog`]. Renders a +/// `button` element pre-wired with the close icon styling, default +/// `type="button"`, and an accessible label. +#[component] +pub fn DialogClose( + #[props(extends = GlobalAttributes)] + #[props(extends = button)] + attributes: Vec, + onclick: Option>, + children: Element, +) -> Element { + let base = attributes!(button { + class: Styles::dx_dialog_close, + r#type: "button", + aria_label: "Close", + }); + let merged = merge_attributes(vec![base, attributes]); + rsx! { + button { + onclick: move |event| { + if let Some(f) = &onclick { + f.call(event); + } + }, + ..merged, + {children} + } + } +} + +#[css_module("/src/dialog/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/dialog/mod.rs b/dioxus-kit/src/dialog/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/dialog/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/dialog/style.css b/dioxus-kit/src/dialog/style.css similarity index 100% rename from preview/src/components/dialog/style.css rename to dioxus-kit/src/dialog/style.css diff --git a/preview/src/components/drag_and_drop_list/component.json b/dioxus-kit/src/drag_and_drop_list/component.json similarity index 80% rename from preview/src/components/drag_and_drop_list/component.json rename to dioxus-kit/src/drag_and_drop_list/component.json index cc86e2eb7..88826062b 100644 --- a/preview/src/components/drag_and_drop_list/component.json +++ b/dioxus-kit/src/drag_and_drop_list/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/drag_and_drop_list/component.rs b/dioxus-kit/src/drag_and_drop_list/component.rs similarity index 97% rename from preview/src/components/drag_and_drop_list/component.rs rename to dioxus-kit/src/drag_and_drop_list/component.rs index c66fe9b14..2e3649002 100644 --- a/preview/src/components/drag_and_drop_list/component.rs +++ b/dioxus-kit/src/drag_and_drop_list/component.rs @@ -1,11 +1,11 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{GripVertical, X}; -use dioxus_primitives::drag_and_drop_list::{ +use dioxus_kit_core::drag_and_drop_list::{ self, DragAndDropContext, DragAndDropDropIndicatorProps, DragAndDropItemContext, DragAndDropListItemProps, DragAndDropListItemsProps, }; -#[css_module("/src/components/drag_and_drop_list/style.css")] +#[css_module("/src/drag_and_drop_list/style.css")] struct Styles; #[derive(Props, Clone, PartialEq)] diff --git a/dioxus-kit/src/drag_and_drop_list/mod.rs b/dioxus-kit/src/drag_and_drop_list/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/drag_and_drop_list/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/drag_and_drop_list/style.css b/dioxus-kit/src/drag_and_drop_list/style.css similarity index 100% rename from preview/src/components/drag_and_drop_list/style.css rename to dioxus-kit/src/drag_and_drop_list/style.css diff --git a/preview/src/components/dropdown_menu/component.json b/dioxus-kit/src/dropdown_menu/component.json similarity index 75% rename from preview/src/components/dropdown_menu/component.json rename to dioxus-kit/src/dropdown_menu/component.json index c55ac0c6a..648c84032 100644 --- a/preview/src/components/dropdown_menu/component.json +++ b/dioxus-kit/src/dropdown_menu/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/dropdown_menu/component.rs b/dioxus-kit/src/dropdown_menu/component.rs similarity index 91% rename from preview/src/components/dropdown_menu/component.rs rename to dioxus-kit/src/dropdown_menu/component.rs index cb605e3eb..70f60567e 100644 --- a/preview/src/components/dropdown_menu/component.rs +++ b/dioxus-kit/src/dropdown_menu/component.rs @@ -1,12 +1,12 @@ use dioxus::prelude::*; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::dropdown_menu::{ +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::dropdown_menu::{ self, DropdownMenuContentProps, DropdownMenuItemProps, DropdownMenuProps, DropdownMenuTriggerProps, }; -use dioxus_primitives::merge_attributes; +use dioxus_kit_core::merge_attributes; -#[css_module("/src/components/dropdown_menu/style.css")] +#[css_module("/src/dropdown_menu/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/dropdown_menu/mod.rs b/dioxus-kit/src/dropdown_menu/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/dropdown_menu/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/dropdown_menu/style.css b/dioxus-kit/src/dropdown_menu/style.css similarity index 100% rename from preview/src/components/dropdown_menu/style.css rename to dioxus-kit/src/dropdown_menu/style.css diff --git a/preview/src/components/hover_card/component.json b/dioxus-kit/src/hover_card/component.json similarity index 75% rename from preview/src/components/hover_card/component.json rename to dioxus-kit/src/hover_card/component.json index 993e079e0..362e7eff6 100644 --- a/preview/src/components/hover_card/component.json +++ b/dioxus-kit/src/hover_card/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/hover_card/component.rs b/dioxus-kit/src/hover_card/component.rs similarity index 93% rename from preview/src/components/hover_card/component.rs rename to dioxus-kit/src/hover_card/component.rs index 0acab8916..858a4da95 100644 --- a/preview/src/components/hover_card/component.rs +++ b/dioxus-kit/src/hover_card/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::hover_card::{ +use dioxus_kit_core::hover_card::{ self, HoverCardContentProps, HoverCardProps, HoverCardTriggerProps, }; -#[css_module("/src/components/hover_card/style.css")] +#[css_module("/src/hover_card/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/hover_card/mod.rs b/dioxus-kit/src/hover_card/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/hover_card/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/hover_card/style.css b/dioxus-kit/src/hover_card/style.css similarity index 100% rename from preview/src/components/hover_card/style.css rename to dioxus-kit/src/hover_card/style.css diff --git a/preview/src/components/input/component.json b/dioxus-kit/src/input/component.json similarity index 73% rename from preview/src/components/input/component.json rename to dioxus-kit/src/input/component.json index 6be8f7ec0..e63140ef4 100644 --- a/preview/src/components/input/component.json +++ b/dioxus-kit/src/input/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/input/component.rs b/dioxus-kit/src/input/component.rs similarity index 98% rename from preview/src/components/input/component.rs rename to dioxus-kit/src/input/component.rs index 541c3074f..229d981df 100644 --- a/preview/src/components/input/component.rs +++ b/dioxus-kit/src/input/component.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -#[css_module("/src/components/input/style.css")] +#[css_module("/src/input/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/input/mod.rs b/dioxus-kit/src/input/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/input/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/input/style.css b/dioxus-kit/src/input/style.css similarity index 100% rename from preview/src/components/input/style.css rename to dioxus-kit/src/input/style.css diff --git a/preview/src/components/item/component.json b/dioxus-kit/src/item/component.json similarity index 75% rename from preview/src/components/item/component.json rename to dioxus-kit/src/item/component.json index 4bf9a0e36..160e25d22 100644 --- a/preview/src/components/item/component.json +++ b/dioxus-kit/src/item/component.json @@ -5,10 +5,10 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], "componentDependencies": ["separator"], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/item/component.rs b/dioxus-kit/src/item/component.rs similarity index 96% rename from preview/src/components/item/component.rs rename to dioxus-kit/src/item/component.rs index 41faacb0f..f2f952624 100644 --- a/preview/src/components/item/component.rs +++ b/dioxus-kit/src/item/component.rs @@ -1,8 +1,8 @@ -use crate::components::separator::Separator; +use crate::separator::Separator; use dioxus::prelude::*; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::merge_attributes; -#[css_module("/src/components/item/style.css")] +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; +#[css_module("/src/item/style.css")] struct Styles; #[derive(Copy, Clone, PartialEq, Default)] diff --git a/dioxus-kit/src/item/mod.rs b/dioxus-kit/src/item/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/item/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/item/style.css b/dioxus-kit/src/item/style.css similarity index 100% rename from preview/src/components/item/style.css rename to dioxus-kit/src/item/style.css diff --git a/preview/src/components/label/component.json b/dioxus-kit/src/label/component.json similarity index 74% rename from preview/src/components/label/component.json rename to dioxus-kit/src/label/component.json index 6541a661e..d88ac7034 100644 --- a/preview/src/components/label/component.json +++ b/dioxus-kit/src/label/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/label/component.rs b/dioxus-kit/src/label/component.rs similarity index 74% rename from preview/src/components/label/component.rs rename to dioxus-kit/src/label/component.rs index b3e89b910..b58076f63 100644 --- a/preview/src/components/label/component.rs +++ b/dioxus-kit/src/label/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; -use dioxus_primitives::label::{self, LabelProps}; -#[css_module("/src/components/label/style.css")] +use dioxus_kit_core::label::{self, LabelProps}; +#[css_module("/src/label/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/label/mod.rs b/dioxus-kit/src/label/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/label/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/label/style.css b/dioxus-kit/src/label/style.css similarity index 100% rename from preview/src/components/label/style.css rename to dioxus-kit/src/label/style.css diff --git a/dioxus-kit/src/lib.rs b/dioxus-kit/src/lib.rs new file mode 100644 index 000000000..5c6036ab5 --- /dev/null +++ b/dioxus-kit/src/lib.rs @@ -0,0 +1,51 @@ +//! Dioxus Kit, a shadcn-styled component library for Dioxus built on top +//! of `dioxus-kit-core`. + +use dioxus::prelude::{asset, manganis, Asset}; + +/// The default shadcn-style theme stylesheet shipped with `dioxus-kit`. +pub const THEME_CSS: Asset = asset!("/assets/dx-components-theme.css"); + +pub mod accordion; +pub mod alert_dialog; +pub mod aspect_ratio; +pub mod avatar; +pub mod badge; +pub mod button; +pub mod calendar; +pub mod card; +pub mod checkbox; +pub mod collapsible; +pub mod color_picker; +pub mod combobox; +pub mod context_menu; +pub mod date_picker; +pub mod dialog; +pub mod drag_and_drop_list; +pub mod dropdown_menu; +pub mod hover_card; +pub mod input; +pub mod item; +pub mod label; +pub mod menubar; +pub mod navbar; +pub mod pagination; +pub mod popover; +pub mod progress; +pub mod radio_group; +pub mod scroll_area; +pub mod select; +pub mod separator; +pub mod sheet; +pub mod sidebar; +pub mod skeleton; +pub mod slider; +pub mod switch; +pub mod tabs; +pub mod textarea; +pub mod toast; +pub mod toggle; +pub mod toggle_group; +pub mod toolbar; +pub mod tooltip; +pub mod virtual_list; diff --git a/preview/src/components/menubar/component.json b/dioxus-kit/src/menubar/component.json similarity index 74% rename from preview/src/components/menubar/component.json rename to dioxus-kit/src/menubar/component.json index 4e68e7c24..1d732a399 100644 --- a/preview/src/components/menubar/component.json +++ b/dioxus-kit/src/menubar/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/menubar/component.rs b/dioxus-kit/src/menubar/component.rs similarity index 95% rename from preview/src/components/menubar/component.rs rename to dioxus-kit/src/menubar/component.rs index 7fac3b4c9..6a451123f 100644 --- a/preview/src/components/menubar/component.rs +++ b/dioxus-kit/src/menubar/component.rs @@ -1,9 +1,9 @@ use dioxus::prelude::*; -use dioxus_primitives::menubar::{ +use dioxus_kit_core::menubar::{ self, MenubarContentProps, MenubarItemProps, MenubarMenuProps, MenubarProps, MenubarTriggerProps, }; -#[css_module("/src/components/menubar/style.css")] +#[css_module("/src/menubar/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/menubar/mod.rs b/dioxus-kit/src/menubar/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/menubar/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/menubar/style.css b/dioxus-kit/src/menubar/style.css similarity index 100% rename from preview/src/components/menubar/style.css rename to dioxus-kit/src/menubar/style.css diff --git a/preview/src/components/navbar/component.json b/dioxus-kit/src/navbar/component.json similarity index 91% rename from preview/src/components/navbar/component.json rename to dioxus-kit/src/navbar/component.json index dc525ee0f..2e63237bf 100644 --- a/preview/src/components/navbar/component.json +++ b/dioxus-kit/src/navbar/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components", "features": ["router"] }, diff --git a/preview/src/components/navbar/component.rs b/dioxus-kit/src/navbar/component.rs similarity index 96% rename from preview/src/components/navbar/component.rs rename to dioxus-kit/src/navbar/component.rs index 0f12fb7f9..01496f0f4 100644 --- a/preview/src/components/navbar/component.rs +++ b/dioxus-kit/src/navbar/component.rs @@ -1,9 +1,9 @@ use dioxus::prelude::*; use dioxus_icons::lucide::ChevronDown; -use dioxus_primitives::navbar::{ +use dioxus_kit_core::navbar::{ self, NavbarContentProps, NavbarItemProps, NavbarNavProps, NavbarProps, NavbarTriggerProps, }; -#[css_module("/src/components/navbar/style.css")] +#[css_module("/src/navbar/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/navbar/mod.rs b/dioxus-kit/src/navbar/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/navbar/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/navbar/style.css b/dioxus-kit/src/navbar/style.css similarity index 100% rename from preview/src/components/navbar/style.css rename to dioxus-kit/src/navbar/style.css diff --git a/preview/src/components/pagination/component.json b/dioxus-kit/src/pagination/component.json similarity index 82% rename from preview/src/components/pagination/component.json rename to dioxus-kit/src/pagination/component.json index 748ab7de8..9c7c66e55 100644 --- a/preview/src/components/pagination/component.json +++ b/dioxus-kit/src/pagination/component.json @@ -11,7 +11,7 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -20,6 +20,6 @@ } ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/pagination/component.rs b/dioxus-kit/src/pagination/component.rs similarity index 98% rename from preview/src/components/pagination/component.rs rename to dioxus-kit/src/pagination/component.rs index c53783a53..4d38bde9d 100644 --- a/preview/src/components/pagination/component.rs +++ b/dioxus-kit/src/pagination/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{ChevronLeft, ChevronRight, Ellipsis}; -#[css_module("/src/components/pagination/style.css")] +#[css_module("/src/pagination/style.css")] struct Styles; #[derive(Copy, Clone, PartialEq, Default)] diff --git a/dioxus-kit/src/pagination/mod.rs b/dioxus-kit/src/pagination/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/pagination/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/pagination/style.css b/dioxus-kit/src/pagination/style.css similarity index 100% rename from preview/src/components/pagination/style.css rename to dioxus-kit/src/pagination/style.css diff --git a/preview/src/components/popover/component.json b/dioxus-kit/src/popover/component.json similarity index 73% rename from preview/src/components/popover/component.json rename to dioxus-kit/src/popover/component.json index cdca62510..db54fb8fb 100644 --- a/preview/src/components/popover/component.json +++ b/dioxus-kit/src/popover/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/popover/component.rs b/dioxus-kit/src/popover/component.rs similarity index 85% rename from preview/src/components/popover/component.rs rename to dioxus-kit/src/popover/component.rs index a1a9efd06..f66bf229b 100644 --- a/preview/src/components/popover/component.rs +++ b/dioxus-kit/src/popover/component.rs @@ -1,10 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::popover::{ - self, PopoverContentProps, PopoverRootProps, PopoverTriggerProps, -}; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::popover::{self, PopoverContentProps, PopoverRootProps, PopoverTriggerProps}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/popover/style.css")] +#[css_module("/src/popover/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/popover/mod.rs b/dioxus-kit/src/popover/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/popover/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/popover/style.css b/dioxus-kit/src/popover/style.css similarity index 100% rename from preview/src/components/popover/style.css rename to dioxus-kit/src/popover/style.css diff --git a/preview/src/components/progress/component.json b/dioxus-kit/src/progress/component.json similarity index 73% rename from preview/src/components/progress/component.json rename to dioxus-kit/src/progress/component.json index dc631e7ba..43bf97b0b 100644 --- a/preview/src/components/progress/component.json +++ b/dioxus-kit/src/progress/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/progress/component.rs b/dioxus-kit/src/progress/component.rs similarity index 78% rename from preview/src/components/progress/component.rs rename to dioxus-kit/src/progress/component.rs index b290a0f02..5621c9bb1 100644 --- a/preview/src/components/progress/component.rs +++ b/dioxus-kit/src/progress/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::progress::{self, ProgressProps}; +use dioxus_kit_core::progress::{self, ProgressProps}; -#[css_module("/src/components/progress/style.css")] +#[css_module("/src/progress/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/progress/mod.rs b/dioxus-kit/src/progress/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/progress/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/progress/style.css b/dioxus-kit/src/progress/style.css similarity index 100% rename from preview/src/components/progress/style.css rename to dioxus-kit/src/progress/style.css diff --git a/preview/src/components/radio_group/component.json b/dioxus-kit/src/radio_group/component.json similarity index 75% rename from preview/src/components/radio_group/component.json rename to dioxus-kit/src/radio_group/component.json index 29f78c4a4..45a373220 100644 --- a/preview/src/components/radio_group/component.json +++ b/dioxus-kit/src/radio_group/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/radio_group/component.rs b/dioxus-kit/src/radio_group/component.rs similarity index 87% rename from preview/src/components/radio_group/component.rs rename to dioxus-kit/src/radio_group/component.rs index 210442299..7c9e211e6 100644 --- a/preview/src/components/radio_group/component.rs +++ b/dioxus-kit/src/radio_group/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::radio_group::{self, RadioGroupProps, RadioItemProps}; +use dioxus_kit_core::radio_group::{self, RadioGroupProps, RadioItemProps}; -#[css_module("/src/components/radio_group/style.css")] +#[css_module("/src/radio_group/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/radio_group/mod.rs b/dioxus-kit/src/radio_group/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/radio_group/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/radio_group/style.css b/dioxus-kit/src/radio_group/style.css similarity index 100% rename from preview/src/components/radio_group/style.css rename to dioxus-kit/src/radio_group/style.css diff --git a/preview/src/components/scroll_area/component.json b/dioxus-kit/src/scroll_area/component.json similarity index 73% rename from preview/src/components/scroll_area/component.json rename to dioxus-kit/src/scroll_area/component.json index 3ddf5231a..66bf48c75 100644 --- a/preview/src/components/scroll_area/component.json +++ b/dioxus-kit/src/scroll_area/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/scroll_area/component.rs b/dioxus-kit/src/scroll_area/component.rs similarity index 68% rename from preview/src/components/scroll_area/component.rs rename to dioxus-kit/src/scroll_area/component.rs index 5e3c37d0e..2aed16796 100644 --- a/preview/src/components/scroll_area/component.rs +++ b/dioxus-kit/src/scroll_area/component.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use dioxus_primitives::scroll_area::{self, ScrollAreaProps}; +use dioxus_kit_core::scroll_area::{self, ScrollAreaProps}; #[component] pub fn ScrollArea(props: ScrollAreaProps) -> Element { diff --git a/dioxus-kit/src/scroll_area/mod.rs b/dioxus-kit/src/scroll_area/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/scroll_area/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/scroll_area/style.css b/dioxus-kit/src/scroll_area/style.css similarity index 100% rename from preview/src/components/scroll_area/style.css rename to dioxus-kit/src/scroll_area/style.css diff --git a/preview/src/components/select/component.json b/dioxus-kit/src/select/component.json similarity index 78% rename from preview/src/components/select/component.json rename to dioxus-kit/src/select/component.json index e95d7cb18..a121dd6bc 100644 --- a/preview/src/components/select/component.json +++ b/dioxus-kit/src/select/component.json @@ -5,7 +5,7 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -13,5 +13,5 @@ "version": "0.1.0" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/select/component.rs b/dioxus-kit/src/select/component.rs similarity index 83% rename from preview/src/components/select/component.rs rename to dioxus-kit/src/select/component.rs index db4677c5e..47941f2d2 100644 --- a/preview/src/components/select/component.rs +++ b/dioxus-kit/src/select/component.rs @@ -1,18 +1,19 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{Check, ChevronDown}; -use dioxus_primitives::select::{ +use dioxus_kit_core::select::{ self, SelectGroupLabelProps, SelectMultiProps, SelectOptionProps, SelectProps, }; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -pub use dioxus_primitives::select::SelectGroup; +pub use dioxus_kit_core::select::SelectGroup; -#[css_module("/src/components/select/style.css")] +#[css_module("/src/select/style.css")] +#[allow(dead_code)] struct Styles; #[component] pub fn Select(props: SelectProps) -> Element { - let base = attributes!(div { class: Styles::dx_select }); + let base = attributes!(div { class: "dx-select" }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { @@ -29,7 +30,7 @@ pub fn Select(props: SelectProps) -> Element typeahead_timeout: props.typeahead_timeout, attributes: merged, select::SelectTrigger { - class: Styles::dx_select_trigger, + class: "dx-select-trigger", select::SelectValue {} ChevronDown { class: "dx-select-expand-icon", @@ -38,7 +39,7 @@ pub fn Select(props: SelectProps) -> Element } } select::SelectList { - class: Styles::dx_select_list, + class: "dx-select-list", {props.children} } } @@ -47,7 +48,7 @@ pub fn Select(props: SelectProps) -> Element #[component] pub fn SelectMulti(props: SelectMultiProps) -> Element { - let base = attributes!(div { class: Styles::dx_select }); + let base = attributes!(div { class: "dx-select" }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { @@ -64,7 +65,7 @@ pub fn SelectMulti(props: SelectMultiProps) - typeahead_timeout: props.typeahead_timeout, attributes: merged, select::SelectTrigger { - class: Styles::dx_select_trigger, + class: "dx-select-trigger", select::SelectValue {} ChevronDown { class: "dx-select-expand-icon", @@ -73,7 +74,7 @@ pub fn SelectMulti(props: SelectMultiProps) - } } select::SelectList { - class: Styles::dx_select_list, + class: "dx-select-list", {props.children} } } @@ -82,7 +83,9 @@ pub fn SelectMulti(props: SelectMultiProps) - #[component] pub fn SelectGroupLabel(props: SelectGroupLabelProps) -> Element { - let base = attributes!(div { class: Styles::dx_select_group_label }); + let base = attributes!(div { + class: "dx-select-group-label" + }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { @@ -96,7 +99,9 @@ pub fn SelectGroupLabel(props: SelectGroupLabelProps) -> Element { #[component] pub fn SelectOption(props: SelectOptionProps) -> Element { - let base = attributes!(div { class: Styles::dx_select_option }); + let base = attributes!(div { + class: "dx-select-option" + }); let merged = merge_attributes(vec![base, props.attributes]); rsx! { diff --git a/dioxus-kit/src/select/mod.rs b/dioxus-kit/src/select/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/select/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/select/style.css b/dioxus-kit/src/select/style.css similarity index 76% rename from preview/src/components/select/style.css rename to dioxus-kit/src/select/style.css index 333851421..5cd3e4c4a 100644 --- a/preview/src/components/select/style.css +++ b/dioxus-kit/src/select/style.css @@ -1,8 +1,8 @@ -.dx-select { +:global(.dx-select) { position: relative; } -.dx-select-trigger { +:global(.dx-select-trigger) { display: flex; box-sizing: border-box; flex-direction: row; @@ -21,27 +21,27 @@ transition: background-color 100ms ease-out; } -.dx-select-trigger:hover:not([data-disabled="true"]), -.dx-select-trigger:focus-visible { +:global(.dx-select-trigger):hover:not([data-disabled="true"]), +:global(.dx-select-trigger):focus-visible { background: var(--light, var(--primary-color-4)) var(--dark, var(--primary-color-5)); color: var(--secondary-color-1); } -.dx-select-trigger span[data-placeholder="true"] { +:global(.dx-select-trigger) span[data-placeholder="true"] { color: var(--secondary-color-5); } -.dx-select[data-state="open"] .dx-select-trigger { +:global(.dx-select)[data-state="open"] :global(.dx-select-trigger) { pointer-events: none; } -.dx-select[data-disabled="true"] .dx-select-trigger { +:global(.dx-select)[data-disabled="true"] :global(.dx-select-trigger) { color: var(--secondary-color-5); cursor: not-allowed; opacity: 0.5; } -.dx-select-list { +:global(.dx-select-list) { position: absolute; z-index: 1000; top: 100%; @@ -60,12 +60,12 @@ will-change: transform, opacity; } -.dx-select-list[data-state="open"] { +:global(.dx-select-list)[data-state="open"] { animation: dx-picker-in 150ms ease-out forwards; pointer-events: auto; } -.dx-select-list[data-state="closed"] { +:global(.dx-select-list)[data-state="closed"] { animation: dx-picker-out 100ms ease-in forwards; pointer-events: none; } @@ -94,7 +94,7 @@ } } -.dx-select-option { +:global(.dx-select-option) { display: flex; align-items: center; justify-content: space-between; @@ -106,20 +106,20 @@ user-select: none; } -.dx-select-option:hover:not([data-disabled="true"]), -.dx-select-option:focus-visible { +:global(.dx-select-option):hover:not([data-disabled="true"]), +:global(.dx-select-option):focus-visible { background: var(--light, var(--primary-color-4)) var(--dark, var(--primary-color-7)); color: var(--secondary-color-1); } -.dx-select-option[data-disabled="true"] { +:global(.dx-select-option)[data-disabled="true"] { color: var(--secondary-color-5); cursor: not-allowed; opacity: 0.5; pointer-events: none; } -.dx-select-group-label { +:global(.dx-select-group-label) { padding: 4px 12px; color: var(--secondary-color-5); font-size: 0.75rem; diff --git a/preview/src/components/separator/component.json b/dioxus-kit/src/separator/component.json similarity index 75% rename from preview/src/components/separator/component.json rename to dioxus-kit/src/separator/component.json index 64505e330..9d8f24ae7 100644 --- a/preview/src/components/separator/component.json +++ b/dioxus-kit/src/separator/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/separator/component.rs b/dioxus-kit/src/separator/component.rs similarity index 71% rename from preview/src/components/separator/component.rs rename to dioxus-kit/src/separator/component.rs index 394447941..56d0f374a 100644 --- a/preview/src/components/separator/component.rs +++ b/dioxus-kit/src/separator/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::separator::{self, SeparatorProps}; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::separator::{self, SeparatorProps}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/separator/style.css")] +#[css_module("/src/separator/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/separator/mod.rs b/dioxus-kit/src/separator/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/separator/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/separator/style.css b/dioxus-kit/src/separator/style.css similarity index 100% rename from preview/src/components/separator/style.css rename to dioxus-kit/src/separator/style.css diff --git a/preview/src/components/sheet/component.json b/dioxus-kit/src/sheet/component.json similarity index 83% rename from preview/src/components/sheet/component.json rename to dioxus-kit/src/sheet/component.json index 947269a37..064b3703d 100644 --- a/preview/src/components/sheet/component.json +++ b/dioxus-kit/src/sheet/component.json @@ -11,7 +11,7 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -20,6 +20,6 @@ } ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/sheet/component.rs b/dioxus-kit/src/sheet/component.rs similarity index 92% rename from preview/src/components/sheet/component.rs rename to dioxus-kit/src/sheet/component.rs index d7b383fc0..834b1768b 100644 --- a/preview/src/components/sheet/component.rs +++ b/dioxus-kit/src/sheet/component.rs @@ -1,12 +1,12 @@ use dioxus::prelude::*; use dioxus_icons::lucide::X; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::dialog::{ +use dioxus_kit_core::dialog::{ self, DialogCtx, DialogDescriptionProps, DialogRootProps, DialogTitleProps, }; -use dioxus_primitives::merge_attributes; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; -#[css_module("/src/components/sheet/style.css")] +#[css_module("/src/sheet/style.css")] struct Styles; #[derive(Debug, Clone, Copy, Default, PartialEq)] @@ -57,7 +57,9 @@ pub fn Sheet(props: DialogRootProps) -> Element { } #[component] -pub fn SheetContentClose(#[props(extends = GlobalAttributes)] attributes: Vec) -> Element { +pub fn SheetContentClose( + #[props(extends = GlobalAttributes)] attributes: Vec, +) -> Element { let base = attributes!(button { class: Styles::dx_sheet_close, }); diff --git a/dioxus-kit/src/sheet/mod.rs b/dioxus-kit/src/sheet/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/sheet/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/sheet/style.css b/dioxus-kit/src/sheet/style.css similarity index 100% rename from preview/src/components/sheet/style.css rename to dioxus-kit/src/sheet/style.css diff --git a/preview/src/components/sidebar/component.json b/dioxus-kit/src/sidebar/component.json similarity index 87% rename from preview/src/components/sidebar/component.json rename to dioxus-kit/src/sidebar/component.json index 195a7e533..220416df5 100644 --- a/preview/src/components/sidebar/component.json +++ b/dioxus-kit/src/sidebar/component.json @@ -11,7 +11,7 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" }, { @@ -27,6 +27,6 @@ "tooltip" ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/sidebar/component.rs b/dioxus-kit/src/sidebar/component.rs similarity index 96% rename from preview/src/components/sidebar/component.rs rename to dioxus-kit/src/sidebar/component.rs index 365c11519..93c730e66 100644 --- a/preview/src/components/sidebar/component.rs +++ b/dioxus-kit/src/sidebar/component.rs @@ -1,18 +1,18 @@ -use crate::components::button::{Button, ButtonVariant}; -use crate::components::separator::Separator; -use crate::components::sheet::{ +use crate::button::{Button, ButtonVariant}; +use crate::separator::Separator; +use crate::sheet::{ Sheet, SheetContentClose, SheetDescription, SheetHeader, SheetSide, SheetTitle, }; -use crate::components::skeleton::Skeleton; -use crate::components::tooltip::{Tooltip, TooltipContent, TooltipTrigger}; +use crate::skeleton::Skeleton; +use crate::tooltip::{Tooltip, TooltipContent, TooltipTrigger}; use dioxus::core::use_drop; use dioxus::prelude::*; use dioxus_icons::lucide::PanelLeft; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::merge_attributes; -use dioxus_primitives::use_controlled; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; +use dioxus_kit_core::use_controlled; -#[css_module("/src/components/sidebar/style.css")] +#[css_module("/src/sidebar/style.css")] struct Styles; // constants @@ -301,7 +301,7 @@ pub fn Sidebar( "data-slot": "sidebar", "data-mobile": "true", SheetContentClose { class: Styles::dx_sidebar_sheet_close } - SheetHeader { class: Styles::dx_sr_only, + SheetHeader { class: "dx-sr-only", SheetTitle { "Sidebar" } SheetDescription { "Displays the mobile sidebar." } } @@ -374,7 +374,7 @@ pub fn SidebarTrigger( class: Styles::dx_sidebar_trigger_icon, size: "1rem", } - span { class: Styles::dx_sr_only, "Toggle Sidebar" } + span { class: "dx-sr-only", "Toggle Sidebar" } } } } @@ -686,8 +686,8 @@ pub fn SidebarMenuButton( } TooltipContent { side: match sidebar_side() { - SidebarSide::Left => dioxus_primitives::ContentSide::Right, - SidebarSide::Right => dioxus_primitives::ContentSide::Left, + SidebarSide::Left => dioxus_kit_core::ContentSide::Right, + SidebarSide::Right => dioxus_kit_core::ContentSide::Left, }, {tooltip_content} } diff --git a/dioxus-kit/src/sidebar/mod.rs b/dioxus-kit/src/sidebar/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/sidebar/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/sidebar/style.css b/dioxus-kit/src/sidebar/style.css similarity index 94% rename from preview/src/components/sidebar/style.css rename to dioxus-kit/src/sidebar/style.css index 1f867bd5b..bb43b8fc4 100644 --- a/preview/src/components/sidebar/style.css +++ b/dioxus-kit/src/sidebar/style.css @@ -1,5 +1,5 @@ /* TODO: abstract as Utilitiy class */ -.dx-sr-only { +:global(.dx-sr-only) { position: absolute; overflow: hidden; width: 1px; @@ -422,13 +422,13 @@ list-style: none; } -.dx-sidebar-menu .dx-sidebar-dropdown-menu, +.dx-sidebar-menu :global(.dx-sidebar-dropdown-menu), .dx-sidebar-menu .dx-sidebar-tooltip { display: block; width: 100%; } -.dx-sidebar-dropdown-menu-content .dx-sidebar-dropdown-separator[data-orientation="horizontal"] { +:global(.dx-sidebar-dropdown-menu-content) :global(.dx-sidebar-dropdown-separator)[data-orientation="horizontal"] { margin: 0.25rem 0; } @@ -436,41 +436,41 @@ position: relative; } -.dx-sidebar-menu-item > .dx-sidebar-dropdown-menu:has(.dx-sidebar-menu-action) { +.dx-sidebar-menu-item > :global(.dx-sidebar-dropdown-menu):has(.dx-sidebar-menu-action) { position: static; } -.dx-sidebar-header .dx-sidebar-menu-button.dx-sidebar-dropdown-menu-trigger:not(:focus-visible), -.dx-sidebar-footer .dx-sidebar-menu-button.dx-sidebar-dropdown-menu-trigger:not(:focus-visible) { +.dx-sidebar-header .dx-sidebar-menu-button:global(.dx-sidebar-dropdown-menu-trigger):not(:focus-visible), +.dx-sidebar-footer .dx-sidebar-menu-button:global(.dx-sidebar-dropdown-menu-trigger):not(:focus-visible) { box-shadow: none; } -.dx-sidebar-sheet .dx-sidebar-header .dx-sidebar-dropdown-menu-content { +.dx-sidebar-sheet .dx-sidebar-header :global(.dx-sidebar-dropdown-menu-content) { margin-top: 4px; margin-bottom: 0; inset: 100% auto auto 0; } -.dx-sidebar-sheet .dx-sidebar-footer .dx-sidebar-dropdown-menu-content { +.dx-sidebar-sheet .dx-sidebar-footer :global(.dx-sidebar-dropdown-menu-content) { margin-top: 0; margin-bottom: 4px; inset: auto auto 100% 0; } -.dx-sidebar-menu-button.dx-sidebar-collapsible-trigger:hover { +.dx-sidebar-menu-button:global(.dx-sidebar-collapsible-trigger):hover { text-decoration: none; text-decoration-line: none; } @media (width >= 768px) { - .dx-sidebar-desktop[data-side="left"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) .dx-sidebar-dropdown-menu-content { + .dx-sidebar-desktop[data-side="left"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) :global(.dx-sidebar-dropdown-menu-content) { top: 0; left: 100%; margin-top: 0; margin-left: 0.5rem; } - .dx-sidebar-desktop[data-side="left"] .dx-sidebar-footer .dx-sidebar-dropdown-menu-content { + .dx-sidebar-desktop[data-side="left"] .dx-sidebar-footer :global(.dx-sidebar-dropdown-menu-content) { top: auto; bottom: 0; left: 100%; @@ -478,7 +478,7 @@ margin-left: 0.5rem; } - .dx-sidebar-desktop[data-side="right"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) .dx-sidebar-dropdown-menu-content { + .dx-sidebar-desktop[data-side="right"] :is(.dx-sidebar-header, .dx-sidebar-menu-item:has(.dx-sidebar-menu-action)) :global(.dx-sidebar-dropdown-menu-content) { top: 0; right: 100%; left: auto; @@ -486,7 +486,7 @@ margin-right: 0.5rem; } - .dx-sidebar-desktop[data-side="right"] .dx-sidebar-footer .dx-sidebar-dropdown-menu-content { + .dx-sidebar-desktop[data-side="right"] .dx-sidebar-footer :global(.dx-sidebar-dropdown-menu-content) { margin-right: 0.5rem; margin-bottom: 0; inset: auto 100% 0 auto; diff --git a/preview/src/components/skeleton/component.json b/dioxus-kit/src/skeleton/component.json similarity index 80% rename from preview/src/components/skeleton/component.json rename to dioxus-kit/src/skeleton/component.json index 22912942e..acb0e69b4 100644 --- a/preview/src/components/skeleton/component.json +++ b/dioxus-kit/src/skeleton/component.json @@ -11,11 +11,11 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/skeleton/component.rs b/dioxus-kit/src/skeleton/component.rs similarity index 72% rename from preview/src/components/skeleton/component.rs rename to dioxus-kit/src/skeleton/component.rs index 1b7e8e4c8..0b18347ab 100644 --- a/preview/src/components/skeleton/component.rs +++ b/dioxus-kit/src/skeleton/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/skeleton/style.css")] +#[css_module("/src/skeleton/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/skeleton/mod.rs b/dioxus-kit/src/skeleton/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/skeleton/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/skeleton/style.css b/dioxus-kit/src/skeleton/style.css similarity index 100% rename from preview/src/components/skeleton/style.css rename to dioxus-kit/src/skeleton/style.css diff --git a/preview/src/components/slider/component.json b/dioxus-kit/src/slider/component.json similarity index 72% rename from preview/src/components/slider/component.json rename to dioxus-kit/src/slider/component.json index cc9493eaf..c68db175b 100644 --- a/preview/src/components/slider/component.json +++ b/dioxus-kit/src/slider/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/slider/component.rs b/dioxus-kit/src/slider/component.rs similarity index 93% rename from preview/src/components/slider/component.rs rename to dioxus-kit/src/slider/component.rs index a1bfea93e..47ad8eac9 100644 --- a/preview/src/components/slider/component.rs +++ b/dioxus-kit/src/slider/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::slider::{self, RangeSliderProps, SliderProps}; +use dioxus_kit_core::slider::{self, RangeSliderProps, SliderProps}; -#[css_module("/src/components/slider/style.css")] +#[css_module("/src/slider/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/slider/mod.rs b/dioxus-kit/src/slider/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/slider/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/slider/style.css b/dioxus-kit/src/slider/style.css similarity index 100% rename from preview/src/components/slider/style.css rename to dioxus-kit/src/slider/style.css diff --git a/preview/src/components/switch/component.json b/dioxus-kit/src/switch/component.json similarity index 72% rename from preview/src/components/switch/component.json rename to dioxus-kit/src/switch/component.json index 6a9229cfc..b96af9a07 100644 --- a/preview/src/components/switch/component.json +++ b/dioxus-kit/src/switch/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/switch/component.rs b/dioxus-kit/src/switch/component.rs similarity index 85% rename from preview/src/components/switch/component.rs rename to dioxus-kit/src/switch/component.rs index fe74182b5..41751e7d5 100644 --- a/preview/src/components/switch/component.rs +++ b/dioxus-kit/src/switch/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::switch::{self, SwitchProps}; +use dioxus_kit_core::switch::{self, SwitchProps}; -#[css_module("/src/components/switch/style.css")] +#[css_module("/src/switch/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/switch/mod.rs b/dioxus-kit/src/switch/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/switch/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/switch/style.css b/dioxus-kit/src/switch/style.css similarity index 90% rename from preview/src/components/switch/style.css rename to dioxus-kit/src/switch/style.css index 50da8a764..1e0998227 100644 --- a/preview/src/components/switch/style.css +++ b/dioxus-kit/src/switch/style.css @@ -1,10 +1,3 @@ -.dx-switch-example { - display: flex; - align-items: center; - padding: 20px; - gap: 15px; -} - .dx-switch { all: unset; position: relative; diff --git a/preview/src/components/tabs/component.json b/dioxus-kit/src/tabs/component.json similarity index 72% rename from preview/src/components/tabs/component.json rename to dioxus-kit/src/tabs/component.json index 2676e568a..b745901c4 100644 --- a/preview/src/components/tabs/component.json +++ b/dioxus-kit/src/tabs/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/tabs/component.rs b/dioxus-kit/src/tabs/component.rs similarity index 94% rename from preview/src/components/tabs/component.rs rename to dioxus-kit/src/tabs/component.rs index 98169dc87..70e71d7f0 100644 --- a/preview/src/components/tabs/component.rs +++ b/dioxus-kit/src/tabs/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::tabs::{self, TabContentProps, TabListProps, TabTriggerProps}; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::tabs::{self, TabContentProps, TabListProps, TabTriggerProps}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/tabs/style.css")] +#[css_module("/src/tabs/style.css")] struct Styles; /// The props for the [`Tabs`] component. diff --git a/dioxus-kit/src/tabs/mod.rs b/dioxus-kit/src/tabs/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/tabs/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/tabs/style.css b/dioxus-kit/src/tabs/style.css similarity index 100% rename from preview/src/components/tabs/style.css rename to dioxus-kit/src/tabs/style.css diff --git a/preview/src/components/textarea/component.json b/dioxus-kit/src/textarea/component.json similarity index 81% rename from preview/src/components/textarea/component.json rename to dioxus-kit/src/textarea/component.json index 28910c4bd..3ae8a435a 100644 --- a/preview/src/components/textarea/component.json +++ b/dioxus-kit/src/textarea/component.json @@ -11,11 +11,11 @@ ], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], "globalAssets": [ - "../../../assets/dx-components-theme.css" + "../../assets/dx-components-theme.css" ] } diff --git a/preview/src/components/textarea/component.rs b/dioxus-kit/src/textarea/component.rs similarity index 98% rename from preview/src/components/textarea/component.rs rename to dioxus-kit/src/textarea/component.rs index 56021b055..efd53666e 100644 --- a/preview/src/components/textarea/component.rs +++ b/dioxus-kit/src/textarea/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; -#[css_module("/src/components/textarea/style.css")] +#[css_module("/src/textarea/style.css")] struct Styles; #[derive(Copy, Clone, PartialEq, Default)] diff --git a/dioxus-kit/src/textarea/mod.rs b/dioxus-kit/src/textarea/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/textarea/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/textarea/style.css b/dioxus-kit/src/textarea/style.css similarity index 100% rename from preview/src/components/textarea/style.css rename to dioxus-kit/src/textarea/style.css diff --git a/preview/src/components/toast/component.json b/dioxus-kit/src/toast/component.json similarity index 72% rename from preview/src/components/toast/component.json rename to dioxus-kit/src/toast/component.json index d35884bf1..a9efb1e68 100644 --- a/preview/src/components/toast/component.json +++ b/dioxus-kit/src/toast/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/toast/component.rs b/dioxus-kit/src/toast/component.rs similarity index 96% rename from preview/src/components/toast/component.rs rename to dioxus-kit/src/toast/component.rs index d3109a0af..a912dfd4d 100644 --- a/preview/src/components/toast/component.rs +++ b/dioxus-kit/src/toast/component.rs @@ -1,11 +1,11 @@ use dioxus::prelude::*; -use dioxus_primitives::toast::{ +use dioxus_kit_core::toast::{ self, Toast, ToastCloseButtonProps, ToastContentProps, ToastDescriptionProps, ToastProps, ToastTitleProps, }; use std::time::Duration; -#[css_module("/src/components/toast/style.css")] +#[css_module("/src/toast/style.css")] struct Styles; #[component] @@ -103,7 +103,7 @@ pub fn ToastProvider( #[cfg(test)] mod tests { use super::*; - use dioxus_primitives::toast::{use_toast, ToastOptions}; + use dioxus_kit_core::toast::{use_toast, ToastOptions}; #[component] fn TriggerToast() -> Element { diff --git a/dioxus-kit/src/toast/mod.rs b/dioxus-kit/src/toast/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/toast/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/toast/style.css b/dioxus-kit/src/toast/style.css similarity index 100% rename from preview/src/components/toast/style.css rename to dioxus-kit/src/toast/style.css diff --git a/preview/src/components/toggle/component.json b/dioxus-kit/src/toggle/component.json similarity index 73% rename from preview/src/components/toggle/component.json rename to dioxus-kit/src/toggle/component.json index df42dffc8..b37f00566 100644 --- a/preview/src/components/toggle/component.json +++ b/dioxus-kit/src/toggle/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/toggle/component.rs b/dioxus-kit/src/toggle/component.rs similarity index 84% rename from preview/src/components/toggle/component.rs rename to dioxus-kit/src/toggle/component.rs index a35ca275f..13bcddda9 100644 --- a/preview/src/components/toggle/component.rs +++ b/dioxus-kit/src/toggle/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::toggle::{self, ToggleProps}; +use dioxus_kit_core::toggle::{self, ToggleProps}; -#[css_module("/src/components/toggle/style.css")] +#[css_module("/src/toggle/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/toggle/mod.rs b/dioxus-kit/src/toggle/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/toggle/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/toggle/style.css b/dioxus-kit/src/toggle/style.css similarity index 100% rename from preview/src/components/toggle/style.css rename to dioxus-kit/src/toggle/style.css diff --git a/preview/src/components/toggle_group/component.json b/dioxus-kit/src/toggle_group/component.json similarity index 75% rename from preview/src/components/toggle_group/component.json rename to dioxus-kit/src/toggle_group/component.json index 99d12e05a..69c65ddab 100644 --- a/preview/src/components/toggle_group/component.json +++ b/dioxus-kit/src/toggle_group/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/toggle_group/component.rs b/dioxus-kit/src/toggle_group/component.rs similarity index 87% rename from preview/src/components/toggle_group/component.rs rename to dioxus-kit/src/toggle_group/component.rs index c06c7ec3c..e8a749774 100644 --- a/preview/src/components/toggle_group/component.rs +++ b/dioxus-kit/src/toggle_group/component.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; -use dioxus_primitives::toggle_group::{self, ToggleGroupProps, ToggleItemProps}; +use dioxus_kit_core::toggle_group::{self, ToggleGroupProps, ToggleItemProps}; -#[css_module("/src/components/toggle_group/style.css")] +#[css_module("/src/toggle_group/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/toggle_group/mod.rs b/dioxus-kit/src/toggle_group/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/toggle_group/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/toggle_group/style.css b/dioxus-kit/src/toggle_group/style.css similarity index 100% rename from preview/src/components/toggle_group/style.css rename to dioxus-kit/src/toggle_group/style.css diff --git a/preview/src/components/toolbar/component.json b/dioxus-kit/src/toolbar/component.json similarity index 74% rename from preview/src/components/toolbar/component.json rename to dioxus-kit/src/toolbar/component.json index beee94a9b..96e8eadf0 100644 --- a/preview/src/components/toolbar/component.json +++ b/dioxus-kit/src/toolbar/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/toolbar/component.rs b/dioxus-kit/src/toolbar/component.rs similarity index 87% rename from preview/src/components/toolbar/component.rs rename to dioxus-kit/src/toolbar/component.rs index 82659277b..3bd927e9b 100644 --- a/preview/src/components/toolbar/component.rs +++ b/dioxus-kit/src/toolbar/component.rs @@ -1,8 +1,8 @@ use dioxus::prelude::*; -use dioxus_primitives::toolbar::{self, ToolbarButtonProps, ToolbarProps, ToolbarSeparatorProps}; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +use dioxus_kit_core::toolbar::{self, ToolbarButtonProps, ToolbarProps, ToolbarSeparatorProps}; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; -#[css_module("/src/components/toolbar/style.css")] +#[css_module("/src/toolbar/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/toolbar/mod.rs b/dioxus-kit/src/toolbar/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/toolbar/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/toolbar/style.css b/dioxus-kit/src/toolbar/style.css similarity index 100% rename from preview/src/components/toolbar/style.css rename to dioxus-kit/src/toolbar/style.css diff --git a/preview/src/components/tooltip/component.json b/dioxus-kit/src/tooltip/component.json similarity index 75% rename from preview/src/components/tooltip/component.json rename to dioxus-kit/src/tooltip/component.json index 931b65a6a..b9cf978b7 100644 --- a/preview/src/components/tooltip/component.json +++ b/dioxus-kit/src/tooltip/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/tooltip/component.rs b/dioxus-kit/src/tooltip/component.rs similarity index 85% rename from preview/src/components/tooltip/component.rs rename to dioxus-kit/src/tooltip/component.rs index fd69dc7af..e5ad59347 100644 --- a/preview/src/components/tooltip/component.rs +++ b/dioxus-kit/src/tooltip/component.rs @@ -1,9 +1,9 @@ use dioxus::prelude::*; -use dioxus_primitives::dioxus_attributes::attributes; -use dioxus_primitives::merge_attributes; -use dioxus_primitives::tooltip::{self, TooltipContentProps, TooltipProps, TooltipTriggerProps}; +use dioxus_kit_core::dioxus_attributes::attributes; +use dioxus_kit_core::merge_attributes; +use dioxus_kit_core::tooltip::{self, TooltipContentProps, TooltipProps, TooltipTriggerProps}; -#[css_module("/src/components/tooltip/style.css")] +#[css_module("/src/tooltip/style.css")] struct Styles; #[component] diff --git a/dioxus-kit/src/tooltip/mod.rs b/dioxus-kit/src/tooltip/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/tooltip/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/tooltip/style.css b/dioxus-kit/src/tooltip/style.css similarity index 100% rename from preview/src/components/tooltip/style.css rename to dioxus-kit/src/tooltip/style.css diff --git a/preview/src/components/virtual_list/component.json b/dioxus-kit/src/virtual_list/component.json similarity index 75% rename from preview/src/components/virtual_list/component.json rename to dioxus-kit/src/virtual_list/component.json index ce029f215..94a8fcae0 100644 --- a/preview/src/components/virtual_list/component.json +++ b/dioxus-kit/src/virtual_list/component.json @@ -5,9 +5,9 @@ "exclude": ["variants", "docs.md", "component.json"], "cargoDependencies": [ { - "name": "dioxus-primitives", + "name": "dioxus-kit-core", "git": "https://github.com/DioxusLabs/components" } ], - "globalAssets": ["../../../assets/dx-components-theme.css"] + "globalAssets": ["../../assets/dx-components-theme.css"] } diff --git a/preview/src/components/virtual_list/component.rs b/dioxus-kit/src/virtual_list/component.rs similarity index 73% rename from preview/src/components/virtual_list/component.rs rename to dioxus-kit/src/virtual_list/component.rs index e33a80a21..f7a36dc3d 100644 --- a/preview/src/components/virtual_list/component.rs +++ b/dioxus-kit/src/virtual_list/component.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; -pub use dioxus_primitives::virtual_list::VirtualListProps; -use dioxus_primitives::{dioxus_attributes::attributes, merge_attributes}; +pub use dioxus_kit_core::virtual_list::VirtualListProps; +use dioxus_kit_core::{dioxus_attributes::attributes, merge_attributes}; /// Styled wrapper around the primitive `VirtualList`. #[component] @@ -11,7 +11,7 @@ pub fn VirtualList(props: VirtualListProps) -> Element { let merged = merge_attributes(vec![base, props.attributes]); rsx! { - dioxus_primitives::virtual_list::VirtualList { + dioxus_kit_core::virtual_list::VirtualList { count: props.count, buffer: props.buffer, estimate_size: props.estimate_size, diff --git a/dioxus-kit/src/virtual_list/mod.rs b/dioxus-kit/src/virtual_list/mod.rs new file mode 100644 index 000000000..2590c0132 --- /dev/null +++ b/dioxus-kit/src/virtual_list/mod.rs @@ -0,0 +1,2 @@ +mod component; +pub use component::*; diff --git a/preview/src/components/virtual_list/style.css b/dioxus-kit/src/virtual_list/style.css similarity index 100% rename from preview/src/components/virtual_list/style.css rename to dioxus-kit/src/virtual_list/style.css diff --git a/preview/Cargo.toml b/preview/Cargo.toml index 240a3afe1..2eb2dc473 100644 --- a/preview/Cargo.toml +++ b/preview/Cargo.toml @@ -8,7 +8,8 @@ rust-version = "1.88.0" dioxus = { workspace = true, features = ["router"] } dioxus-code = { version = "0.1.0", default-features = false, features = ["macro", "lang-css"] } dioxus-icons = "0.1.0" -dioxus-primitives.workspace = true +dioxus-kit-core.workspace = true +dioxus-kit.workspace = true dioxus-i18n = { git = "https://github.com/ealmloff/dioxus-i18n", branch = "bump-dioxus" } palette = "0.7.6" unic-langid = { version = "0.9", features = ["macros"] } @@ -28,7 +29,7 @@ serde_json = "1" dioxus-ssr = "0.7.0" [features] -web = ["dioxus/web", "dioxus-primitives/web"] +web = ["dioxus/web", "dioxus-kit-core/web", "dioxus-kit/web"] desktop = ["dioxus/desktop"] fullstack = ["dioxus/fullstack"] server = ["dioxus/server", "dioxus/fullstack"] diff --git a/preview/build.rs b/preview/build.rs index bf2d168cf..3abaca304 100644 --- a/preview/build.rs +++ b/preview/build.rs @@ -4,6 +4,20 @@ fn main() { let out_dir = std::env::var("OUT_DIR").unwrap(); let out_dir = std::path::PathBuf::from(out_dir); println!("cargo:rerun-if-changed=src/components"); + println!("cargo:rerun-if-changed=../dioxus-kit/src"); + + // Component docs live in preview, while component metadata lives with the + // styled component crate so it can be packaged by the CLI. + for folder in std::fs::read_dir("../dioxus-kit/src").unwrap().flatten() { + if !folder.file_type().unwrap().is_dir() { + continue; + } + let component_json = folder.path().join("component.json"); + if component_json.exists() { + write_component_description(&component_json, &out_dir).unwrap(); + } + } + // Process all markdown files in each component folder. for folder in std::fs::read_dir("src/components").unwrap().flatten() { if !folder.file_type().unwrap().is_dir() { @@ -33,15 +47,28 @@ fn walk_markdown_dir(dir: &std::path::Path, out_dir: &std::path::Path) -> std::i std::fs::write(out_file_path, markdown).unwrap(); continue; } - if file.file_name() == "component.json" { - let description = read_component_description(&file.path()); - let out_file_path = out_folder.join("description.txt"); - std::fs::write(out_file_path, description).unwrap(); - } } Ok(()) } +fn write_component_description( + component_json_path: &std::path::Path, + out_dir: &std::path::Path, +) -> std::io::Result<()> { + println!("cargo:rerun-if-changed={}", component_json_path.display()); + let component_name = component_json_path + .parent() + .and_then(std::path::Path::file_name) + .expect("component metadata must be in a component directory"); + let out_folder = out_dir.join(component_name); + std::fs::create_dir_all(&out_folder)?; + let out_file_path = out_folder.join("description.txt"); + std::fs::write( + out_file_path, + read_component_description(component_json_path), + ) +} + fn process_markdown_to_html(markdown_path: &std::path::Path) -> String { println!("cargo:rerun-if-changed={}", markdown_path.display()); use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag, TagEnd}; diff --git a/preview/src/components/accordion/mod.rs b/preview/src/components/accordion/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/accordion/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/alert_dialog/mod.rs b/preview/src/components/alert_dialog/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/alert_dialog/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/aspect_ratio/component.rs b/preview/src/components/aspect_ratio/component.rs deleted file mode 100644 index df3dd709e..000000000 --- a/preview/src/components/aspect_ratio/component.rs +++ /dev/null @@ -1,7 +0,0 @@ -use dioxus::prelude::*; -use dioxus_primitives::aspect_ratio::AspectRatioProps; - -#[component] -pub fn AspectRatio(props: AspectRatioProps) -> Element { - dioxus_primitives::aspect_ratio::AspectRatio(props) -} diff --git a/preview/src/components/aspect_ratio/mod.rs b/preview/src/components/aspect_ratio/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/aspect_ratio/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/aspect_ratio/style.css b/preview/src/components/aspect_ratio/style.css deleted file mode 100644 index 5501a570b..000000000 --- a/preview/src/components/aspect_ratio/style.css +++ /dev/null @@ -1,12 +0,0 @@ -.dx-aspect-ratio-container { - overflow: hidden; - box-sizing: border-box; - padding: 1rem; - border-radius: .5rem; -} - -.dx-aspect-ratio-image { - width: 100%; - height: 100%; - object-fit: cover; -} diff --git a/preview/src/components/aspect_ratio/variants/main/demo.css b/preview/src/components/aspect_ratio/variants/main/demo.css new file mode 100644 index 000000000..a55ed2634 --- /dev/null +++ b/preview/src/components/aspect_ratio/variants/main/demo.css @@ -0,0 +1,6 @@ +.dx-aspect-ratio-container { + overflow: hidden; + box-sizing: border-box; + padding: 1rem; + border-radius: 0.5rem; +} diff --git a/preview/src/components/aspect_ratio/variants/main/mod.rs b/preview/src/components/aspect_ratio/variants/main/mod.rs index ab880b918..7886f91c9 100644 --- a/preview/src/components/aspect_ratio/variants/main/mod.rs +++ b/preview/src/components/aspect_ratio/variants/main/mod.rs @@ -1,7 +1,7 @@ use super::super::component::AspectRatio; use dioxus::prelude::*; -#[css_module("/src/components/aspect_ratio/style.css")] +#[css_module("/src/components/aspect_ratio/variants/main/demo.css")] struct Styles; #[component] diff --git a/preview/src/components/avatar/mod.rs b/preview/src/components/avatar/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/avatar/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/avatar/variants/main/demo.css b/preview/src/components/avatar/variants/main/demo.css new file mode 100644 index 000000000..42ce50bbc --- /dev/null +++ b/preview/src/components/avatar/variants/main/demo.css @@ -0,0 +1,12 @@ +.dx-avatar-item { + display: flex; + flex-direction: column; + align-items: center; + gap: 0.5rem; +} + +.dx-avatar-label { + margin: 0; + color: var(--secondary-color-4); + font-size: 0.875rem; +} diff --git a/preview/src/components/avatar/variants/main/mod.rs b/preview/src/components/avatar/variants/main/mod.rs index 4556237a3..3a03573a0 100644 --- a/preview/src/components/avatar/variants/main/mod.rs +++ b/preview/src/components/avatar/variants/main/mod.rs @@ -1,7 +1,7 @@ use super::super::component::*; use dioxus::prelude::*; -#[css_module("/src/components/avatar/style.css")] +#[css_module("/src/components/avatar/variants/main/demo.css")] struct Styles; // Keep this request pending so the example uses the real avatar loading state. diff --git a/preview/src/components/badge/mod.rs b/preview/src/components/badge/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/badge/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/badge/variants/main/demo.css b/preview/src/components/badge/variants/main/demo.css new file mode 100644 index 000000000..1931b3b57 --- /dev/null +++ b/preview/src/components/badge/variants/main/demo.css @@ -0,0 +1,5 @@ +.dx-badge-example { + display: flex; + align-items: center; + gap: 1rem; +} diff --git a/preview/src/components/badge/variants/main/mod.rs b/preview/src/components/badge/variants/main/mod.rs index de2f49989..42d501833 100644 --- a/preview/src/components/badge/variants/main/mod.rs +++ b/preview/src/components/badge/variants/main/mod.rs @@ -2,7 +2,7 @@ use dioxus::prelude::*; use super::super::component::*; -#[css_module("/src/components/badge/style.css")] +#[css_module("/src/components/badge/variants/main/demo.css")] struct Styles; #[component] diff --git a/preview/src/components/button/mod.rs b/preview/src/components/button/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/button/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/calendar/mod.rs b/preview/src/components/calendar/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/calendar/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/calendar/variants/multi_month/mod.rs b/preview/src/components/calendar/variants/multi_month/mod.rs index f41a5313c..f53df101b 100644 --- a/preview/src/components/calendar/variants/multi_month/mod.rs +++ b/preview/src/components/calendar/variants/multi_month/mod.rs @@ -2,7 +2,7 @@ use super::super::component::*; use dioxus::prelude::*; use time::{macros::date, Date}; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/calendar/variants/range/mod.rs b/preview/src/components/calendar/variants/range/mod.rs index 9a2418c66..2482032f2 100644 --- a/preview/src/components/calendar/variants/range/mod.rs +++ b/preview/src/components/calendar/variants/range/mod.rs @@ -2,7 +2,7 @@ use super::super::component::*; use dioxus::prelude::*; use time::{macros::date, Date}; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/calendar/variants/unavailable_dates/mod.rs b/preview/src/components/calendar/variants/unavailable_dates/mod.rs index 415f3554a..91a61d562 100644 --- a/preview/src/components/calendar/variants/unavailable_dates/mod.rs +++ b/preview/src/components/calendar/variants/unavailable_dates/mod.rs @@ -2,7 +2,7 @@ use super::super::component::*; use dioxus::prelude::*; use time::{ext::NumericalDuration, macros::date, Date}; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/checkbox/mod.rs b/preview/src/components/checkbox/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/checkbox/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/collapsible/mod.rs b/preview/src/components/collapsible/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/collapsible/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/color_picker/mod.rs b/preview/src/components/color_picker/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/color_picker/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/color_picker/variants/main/mod.rs b/preview/src/components/color_picker/variants/main/mod.rs index 15e620da4..c9980412c 100644 --- a/preview/src/components/color_picker/variants/main/mod.rs +++ b/preview/src/components/color_picker/variants/main/mod.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; use super::super::component::*; -use dioxus_primitives::color_picker::Color; +use dioxus_kit_core::color_picker::Color; use palette::{encoding, Hsv, IntoColor}; #[component] diff --git a/preview/src/components/context_menu/mod.rs b/preview/src/components/context_menu/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/context_menu/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/date_picker/mod.rs b/preview/src/components/date_picker/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/date_picker/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/date_picker/variants/multi_month/mod.rs b/preview/src/components/date_picker/variants/multi_month/mod.rs index 5736cad87..4a7f42ea1 100644 --- a/preview/src/components/date_picker/variants/multi_month/mod.rs +++ b/preview/src/components/date_picker/variants/multi_month/mod.rs @@ -1,7 +1,7 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/date_picker/variants/range/mod.rs b/preview/src/components/date_picker/variants/range/mod.rs index fadc22662..cd5032ba1 100644 --- a/preview/src/components/date_picker/variants/range/mod.rs +++ b/preview/src/components/date_picker/variants/range/mod.rs @@ -1,7 +1,7 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/date_picker/variants/unavailable_dates/mod.rs b/preview/src/components/date_picker/variants/unavailable_dates/mod.rs index e5d790215..9e895a09d 100644 --- a/preview/src/components/date_picker/variants/unavailable_dates/mod.rs +++ b/preview/src/components/date_picker/variants/unavailable_dates/mod.rs @@ -1,7 +1,7 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::calendar::DateRange; +use dioxus_kit_core::calendar::DateRange; use time::{ext::NumericalDuration, macros::date}; #[component] diff --git a/preview/src/components/dialog/mod.rs b/preview/src/components/dialog/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/dialog/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/dialog/variants/main/mod.rs b/preview/src/components/dialog/variants/main/mod.rs index f74155dd5..7455a9b6c 100644 --- a/preview/src/components/dialog/variants/main/mod.rs +++ b/preview/src/components/dialog/variants/main/mod.rs @@ -1,11 +1,8 @@ use crate::components::button::component::Button; -use super::super::component::{Dialog, DialogDescription, DialogTitle}; +use super::super::component::{Dialog, DialogClose, DialogDescription, DialogTitle}; use dioxus::prelude::*; -#[css_module("/src/components/dialog/style.css")] -struct Styles; - #[component] pub fn Demo() -> Element { let mut open = use_signal(|| false); @@ -18,10 +15,7 @@ pub fn Demo() -> Element { "Show Dialog" } Dialog { open: open(), on_open_change: move |v| open.set(v), - button { - class: Styles::dx_dialog_close, - r#type: "button", - aria_label: "Close", + DialogClose { tabindex: if open() { "0" } else { "-1" }, onclick: move |_| open.set(false), "×" diff --git a/preview/src/components/drag_and_drop_list/mod.rs b/preview/src/components/drag_and_drop_list/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/drag_and_drop_list/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/dropdown_menu/mod.rs b/preview/src/components/dropdown_menu/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/dropdown_menu/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/dropdown_menu/variants/main/mod.rs b/preview/src/components/dropdown_menu/variants/main/mod.rs index c5f0d04eb..c018712f1 100644 --- a/preview/src/components/dropdown_menu/variants/main/mod.rs +++ b/preview/src/components/dropdown_menu/variants/main/mod.rs @@ -4,9 +4,6 @@ use super::super::component::{ use dioxus::prelude::*; use strum::IntoEnumIterator; -#[css_module("/src/components/dropdown_menu/style.css")] -struct Styles; - #[derive(Clone, Copy, strum::Display, strum::EnumIter, PartialEq)] enum Operation { Edit, @@ -22,7 +19,6 @@ pub fn Demo() -> Element { let operations = Operation::iter().enumerate().map(|(i, o)| { rsx! { DropdownMenuItem:: { - class: Styles::dx_dropdown_menu_item, value: o, index: i, disabled: matches!(o, Operation::Undo), @@ -35,9 +31,9 @@ pub fn Demo() -> Element { }); rsx! { - DropdownMenu { class: Styles::dx_dropdown_menu, default_open: false, - DropdownMenuTrigger { class: Styles::dx_dropdown_menu_trigger, "Open Menu" } - DropdownMenuContent { class: Styles::dx_dropdown_menu_content, {operations} } + DropdownMenu { default_open: false, + DropdownMenuTrigger { "Open Menu" } + DropdownMenuContent { {operations} } } if let Some(op) = selected_operation() { "Selected: {op}" diff --git a/preview/src/components/form/component.json b/preview/src/components/form/component.json deleted file mode 100644 index 7180e7248..000000000 --- a/preview/src/components/form/component.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "form", - "description": "A form component for collecting user input.", - "authors": ["Evan Almloff"], - "exclude": ["variants", "docs.md", "component.json"], - "cargoDependencies": [ - { - "name": "dioxus-primitives", - "git": "https://github.com/DioxusLabs/components" - } - ], - "globalAssets": ["../../../assets/dx-components-theme.css"] -} diff --git a/preview/src/components/form/component.rs b/preview/src/components/form/component.rs deleted file mode 100644 index 8b1378917..000000000 --- a/preview/src/components/form/component.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/preview/src/components/form/docs.md b/preview/src/components/form/docs.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/preview/src/components/form/mod.rs b/preview/src/components/form/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/form/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/form/style.css b/preview/src/components/form/style.css deleted file mode 100644 index 83f3065c4..000000000 --- a/preview/src/components/form/style.css +++ /dev/null @@ -1,21 +0,0 @@ -.dx-tos-check { - width: 50px; - height: 50px; - border: 1px solid var(--primary-color-6); - border-radius: 4px; - margin: 8px 16px; - background-color: var(--primary-color-1); - color: var(--secondary-color-4); - cursor: pointer; - font-size: 14px; -} - -.dx-form-example button { - padding: 8px 16px; - border: 1px solid var(--primary-color-6); - border-radius: 4px; - background-color: var(--primary-color-1); - color: var(--secondary-color-4); - cursor: pointer; - font-size: 14px; -} diff --git a/preview/src/components/form/variants/main/mod.rs b/preview/src/components/form/variants/main/mod.rs deleted file mode 100644 index 2f5a4057f..000000000 --- a/preview/src/components/form/variants/main/mod.rs +++ /dev/null @@ -1,23 +0,0 @@ -use dioxus::prelude::*; -use dioxus_primitives::checkbox::{Checkbox, CheckboxIndicator}; - -#[css_module("/src/components/form/style.css")] -struct Styles; - -#[component] -pub fn Demo() -> Element { - rsx! { - form { - class: Styles::dx_form_example, - onsubmit: move |e| { - tracing::info!("{:?}", e.values()); - }, - Checkbox { id: "tos-check", class: Styles::dx_tos_check, name: "tos-check", - CheckboxIndicator { "+" } - } - label { r#for: "tos-check", "I agree to the terms presented." } - br {} - button { r#type: "submit", "Submit" } - } - } -} diff --git a/preview/src/components/hover_card/mod.rs b/preview/src/components/hover_card/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/hover_card/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/hover_card/variants/main/mod.rs b/preview/src/components/hover_card/variants/main/mod.rs index 7f7041180..d4473cad4 100644 --- a/preview/src/components/hover_card/variants/main/mod.rs +++ b/preview/src/components/hover_card/variants/main/mod.rs @@ -1,6 +1,6 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::ContentSide; +use dioxus_kit_core::ContentSide; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/input/mod.rs b/preview/src/components/input/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/input/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/label/mod.rs b/preview/src/components/label/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/label/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/menubar/mod.rs b/preview/src/components/menubar/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/menubar/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/mod.rs b/preview/src/components/mod.rs index cad937b4d..d87994bdf 100644 --- a/preview/src/components/mod.rs +++ b/preview/src/components/mod.rs @@ -54,9 +54,10 @@ macro_rules! examples { ($($name:ident $(($kind:ident))? $([$($variant:ident),*])?),* $(,)?) => { $( pub(crate) mod $name { - pub(crate) mod component; #[allow(unused)] - pub use component::*; + pub use ::dioxus_kit::$name as component; + #[allow(unused)] + pub use ::dioxus_kit::$name::*; pub(crate) mod variants { pub(crate) mod main; $( @@ -91,10 +92,10 @@ macro_rules! examples { )), docs: include_str!(concat!(env!("OUT_DIR"), "/", stringify!($name), "/docs.html")), component: HighlightedCode { - source: dioxus_code::code!(concat!("/src/components/", stringify!($name), "/component.rs")), + source: dioxus_code::code!(concat!(env!("CARGO_MANIFEST_DIR"), "/../dioxus-kit/src/", stringify!($name), "/component.rs")), }, style: HighlightedCode { - source: dioxus_code::code!(concat!("/src/components/", stringify!($name), "/style.css")), + source: dioxus_code::code!(concat!(env!("CARGO_MANIFEST_DIR"), "/../dioxus-kit/src/", stringify!($name), "/style.css")), }, variants: &[ ComponentVariantDemoData { @@ -134,10 +135,10 @@ macro_rules! examples { )), docs: include_str!(concat!(env!("OUT_DIR"), "/", stringify!($name), "/docs.html")), component: HighlightedCode { - source: dioxus_code::code!(concat!("/src/components/", stringify!($name), "/component.rs")), + source: dioxus_code::code!(concat!(env!("CARGO_MANIFEST_DIR"), "/../dioxus-kit/src/", stringify!($name), "/component.rs")), }, style: HighlightedCode { - source: dioxus_code::code!(concat!("/src/components/", stringify!($name), "/style.css")), + source: dioxus_code::code!(concat!(env!("CARGO_MANIFEST_DIR"), "/../dioxus-kit/src/", stringify!($name), "/style.css")), }, variants: &[ ComponentVariantDemoData { diff --git a/preview/src/components/navbar/mod.rs b/preview/src/components/navbar/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/navbar/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/popover/mod.rs b/preview/src/components/popover/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/popover/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/progress/mod.rs b/preview/src/components/progress/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/progress/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/radio_group/mod.rs b/preview/src/components/radio_group/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/radio_group/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/scroll_area/mod.rs b/preview/src/components/scroll_area/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/scroll_area/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/scroll_area/variants/main/mod.rs b/preview/src/components/scroll_area/variants/main/mod.rs index 260e8856d..8afdfcddd 100644 --- a/preview/src/components/scroll_area/variants/main/mod.rs +++ b/preview/src/components/scroll_area/variants/main/mod.rs @@ -1,6 +1,6 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::scroll_area::ScrollDirection; +use dioxus_kit_core::scroll_area::ScrollDirection; #[component] pub fn Demo() -> Element { diff --git a/preview/src/components/select/mod.rs b/preview/src/components/select/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/select/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/separator/mod.rs b/preview/src/components/separator/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/separator/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/sidebar/variants/floating/mod.rs b/preview/src/components/sidebar/variants/floating/mod.rs index e06f017cd..3d5e97699 100644 --- a/preview/src/components/sidebar/variants/floating/mod.rs +++ b/preview/src/components/sidebar/variants/floating/mod.rs @@ -19,8 +19,6 @@ use dioxus::prelude::*; #[css_module("/src/components/sidebar/variants/demo.css")] struct DemoStyles; -#[css_module("/src/components/sidebar/style.css")] -struct Styles; #[derive(Clone, PartialEq)] struct Team { @@ -211,8 +209,8 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, div { style: "display:flex; flex-shrink:0; align-items:center; justify-content:center; width:2rem; height:2rem; aspect-ratio:1; border-radius:0.5rem; background:var(--dx-sidebar-accent); color:var(--dx-sidebar-accent-foreground);", @@ -226,7 +224,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "padding:0.5rem; font-size:0.75rem; opacity:0.7;", "Teams" } @@ -242,7 +240,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: teams.len(), value: 999usize, @@ -268,7 +266,7 @@ fn NavMain(items: &'static [NavMainItem]) -> Element { default_open: item.is_active, as: move |attributes: Vec| rsx! { SidebarMenuItem { key: "{item.title}", attributes, - CollapsibleTrigger { class: Styles::dx_sidebar_collapsible_trigger, + CollapsibleTrigger { class: "dx-sidebar-collapsible-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, @@ -322,16 +320,16 @@ fn NavProjects(projects: &'static [Project]) -> Element { } }, } - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuAction { show_on_hover: true, attributes, DemoIcon {} - span { class: Styles::dx_sr_only, "More" } + span { class: "dx-sr-only", "More" } } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", DropdownMenuItem { index: 0usize, value: "view".to_string(), @@ -346,7 +344,7 @@ fn NavProjects(projects: &'static [Project]) -> Element { DemoIcon {} span { "Share Project" } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 2usize, value: "delete".to_string(), @@ -375,8 +373,8 @@ fn NavUser() -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, ImageAvatar { @@ -394,7 +392,7 @@ fn NavUser() -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "display:flex; align-items:center; gap:0.5rem; padding:0.375rem 0.25rem; text-align:left; font-size:0.875rem;", ImageAvatar { size: AvatarImageSize::Small, @@ -408,7 +406,7 @@ fn NavUser() -> Element { span { class: DemoStyles::dx_sidebar_info_subtitle, "m@example.com" } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 0usize, value: "upgrade".to_string(), @@ -416,7 +414,7 @@ fn NavUser() -> Element { DemoIcon {} "Upgrade to Pro" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 1usize, value: "account".to_string(), @@ -438,7 +436,7 @@ fn NavUser() -> Element { DemoIcon {} "Notifications" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 4usize, value: "logout".to_string(), diff --git a/preview/src/components/sidebar/variants/inset/mod.rs b/preview/src/components/sidebar/variants/inset/mod.rs index dddd144c5..b4b5c2bab 100644 --- a/preview/src/components/sidebar/variants/inset/mod.rs +++ b/preview/src/components/sidebar/variants/inset/mod.rs @@ -19,8 +19,6 @@ use dioxus::prelude::*; #[css_module("/src/components/sidebar/variants/demo.css")] struct DemoStyles; -#[css_module("/src/components/sidebar/style.css")] -struct Styles; #[derive(Clone, PartialEq)] struct Team { @@ -211,8 +209,8 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, div { style: "display:flex; flex-shrink:0; align-items:center; justify-content:center; width:2rem; height:2rem; aspect-ratio:1; border-radius:0.5rem; background:var(--dx-sidebar-accent); color:var(--dx-sidebar-accent-foreground);", @@ -226,7 +224,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "padding:0.5rem; font-size:0.75rem; opacity:0.7;", "Teams" } @@ -242,7 +240,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: teams.len(), value: 999usize, @@ -268,7 +266,7 @@ fn NavMain(items: &'static [NavMainItem]) -> Element { default_open: item.is_active, as: move |attributes: Vec| rsx! { SidebarMenuItem { key: "{item.title}", attributes, - CollapsibleTrigger { class: Styles::dx_sidebar_collapsible_trigger, + CollapsibleTrigger { class: "dx-sidebar-collapsible-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, @@ -322,16 +320,16 @@ fn NavProjects(projects: &'static [Project]) -> Element { } }, } - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuAction { show_on_hover: true, attributes, DemoIcon {} - span { class: Styles::dx_sr_only, "More" } + span { class: "dx-sr-only", "More" } } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", DropdownMenuItem { index: 0usize, value: "view".to_string(), @@ -346,7 +344,7 @@ fn NavProjects(projects: &'static [Project]) -> Element { DemoIcon {} span { "Share Project" } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 2usize, value: "delete".to_string(), @@ -375,8 +373,8 @@ fn NavUser() -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, ImageAvatar { @@ -394,7 +392,7 @@ fn NavUser() -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "display:flex; align-items:center; gap:0.5rem; padding:0.375rem 0.25rem; text-align:left; font-size:0.875rem;", ImageAvatar { size: AvatarImageSize::Small, @@ -408,7 +406,7 @@ fn NavUser() -> Element { span { class: DemoStyles::dx_sidebar_info_subtitle, "m@example.com" } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 0usize, value: "upgrade".to_string(), @@ -416,7 +414,7 @@ fn NavUser() -> Element { DemoIcon {} "Upgrade to Pro" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 1usize, value: "account".to_string(), @@ -438,7 +436,7 @@ fn NavUser() -> Element { DemoIcon {} "Notifications" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 4usize, value: "logout".to_string(), diff --git a/preview/src/components/sidebar/variants/main/mod.rs b/preview/src/components/sidebar/variants/main/mod.rs index f007f0b19..302fdc76f 100644 --- a/preview/src/components/sidebar/variants/main/mod.rs +++ b/preview/src/components/sidebar/variants/main/mod.rs @@ -19,8 +19,6 @@ use dioxus::prelude::*; #[css_module("/src/components/sidebar/variants/demo.css")] struct DemoStyles; -#[css_module("/src/components/sidebar/style.css")] -struct Styles; #[derive(Clone, PartialEq)] struct Team { @@ -211,8 +209,8 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, div { style: "display:flex; flex-shrink:0; align-items:center; justify-content:center; width:2rem; height:2rem; aspect-ratio:1; border-radius:0.5rem; background:var(--dx-sidebar-accent); color:var(--dx-sidebar-accent-foreground);", @@ -226,7 +224,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "padding:0.5rem; font-size:0.75rem; opacity:0.7;", "Teams" } @@ -242,7 +240,7 @@ fn TeamSwitcher(teams: &'static [Team]) -> Element { } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: teams.len(), value: 999usize, @@ -268,7 +266,7 @@ fn NavMain(items: &'static [NavMainItem]) -> Element { default_open: item.is_active, as: move |attributes: Vec| rsx! { SidebarMenuItem { key: "{item.title}", attributes, - CollapsibleTrigger { class: Styles::dx_sidebar_collapsible_trigger, + CollapsibleTrigger { class: "dx-sidebar-collapsible-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, @@ -322,16 +320,16 @@ fn NavProjects(projects: &'static [Project]) -> Element { } }, } - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuAction { show_on_hover: true, attributes, DemoIcon {} - span { class: Styles::dx_sr_only, "More" } + span { class: "dx-sr-only", "More" } } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", DropdownMenuItem { index: 0usize, value: "view".to_string(), @@ -346,7 +344,7 @@ fn NavProjects(projects: &'static [Project]) -> Element { DemoIcon {} span { "Share Project" } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 2usize, value: "delete".to_string(), @@ -375,8 +373,8 @@ fn NavUser() -> Element { rsx! { SidebarMenu { SidebarMenuItem { - DropdownMenu { class: Styles::dx_sidebar_dropdown_menu, - DropdownMenuTrigger { class: Styles::dx_sidebar_dropdown_menu_trigger, + DropdownMenu { class: "dx-sidebar-dropdown-menu", + DropdownMenuTrigger { class: "dx-sidebar-dropdown-menu-trigger", as: move |attributes: Vec| rsx! { SidebarMenuButton { class: DemoStyles::dx_sidebar_menu_disclosure_button, size: SidebarMenuButtonSize::Lg, attributes, ImageAvatar { @@ -394,7 +392,7 @@ fn NavUser() -> Element { } }, } - DropdownMenuContent { class: Styles::dx_sidebar_dropdown_menu_content, + DropdownMenuContent { class: "dx-sidebar-dropdown-menu-content", div { style: "display:flex; align-items:center; gap:0.5rem; padding:0.375rem 0.25rem; text-align:left; font-size:0.875rem;", ImageAvatar { size: AvatarImageSize::Small, @@ -408,7 +406,7 @@ fn NavUser() -> Element { span { class: DemoStyles::dx_sidebar_info_subtitle, "m@example.com" } } } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 0usize, value: "upgrade".to_string(), @@ -416,7 +414,7 @@ fn NavUser() -> Element { DemoIcon {} "Upgrade to Pro" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 1usize, value: "account".to_string(), @@ -438,7 +436,7 @@ fn NavUser() -> Element { DemoIcon {} "Notifications" } - Separator { class: Styles::dx_sidebar_dropdown_separator, decorative: true } + Separator { class: "dx-sidebar-dropdown-separator", decorative: true } DropdownMenuItem { index: 4usize, value: "logout".to_string(), diff --git a/preview/src/components/skeleton/mod.rs b/preview/src/components/skeleton/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/skeleton/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/slider/mod.rs b/preview/src/components/slider/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/slider/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/switch/mod.rs b/preview/src/components/switch/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/switch/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/switch/variants/main/demo.css b/preview/src/components/switch/variants/main/demo.css new file mode 100644 index 000000000..bfa780cdf --- /dev/null +++ b/preview/src/components/switch/variants/main/demo.css @@ -0,0 +1,6 @@ +.dx-switch-example { + display: flex; + align-items: center; + padding: 20px; + gap: 15px; +} diff --git a/preview/src/components/switch/variants/main/mod.rs b/preview/src/components/switch/variants/main/mod.rs index 49727ef20..1346f859e 100644 --- a/preview/src/components/switch/variants/main/mod.rs +++ b/preview/src/components/switch/variants/main/mod.rs @@ -1,7 +1,7 @@ use super::super::component::*; use dioxus::prelude::*; -#[css_module("/src/components/switch/style.css")] +#[css_module("/src/components/switch/variants/main/demo.css")] struct Styles; #[component] diff --git a/preview/src/components/tabs/mod.rs b/preview/src/components/tabs/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/tabs/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/toast/mod.rs b/preview/src/components/toast/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/toast/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/toast/variants/main/mod.rs b/preview/src/components/toast/variants/main/mod.rs index af0911cf6..a6faea488 100644 --- a/preview/src/components/toast/variants/main/mod.rs +++ b/preview/src/components/toast/variants/main/mod.rs @@ -2,7 +2,7 @@ use crate::components::button::component::Button; use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::toast::{use_toast, ToastOptions}; +use dioxus_kit_core::toast::{use_toast, ToastOptions}; use std::time::Duration; #[component] diff --git a/preview/src/components/toggle/mod.rs b/preview/src/components/toggle/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/toggle/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/toggle_group/mod.rs b/preview/src/components/toggle_group/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/toggle_group/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/toolbar/mod.rs b/preview/src/components/toolbar/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/toolbar/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/tooltip/mod.rs b/preview/src/components/tooltip/mod.rs deleted file mode 100644 index 9a8ae5565..000000000 --- a/preview/src/components/tooltip/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod component; -pub use component::*; \ No newline at end of file diff --git a/preview/src/components/tooltip/variants/main/mod.rs b/preview/src/components/tooltip/variants/main/mod.rs index 9bd2dd6cb..719f674e3 100644 --- a/preview/src/components/tooltip/variants/main/mod.rs +++ b/preview/src/components/tooltip/variants/main/mod.rs @@ -1,6 +1,6 @@ use super::super::component::*; use dioxus::prelude::*; -use dioxus_primitives::ContentSide; +use dioxus_kit_core::ContentSide; #[component] pub fn Demo() -> Element { diff --git a/preview/src/dashboard/views/email_client/compose.rs b/preview/src/dashboard/views/email_client/compose.rs index 21918d6e9..3db83c8f7 100644 --- a/preview/src/dashboard/views/email_client/compose.rs +++ b/preview/src/dashboard/views/email_client/compose.rs @@ -1,5 +1,5 @@ use dioxus::prelude::*; -use dioxus_primitives::toast::{use_toast, ToastOptions}; +use dioxus_kit_core::toast::{use_toast, ToastOptions}; use crate::components::button::{Button, ButtonVariant}; use crate::components::dialog::{Dialog, DialogDescription, DialogTitle}; diff --git a/preview/src/dashboard/views/email_client/list_pane.rs b/preview/src/dashboard/views/email_client/list_pane.rs index c0551ce80..abcb58ec2 100644 --- a/preview/src/dashboard/views/email_client/list_pane.rs +++ b/preview/src/dashboard/views/email_client/list_pane.rs @@ -1,6 +1,6 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{Check, ChevronDown}; -use dioxus_primitives::select as primitive_select; +use dioxus_kit_core::select as primitive_select; use crate::components::avatar::{AvatarImageSize, AvatarShape, ImageAvatar}; use crate::components::button::{Button, ButtonVariant}; @@ -17,9 +17,6 @@ use crate::dashboard::common::{ use super::avatars::avatar_profile_for_key; use super::state::{EmailClientState, EmailClientStateStoreExt, EmailClientStateStoreImplExt}; -#[css_module("/src/components/select/style.css")] -struct SelectStyles; - #[derive(Clone, PartialEq)] pub(super) enum ListRow { DayHeader(&'static str), @@ -84,14 +81,14 @@ pub(super) fn ListPane( } } primitive_select::SelectMulti:: { - class: SelectStyles::dx_select, + class: "dx-select", values: Some(tags.clone()), default_values: vec![], on_values_change: move |values| { state.set_selected_tags(values); }, primitive_select::SelectTrigger { - class: format!("{} ec-filter-trigger", SelectStyles::dx_select_trigger), + class: "dx-select-trigger ec-filter-trigger", aria_label: "Filter by tag", LucideIcon { kind: IconKind::Filter } if !tags.is_empty() { @@ -104,13 +101,13 @@ pub(super) fn ListPane( } } primitive_select::SelectList { - class: format!("{} ec-filter-list", SelectStyles::dx_select_list), + class: "dx-select-list ec-filter-list", aria_label: "Filter by tag", primitive_select::SelectGroup { - primitive_select::SelectGroupLabel { class: SelectStyles::dx_select_group_label, "Tags" } + primitive_select::SelectGroupLabel { class: "dx-select-group-label", "Tags" } for (index, tag) in MessageTag::ALL.iter().enumerate() { primitive_select::SelectOption:: { - class: SelectStyles::dx_select_option, + class: "dx-select-option", key: "{tag.label()}", index, value: *tag, diff --git a/preview/src/dashboard/views/email_client/read_pane.rs b/preview/src/dashboard/views/email_client/read_pane.rs index 98ff5bf37..0bae7b926 100644 --- a/preview/src/dashboard/views/email_client/read_pane.rs +++ b/preview/src/dashboard/views/email_client/read_pane.rs @@ -1,7 +1,7 @@ use dioxus::prelude::*; use dioxus_icons::lucide::{Check, ChevronDown}; -use dioxus_primitives::select as primitive_select; -use dioxus_primitives::toast::{use_toast, ToastOptions}; +use dioxus_kit_core::select as primitive_select; +use dioxus_kit_core::toast::{use_toast, ToastOptions}; use std::rc::Rc; use crate::components::avatar::{AvatarImageSize, AvatarShape, ImageAvatar}; @@ -20,9 +20,6 @@ use crate::dashboard::common::{ use super::avatars::avatar_profile_for_key; use super::state::{EmailClientState, EmailClientStateStoreExt, EmailClientStateStoreImplExt}; -#[css_module("/src/components/select/style.css")] -struct SelectStyles; - #[component] pub(super) fn ReadPane( mut state: Store, @@ -158,14 +155,14 @@ pub(super) fn ReadPane( "{selected_static.thread_count} message{(selected_static.thread_count > 1).then(|| \"s\").unwrap_or(\"\")} in this thread" } primitive_select::SelectMulti:: { - class: SelectStyles::dx_select, + class: "dx-select", values: Some(selected_tags.clone()), default_values: selected_tags.clone(), on_values_change: move |values: Vec| { state.set_message_tags(tag_edit_uid.clone(), values); }, primitive_select::SelectTrigger { - class: format!("{} ec-tag-edit-trigger", SelectStyles::dx_select_trigger), + class: "dx-select-trigger ec-tag-edit-trigger", aria_label: "Add tag", "+ Tag" ChevronDown { @@ -175,13 +172,13 @@ pub(super) fn ReadPane( } } primitive_select::SelectList { - class: format!("{} ec-filter-list", SelectStyles::dx_select_list), + class: "dx-select-list ec-filter-list", aria_label: "Edit tags", primitive_select::SelectGroup { - primitive_select::SelectGroupLabel { class: SelectStyles::dx_select_group_label, "Tags" } + primitive_select::SelectGroupLabel { class: "dx-select-group-label", "Tags" } for (index, tag) in MessageTag::ALL.iter().enumerate() { primitive_select::SelectOption:: { - class: SelectStyles::dx_select_option, + class: "dx-select-option", key: "{tag.label()}", index, value: *tag, diff --git a/preview/src/main.rs b/preview/src/main.rs index c5fb6f408..0af90e9e3 100644 --- a/preview/src/main.rs +++ b/preview/src/main.rs @@ -1,3 +1,5 @@ +#![allow(unpredictable_function_pointer_comparisons)] + use crate::components::{ avatar::{AvatarImageSize, ImageAvatar}, badge::{Badge, BadgeVariant, VerifiedIcon}, @@ -257,7 +259,7 @@ fn NavigationLayout() -> Element { document::Link { rel: "stylesheet", href: asset!("/assets/main.css") } document::Link { rel: "stylesheet", - href: asset!("/assets/dx-components-theme.css"), + href: dioxus_kit::THEME_CSS, } document::Link { rel: "stylesheet", href: asset!("/assets/hero.css") } Navbar {} @@ -1099,7 +1101,7 @@ fn BlockComponentVariantHighlight( fn EmailClientDashboard(dark_mode: Option) -> Element { rsx! { document::Link { rel: "stylesheet", href: asset!("/assets/main.css") } - document::Link { rel: "stylesheet", href: asset!("/assets/dx-components-theme.css") } + document::Link { rel: "stylesheet", href: dioxus_kit::THEME_CSS } dashboard::views::email_client::EmailClient {} } } @@ -1133,7 +1135,7 @@ fn ComponentBlockDemo(name: String, variant: Option, dark_mode: Option Element { Checkbox { id: tag.0, name: tag.0, - default_checked: if tag.2 { dioxus_primitives::checkbox::CheckboxState::Checked } else { dioxus_primitives::checkbox::CheckboxState::Unchecked }, + default_checked: if tag.2 { dioxus_kit_core::checkbox::CheckboxState::Checked } else { dioxus_kit_core::checkbox::CheckboxState::Unchecked }, aria_label: tag.1, } Label { html_for: tag.0, "{tag.1}" } @@ -1596,7 +1598,7 @@ fn BlockFilters() -> Element { #[component] fn BlockColorPalette() -> Element { - use dioxus_primitives::color_picker::Color; + use dioxus_kit_core::color_picker::Color; use palette::{encoding, Hsv, IntoColor}; let mut color = use_signal(|| -> Hsv { @@ -1982,5 +1984,8 @@ fn GotoIcon(mut props: LinkProps) -> Element { } const THEME_CSS: HighlightedCode = HighlightedCode { - source: dioxus_code::code!("/assets/dx-components-theme.css"), + source: dioxus_code::code!(concat!( + env!("CARGO_MANIFEST_DIR"), + "/../dioxus-kit/assets/dx-components-theme.css" + )), }; diff --git a/test-harness/Cargo.toml b/test-harness/Cargo.toml index b0f16080b..01fe0a80f 100644 --- a/test-harness/Cargo.toml +++ b/test-harness/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] dioxus = { version = "0.7.9", features = [] } -dioxus-primitives = { path = "../primitives/", version = "0.0.1", default-features = false, features = ["router"] } +dioxus-kit-core = { path = "../dioxus-kit-core/", version = "0.0.1", default-features = false, features = ["router"] } [features] default = ["web"]