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/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

@@ -52,9 +52,9 @@ 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::TextFont;
 use bevy_text::TextInputAttributes;
 use bevy_text::TextInputBuffer;
 use bevy_text::TextInputSystems;
@@ -149,7 +149,7 @@ impl Default for TextUnderCursorColor {
     TextInputStyle,
     TextInputMultiClickCounter,
     TextInputBuffer,
-    TextCursorBlinkTimer,
+    TextCursorBlinkTimer
 )]
 #[component(
     on_add = on_add_text_input_node,
@@ -429,7 +429,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 +505,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));

crates/bevy_ui/src/widget/text_field.rs

@@ -36,9 +36,9 @@ use bevy_picking::events::Pointer;
 use bevy_picking::events::Press;
 use bevy_picking::pointer::PointerButton;
 use bevy_text::Justify;
-use bevy_text::TextFont;
 use bevy_text::TextEdit;
 use bevy_text::TextEdits;
+use bevy_text::TextFont;
 use bevy_text::TextInputAttributes;
 use bevy_text::TextInputBuffer;
 use bevy_text::TextInputTarget;

crates/bevy_ui_render/src/lib.rs

@@ -62,7 +62,7 @@ use gradient::GradientPlugin;
 
 use bevy_platform::collections::{HashMap, HashSet};
 use bevy_text::{
-    ComputedTextBlock, PositionedGlyph, PlaceholderLayout, TextBackgroundColor, TextColor,
+    ComputedTextBlock, PlaceholderLayout, PositionedGlyph, TextBackgroundColor, TextColor,
     TextInputBuffer, TextLayoutInfo,
 };
 use bevy_transform::components::GlobalTransform;

examples/ui/password_input.rs

@@ -12,8 +12,8 @@ use bevy::input_focus::tab_navigation::TabNavigationPlugin;
 use bevy::input_focus::InputDispatchPlugin;
 use bevy::picking::hover::Hovered;
 use bevy::prelude::*;
-use bevy::text::Placeholder;
 use bevy::text::PasswordMask;
+use bevy::text::Placeholder;
 use bevy::text::TextInputValue;
 use bevy::ui::widget::TextField;
 use bevy::ui::widget::TextInputPlugin;
@@ -41,13 +41,12 @@ fn setup(mut commands: Commands) {
     // UI camera
     commands.spawn(Camera2d);
 
-    let on_click = commands.register_system(
-        |_: In<Activate>, mut query: Query<&mut PasswordMask>| {
+    let on_click =
+        commands.register_system(|_: In<Activate>, mut query: Query<&mut PasswordMask>| {
             for mut password in query.iter_mut() {
                 password.show_password = !password.show_password;
             }
-        },
-    );
+        });
 
     commands.spawn((
         Node {