Skip to content

A platform for community discussion. Free, open, simple.

FIX: Don't onebox links in nested rich editors

Régis Hanolf01afaac1417
diff --git a/frontend/discourse/app/static/prosemirror/extensions/onebox.js b/frontend/discourse/app/static/prosemirror/extensions/onebox.js
index e5e26fda793..d4d99d0f8cf 100644
--- a/frontend/discourse/app/static/prosemirror/extensions/onebox.js
+++ b/frontend/discourse/app/static/prosemirror/extensions/onebox.js
@@ -35,6 +35,10 @@ export function oneboxTypeAtPos(doc, pos) {
: "inline";
}
+function isNestedDoc(doc) {
+ return doc.type !== doc.type.schema.topNodeType;
+}
+
const ONEBOX_NODE_TYPES = new Set(["onebox", "onebox_inline"]);
const oneboxSlotsCache = new WeakMap();
@@ -201,6 +205,10 @@ const extension = {
// `forceUrl` bypasses selection/topLevel/failed checks for that URL.
function scanForOneboxLinks(doc, decoSet, tr, forceUrl) {
const decorations = [];
+ if (isNestedDoc(doc)) {
+ return decorations;
+ }
+
const pastLimit = oneboxesPastLimit(doc, maxOneboxes());
doc.descendants((node, pos) => {
const link = node.marks.find((mark) => mark.type.name === "link");
@@ -551,7 +559,7 @@ const extension = {
const docChanged = transactions.some((tr) => tr.docChanged);
const selectionChanged = !prevState.selection.eq(state.selection);
- if (!docChanged && !selectionChanged) {
+ if ((!docChanged && !selectionChanged) || isNestedDoc(state.doc)) {
return;
}
diff --git a/frontend/discourse/tests/integration/components/prosemirror-editor/onebox-test.js b/frontend/discourse/tests/integration/components/prosemirror-editor/onebox-test.js
index f1b58ccd0e1..cc63c29e2eb 100644
--- a/frontend/discourse/tests/integration/components/prosemirror-editor/onebox-test.js
+++ b/frontend/discourse/tests/integration/components/prosemirror-editor/onebox-test.js
@@ -1,8 +1,9 @@
import { click, settled } from "@ember/test-helpers";
import { setLocalCache } from "pretty-text/oneboxer-cache";
-import { NodeSelection, TextSelection } from "prosemirror-state";
+import { EditorState, NodeSelection, TextSelection } from "prosemirror-state";
import { module, test } from "qunit";
import { buildEngine } from "discourse/static/markdown-it";
+import { oneboxPluginKey } from "discourse/static/prosemirror/extensions/onebox";
import { setupRenderingTest } from "discourse/tests/helpers/component-test";
import pretender from "discourse/tests/helpers/create-pretender";
import { setupRichEditor } from "discourse/tests/helpers/rich-editor-helper";
@@ -223,6 +224,21 @@ module(
assert.strictEqual(editor.value, `see \\[${OTHER_URL}] here`);
});
+ test("ignores nested editor states", async function (assert) {
+ const [editor] = await setupRichEditor(assert, `> ${URL}\n>\n> b`);
+ const { view } = editor;
+
+ const inner = EditorState.create({
+ doc: view.state.doc.firstChild,
+ plugins: view.state.plugins,
+ });
+ const tr = inner.tr.insertText("c", inner.doc.content.size - 1);
+ tr.setSelection(TextSelection.atEnd(tr.doc));
+ const { state } = inner.applyTransaction(tr);
+
+ assert.strictEqual(oneboxPluginKey.getState(state).find().length, 0);
+ });
+
test("holds a lone link inline while the cursor is on its line", async function (assert) {
const [editor] = await setupRichEditor(assert, "a\n\nb");
const { view } = editor;