summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2019-12-19 17:07:20 +0100
committerLibravatar GitHub <noreply@github.com>2019-12-19 17:07:20 +0100
commit9cf61fb82cb715ab0af15343be258b2b227d85f4 (patch)
tree1a6460ba8981b0bcef2bd64e975e0021425ac823 /web
parentc822ea753e6121cc53aa1a75112af6063e3e06dd (diff)
parent68c8ebcd775416d5eb8efa9c095bbe1d44d964ad (diff)
downloadiced-9cf61fb82cb715ab0af15343be258b2b227d85f4.tar.gz
iced-9cf61fb82cb715ab0af15343be258b2b227d85f4.tar.bz2
iced-9cf61fb82cb715ab0af15343be258b2b227d85f4.zip
Merge pull request #131 from hecrj/fix/web-subscription-missing
Fix `Subscription` missing in `iced_web`
Diffstat (limited to 'web')
-rw-r--r--web/Cargo.toml2
-rw-r--r--web/src/hasher.rs21
-rw-r--r--web/src/lib.rs4
-rw-r--r--web/src/subscription.rs19
4 files changed, 45 insertions, 1 deletions
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 8c559d73..605c7462 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["web-programming"]
maintenance = { status = "actively-developed" }
[dependencies]
-iced_core = { version = "0.1.0", path = "../core", features = ["command"] }
+iced_core = { version = "0.1.0", path = "../core", features = ["command", "subscription"] }
dodrio = "0.1.0"
wasm-bindgen = "0.2.51"
wasm-bindgen-futures = "0.4"
diff --git a/web/src/hasher.rs b/web/src/hasher.rs
new file mode 100644
index 00000000..1a28a2f9
--- /dev/null
+++ b/web/src/hasher.rs
@@ -0,0 +1,21 @@
+use std::collections::hash_map::DefaultHasher;
+
+/// The hasher used to compare subscriptions.
+#[derive(Debug)]
+pub struct Hasher(DefaultHasher);
+
+impl Default for Hasher {
+ fn default() -> Self {
+ Hasher(DefaultHasher::default())
+ }
+}
+
+impl core::hash::Hasher for Hasher {
+ fn write(&mut self, bytes: &[u8]) {
+ self.0.write(bytes)
+ }
+
+ fn finish(&self) -> u64 {
+ self.0.finish()
+ }
+}
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 782bcf93..d4c422d2 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -61,18 +61,22 @@ use std::{cell::RefCell, rc::Rc};
mod bus;
mod element;
+mod hasher;
pub mod style;
+pub mod subscription;
pub mod widget;
pub use bus::Bus;
pub use dodrio;
pub use element::Element;
+pub use hasher::Hasher;
pub use iced_core::{
Align, Background, Color, Command, Font, HorizontalAlignment, Length,
VerticalAlignment,
};
pub use style::Style;
+pub use subscription::Subscription;
pub use widget::*;
/// An interactive web application.
diff --git a/web/src/subscription.rs b/web/src/subscription.rs
new file mode 100644
index 00000000..4638c8ab
--- /dev/null
+++ b/web/src/subscription.rs
@@ -0,0 +1,19 @@
+//! Listen to external events in your application.
+use crate::Hasher;
+
+/// A request to listen to external events.
+///
+/// Besides performing async actions on demand with [`Command`], most
+/// applications also need to listen to external events passively.
+///
+/// A [`Subscription`] is normally provided to some runtime, like a [`Command`],
+/// and it will generate events as long as the user keeps requesting it.
+///
+/// For instance, you can use a [`Subscription`] to listen to a WebSocket
+/// connection, keyboard presses, mouse events, time ticks, etc.
+///
+/// [`Command`]: ../struct.Command.html
+/// [`Subscription`]: struct.Subscription.html
+pub type Subscription<T> = iced_core::Subscription<Hasher, (), T>;
+
+pub use iced_core::subscription::Recipe;