diff --git a/.idea/leptos-use.iml b/.idea/leptos-use.iml index d2dd358..362e988 100644 --- a/.idea/leptos-use.iml +++ b/.idea/leptos-use.iml @@ -34,6 +34,8 @@ + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bb0fff..8b93d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.3.2] - 2023-06-17 ### New Functions 🚀 - `use_css_var` +- `use_element_hover` ## [0.3.1] - 2023-06-15 diff --git a/README.md b/README.md index 8a61f0b..304bfae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@

Crates.io Docs & Demos - 33 Functions + 35 Functions


diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md index a551d9f..62ed0a8 100644 --- a/docs/book/src/SUMMARY.md +++ b/docs/book/src/SUMMARY.md @@ -32,6 +32,7 @@ # Sensors - [on_click_outside](sensors/on_click_outside.md) +- [use_element_hover](sensors/use_element_hover.md) - [use_mouse](sensors/use_mouse.md) - [use_scroll](sensors/use_scroll.md) diff --git a/docs/book/src/introduction.md b/docs/book/src/introduction.md index f97fb48..09ee0b6 100644 --- a/docs/book/src/introduction.md +++ b/docs/book/src/introduction.md @@ -11,6 +11,6 @@

Crates.io Docs & Demos - 33 Functions + 35 Functions

