Skip to content

[Bug Fix] Prevent Command dialog stacking #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djalmaaraujo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Bug Fix] Prevent Command dialog stacking #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions docs/app/javascript/controllers/ruby_ui/command_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Controller } from "@hotwired/stimulus";
import Fuse from "fuse.js";

const OPEN_DIALOG_SELECTOR = "[data-ruby-ui--command-dialog]";

// Connects to data-controller="ruby-ui--command"
export default class extends Controller {
static targets = ["input", "group", "item", "empty", "content"];
Expand Down Expand Up @@ -37,6 +39,12 @@ export default class extends Controller {
return;
}

const openDialog = document.querySelector(OPEN_DIALOG_SELECTOR);
if (openDialog) {
this.focusDialogInput(openDialog);
return;
}

document.body.insertAdjacentHTML("beforeend", this.contentTarget.innerHTML);
// prevent scroll on body
document.body.classList.add("overflow-hidden");
Expand Down Expand Up @@ -144,4 +152,9 @@ export default class extends Controller {
this.itemTargets.forEach((item) => this.toggleAriaSelected(item, false));
this.selectedIndex = -1;
}

focusDialogInput(dialog) {
const input = dialog.querySelector("[data-ruby-ui--command-target='input']");
input?.focus();
}
}
13 changes: 13 additions & 0 deletions gem/lib/ruby_ui/command/command_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Controller } from "@hotwired/stimulus";
import Fuse from "fuse.js";

const OPEN_DIALOG_SELECTOR = "[data-ruby-ui--command-dialog]";

// Connects to data-controller="ruby-ui--command"
export default class extends Controller {
static targets = ["input", "group", "item", "empty", "content"];
Expand Down Expand Up @@ -37,6 +39,12 @@ export default class extends Controller {
return;
}

const openDialog = document.querySelector(OPEN_DIALOG_SELECTOR);
if (openDialog) {
this.focusDialogInput(openDialog);
return;
}

document.body.insertAdjacentHTML("beforeend", this.contentTarget.innerHTML);
// prevent scroll on body
document.body.classList.add("overflow-hidden");
Expand Down Expand Up @@ -144,4 +152,9 @@ export default class extends Controller {
this.itemTargets.forEach((item) => this.toggleAriaSelected(item, false));
this.selectedIndex = -1;
}

focusDialogInput(dialog) {
const input = dialog.querySelector("[data-ruby-ui--command-target='input']");
input?.focus();
}
}
2 changes: 1 addition & 1 deletion gem/lib/ruby_ui/command/command_dialog_content.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def initialize(size: :md, **attrs)

def view_template(&block)
template(data: {ruby_ui__command_target: "content"}) do
div(data: {controller: "ruby-ui--command"}) do
div(data: {controller: "ruby-ui--command", ruby_ui__command_dialog: true}) do
backdrop
div(**attrs, &block)
end
Expand Down
1 change: 1 addition & 0 deletions gem/test/ruby_ui/command_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ def test_render_with_all_items
end

assert_match(/Search/, output)
assert_match(/data-ruby-ui--command-dialog/, output)
end
end