A platform for community discussion. Free, open, simple.
FIX: Allow re-blur on spoiler when in details view (#41266)
Bannon Tanner65d162b350b6
diff --git a/plugins/spoiler-alert/assets/javascripts/lib/apply-spoiler.js b/plugins/spoiler-alert/assets/javascripts/lib/apply-spoiler.jsindex bb6ad70c831..f00629ef519 100644--- a/plugins/spoiler-alert/assets/javascripts/lib/apply-spoiler.js+++ b/plugins/spoiler-alert/assets/javascripts/lib/apply-spoiler.js@@ -21,8 +21,12 @@ const INTERACTIVE_SELECTOR = [".lightbox",].join(", ");-function isInteractive(event) {- return event.defaultPrevented || event.target.closest(INTERACTIVE_SELECTOR);+function isInteractive(event, element) {+ if (event.defaultPrevented) {+ return true;+ }+ const interactive = event.target.closest(INTERACTIVE_SELECTOR);+ return interactive && element.contains(interactive);}function noTextSelected() {@@ -81,7 +85,7 @@ function toggleSpoiler(event, element) {if (element.getAttribute("data-spoiler-state") === "blurred") {_setSpoilerVisible(element);event.preventDefault();- } else if (!isInteractive(event) && noTextSelected()) {+ } else if (!isInteractive(event, element) && noTextSelected()) {_setSpoilerHidden(element);}}diff --git a/plugins/spoiler-alert/test/javascripts/unit/lib/apply-spoiler-test.js b/plugins/spoiler-alert/test/javascripts/unit/lib/apply-spoiler-test.jsnew file mode 100644index 00000000000..018cb4bc4f5--- /dev/null+++ b/plugins/spoiler-alert/test/javascripts/unit/lib/apply-spoiler-test.js@@ -0,0 +1,116 @@+import { setupTest } from "ember-qunit";+import { module, test } from "qunit";+import applySpoiler from "discourse/plugins/spoiler-alert/lib/apply-spoiler";++module("Spoiler Alert | Unit | apply-spoiler", function (hooks) {+ setupTest(hooks);++ function buildSpoiler() {+ const spoiler = document.createElement("div");+ spoiler.classList.add("spoiler");+ spoiler.textContent = "secret";+ return spoiler;+ }++ test("toggles between blurred and revealed on successive clicks", function (assert) {+ const spoiler = buildSpoiler();+ document.body.appendChild(spoiler);++ try {+ applySpoiler(spoiler);+ assert+ .dom(spoiler)+ .hasAttribute("data-spoiler-state", "blurred", "starts blurred");++ spoiler.click();+ assert+ .dom(spoiler)+ .hasAttribute("data-spoiler-state", "revealed", "reveals on click");++ spoiler.click();+ assert+ .dom(spoiler)+ .hasAttribute(+ "data-spoiler-state",+ "blurred",+ "re-blurs on second click"+ );+ } finally {+ spoiler.remove();+ }+ });++ test("can be re-blurred when nested inside a <details> element", function (assert) {+ const details = document.createElement("details");+ details.open = true;+ const summary = document.createElement("summary");+ summary.textContent = "Summary";+ details.appendChild(summary);++ const spoiler = buildSpoiler();+ details.appendChild(spoiler);+ document.body.appendChild(details);++ try {+ applySpoiler(spoiler);+ assert+ .dom(spoiler)+ .hasAttribute("data-spoiler-state", "blurred", "starts blurred");++ spoiler.click();+ assert+ .dom(spoiler)+ .hasAttribute(+ "data-spoiler-state",+ "revealed",+ "reveals on first click"+ );++ spoiler.click();+ assert+ .dom(spoiler)+ .hasAttribute(+ "data-spoiler-state",+ "blurred",+ "re-blurs on second click even though an ancestor <details> exists"+ );+ } finally {+ details.remove();+ }+ });++ test("clicking an interactive descendant does not re-blur the spoiler", function (assert) {+ const spoiler = buildSpoiler();+ spoiler.textContent = "";+ const link = document.createElement("a");+ link.href = "#";+ link.textContent = "a link";+ link.addEventListener("click", (event) => event.preventDefault());+ spoiler.appendChild(link);+ document.body.appendChild(spoiler);++ try {+ applySpoiler(spoiler);++ spoiler.click();+ assert+ .dom(spoiler)+ .hasAttribute(+ "data-spoiler-state",+ "revealed",+ "reveals on first click"+ );++ link.click();+ assert+ .dom(spoiler)+ .hasAttribute(+ "data-spoiler-state",+ "revealed",+ "clicking an interactive descendant does not re-blur the spoiler"+ );+ } finally {+ spoiler.remove();+ }+ });+});