\ No newline at end of file diff --git a/docs/book/src/sensors/use_element_hover.md b/docs/book/src/sensors/use_element_hover.md new file mode 100644 index 0000000..9b3d224 --- /dev/null +++ b/docs/book/src/sensors/use_element_hover.md @@ -0,0 +1,3 @@ +# use_element_hover + + diff --git a/examples/Cargo.toml b/examples/Cargo.toml index def923e..84f72d9 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,6 +7,7 @@ members = [ "use_ceil", "use_css_var", "use_debounce_fn", + "use_element_hover", "use_element_size", "use_element_visibility", "use_event_listener", diff --git a/examples/use_element_hover/Cargo.toml b/examples/use_element_hover/Cargo.toml new file mode 100644 index 0000000..e4b60cb --- /dev/null +++ b/examples/use_element_hover/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "use_element_hover" +version = "0.1.0" +edition = "2021" + +[dependencies] +leptos = "0.3" +console_error_panic_hook = "0.1" +console_log = "1" +log = "0.4" +leptos-use = { path = "../..", features = ["docs"] } +web-sys = "0.3" + +[dev-dependencies] +wasm-bindgen = "0.2" +wasm-bindgen-test = "0.3.0" diff --git a/examples/use_element_hover/README.md b/examples/use_element_hover/README.md new file mode 100644 index 0000000..0c1276d --- /dev/null +++ b/examples/use_element_hover/README.md @@ -0,0 +1,23 @@ +A simple example for `use_element_hover`. + +If you don't have it installed already, install [Trunk](https://trunkrs.dev/) and [Tailwind](https://tailwindcss.com/docs/installation) +as well as the nightly toolchain for Rust and the wasm32-unknown-unknown target: + +```bash +cargo install trunk +npm install -D tailwindcss @tailwindcss/forms +rustup toolchain install nightly +rustup target add wasm32-unknown-unknown +``` + +Then, open two terminals. In the first one, run: + +``` +npx tailwindcss -i ./input.css -o ./style/output.css --watch +``` + +In the second one, run: + +```bash +trunk serve --open +``` \ No newline at end of file diff --git a/examples/use_element_hover/Trunk.toml b/examples/use_element_hover/Trunk.toml new file mode 100644 index 0000000..3e4be08 --- /dev/null +++ b/examples/use_element_hover/Trunk.toml @@ -0,0 +1,2 @@ +[build] +public_url = "/demo/" \ No newline at end of file diff --git a/examples/use_element_hover/index.html b/examples/use_element_hover/index.html new file mode 100644 index 0000000..ae249a6 --- /dev/null +++ b/examples/use_element_hover/index.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/examples/use_element_hover/input.css b/examples/use_element_hover/input.css new file mode 100644 index 0000000..bd6213e --- /dev/null +++ b/examples/use_element_hover/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/examples/use_element_hover/rust-toolchain.toml b/examples/use_element_hover/rust-toolchain.toml new file mode 100644 index 0000000..271800c --- /dev/null +++ b/examples/use_element_hover/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly" \ No newline at end of file diff --git a/examples/use_element_hover/src/main.rs b/examples/use_element_hover/src/main.rs new file mode 100644 index 0000000..913cdc3 --- /dev/null +++ b/examples/use_element_hover/src/main.rs @@ -0,0 +1,29 @@ +use leptos::*; +use leptos_use::docs::demo_or_body; +use leptos_use::{use_element_hover_with_options, UseElementHoverOptions}; + +#[component] +fn Demo(cx: Scope) -> impl IntoView { + let el = create_node_ref(cx); + + let is_hovered = use_element_hover_with_options( + cx, + el, + UseElementHoverOptions::default() + .delay_enter(200) + .delay_leave(600), + ); + + view! { cx, + + } +} + +fn main() { + _ = console_log::init_with_level(log::Level::Debug); + console_error_panic_hook::set_once(); + + mount_to(demo_or_body(), |cx| { + view! { cx, } + }) +} diff --git a/examples/use_element_hover/style/output.css b/examples/use_element_hover/style/output.css new file mode 100644 index 0000000..ab5191f --- /dev/null +++ b/examples/use_element_hover/style/output.css @@ -0,0 +1,289 @@ +[type='text'],[type='email'],[type='url'],[type='password'],[type='number'],[type='date'],[type='datetime-local'],[type='month'],[type='search'],[type='tel'],[type='time'],[type='week'],[multiple],textarea,select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background-color: #fff; + border-color: #6b7280; + border-width: 1px; + border-radius: 0px; + padding-top: 0.5rem; + padding-right: 0.75rem; + padding-bottom: 0.5rem; + padding-left: 0.75rem; + font-size: 1rem; + line-height: 1.5rem; + --tw-shadow: 0 0 #0000; +} + +[type='text']:focus, [type='email']:focus, [type='url']:focus, [type='password']:focus, [type='number']:focus, [type='date']:focus, [type='datetime-local']:focus, [type='month']:focus, [type='search']:focus, [type='tel']:focus, [type='time']:focus, [type='week']:focus, [multiple]:focus, textarea:focus, select:focus { + outline: 2px solid transparent; + outline-offset: 2px; + --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/); + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: #2563eb; + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); + border-color: #2563eb; +} + +input::-moz-placeholder, textarea::-moz-placeholder { + color: #6b7280; + opacity: 1; +} + +input::placeholder,textarea::placeholder { + color: #6b7280; + opacity: 1; +} + +::-webkit-datetime-edit-fields-wrapper { + padding: 0; +} + +::-webkit-date-and-time-value { + min-height: 1.5em; +} + +::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field { + padding-top: 0; + padding-bottom: 0; +} + +select { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e"); + background-position: right 0.5rem center; + background-repeat: no-repeat; + background-size: 1.5em 1.5em; + padding-right: 2.5rem; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +[multiple] { + background-image: initial; + background-position: initial; + background-repeat: unset; + background-size: initial; + padding-right: 0.75rem; + -webkit-print-color-adjust: unset; + print-color-adjust: unset; +} + +[type='checkbox'],[type='radio'] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + padding: 0; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + display: inline-block; + vertical-align: middle; + background-origin: border-box; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + flex-shrink: 0; + height: 1rem; + width: 1rem; + color: #2563eb; + background-color: #fff; + border-color: #6b7280; + border-width: 1px; + --tw-shadow: 0 0 #0000; +} + +[type='checkbox'] { + border-radius: 0px; +} + +[type='radio'] { + border-radius: 100%; +} + +[type='checkbox']:focus,[type='radio']:focus { + outline: 2px solid transparent; + outline-offset: 2px; + --tw-ring-inset: var(--tw-empty,/*!*/ /*!*/); + --tw-ring-offset-width: 2px; + --tw-ring-offset-color: #fff; + --tw-ring-color: #2563eb; + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); +} + +[type='checkbox']:checked,[type='radio']:checked { + border-color: transparent; + background-color: currentColor; + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; +} + +[type='checkbox']:checked { + background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e"); +} + +[type='radio']:checked { + background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e"); +} + +[type='checkbox']:checked:hover,[type='checkbox']:checked:focus,[type='radio']:checked:hover,[type='radio']:checked:focus { + border-color: transparent; + background-color: currentColor; +} + +[type='checkbox']:indeterminate { + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e"); + border-color: transparent; + background-color: currentColor; + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; +} + +[type='checkbox']:indeterminate:hover,[type='checkbox']:indeterminate:focus { + border-color: transparent; + background-color: currentColor; +} + +[type='file'] { + background: unset; + border-color: inherit; + border-width: 0; + border-radius: 0; + padding: 0; + font-size: unset; + line-height: inherit; +} + +[type='file']:focus { + outline: 1px solid ButtonText; + outline: 1px auto -webkit-focus-ring-color; +} + +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; +} + +.block { + display: block; +} + +.text-\[--brand-color\] { + color: var(--brand-color); +} + +.text-green-600 { + --tw-text-opacity: 1; + color: rgb(22 163 74 / var(--tw-text-opacity)); +} + +.opacity-75 { + opacity: 0.75; +} + +@media (prefers-color-scheme: dark) { + .dark\:text-green-500 { + --tw-text-opacity: 1; + color: rgb(34 197 94 / var(--tw-text-opacity)); + } +} \ No newline at end of file diff --git a/examples/use_element_hover/tailwind.config.js b/examples/use_element_hover/tailwind.config.js new file mode 100644 index 0000000..bc09f5e --- /dev/null +++ b/examples/use_element_hover/tailwind.config.js @@ -0,0 +1,15 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: { + files: ["*.html", "./src/**/*.rs", "../../src/docs/**/*.rs"], + }, + theme: { + extend: {}, + }, + corePlugins: { + preflight: false, + }, + plugins: [ + require('@tailwindcss/forms'), + ], +} \ No newline at end of file diff --git a/examples/use_interval/Cargo.toml b/examples/use_interval/Cargo.toml index 8dfb795..216ae55 100644 --- a/examples/use_interval/Cargo.toml +++ b/examples/use_interval/Cargo.toml @@ -8,7 +8,7 @@ leptos = "0.3" console_error_panic_hook = "0.1" console_log = "1" log = "0.4" -leptos-use = { path = "../..", features = ["docs", "math"] } +leptos-use = { path = "../..", features = ["docs"] } web-sys = "0.3" [dev-dependencies] diff --git a/src/lib.rs b/src/lib.rs index b69f1f5..99ac038 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,6 +24,7 @@ mod on_click_outside; mod use_breakpoints; mod use_css_var; mod use_debounce_fn; +mod use_element_hover; mod use_element_visibility; mod use_event_listener; mod use_favicon; @@ -48,6 +49,7 @@ pub use on_click_outside::*; pub use use_breakpoints::*; pub use use_css_var::*; pub use use_debounce_fn::*; +pub use use_element_hover::*; pub use use_element_visibility::*; pub use use_event_listener::*; pub use use_favicon::*; diff --git a/src/use_element_hover.rs b/src/use_element_hover.rs new file mode 100644 index 0000000..0b5c6d8 --- /dev/null +++ b/src/use_element_hover.rs @@ -0,0 +1,111 @@ +use crate::core::ElementMaybeSignal; +use crate::use_event_listener_with_options; +use default_struct_builder::DefaultBuilder; +use leptos::ev::{mouseenter, mouseleave}; +use leptos::leptos_dom::helpers::TimeoutHandle; +use leptos::*; +use std::time::Duration; +use web_sys::AddEventListenerOptions; + +/// Reactive element's hover state. +/// +/// ## Demo +/// +/// [Link to Demo](https://github.com/Synphonyte/leptos-use/tree/main/examples/use_element_hover) +/// +/// ## Usage +/// +/// ``` +/// # use leptos::*; +/// use leptos_use::use_element_hover; +/// # +/// # #[component] +/// # fn Demo(cx: Scope) -> impl IntoView { +/// let el = create_node_ref(cx); +/// let is_hovered = use_element_hover(cx, el); +/// +/// view! { cx, +/// +/// } +/// # } +/// ``` + +pub fn use_element_hover(cx: Scope, el: El) -> Signal +where + El: Clone, + (Scope, El): Into>, + T: Into + Clone + 'static, +{ + use_element_hover_with_options(cx, el, UseElementHoverOptions::default()) +} + +/// Version of [`use_element_hover`] that takes a `UseElementHoverOptions`. See [`use_element_hover`] for how to use. + +pub fn use_element_hover_with_options( + cx: Scope, + el: El, + options: UseElementHoverOptions, +) -> Signal +where + El: Clone, + (Scope, El): Into>, + T: Into + Clone + 'static, +{ + let UseElementHoverOptions { + delay_enter, + delay_leave, + } = options; + + let (is_hovered, set_hovered) = create_signal(cx, false); + + let mut timer: Option = None; + + let mut toggle = move |entering: bool| { + let delay = if entering { delay_enter } else { delay_leave }; + + if let Some(handle) = timer.take() { + handle.clear(); + } + + if delay > 0 { + timer = set_timeout_with_handle( + move || set_hovered(entering), + Duration::from_millis(delay), + ) + .ok(); + } else { + set_hovered(entering); + } + }; + + let mut listener_options = AddEventListenerOptions::new(); + listener_options.passive(true); + + let _ = use_event_listener_with_options( + cx, + el.clone(), + mouseenter, + move |_| toggle(true), + listener_options.clone(), + ); + + let _ = use_event_listener_with_options( + cx, + el, + mouseleave, + move |_| toggle(false), + listener_options, + ); + + is_hovered.into() +} + +/// Options for [`use_element_hover_with_options`]. +#[derive(DefaultBuilder, Default)] +pub struct UseElementHoverOptions { + /// The time in ms the mouse has to be hovered over the element before the signal is changed to `true`. Defaults to `0`. + delay_enter: u64, + + /// The time in ms after the mouse has left the element before the signal is changed to `false`. Defaults to `0`. + delay_leave: u64, +} diff --git a/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs b/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs index b27d203..1093ceb 100644 --- a/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs +++ b/template/src/{{ module }}/{{ function_name }}.ffizer.hbs.rs @@ -27,7 +27,7 @@ pub fn {{ function_name }}() -> {{ to_pascal_case function_name }}Return { /// Version of [`{{ function_name }}`] that takes a `{{ to_pascal_case function_name }}Options`. See [`{{ function_name }}`] for how to use. {{#if feature}}#[doc(cfg(feature = "{{feature}}"))]{{/if}} -pub fn {{ function_name }}_with_options(options: {{ to_pascal_case function_name }}Return) -> {{ to_pascal_case function_name }}Return { +pub fn {{ function_name }}_with_options(options: {{ to_pascal_case function_name }}Options) -> {{ to_pascal_case function_name }}Return { {{ to_pascal_case function_name }}Return {} }