Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-14 00:17:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts for files

Browse source
This commit is contained in:
Jonathan Kelley 2024-01-08 14:08:21 -08:00
parent 8ef7503a90
commit 9c4d90350f
No known key found for this signature in database
GPG key ID: 1FBB50F7EB0A08BE
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -133,7 +133,6 @@ serde_json = "1.0.79"
rand = { version = "0.8.4", features = ["small_rng"] } rand = { version = "0.8.4", features = ["small_rng"] }
tokio = { version = "1.16.1", features = ["full"] } tokio = { version = "1.16.1", features = ["full"] }
reqwest = { version = "0.11.9", features = ["json"] } reqwest = { version = "0.11.9", features = ["json"] }
fern = { version = "0.6.0", features = ["colored"] }
env_logger = "0.10.0" env_logger = "0.10.0"
simple_logger = "4.0.0" simple_logger = "4.0.0"
thiserror = { workspace = true } thiserror = { workspace = true }

3
examples/file_upload.rs
View file

@ -1,4 +1,5 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
use dioxus::html::HasFileData;
use dioxus::prelude::*; use dioxus::prelude::*;
use tokio::time::sleep; use tokio::time::sleep;
@ -48,7 +49,7 @@ fn App(cx: Scope) -> Element {
ondrop: move |evt| { ondrop: move |evt| {
to_owned![files_uploaded]; to_owned![files_uploaded];
async move { async move {
if let Some(file_engine) = &evt.files { if let Some(file_engine) = &evt.files() {
let files = file_engine.files(); let files = file_engine.files();
for file_name in &files { for file_name in &files {
if let Some(file) = file_engine.read_file_to_string(file_name).await{ if let Some(file) = file_engine.read_file_to_string(file_name).await{

2
packages/html/src/events/drag.rs
View file

@ -8,8 +8,6 @@ use keyboard_types::Modifiers;
use crate::HasMouseData; use crate::HasMouseData;
use std::fmt::Debug;
pub type DragEvent = Event<DragData>; pub type DragEvent = Event<DragData>;
/// The DragEvent interface is a DOM event that represents a drag and drop interaction. The user initiates a drag by /// The DragEvent interface is a DOM event that represents a drag and drop interaction. The user initiates a drag by