skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent panic when copying text outside of a secure context (#5326) 

* Closes <https://github.com/emilk/egui/issues/5293>
* [x] I have followed the instructions in the PR template
This commit is contained in:
YgorSouza 2024-11-01 13:21:59 +01:00 committed by GitHub
parent bbbd936f50
commit 444c21a437
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/eframe/src/web/mod.rs
View File

@ -174,6 +174,13 @@ fn set_cursor_icon(cursor: egui::CursorIcon) -> Option<()> {
/// Set the clipboard text. /// Set the clipboard text.
fn set_clipboard_text(s: &str) { fn set_clipboard_text(s: &str) {
if let Some(window) = web_sys::window() { if let Some(window) = web_sys::window() {
if !window.is_secure_context() {
log::error!(
"Clipboard is not available because we are not in a secure context. \
See https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts"
);
return;
}
let promise = window.navigator().clipboard().write_text(s); let promise = window.navigator().clipboard().write_text(s);
let future = wasm_bindgen_futures::JsFuture::from(promise); let future = wasm_bindgen_futures::JsFuture::from(promise);
let future = async move { let future = async move {

4
crates/egui/src/context.rs
View File

@ -1439,6 +1439,10 @@ impl Context {
/// ///
/// Empty strings are ignored. /// Empty strings are ignored.
/// ///
/// Note that in wasm applications, the clipboard is only accessible in secure contexts (e.g.,
/// HTTPS or localhost). If this method is used outside of a secure context, it will log an
/// error and do nothing. See <https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts>.
///
/// Equivalent to: /// Equivalent to:
/// ``` /// ```
/// # let ctx = egui::Context::default(); /// # let ctx = egui::Context::default();