diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d62aa2..e33639d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### New Functions 🚀 +- `use_toggle` - `use_prefers_reduced_motion` ### Breaking Change 🛠 diff --git a/Cargo.toml b/Cargo.toml index 08472be..a35148d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,6 +106,7 @@ default = [ "use_throttle_fn", "use_timeout_fn", "use_timestamp", + "use_toggle", "use_to_string", "use_user_media", "use_web_notification", @@ -316,6 +317,7 @@ use_supported = [] use_throttle_fn = [] use_timeout_fn = [] use_timestamp = ["use_interval_fn", "use_raf_fn"] +use_toggle = [] use_to_string = [] use_user_media = [ "use_window", diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md index ebbb19f..f92fe71 100644 --- a/docs/book/src/SUMMARY.md +++ b/docs/book/src/SUMMARY.md @@ -111,6 +111,7 @@ - [use_supported](utilities/use_supported.md) - [use_throttle_fn](utilities/use_throttle_fn.md) - [use_to_string](utilities/use_to_string.md) +- [use_toggle](utilities/use_toggle.md) # Intl diff --git a/docs/book/src/utilities/use_toggle.md b/docs/book/src/utilities/use_toggle.md new file mode 100644 index 0000000..3ecd99c --- /dev/null +++ b/docs/book/src/utilities/use_toggle.md @@ -0,0 +1,3 @@ +# use_toggle + + diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 4d029f4..7ad0f2b 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -58,6 +58,7 @@ members = [ "use_throttle_fn", "use_timeout_fn", "use_timestamp", + "use_toggle", "use_user_media", "use_web_notification", "use_websocket", diff --git a/examples/use_toggle/Cargo.toml b/examples/use_toggle/Cargo.toml new file mode 100644 index 0000000..f97f972 --- /dev/null +++ b/examples/use_toggle/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "use_toggle" +version = "0.1.0" +edition = "2021" + +[dependencies] +leptos = { version = "0.6", features = ["nightly", "csr"] } +console_error_panic_hook = "0.1" +console_log = "1" +log = "0.4" +leptos-use = { path = "../..", features = ["use_toggle", "docs"] } +web-sys = "0.3" + +[dev-dependencies] +wasm-bindgen = "0.2" +wasm-bindgen-test = "0.3.0" diff --git a/examples/use_toggle/README.md b/examples/use_toggle/README.md new file mode 100644 index 0000000..f3e2725 --- /dev/null +++ b/examples/use_toggle/README.md @@ -0,0 +1,23 @@ +A simple example for `use_toggle`. + +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_toggle/Trunk.toml b/examples/use_toggle/Trunk.toml new file mode 100644 index 0000000..3e4be08 --- /dev/null +++ b/examples/use_toggle/Trunk.toml @@ -0,0 +1,2 @@ +[build] +public_url = "/demo/" \ No newline at end of file diff --git a/examples/use_toggle/index.html b/examples/use_toggle/index.html new file mode 100644 index 0000000..ae249a6 --- /dev/null +++ b/examples/use_toggle/index.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/examples/use_toggle/input.css b/examples/use_toggle/input.css new file mode 100644 index 0000000..bd6213e --- /dev/null +++ b/examples/use_toggle/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/examples/use_toggle/rust-toolchain.toml b/examples/use_toggle/rust-toolchain.toml new file mode 100644 index 0000000..271800c --- /dev/null +++ b/examples/use_toggle/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly" \ No newline at end of file diff --git a/examples/use_toggle/src/main.rs b/examples/use_toggle/src/main.rs new file mode 100644 index 0000000..eacec55 --- /dev/null +++ b/examples/use_toggle/src/main.rs @@ -0,0 +1,24 @@ +use leptos::*; +use leptos_use::docs::{demo_or_body, BooleanDisplay}; +use leptos_use::{use_toggle, UseToggleReturn}; + +#[component] +fn Demo() -> impl IntoView { + let UseToggleReturn { toggle, value, set_value } = use_toggle(true); + + view! { +

Value:

+ + + + } +} + +fn main() { + _ = console_log::init_with_level(log::Level::Debug); + console_error_panic_hook::set_once(); + + mount_to(demo_or_body(), || { + view! { } + }) +} diff --git a/examples/use_toggle/style/output.css b/examples/use_toggle/style/output.css new file mode 100644 index 0000000..ab5191f --- /dev/null +++ b/examples/use_toggle/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_toggle/tailwind.config.js b/examples/use_toggle/tailwind.config.js new file mode 100644 index 0000000..bc09f5e --- /dev/null +++ b/examples/use_toggle/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/src/lib.rs b/src/lib.rs index 1b18ab1..79e59ef 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,6 +28,8 @@ mod is_ok; mod is_some; #[cfg(feature = "on_click_outside")] mod on_click_outside; +#[cfg(feature = "use_toggle")] +mod use_toggle; #[cfg(feature = "signal_debounced")] mod signal_debounced; #[cfg(feature = "signal_throttled")] @@ -167,6 +169,8 @@ pub use is_ok::*; pub use is_some::*; #[cfg(feature = "on_click_outside")] pub use on_click_outside::*; +#[cfg(feature = "use_toggle")] +pub use use_toggle::*; #[cfg(feature = "signal_debounced")] pub use signal_debounced::*; #[cfg(feature = "signal_throttled")] diff --git a/src/use_toggle.rs b/src/use_toggle.rs new file mode 100644 index 0000000..390b510 --- /dev/null +++ b/src/use_toggle.rs @@ -0,0 +1,55 @@ +use leptos::*; +use crate::core::MaybeRwSignal; + +/// A boolean switcher with utility functions. +/// +/// ## Demo +/// +/// [Link to Demo](https://github.com/Synphonyte/leptos-use/tree/main/examples/use_toggle) +/// +/// ## Usage +/// +/// ``` +/// # use leptos::*; +/// # use leptos_use::{use_toggle, UseToggleReturn}; +/// # +/// # #[component] +/// # fn Demo() -> impl IntoView { +/// let UseToggleReturn { toggle, value, set_value } = use_toggle(true); +/// # +/// # view! { } +/// # } +/// ``` +/// +/// ## See also +/// +/// * [`fn@crate::use_cycle_list`] +// #[doc(cfg(feature = "use_toggle"))] +pub fn use_toggle(initial_value: impl Into>) -> UseToggleReturn { + let initial_value = initial_value.into(); + let (value, set_value) = initial_value.into_signal(); + + let toggle = move || { + set_value.update(|v| *v = !*v); + }; + + UseToggleReturn { + toggle, + value, + set_value, + } +} + +/// Return type of [`fn@crate::use_toggle`]. +// #[doc(cfg(feature = "use_toggle"))] +pub struct UseToggleReturn +where + F: Fn() + Clone + 'static, +{ + /// Toggles the value between `true` and `false`. + pub toggle: F, + /// The current value as signal. + pub value: Signal, + /// Sets the current value to the given value. + pub set_value: WriteSignal, +} \ No newline at end of file diff --git a/template/modify_files.py b/template/modify_files.py index dd0c865..4efdb23 100644 --- a/template/modify_files.py +++ b/template/modify_files.py @@ -13,6 +13,7 @@ def main(): args = parser.parse_args() + modify_cargo_toml(args) modify_changelog(args) modify_librs(args) modify_modrs(args) @@ -93,7 +94,7 @@ def modify_librs(args): with open("src/lib.rs", "r") as f: lib_source = f.read() - feature_prefix = "" if args.feature is None else f"#[cfg(feature = \"{args.feature}\"))]\n" + feature_prefix = "" if args.feature is None else f"#[cfg(feature = \"{args.feature}\")]\n" if args.module is None: lib_source = lib_source.replace("mod on_click_outside;", @@ -140,5 +141,27 @@ def modify_changelog(args): f.write("".join(changelog_source)) +def modify_cargo_toml(args): + with open("Cargo.toml", "r") as f: + cargo_toml_source = f.readlines() + + in_features = False + in_default = False + + for i, line in enumerate(cargo_toml_source): + if line.startswith("[features]"): + in_features = True + + if in_features and line.startswith("default = ["): + in_default = True + cargo_toml_source.insert(i + 1, f" \"{args.feature}\",\n") + + if in_default and line.startswith("]"): + cargo_toml_source.insert(i + 1, f"{args.feature} = []\n") + break + + with open("Cargo.toml", "w") as f: + f.write("".join(cargo_toml_source)) + if __name__ == '__main__': main()