CI

Author: Zeophlite

crates/bevy_clipboard/src/lib.rs

@@ -61,7 +61,6 @@ impl ClipboardRead {
 pub struct ClipboardBasic(pub String);
 // TODO: remove ClipboardNotSupported , write into ClipboardBasic instead
 
-
 /// Resource providing access to the clipboard
 #[cfg(unix)]
 #[derive(Resource)]
@@ -153,7 +152,7 @@ impl Clipboard {
             use wasm_bindgen_futures::JsFuture;
 
             let clipboard = web_sys::window()
-                .and_then(|w| w.navigator().clipboard())
+                .and_then(|w| Some(w.navigator().clipboard()))
                 .ok_or(ClipboardError::ClipboardNotSupported)?;
 
             let result = JsFuture::from(clipboard.read_text()).await;

crates/bevy_text/src/input/mod.rs

@@ -37,10 +37,7 @@
 //!
 //! ## Copy-paste and clipboard support
 //!
-//! The clipboard support provided by this module is very basic, and only works within the `bevy` app,
-//! storing a simple [`String`].
-//!
-//! It can be accessed via the [`Clipboard`] resource.
+//! This module integrates clipboard support from [`bevy_clipboard`].
 
 use bevy_ecs::schedule::SystemSet;
 pub use cosmic_text::Motion;

crates/bevy_text/src/input/text_edit.rs

@@ -12,8 +12,8 @@ pub use cosmic_text::Motion;
 use cosmic_text::{Action, BorrowedWithFontSystem, Edit, Editor, Selection};
 
 use crate::{
-    get_cosmic_text_buffer_contents, CosmicFontSystem, TextInputAttributes,
-    TextInputBuffer, TextInputFilter, TextInputValue,
+    get_cosmic_text_buffer_contents, CosmicFontSystem, TextInputAttributes, TextInputBuffer,
+    TextInputFilter, TextInputValue,
 };
 
 /// Text input commands queue
@@ -198,7 +198,8 @@ pub fn apply_text_edits(
                         clipboard.as_mut(),
                         &action,
                     ) {
-                        commands.trigger_targets(TextInputEvent::InvalidEdit(error, action), entity);
+                        commands
+                            .trigger_targets(TextInputEvent::InvalidEdit(error, action), entity);
                     }
                 }
             }
