From cd0be5ac62693907444a5b1a152aad1fce85b2b2 Mon Sep 17 00:00:00 2001 From: Sean Aye Date: Fri, 24 Nov 2023 15:06:35 -0500 Subject: [PATCH 1/5] add use_display_media --- .idea/leptos-use.iml | 5 +++- Cargo.toml | 4 +++ docs/book/src/browser/use_display_media.md | 3 ++ examples/Cargo.toml | 1 + examples/use_display_media/Cargo.toml | 16 ++++++++++ examples/use_display_media/Trunk.toml | 2 ++ examples/use_display_media/index.html | 5 ++++ .../use_display_media/rust-toolchain.toml | 2 ++ examples/use_display_media/src/main.rs | 30 +++++++++++++++++++ src/lib.rs | 2 ++ src/use_display_media.rs | 29 ++++++++++++++++++ 11 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 docs/book/src/browser/use_display_media.md create mode 100644 examples/use_display_media/Cargo.toml create mode 100644 examples/use_display_media/Trunk.toml create mode 100644 examples/use_display_media/index.html create mode 100644 examples/use_display_media/rust-toolchain.toml create mode 100644 examples/use_display_media/src/main.rs create mode 100644 src/use_display_media.rs diff --git a/.idea/leptos-use.iml b/.idea/leptos-use.iml index 830c9eb..224ebd7 100644 --- a/.idea/leptos-use.iml +++ b/.idea/leptos-use.iml @@ -12,6 +12,7 @@ + @@ -67,7 +68,9 @@ + + @@ -90,4 +93,4 @@ - \ No newline at end of file + diff --git a/Cargo.toml b/Cargo.toml index 4c31f33..a4bcbda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ cfg-if = "1" default-struct-builder = "0.5" futures-util = "0.3" gloo-timers = { version = "0.3.0", features = ["futures"] } +gloo-utils = { version = "0.2.0"} js-sys = "0.3" lazy_static = "1" leptos = "0.5" @@ -40,6 +41,7 @@ features = [ "CssStyleDeclaration", "CustomEvent", "CustomEventInit", + "DisplayMediaStreamConstraints", "DomRect", "DomRectReadOnly", "DataTransfer", @@ -57,7 +59,9 @@ features = [ "IntersectionObserver", "IntersectionObserverInit", "IntersectionObserverEntry", + "MediaDevices", "MediaQueryList", + "MediaStream", "MouseEvent", "MutationObserver", "MutationObserverInit", diff --git a/docs/book/src/browser/use_display_media.md b/docs/book/src/browser/use_display_media.md new file mode 100644 index 0000000..5d4219f --- /dev/null +++ b/docs/book/src/browser/use_display_media.md @@ -0,0 +1,3 @@ +# use_display_media + + diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e61f920..d9f03b9 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -13,6 +13,7 @@ members = [ "use_css_var", "use_cycle_list", "use_debounce_fn", + "use_display_media", "use_document_visibility", "use_draggable", "use_drop_zone", diff --git a/examples/use_display_media/Cargo.toml b/examples/use_display_media/Cargo.toml new file mode 100644 index 0000000..32014f2 --- /dev/null +++ b/examples/use_display_media/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "use_display_media" +version = "0.1.0" +edition = "2021" + +[dependencies] +leptos = { version = "0.5", features = ["nightly", "csr"] } +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_display_media/Trunk.toml b/examples/use_display_media/Trunk.toml new file mode 100644 index 0000000..3e4be08 --- /dev/null +++ b/examples/use_display_media/Trunk.toml @@ -0,0 +1,2 @@ +[build] +public_url = "/demo/" \ No newline at end of file diff --git a/examples/use_display_media/index.html b/examples/use_display_media/index.html new file mode 100644 index 0000000..25f83eb --- /dev/null +++ b/examples/use_display_media/index.html @@ -0,0 +1,5 @@ + + + + + diff --git a/examples/use_display_media/rust-toolchain.toml b/examples/use_display_media/rust-toolchain.toml new file mode 100644 index 0000000..271800c --- /dev/null +++ b/examples/use_display_media/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly" \ No newline at end of file diff --git a/examples/use_display_media/src/main.rs b/examples/use_display_media/src/main.rs new file mode 100644 index 0000000..01cb48e --- /dev/null +++ b/examples/use_display_media/src/main.rs @@ -0,0 +1,30 @@ +use leptos::*; +use leptos_use::docs::{demo_or_body, Note}; +use leptos_use::use_display_media; + +#[component] +fn Demo() -> impl IntoView { + let stream = use_display_media(None); + let video_ref = create_node_ref::(); + + create_effect(move |_| match stream.get() { + Some(Ok(s)) => { + video_ref.get().expect("video element ref not created").set_src_object(Some(&s)); + video_ref.get().map(|v| v.play()); + } + Some(Err(e)) => log::error!("Failed to get media stream: {:?}", e), + None => log::debug!("No stream yet"), + }); + + view! { } +} + +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/src/lib.rs b/src/lib.rs index caf6dd5..d42079d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,6 +22,7 @@ mod use_color_mode; mod use_css_var; mod use_cycle_list; mod use_debounce_fn; +mod use_display_media; mod use_document; mod use_document_visibility; mod use_draggable; @@ -76,6 +77,7 @@ pub use use_color_mode::*; pub use use_css_var::*; pub use use_cycle_list::*; pub use use_debounce_fn::*; +pub use use_display_media::*; pub use use_document::*; pub use use_document_visibility::*; pub use use_draggable::*; diff --git a/src/use_display_media.rs b/src/use_display_media.rs new file mode 100644 index 0000000..c68dfc6 --- /dev/null +++ b/src/use_display_media.rs @@ -0,0 +1,29 @@ +use leptos::*; +use wasm_bindgen::{JsValue, JsCast}; +use web_sys::{DisplayMediaStreamConstraints, MediaStream}; +use crate::use_window::use_window; + +async fn create_media(opts: Option) -> Result { + let media = use_window() + .navigator() + .ok_or_else(|| JsValue::from_str("Failed to access window.navigator")) + .and_then(|n| n.media_devices())?; + + let promise = match opts { + Some(o) => media.get_display_media_with_constraints(&o), + None => media.get_display_media(), + }?; + let res = wasm_bindgen_futures::JsFuture::from(promise).await?; + Ok::<_, JsValue>(MediaStream::unchecked_from_js(res)) +} + +type UseDisplayReturn = Resource, Result>; + +pub fn use_display_media(options: S) -> UseDisplayReturn +where + S: Into>>, +{ + let opts: MaybeSignal> = options.into(); + create_local_resource(move || opts.with(|o| o.as_ref().cloned()), create_media) +} + From f34e62fb6b4def61bfad40a58247e80b9f93a9d3 Mon Sep 17 00:00:00 2001 From: Sean Aye Date: Fri, 24 Nov 2023 15:23:30 -0500 Subject: [PATCH 2/5] fix the example via template --- CHANGELOG.md | 4 + docs/book/src/SUMMARY.md | 1 + docs/book/src/browser/use_display_media.md | 2 +- examples/Cargo.toml | 1 + examples/use_display_media/README.md | 23 ++ examples/use_display_media/index.html | 6 +- examples/use_display_media/input.css | 3 + examples/use_display_media/style/output.css | 289 ++++++++++++++++++ examples/use_display_media/tailwind.config.js | 15 + src/lib.rs | 1 + src/use_display_media.rs | 19 ++ 11 files changed, 361 insertions(+), 3 deletions(-) create mode 100644 examples/use_display_media/README.md create mode 100644 examples/use_display_media/input.css create mode 100644 examples/use_display_media/style/output.css create mode 100644 examples/use_display_media/tailwind.config.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 67e8a12..199ab63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### New Functions 🚀 + +- `use_display_media` + ### Breaking Changes 🛠 - (@feral-dot-io) The use `use__storage` functions have been rewritten to use `Codec`s instead of always diff --git a/docs/book/src/SUMMARY.md b/docs/book/src/SUMMARY.md index 35658f4..2cf9fc6 100644 --- a/docs/book/src/SUMMARY.md +++ b/docs/book/src/SUMMARY.md @@ -33,6 +33,7 @@ - [use_breakpoints](browser/use_breakpoints.md) - [use_color_mode](browser/use_color_mode.md) - [use_css_var](browser/use_css_var.md) +- [use_display_media](browser/use_display_media.md) - [use_event_listener](browser/use_event_listener.md) - [use_favicon](browser/use_favicon.md) - [use_media_query](browser/use_media_query.md) diff --git a/docs/book/src/browser/use_display_media.md b/docs/book/src/browser/use_display_media.md index 5d4219f..6a2d3ed 100644 --- a/docs/book/src/browser/use_display_media.md +++ b/docs/book/src/browser/use_display_media.md @@ -1,3 +1,3 @@ # use_display_media - + diff --git a/examples/Cargo.toml b/examples/Cargo.toml index d9f03b9..462659c 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,6 +14,7 @@ members = [ "use_cycle_list", "use_debounce_fn", "use_display_media", + "use_display_media", "use_document_visibility", "use_draggable", "use_drop_zone", diff --git a/examples/use_display_media/README.md b/examples/use_display_media/README.md new file mode 100644 index 0000000..3cc0e27 --- /dev/null +++ b/examples/use_display_media/README.md @@ -0,0 +1,23 @@ +A simple example for `use_display_media`. + +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_display_media/index.html b/examples/use_display_media/index.html index 25f83eb..ae249a6 100644 --- a/examples/use_display_media/index.html +++ b/examples/use_display_media/index.html @@ -1,5 +1,7 @@ - - + + + + diff --git a/examples/use_display_media/input.css b/examples/use_display_media/input.css new file mode 100644 index 0000000..bd6213e --- /dev/null +++ b/examples/use_display_media/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/examples/use_display_media/style/output.css b/examples/use_display_media/style/output.css new file mode 100644 index 0000000..ab5191f --- /dev/null +++ b/examples/use_display_media/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_display_media/tailwind.config.js b/examples/use_display_media/tailwind.config.js new file mode 100644 index 0000000..bc09f5e --- /dev/null +++ b/examples/use_display_media/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 d42079d..09811d6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,6 +69,7 @@ pub use is_none::*; pub use is_ok::*; pub use is_some::*; pub use on_click_outside::*; +pub use use_display_media::*; pub use signal_debounced::*; pub use signal_throttled::*; pub use use_active_element::*; diff --git a/src/use_display_media.rs b/src/use_display_media.rs index c68dfc6..4d46744 100644 --- a/src/use_display_media.rs +++ b/src/use_display_media.rs @@ -19,6 +19,25 @@ async fn create_media(opts: Option) -> Result, Result>; +/// +/// +/// ## Demo +/// +/// [Link to Demo](https://github.com/Synphonyte/leptos-use/tree/main/examples/use_display_media) +/// +/// ## Usage +/// +/// ``` +/// # use leptos::*; +/// # use leptos_use::use_display_media; +/// # +/// # #[component] +/// # fn Demo() -> impl IntoView { +/// use_display_media(); +/// # +/// # view! { } +/// # } +/// ``` pub fn use_display_media(options: S) -> UseDisplayReturn where S: Into>>, From ba6082a32f45f89078aba21e0c89fa3e9d543d18 Mon Sep 17 00:00:00 2001 From: Sean Aye Date: Wed, 29 Nov 2023 18:52:39 -0500 Subject: [PATCH 3/5] implement changes --- examples/Cargo.toml | 1 - src/use_display_media.rs | 36 ++++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 462659c..d9f03b9 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,7 +14,6 @@ members = [ "use_cycle_list", "use_debounce_fn", "use_display_media", - "use_display_media", "use_document_visibility", "use_draggable", "use_drop_zone", diff --git a/src/use_display_media.rs b/src/use_display_media.rs index 4d46744..848d2f7 100644 --- a/src/use_display_media.rs +++ b/src/use_display_media.rs @@ -3,23 +3,8 @@ use wasm_bindgen::{JsValue, JsCast}; use web_sys::{DisplayMediaStreamConstraints, MediaStream}; use crate::use_window::use_window; -async fn create_media(opts: Option) -> Result { - let media = use_window() - .navigator() - .ok_or_else(|| JsValue::from_str("Failed to access window.navigator")) - .and_then(|n| n.media_devices())?; - let promise = match opts { - Some(o) => media.get_display_media_with_constraints(&o), - None => media.get_display_media(), - }?; - let res = wasm_bindgen_futures::JsFuture::from(promise).await?; - Ok::<_, JsValue>(MediaStream::unchecked_from_js(res)) -} - -type UseDisplayReturn = Resource, Result>; - -/// +/// Get a media stream from the user's display. /// /// ## Demo /// @@ -46,3 +31,22 @@ where create_local_resource(move || opts.with(|o| o.as_ref().cloned()), create_media) } +async fn create_media(opts: Option) -> Result { + let media = use_window() + .navigator() + .ok_or_else(|| JsValue::from_str("Failed to access window.navigator")) + .and_then(|n| n.media_devices())?; + + let promise = match opts { + Some(o) => media.get_display_media_with_constraints(&o), + None => media.get_display_media(), + }?; + let res = wasm_bindgen_futures::JsFuture::from(promise).await?; + Ok::<_, JsValue>(MediaStream::unchecked_from_js(res)) +} + + +/// A leptos resource which optionally accepts a [DisplayMediaParamContraints](https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.DisplayMediaStreamConstraints.html) +/// The resource contains a result containing the media stream or the rejected JsValue +type UseDisplayReturn = Resource, Result>; + From 6c5d9e6f57db0d09c767bcbf542aeee23d7951bc Mon Sep 17 00:00:00 2001 From: Sean Aye Date: Wed, 29 Nov 2023 18:55:22 -0500 Subject: [PATCH 4/5] update doc comment --- src/use_display_media.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/use_display_media.rs b/src/use_display_media.rs index 848d2f7..9a645bf 100644 --- a/src/use_display_media.rs +++ b/src/use_display_media.rs @@ -4,7 +4,7 @@ use web_sys::{DisplayMediaStreamConstraints, MediaStream}; use crate::use_window::use_window; -/// Get a media stream from the user's display. +/// Get a Resource containing a media stream from the user's display. /// /// ## Demo /// From 50c3e14f77a8187f811f8166a07698351f1b7b65 Mon Sep 17 00:00:00 2001 From: Sean Aye Date: Thu, 30 Nov 2023 08:01:08 -0500 Subject: [PATCH 5/5] update example --- src/use_display_media.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/use_display_media.rs b/src/use_display_media.rs index 9a645bf..15d54f9 100644 --- a/src/use_display_media.rs +++ b/src/use_display_media.rs @@ -18,9 +18,19 @@ use crate::use_window::use_window; /// # /// # #[component] /// # fn Demo() -> impl IntoView { -/// use_display_media(); +/// # let stream = use_display_media(None); /// # -/// # view! { } +/// # let video_ref = create_node_ref::(); +/// # create_effect(move |_| match stream.get() { +/// # Some(Ok(s)) => { +/// # video_ref.get().expect("video element ref not created").set_src_object(Some(&s)); +/// # video_ref.get().map(|v| v.play()); +/// # } +/// # Some(Err(e)) => log::error!("Failed to get media stream: {:?}", e), +/// # None => log::debug!("No stream yet"), +/// # }); +/// # +/// # view! { } /// # } /// ``` pub fn use_display_media(options: S) -> UseDisplayReturn