* create static site generation helpers in the router crate * work on integrating static site generation into fullstack * move ssg into a separate crate * integrate ssg with the launch builder * simplify ssg example * fix static_routes for child routes * move CLI hot reloading websocket code into dioxus-hot-reload * fix some unused imports * use the same hot reloading websocket code for fullstack * fix fullstack hot reloading * move cli hot reloading logic into the hot reload crate * ssg example working with dx serve * add more examples * fix clippy * switch to a result for Element * fix formatting * fix hot reload doctest imports * fix axum imports * add show method to error context * implement retaining nodes during suspense * fix unterminated if statements * communicate between tasks and suspense boundaries * make suspense placeholders easier to use * implement IntoDynNode and IntoVNode for more wrappers * fix clippy examples * fix rsx tests * add streaming html utilities to the ssr package * unify hydration and non-hydration ssr cache * fix router with Result Element * don't run server doc tests * Fix hot reload websocket doc examples * simple apps working with fullstack streaming * fix preloading wasm * Report errors encountered while streaming * remove async from incremental renderer * document new VirtualDom suspense methods * make streaming work with incremental rendering * fix static site generation * document suspense structs * create closure type; allow async event handlers in props; allow shorthand event handlers * test forwarding event handlers with the shorthand syntax * fix clippy * fix imports in spawn async doctest * fix empty rsx * fix async result event handlers * fix mounting router in multiple places * Fix task dead cancel race condition * simplify diffing before adding suspense * fix binary size increase * fix attribute diffing * more diffing fixes * create minimal fullstack feature * smaller fullstack bundles * allow mounting nodes that are already created and creating nodes without mounting them * fix hot reload feature * fix replacing components * don't reclaim virtual nodes * client side suspense working! * fix CLI * slightly smaller fullstack builds * fix multiple suspended scopes * fix merge errors * yield back to tokio every few polls to fix suspending on many tasks at once * remove logs * document suspense boundary and update suspense example * fix ssg * make streaming optional * fix some router and core tests * fix suspense example * fix serialization with out of order server futures * add incremental streaming hackernews demo * fix hackernews demo * fix root hackernews redirect * fix formatting * add tests for suspense cases * slightly smaller binaries * slightly smaller * improve error handling docs * fix errors example link * fix doc tests * remove log file * fix ssr cache type inference * remove index.html * fix ssg render template * fix assigning ids on elements with dynamic attributes * add desktop feature to the workspace examples * remove router static generation example; ssg lives in the dioxus-static-generation package * add a test for effects during suspense * only run effects on mounted nodes * fix multiple suspense roots * fix node iterator * fix closures without arguments * fix dioxus-core readme doctest * remove suspense logs * fix scope stack * fix clippy * remove unused suspense boundary from hackernews * assert that launch never returns for better compiler errors * fix static generation launch function * fix web renderer * pass context providers into server functions * add an example for FromContext * clean up DioxusRouterExt * fix server function context * fix fullstack desktop example * forward CLI serve settings to fullstack * re-export serve config at the root of fullstack * forward env directly instead of using a guard * just set the port in the CLI for fullstack playwright tests * fix fullstack dioxus-cli-config feature * fix launch server merge conflicts * fix fullstack launch context * Merge branch 'main' into suspense-2.0 * fix fullstack html data * remove drop virtual dom feature * add a comment about only_write_templates binary size workaround * remove explicit dependencies from use_server_future * make ErrorContext and SuspenseContext more similar * Tweak: small tweaks to tomls to make diff smaller * only rerun components under suspense after the initial placeholders are sent to the client * add module docs for suspense * keep track of when suspense boundaries are resolved * start implementing JS out of order streaming * fix core tests * implement the server side of suspense with js * fix streaming ssr with nested suspense * move streaming ssr code into fullstack * revert minification changes * serialize server future data as the html streams * start loading scripts wasm immediately instead of defering the script * very basic nested suspense example working with minimal html updates * clean up some suspense/error docs * fix hydrating nested pending server futures * sort resolved boundaries by height * Fix disconnecting clients while streaming * fix static generation crate * don't insert extra divs when hydrating streamed chunks * wait to swap in the elements until they are hydrated * remove inline streaming script * hackernews partially working * fix spa mode * banish the open shadow dom * fix removing placeholder * set up streaming playwright test * run web playwright tests on 9999 to avoid port conflicts with other local servers * remove suspense nodes if the suspense boundary is replaced before the suspense resolves on the server * ignore hydration of removed suspense boundaries * use path based indexing to fix hydrating suspense after parent suspense with child is removed * re-export dioxus error * remove resolved suspense divs if the suspense boundary has been removed * Fix client side initialized server futures * ignore comment nodes while traversing nodes in core to avoid lists getting swapped out with suspense * Pass initial hydration data to the client * hide pre nodes * don't panic if reclaiming an element fails * fix scope stack when polling tasks * improve deserialization out of length message * Ok(VNode::placeholder()) -> VNode::empty() * fix typo in rsx usage * restore testing changes from suspense example * clean up some logs and comments * fix playwright tests * clean up more changes in core * clean up core tests * remove anymap dependency * clean up changes to hooks * clean up changes in the router, rsx, and web * revert changes to axum-hello-world * fix use_server_future * fix clippy in dioxus-core * check that the next or previous node exist before checking if we should ignore them * fix formatting * fix suspense playwright test * remove unused suspense code * add more suspense playwright tests * add more docs for error boundaries * fix suspense core tests * fix ErrorBoundary example * remove a bunch of debug logging in js * fix router failure_external_navigation * use absolute paths in the interpreter build.rs * strip '\r' while hashing ts files * add a wrapper with a default error boundary and suspense boundary * restore hot reloading * ignore non-ts files when hashing * sort ts files before hashing them * fix rsx tests * fix fullstack doc tests * fix core tests * fix axum auth example * update suspense hydration diagram * longer playwright build limit * tiny fixes - spelling, formatting * update diagram link * remove comment and template nodes for suspense placeholders * remove comment nodes as we hydrate text * simplify hackernews example * clean up hydrating text nodes * switch to a separate environment variable for the base path for smaller binaries * clean up file system html trait * fix form data * move streaming code into fullstack * implement serialize and deserialize for CapturedError * remove waits in the nested suspense playwright spec * force sequential fullstack builds for CI * longer nested suspense delay for CI * fix --force-sequential flag * wait to launch server until client build is done --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
248 lines
6.4 KiB
Rust
248 lines
6.4 KiB
Rust
use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
|
|
use crate::input_data::{MouseButton, MouseButtonSet};
|
|
use crate::prelude::*;
|
|
|
|
use dioxus_core::Event;
|
|
use keyboard_types::Modifiers;
|
|
|
|
use crate::HasMouseData;
|
|
|
|
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
|
|
/// placing a pointer device (such as a mouse) on the touch surface and then dragging the pointer to a new location
|
|
/// (such as another DOM element). Applications are free to interpret a drag and drop interaction in an
|
|
/// application-specific way.
|
|
pub struct DragData {
|
|
inner: Box<dyn HasDragData>,
|
|
}
|
|
|
|
impl<E: HasDragData + 'static> From<E> for DragData {
|
|
fn from(e: E) -> Self {
|
|
Self { inner: Box::new(e) }
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Debug for DragData {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("DragData")
|
|
.field("coordinates", &self.coordinates())
|
|
.field("modifiers", &self.modifiers())
|
|
.field("held_buttons", &self.held_buttons())
|
|
.field("trigger_button", &self.trigger_button())
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
impl PartialEq for DragData {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.coordinates() == other.coordinates()
|
|
&& self.modifiers() == other.modifiers()
|
|
&& self.held_buttons() == other.held_buttons()
|
|
&& self.trigger_button() == other.trigger_button()
|
|
}
|
|
}
|
|
|
|
impl DragData {
|
|
/// Create a new DragData
|
|
pub fn new(inner: impl HasDragData + 'static) -> Self {
|
|
Self {
|
|
inner: Box::new(inner),
|
|
}
|
|
}
|
|
|
|
/// Downcast this event data to a specific type
|
|
pub fn downcast<T: 'static>(&self) -> Option<&T> {
|
|
HasDragData::as_any(&*self.inner).downcast_ref::<T>()
|
|
}
|
|
}
|
|
|
|
impl crate::HasFileData for DragData {
|
|
#[cfg(feature = "file-engine")]
|
|
fn files(&self) -> Option<std::sync::Arc<dyn crate::file_data::FileEngine>> {
|
|
self.inner.files()
|
|
}
|
|
}
|
|
|
|
impl InteractionLocation for DragData {
|
|
fn client_coordinates(&self) -> ClientPoint {
|
|
self.inner.client_coordinates()
|
|
}
|
|
|
|
fn page_coordinates(&self) -> PagePoint {
|
|
self.inner.page_coordinates()
|
|
}
|
|
|
|
fn screen_coordinates(&self) -> ScreenPoint {
|
|
self.inner.screen_coordinates()
|
|
}
|
|
}
|
|
|
|
impl InteractionElementOffset for DragData {
|
|
fn element_coordinates(&self) -> ElementPoint {
|
|
self.inner.element_coordinates()
|
|
}
|
|
|
|
fn coordinates(&self) -> Coordinates {
|
|
self.inner.coordinates()
|
|
}
|
|
}
|
|
|
|
impl ModifiersInteraction for DragData {
|
|
fn modifiers(&self) -> Modifiers {
|
|
self.inner.modifiers()
|
|
}
|
|
}
|
|
|
|
impl PointerInteraction for DragData {
|
|
fn held_buttons(&self) -> MouseButtonSet {
|
|
self.inner.held_buttons()
|
|
}
|
|
|
|
// todo the following is kind of bad; should we just return None when the trigger_button is unreliable (and frankly irrelevant)? i guess we would need the event_type here
|
|
fn trigger_button(&self) -> Option<MouseButton> {
|
|
self.inner.trigger_button()
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
/// A serialized version of DragData
|
|
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
|
pub struct SerializedDragData {
|
|
pub mouse: crate::point_interaction::SerializedPointInteraction,
|
|
|
|
#[cfg(feature = "file-engine")]
|
|
#[serde(default)]
|
|
files: Option<crate::file_data::SerializedFileEngine>,
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl SerializedDragData {
|
|
fn new(drag: &DragData) -> Self {
|
|
Self {
|
|
mouse: crate::point_interaction::SerializedPointInteraction::from(drag),
|
|
#[cfg(feature = "file-engine")]
|
|
files: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl HasDragData for SerializedDragData {
|
|
fn as_any(&self) -> &dyn std::any::Any {
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl crate::file_data::HasFileData for SerializedDragData {
|
|
#[cfg(feature = "file-engine")]
|
|
fn files(&self) -> Option<std::sync::Arc<dyn crate::file_data::FileEngine>> {
|
|
self.files
|
|
.as_ref()
|
|
.map(|files| std::sync::Arc::new(files.clone()) as _)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl HasMouseData for SerializedDragData {
|
|
fn as_any(&self) -> &dyn std::any::Any {
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl InteractionLocation for SerializedDragData {
|
|
fn client_coordinates(&self) -> ClientPoint {
|
|
self.mouse.client_coordinates()
|
|
}
|
|
|
|
fn page_coordinates(&self) -> PagePoint {
|
|
self.mouse.page_coordinates()
|
|
}
|
|
|
|
fn screen_coordinates(&self) -> ScreenPoint {
|
|
self.mouse.screen_coordinates()
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl InteractionElementOffset for SerializedDragData {
|
|
fn element_coordinates(&self) -> ElementPoint {
|
|
self.mouse.element_coordinates()
|
|
}
|
|
|
|
fn coordinates(&self) -> Coordinates {
|
|
self.mouse.coordinates()
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl ModifiersInteraction for SerializedDragData {
|
|
fn modifiers(&self) -> Modifiers {
|
|
self.mouse.modifiers()
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl PointerInteraction for SerializedDragData {
|
|
fn held_buttons(&self) -> MouseButtonSet {
|
|
self.mouse.held_buttons()
|
|
}
|
|
|
|
fn trigger_button(&self) -> Option<MouseButton> {
|
|
self.mouse.trigger_button()
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl serde::Serialize for DragData {
|
|
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
|
SerializedDragData::new(self).serialize(serializer)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl<'de> serde::Deserialize<'de> for DragData {
|
|
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
|
let data = SerializedDragData::deserialize(deserializer)?;
|
|
Ok(Self {
|
|
inner: Box::new(data),
|
|
})
|
|
}
|
|
}
|
|
|
|
/// A trait for any object that has the data for a drag event
|
|
pub trait HasDragData: HasMouseData + crate::HasFileData {
|
|
/// return self as Any
|
|
fn as_any(&self) -> &dyn std::any::Any;
|
|
}
|
|
|
|
impl_event! {
|
|
DragData;
|
|
|
|
/// ondrag
|
|
ondrag
|
|
|
|
/// ondragend
|
|
ondragend
|
|
|
|
/// ondragenter
|
|
ondragenter
|
|
|
|
/// ondragexit
|
|
ondragexit
|
|
|
|
/// ondragleave
|
|
ondragleave
|
|
|
|
/// ondragover
|
|
ondragover
|
|
|
|
/// ondragstart
|
|
ondragstart
|
|
|
|
/// ondrop
|
|
ondrop
|
|
}
|