@@ -231,15 +232,14 @@ pub fn apply_text_edit(
     clipboard: Option<&mut ResMut<Clipboard>>,
     edit: &TextEdit,
 ) -> Result<(), InvalidTextEditError> {
-
     editor.start_change();
 
     match edit {
         TextEdit::Copy => {
-            if let Some(text) = editor.copy_selection() {
-                if let Some(clipboard) = clipboard {
-                    let _ = clipboard.set_text(text);
-                }
+            if let Some(text) = editor.copy_selection()
+                && let Some(clipboard) = clipboard
+            {
+                let _ = clipboard.set_text(text);
             }
         }
         TextEdit::Cut => {
@@ -379,7 +379,6 @@ pub fn apply_text_edit(
     Ok(())
 }
 
-
 /// Automatically propagated events that can be dispatched by a text input entity.
 #[derive(EntityEvent, Clone, Debug, Component)]
 #[entity_event(traversal = &'static ChildOf, auto_propagate)]

crates/bevy_text/src/lib.rs

@@ -110,21 +110,20 @@ impl Plugin for TextPlugin {
             )
             .add_systems(Last, trim_cosmic_cache);
 
-        app.init_resource::<TextCursorBlinkInterval>()
-            .add_systems(
-                PostUpdate,
-                (
-                    update_text_input_buffers,
-                    apply_text_edits,
-                    update_password_masks,
-                    update_text_input_layouts,
-                    update_placeholder_layouts,
-                )
-                    .chain()
-                    .in_set(TextInputSystems)
-                    .before(AssetEventSystems)
-                    .ambiguous_with(Text2dUpdateSystems)
-            );
+        app.init_resource::<TextCursorBlinkInterval>().add_systems(
+            PostUpdate,
+            (
+                update_text_input_buffers,
+                apply_text_edits,
+                update_password_masks,
+                update_text_input_layouts,
+                update_placeholder_layouts,
+            )
+                .chain()
+                .in_set(TextInputSystems)
+                .before(AssetEventSystems)
+                .ambiguous_with(Text2dUpdateSystems),
+        );
 
         #[cfg(feature = "default_font")]
         {

crates/bevy_text/src/text.rs

@@ -40,7 +40,7 @@ pub struct TextEntity {
 #[derive(Component, Debug, Clone, Reflect)]
 #[reflect(Component, Debug, Default, Clone)]
 pub struct ComputedTextBlock {
-    /// Buffer for managing text layout and creating [`TextLayoutInfo`](crate::pipeline::TextLayoutInfo).
+    /// Buffer for managing text layout and creating [`crate::pipeline::TextLayoutInfo`].
     ///
     /// This is private because buffer contents are always refreshed from ECS state when writing glyphs to
     /// `TextLayoutInfo`. If you want to control the buffer contents manually or use the `cosmic-text`

crates/bevy_ui/src/lib.rs

@@ -262,6 +262,8 @@ fn build_text_interop(app: &mut App) {
                 .ambiguous_with(bevy_sprite::calculate_bounds_text2d)
                 .ambiguous_with(bevy_text::update_password_masks)
                 .ambiguous_with(bevy_text::update_placeholder_layouts)
+                .ambiguous_with(bevy_text::update_text_input_buffers)
+                .ambiguous_with(bevy_text::apply_text_edits)
                 .ambiguous_with(bevy_text::update_text_input_layouts),
         ),
     );

crates/bevy_ui/src/widget/event.rs

@@ -1,6 +1,4 @@
-use bevy_ecs::{
-    component::Component, entity::Entity, event::EntityEvent
-};
+use bevy_ecs::{component::Component, entity::Entity, event::EntityEvent};
 
 /// Represents one or more text inputs in a form being submitted
 #[derive(EntityEvent, Clone, Debug, Component)]

crates/bevy_ui/src/widget/text_box.rs

@@ -1,64 +1,42 @@
-use crate::widget::measure_lines;
-use crate::widget::update_text_field_attributes;
-use crate::widget::TextSubmission;
-use crate::ComputedNode;
-use crate::Node;
-use crate::UiGlobalTransform;
-use crate::UiScale;
-use crate::UiSystems;
-use bevy_app::Plugin;
-use bevy_app::PostUpdate;
-use bevy_color::palettes::tailwind::BLUE_900;
-use bevy_color::palettes::tailwind::GRAY_300;
-use bevy_color::palettes::tailwind::GRAY_400;
-use bevy_color::palettes::tailwind::GRAY_950;
-use bevy_color::palettes::tailwind::SKY_300;
-use bevy_color::Color;
-use bevy_derive::Deref;
-use bevy_derive::DerefMut;
-use bevy_ecs::change_detection::DetectChangesMut;
-use bevy_ecs::component::Component;
-use bevy_ecs::entity::Entity;
-use bevy_ecs::event::EventReader;
-use bevy_ecs::lifecycle::HookContext;
-use bevy_ecs::observer::Observer;
-use bevy_ecs::observer::On;
-use bevy_ecs::query::Has;
-use bevy_ecs::resource::Resource;
-use bevy_ecs::schedule::IntoScheduleConfigs;
-use bevy_ecs::system::Commands;
-use bevy_ecs::system::Query;
-use bevy_ecs::system::Res;
-use bevy_ecs::system::ResMut;
-use bevy_ecs::world::DeferredWorld;
-use bevy_input::keyboard::Key;
-use bevy_input::keyboard::KeyboardInput;
-use bevy_input::mouse::MouseScrollUnit;
-use bevy_input::mouse::MouseWheel;
-use bevy_input::ButtonInput;
-use bevy_input_focus::tab_navigation::NavAction;
-use bevy_input_focus::FocusedInput;
-use bevy_input_focus::InputFocus;
-use bevy_math::IVec2;
-use bevy_math::Rect;
-use bevy_math::Vec2;
-use bevy_picking::events::Click;
-use bevy_picking::events::Drag;
-use bevy_picking::events::Move;
-use bevy_picking::events::Pointer;
-use bevy_picking::events::Press;
-use bevy_picking::hover::HoverMap;
-use bevy_picking::pointer::PointerButton;
-use bevy_text::Justify;
-use bevy_text::LineBreak;
-use bevy_text::Motion;
-use bevy_text::TextFont;
-use bevy_text::TextEdit;
-use bevy_text::TextEdits;
-use bevy_text::TextInputAttributes;
-use bevy_text::TextInputBuffer;
-use bevy_text::TextInputSystems;
-use bevy_text::TextInputTarget;
+use crate::{
+    widget::{measure_lines, update_text_field_attributes, TextSubmission},
+    ComputedNode, Node, UiGlobalTransform, UiScale, UiSystems,
+};
+use bevy_app::{Plugin, PostUpdate};
+use bevy_color::{
+    palettes::tailwind::{BLUE_900, GRAY_300, GRAY_400, GRAY_950, SKY_300},
+    Color,
+};
+use bevy_derive::{Deref, DerefMut};
+use bevy_ecs::{
+    change_detection::DetectChangesMut,
+    component::Component,
+    entity::Entity,
+    event::EventReader,
+    lifecycle::HookContext,
+    observer::{Observer, On},
+    query::Has,
+    resource::Resource,
+    schedule::IntoScheduleConfigs,
+    system::{Commands, Query, Res, ResMut},
+    world::DeferredWorld,
+};
+use bevy_input::{
+    keyboard::{Key, KeyboardInput},
+    mouse::{MouseScrollUnit, MouseWheel},
+    ButtonInput,
+};
+use bevy_input_focus::{tab_navigation::NavAction, FocusedInput, InputFocus};
+use bevy_math::{IVec2, Rect, Vec2};
+use bevy_picking::{
+    events::{Click, Drag, Move, Pointer, Press},
+    hover::HoverMap,
+    pointer::PointerButton,
+};
+use bevy_text::{
+    Justify, LineBreak, Motion, TextEdit, TextEdits, TextFont, TextInputAttributes,
+    TextInputBuffer, TextInputSystems, TextInputTarget,
+};
 use bevy_time::Time;
 use core::time::Duration;
 
@@ -149,7 +127,7 @@ impl Default for TextUnderCursorColor {
     TextInputStyle,
     TextInputMultiClickCounter,
     TextInputBuffer,
-    TextCursorBlinkTimer,
+    TextCursorBlinkTimer
 )]
 #[component(
     on_add = on_add_text_input_node,
@@ -342,32 +320,31 @@ fn on_multi_click_set_selection(
     };
 
     let now = time.elapsed_secs();
-    if let Ok(mut multi_click_data) = multi_click_data.get_mut(click.entity()) {
-        if now - multi_click_data.last_click_time
+    if let Ok(mut multi_click_data) = multi_click_data.get_mut(click.entity())
+        && now - multi_click_data.last_click_time
             <= multi_click_delay.as_secs_f32() * multi_click_data.click_count as f32
-        {
-            let rect = Rect::from_center_size(transform.translation, node.size());
+    {
+        let rect = Rect::from_center_size(transform.translation, node.size());
 
-            let position =
-                click.pointer_location.position * node.inverse_scale_factor().recip() - rect.min;
+        let position =
+            click.pointer_location.position * node.inverse_scale_factor().recip() - rect.min;
 
-            match multi_click_data.click_count {
-                1 => {
-                    multi_click_data.click_count += 1;
-                    multi_click_data.last_click_time = now;
+        match multi_click_data.click_count {
+            1 => {
+                multi_click_data.click_count += 1;
+                multi_click_data.last_click_time = now;
 
-                    actions.queue(TextEdit::DoubleClick(position.as_ivec2()));
-                    return;
-                }
-                2 => {
-                    actions.queue(TextEdit::TripleClick(position.as_ivec2()));
-                    if let Ok(mut entity) = commands.get_entity(click.entity()) {
-                        entity.try_remove::<TextInputMultiClickCounter>();
-                    }
-                    return;
+                actions.queue(TextEdit::DoubleClick(position.as_ivec2()));
+                return;
+            }
+            2 => {
+                actions.queue(TextEdit::TripleClick(position.as_ivec2()));
+                if let Ok(mut entity) = commands.get_entity(click.entity()) {
+                    entity.try_remove::<TextInputMultiClickCounter>();
                 }
-                _ => (),
+                return;
             }
+            _ => (),
         }
     }
     if let Ok(mut entity) = commands.get_entity(click.entity()) {
@@ -429,7 +406,12 @@ impl Default for NextFocus {
 pub fn on_focused_keyboard_input(
     mut trigger: On<FocusedInput<KeyboardInput>>,
     mut commands: Commands,
-    mut query: Query<(&mut TextEdits, Has<SingleLineInputField>, &TextBox, &TextInputBuffer)>,
+    mut query: Query<(
+        &mut TextEdits,
+        Has<SingleLineInputField>,
+        &TextBox,
+        &TextInputBuffer,
+    )>,
     mut modifiers: Option<ResMut<GlobalTextInputState>>,
     keyboard_state: Res<ButtonInput<Key>>,
 ) {
@@ -500,10 +482,7 @@ pub fn on_focused_keyboard_input(
                 }
             }
             Key::Home => {
-                actions.queue(TextEdit::motion(
-                    Motion::BufferStart,
-                    is_shift_pressed,
-                ));
+                actions.queue(TextEdit::motion(Motion::BufferStart, is_shift_pressed));
             }
             Key::End => {
                 actions.queue(TextEdit::motion(Motion::BufferEnd, is_shift_pressed));