A platform for community discussion. Free, open, simple.
UX: Dismiss alt text input when clicking image instead of opening lightbox (#40777)
Renato Atilio0b86a02f5bf1
diff --git a/app/assets/stylesheets/common/rich-editor/rich-editor.scss b/app/assets/stylesheets/common/rich-editor/rich-editor.scssindex 0a3d49c0860..d25cc5e2f25 100644--- a/app/assets/stylesheets/common/rich-editor/rich-editor.scss+++ b/app/assets/stylesheets/common/rich-editor/rich-editor.scss@@ -497,6 +497,10 @@cursor: zoom-in;}}++ &:has(.image-alt-text-input:focus-within) img.ProseMirror-selectednode {+ cursor: default;+ }}.image-alt-text-input {diff --git a/frontend/discourse/app/static/prosemirror/components/image-node-view.gjs b/frontend/discourse/app/static/prosemirror/components/image-node-view.gjsindex 47f1bf28539..8d92b24a409 100644--- a/frontend/discourse/app/static/prosemirror/components/image-node-view.gjs+++ b/frontend/discourse/app/static/prosemirror/components/image-node-view.gjs@@ -611,8 +611,27 @@ export default class ImageNodeView extends Component {this.imageLoaded = true;}+ get altInputHasFocus() {+ return !!this.altMenuInstance?.content?.contains(document.activeElement);+ }++ @action+ handleImageMouseDown(event) {+ // keep the alt input focused so handleImageClick treats this click as+ // a dismissal — ProseMirror also ignores default-prevented events+ if (event.button === 0 && this.altInputHasFocus) {+ event.preventDefault();+ }+ }+@actionasync handleImageClick(event) {+ if (this.altInputHasFocus) {+ event.preventDefault();+ this.args.view.focus();+ return;+ }+if (this.image.classList.contains("ProseMirror-selectednode")) {event?.preventDefault();event?.stopPropagation();@@ -644,6 +663,8 @@ export default class ImageNodeView extends Component {role="button"{{didInsert this.setupImage}}{{on "load" this.updateImageLoaded}}+ {{! eslint-disable ember/template-no-pointer-down-event-binding }}+ {{on "mousedown" this.handleImageMouseDown}}{{on "click" this.handleImageClick}}/>{{#if this.isPlaceholder}}diff --git a/spec/system/composer/prosemirror_images_spec.rb b/spec/system/composer/prosemirror_images_spec.rbindex 398247a7c9e..413d7bafdf6 100644--- a/spec/system/composer/prosemirror_images_spec.rb+++ b/spec/system/composer/prosemirror_images_spec.rb@@ -195,7 +195,7 @@ describe "Composer - ProseMirror - Images" dodescribe "image lightbox" dolet(:lightbox) { PageObjects::Components::PhotoSwipe.new }- def click_selected_image_to_open_lightbox+ def click_selected_imagepage.execute_script(<<~JS)document.querySelector('.composer-image-node img.ProseMirror-selectednode')?.click();JS@@ -205,7 +205,7 @@ describe "Composer - ProseMirror - Images" doopen_composerpaste_and_click_image- click_selected_image_to_open_lightbox+ click_selected_imageexpect(lightbox).to be_visibleexpect(lightbox).to have_no_counter@@ -227,7 +227,7 @@ describe "Composer - ProseMirror - Images" dofirst_image.clickexpect(first_image[:class]).to include("ProseMirror-selectednode")- click_selected_image_to_open_lightbox+ click_selected_imageexpect(lightbox).to be_visibleexpect(lightbox).to have_css(".pswp__counter", text: "1 / 2")@@ -241,12 +241,29 @@ describe "Composer - ProseMirror - Images" doexpect(page).to have_css("[data-identifier='composer-image-toolbar']")end+ it "lets the user dismiss the alt text input by clicking the image without opening the lightbox" do+ open_composer+ paste_and_click_image++ find(".image-alt-text-input__display").click+ find(".image-alt-text-input__field").fill_in(with: "described image")++ click_selected_image++ expect(page).to have_no_css(".image-alt-text-input.--expanded")+ expect(rich.find(".composer-image-node img")["alt"]).to eq("described image")+ expect(page).to have_no_css(".pswp")++ click_selected_image+ expect(lightbox).to be_visible+ end+it "navigates between images using prev/next buttons" doopen_composercomposer.type_content("\n\n")rich.find(".composer-image-node img[alt='first']").click- click_selected_image_to_open_lightbox+ click_selected_imageexpect(lightbox).to be_visibleexpect(lightbox).to have_caption_title("first")