From 76698ff2b5753e637b14533650c0d28e681be3c5 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 1 Sep 2021 19:21:49 +0700 Subject: Make `Command` implementations platform-specific This allows us to introduce a platform-specific `Action` to both `iced_native` and `iced_web` and remove the `Clipboard` from `Application::update` to maintain purity. Additionally, this should let us implement further actions to let users query and modify the shell environment (e.g. window, clipboard, and more!) --- web/src/command.rs | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 web/src/command.rs (limited to 'web/src/command.rs') diff --git a/web/src/command.rs b/web/src/command.rs new file mode 100644 index 00000000..606097de --- /dev/null +++ b/web/src/command.rs @@ -0,0 +1,77 @@ +mod action; + +pub use action::Action; + +#[cfg(target_arch = "wasm32")] +use std::future::Future; + +/// A set of asynchronous actions to be performed by some runtime. +pub enum Command { + None, + Single(Action), + Batch(Vec>), +} + +impl Command { + /// Creates an empty [`Command`]. + /// + /// In other words, a [`Command`] that does nothing. + pub fn none() -> Self { + Self::None + } + + /// Creates a [`Command`] that performs the action of the given future. + #[cfg(target_arch = "wasm32")] + pub fn perform( + future: impl Future + 'static, + f: impl Fn(T) -> A + 'static + Send, + ) -> Command { + use iced_futures::futures::FutureExt; + + Command::Single(Action::Future(Box::pin(future.map(f)))) + } + + /// Applies a transformation to the result of a [`Command`]. + #[cfg(target_arch = "wasm32")] + pub fn map(mut self, f: impl Fn(T) -> A + 'static + Clone) -> Command + where + T: 'static, + { + match self { + Self::None => Command::None, + Self::Single(action) => Command::Single(action.map(f)), + Self::Batch(batch) => Command::Batch( + batch + .into_iter() + .map(|action| action.map(f.clone())) + .collect(), + ), + } + } + + /// Creates a [`Command`] that performs the actions of all the given + /// commands. + /// + /// Once this command is run, all the commands will be executed at once. + pub fn batch(commands: impl IntoIterator>) -> Self { + let mut batch = Vec::new(); + + for command in commands { + match command { + Self::None => {} + Self::Single(command) => batch.push(command), + Self::Batch(commands) => batch.extend(commands), + } + } + + Self::Batch(batch) + } + + pub fn actions(self) -> Vec> { + match self { + Self::None => Vec::new(), + Self::Single(action) => vec![action], + Self::Batch(batch) => batch, + } + } +} -- cgit From 6887afdb2c71429fa032d68f2ee3a4a075ecca1d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 2 Sep 2021 13:47:34 +0700 Subject: Remove unnecessary `mut self` in `Command::map` --- web/src/command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/src/command.rs') diff --git a/web/src/command.rs b/web/src/command.rs index 606097de..ff6965c1 100644 --- a/web/src/command.rs +++ b/web/src/command.rs @@ -33,7 +33,7 @@ impl Command { /// Applies a transformation to the result of a [`Command`]. #[cfg(target_arch = "wasm32")] - pub fn map(mut self, f: impl Fn(T) -> A + 'static + Clone) -> Command + pub fn map(self, f: impl Fn(T) -> A + 'static + Clone) -> Command where T: 'static, { -- cgit From 6fce35393fb2dc3dcbc5f423fa8472f5ce1f7027 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 2 Sep 2021 15:50:00 +0700 Subject: Hide implementation details of `Command` in `iced_futures` --- web/src/command.rs | 65 +++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 40 deletions(-) (limited to 'web/src/command.rs') diff --git a/web/src/command.rs b/web/src/command.rs index ff6965c1..f222795d 100644 --- a/web/src/command.rs +++ b/web/src/command.rs @@ -6,18 +6,19 @@ pub use action::Action; use std::future::Future; /// A set of asynchronous actions to be performed by some runtime. -pub enum Command { - None, - Single(Action), - Batch(Vec>), -} +pub struct Command(iced_futures::Command>); impl Command { /// Creates an empty [`Command`]. /// /// In other words, a [`Command`] that does nothing. - pub fn none() -> Self { - Self::None + pub const fn none() -> Self { + Self(iced_futures::Command::none()) + } + + /// Creates a [`Command`] that performs a single [`Action`]. + pub const fn single(action: Action) -> Self { + Self(iced_futures::Command::single(action)) } /// Creates a [`Command`] that performs the action of the given future. @@ -28,25 +29,7 @@ impl Command { ) -> Command { use iced_futures::futures::FutureExt; - Command::Single(Action::Future(Box::pin(future.map(f)))) - } - - /// Applies a transformation to the result of a [`Command`]. - #[cfg(target_arch = "wasm32")] - pub fn map(self, f: impl Fn(T) -> A + 'static + Clone) -> Command - where - T: 'static, - { - match self { - Self::None => Command::None, - Self::Single(action) => Command::Single(action.map(f)), - Self::Batch(batch) => Command::Batch( - batch - .into_iter() - .map(|action| action.map(f.clone())) - .collect(), - ), - } + Command::single(Action::Future(Box::pin(future.map(f)))) } /// Creates a [`Command`] that performs the actions of all the given @@ -54,24 +37,26 @@ impl Command { /// /// Once this command is run, all the commands will be executed at once. pub fn batch(commands: impl IntoIterator>) -> Self { - let mut batch = Vec::new(); + Self(iced_futures::Command::batch( + commands.into_iter().map(|Command(command)| command), + )) + } - for command in commands { - match command { - Self::None => {} - Self::Single(command) => batch.push(command), - Self::Batch(commands) => batch.extend(commands), - } - } + /// Applies a transformation to the result of a [`Command`]. + #[cfg(target_arch = "wasm32")] + pub fn map(self, f: impl Fn(T) -> A + 'static + Clone) -> Command + where + T: 'static, + { + let Command(command) = self; - Self::Batch(batch) + Command(command.map(move |action| action.map(f.clone()))) } + /// Returns all of the actions of the [`Command`]. pub fn actions(self) -> Vec> { - match self { - Self::None => Vec::new(), - Self::Single(action) => vec![action], - Self::Batch(batch) => batch, - } + let Command(command) = self; + + command.actions() } } -- cgit From 01b945b9814b9dc546e783a6dab66e4f7fe49786 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 13 Sep 2021 11:22:53 +0700 Subject: Write missing docs and `Debug` implementations for `web` --- web/src/command.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'web/src/command.rs') diff --git a/web/src/command.rs b/web/src/command.rs index f222795d..33e49e70 100644 --- a/web/src/command.rs +++ b/web/src/command.rs @@ -2,6 +2,8 @@ mod action; pub use action::Action; +use std::fmt; + #[cfg(target_arch = "wasm32")] use std::future::Future; @@ -60,3 +62,11 @@ impl Command { command.actions() } } + +impl fmt::Debug for Command { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let Command(command) = self; + + command.fmt(f) + } +} -- cgit