@richscripts/richtexteditor 2.7.0 → 2.7.1

package/richtexteditor/plugins/dialoga11y.js

@@ -82,9 +82,24 @@ function RTE_Plugin_DialogA11y() {
         }
     }
 
+    // 2026-09-05 Widened. The original selector only matched
+    // <rte-dropdown-panel>/.rte-panel-general, but Find&Replace, Insert Link and
+    // their siblings render as <rte-dialog-float class="rte-panel-find"> wrapping
+    // an <rte-dialog-inner role="dialog">. Those carry EXACTLY the markup this
+    // plugin consumes - an <rte-dialog-header> and <rte-dialog-line-X> field
+    // wrappers - and were simply never visited, so the plugin reported nothing
+    // and covered nothing. Measured before the change: calling
+    // editor.applyDialogAccessibility() with the find dialog open labelled 0 of
+    // its 4 inputs, leaving "Find" and "Replace" announced as bare "edit"
+    // (WCAG 1.3.1 / 3.3.2 / 4.1.2) while the two checkboxes were fine because
+    // the core happens to wrap those in <label>.
+    //
+    // Widening is safe because enhancePanel() still requires an
+    // <rte-dialog-header>, which is what keeps colour/font dropdowns out.
     function isPanel(el) {
         return el && el.nodeType === 1 &&
-            (el.tagName === "RTE-DROPDOWN-PANEL" || /rte-panel-general/.test(el.className || ""));
+            (el.tagName === "RTE-DROPDOWN-PANEL" || el.tagName === "RTE-DIALOG-FLOAT" ||
+             /rte-panel-general/.test(el.className || ""));
     }
 
     function schedule(panel) {
@@ -104,7 +119,7 @@ function RTE_Plugin_DialogA11y() {
 
     function enhanceAll(host) {
         if (!host || !host.querySelectorAll) return;
-        var ps = host.querySelectorAll("rte-dropdown-panel,[class*='rte-panel-general']");
+        var ps = host.querySelectorAll("rte-dropdown-panel,rte-dialog-float,[class*='rte-panel-general']");
         for (var i = 0; i < ps.length; i++) enhancePanel(ps[i]);
     }
 
@@ -116,12 +131,22 @@ function RTE_Plugin_DialogA11y() {
         var name = (headerEl.textContent || "").trim()
             .replace(/\s*\((?:Ctrl|Cmd|Alt|Shift|⌘|⇧|⌥)[^)]*\)\s*$/i, "").trim();
 
+        // Name the element that IS the dialog. The float-style panels already
+        // carry role="dialog" on an inner <rte-dialog-inner>; adding a second
+        // role="dialog" to the wrapper would announce two nested dialogs, so
+        // when an inner one exists it is the target and the wrapper is left
+        // alone. When there is none (the original dropdown-panel shape) this
+        // resolves to the panel itself and behaves exactly as before.
+        var dialogEl = panel.getAttribute("role") === "dialog"
+            ? panel
+            : (panel.querySelector('[role="dialog"]') || panel);
+
         // A titled, form-bearing popup is a dialog, not a menu — override the
         // core's default role="menu" (a menu must not contain text fields).
-        var role = panel.getAttribute("role");
-        if (!role || role === "menu") panel.setAttribute("role", "dialog");
-        if (name && !panel.getAttribute("aria-label") && !panel.getAttribute("aria-labelledby")) {
-            panel.setAttribute("aria-label", name);
+        var role = dialogEl.getAttribute("role");
+        if (!role || role === "menu") dialogEl.setAttribute("role", "dialog");
+        if (name && !dialogEl.getAttribute("aria-label") && !dialogEl.getAttribute("aria-labelledby")) {
+            dialogEl.setAttribute("aria-label", name);
         }
 
         var fields = panel.querySelectorAll("input,select,textarea");
@@ -136,6 +161,25 @@ function RTE_Plugin_DialogA11y() {
     }
 
     function fieldLabel(f, dialogName) {
+        // 0) THE VISIBLE LABEL WINS. 2026-09-05: deriving the name from the
+        // <rte-dialog-line-X> suffix alone produced "Keyword" for a field whose
+        // visible label reads "Find". That fails WCAG 2.5.3 Label in Name, and
+        // it breaks speech input concretely: a user says "Find" and nothing
+        // matches, because the accessible name does not contain the words they
+        // can see. The markup already carries the right text in a sibling
+        // <rte-dialog-input-label>, so prefer it and keep the suffix as the
+        // fallback for fields that have no visible label.
+        var lineEl = f.parentElement;
+        for (var d = 0; d < 8 && lineEl; d++) {
+            if (/^RTE-DIALOG-LINE-/.test(lineEl.tagName || "")) break;
+            lineEl = lineEl.parentElement;
+        }
+        if (lineEl && lineEl.querySelector) {
+            var visEl = lineEl.querySelector("rte-dialog-input-label");
+            var vis = visEl ? (visEl.textContent || "").replace(/^\s+|\s+$/g, "").replace(/[:：]\s*$/, "") : "";
+            if (vis) return vis;
+        }
+
         // 1) nearest <rte-dialog-line-X> ancestor — the suffix is the field meaning
         var n = f.parentElement;
         for (var i = 0; i < 8 && n; i++) {

package/richtexteditor/plugins/documentimport.js

@@ -951,6 +951,25 @@ function RTE_Plugin_DocumentImport() {
                     var hv = hl.getAttributeNS(W, "val") || hl.getAttribute("w:val") || "";
                     if (hv && hv !== "none") css += "background-color:" + hv + ";";
                 }
+                // w:shd is the OTHER way Word carries a background, and it is the
+                // one our own exporter writes (w:highlight only accepts a fixed
+                // set of colour NAMES, shd takes any hex). Reading only
+                // w:highlight meant every highlight we exported came back
+                // unhighlighted - the two sides used different vocabulary for the
+                // same thing.
+                var shd = firstChildEl(rpr, "shd");
+                if (shd) {
+                    var fill = shd.getAttributeNS(W, "fill") || shd.getAttribute("w:fill") || "";
+                    if (fill && /^[0-9A-Fa-f]{6}$/.test(fill)) css += "background-color:#" + fill + ";";
+                }
+                // Monospace run -> inline code. Our exporter marks <code>/<kbd>/
+                // <samp>/<pre> with w:rFonts Consolas; nothing read it back.
+                var rf = firstChildEl(rpr, "rFonts");
+                if (rf) {
+                    var asc = rf.getAttributeNS(W, "ascii") || rf.getAttribute("w:ascii") || "";
+                    if (/consolas|courier|monospace|mono$/i.test(asc)) txt = "<code>" + txt + "</code>";
+                    else if (asc) css += "font-family:" + asc.replace(/[<>"]/g, "") + ";";
+                }
                 var sz = firstChildEl(rpr, "sz");
                 if (sz) {
                     var sv = parseInt(sz.getAttributeNS(W, "val") || sz.getAttribute("w:val") || "", 10);
@@ -1123,7 +1142,16 @@ function RTE_Plugin_DocumentImport() {
                 // without this they came back as plain <p> and the round-trip lost
                 // every blockquote. Match Quote / IntenseQuote / BlockQuote.
                 else if (/^(intense)?quote$|blockquote/i.test(v.replace(/\s+/g, ""))) info.quote = true;
+                // docxexport.js writes <w:pStyle w:val="Code"/> for <pre>; without
+                // this a code block came back as an ordinary paragraph and lost
+                // both its monospace and its whitespace.
+                else if (/^(code|sourcecode|htmlpre|preformatted)$/i.test(v.replace(/\s+/g, ""))) info.pre = true;
             }
+            // A horizontal rule is exported as an EMPTY paragraph carrying a
+            // bottom border - Word has no <hr>. Nothing read it back, so every
+            // rule became a stray blank paragraph on import.
+            var pbdr = firstChildEl(ppr, "pBdr");
+            if (pbdr && firstChildEl(pbdr, "bottom")) info.rule = true;
             var numPr = firstChildEl(ppr, "numPr");
             if (numPr) {
                 info.list = true;
@@ -1217,6 +1245,12 @@ function RTE_Plugin_DocumentImport() {
                     continue;
                 }
                 closeListsTo(0);
+                // Only a rule when the paragraph carries no text of its own -
+                // a bordered paragraph WITH content is a real bordered paragraph.
+                if (st.rule && !(inner || "").replace(/<[^>]*>/g, "").trim()) {
+                    closeListsTo(0); out.push("<hr>"); continue;
+                }
+                if (st.pre) { out.push("<pre>" + (inner || "<br>") + "</pre>"); continue; }
                 if (st.heading) {
                     // Headings carry w:ind too; without this an indented
                     // heading imported flush left.

package/richtexteditor/plugins/docxexport.js

@@ -194,7 +194,7 @@ function RTE_Plugin_DocxExport() {
             bold: inherited.bold, italic: inherited.italic, underline: inherited.underline,
             strike: inherited.strike, sizeHalfPoints: inherited.sizeHalfPoints,
             color: inherited.color, highlight: inherited.highlight, vertAlign: inherited.vertAlign,
-            mono: inherited.mono
+            mono: inherited.mono, font: inherited.font
         };
         var tag = node.tagName ? node.tagName.toLowerCase() : "";
         if (tag === "b" || tag === "strong") s.bold = true;
@@ -204,6 +204,10 @@ function RTE_Plugin_DocxExport() {
         if (tag === "sup") s.vertAlign = "superscript";
         if (tag === "sub") s.vertAlign = "subscript";
         if (tag === "code" || tag === "kbd" || tag === "samp" || tag === "pre") s.mono = true;
+        // <mark> carries no inline style, so the CSS branch below never sees it
+        // and highlighted text was dropped entirely on export. Word's own
+        // default highlight is yellow.
+        if (tag === "mark") s.highlight = s.highlight || "FFFF00";
 
         var css = node.style;
         if (css) {
@@ -214,6 +218,12 @@ function RTE_Plugin_DocxExport() {
             if (deco.indexOf("line-through") >= 0) s.strike = true;
             if (css.color) { var c = hexColor(css.color); if (c) s.color = c; }
             if (css.backgroundColor) { var h = hexColor(css.backgroundColor); if (h) s.highlight = h; }
+            // Font family was read by nothing, so an exported document lost every
+            // typeface choice. Word wants ONE family name, not a CSS stack.
+            if (css.fontFamily) {
+                var fam = String(css.fontFamily).split(",")[0].replace(/^\s*['"]?|['"]?\s*$/g, "");
+                if (fam) s.font = fam;
+            }
             if (css.fontSize) {
                 var pt = cssToPoints(css.fontSize);
                 // w:sz is in HALF-POINTS. Writing points here makes every
@@ -250,7 +260,10 @@ function RTE_Plugin_DocxExport() {
 
     function runProps(s) {
         var p = "";
-        if (s.mono) p += '<w:rFonts w:ascii="Consolas" w:hAnsi="Consolas"/>';
+        // One rFonts element only: mono wins, because <code> inside a styled span
+        // should still read as code.
+        var fontName = s.mono ? "Consolas" : (s.font || "");
+        if (fontName) p += '<w:rFonts w:ascii="' + esc(fontName) + '" w:hAnsi="' + esc(fontName) + '"/>';
         if (s.bold) p += "<w:b/>";
         if (s.italic) p += "<w:i/>";
         if (s.underline) p += '<w:u w:val="single"/>';
@@ -668,7 +681,17 @@ function RTE_Plugin_DocxExport() {
             for (var i = 0; i < node.childNodes.length; i++) {
                 var li = node.childNodes[i];
                 if (li.nodeType !== 1 || li.tagName.toLowerCase() !== "li") continue;
-                xml += para(li, styleFrom(li, style), { numId: numId, level: level, pageBreakBefore: pendingBreak });
+                // Serialise the item's OWN content only. para() walks every
+                // descendant, so passing the whole <li> emitted the nested list's
+                // text here AND again as its own items below - a round trip turned
+                // "xx" with a child "yy" into "xxyy". Content duplication, not loss.
+                var own = li.ownerDocument.createElement("li");
+                for (var k = 0; k < li.childNodes.length; k++) {
+                    var ch = li.childNodes[k];
+                    if (ch.nodeType === 1 && /^(ul|ol)$/.test(ch.tagName.toLowerCase())) continue;
+                    own.appendChild(ch.cloneNode(true));
+                }
+                xml += para(own, styleFrom(li, style), { numId: numId, level: level, pageBreakBefore: pendingBreak });
                 pendingBreak = false;
                 for (var j = 0; j < li.childNodes.length; j++) {
                     var sub = li.childNodes[j];

package/richtexteditor/plugins/keyboarda11y.js

@@ -55,6 +55,21 @@ function RTE_Plugin_KeyboardA11y() {
         if (config.keyboardA11y === false) return;
 
         editor.focusToolbar = function () { return focusFirstToolbarButton(); };
+        // Public so plugins can report their own outcomes -- find/replace match
+        // counts, what the paste filter removed, export completion.
+        editor.announce = function (text, opts) { return announce(text, opts); };
+        // setReadOnly() lives in the core and cannot call into a plugin, so wrap
+        // it here rather than leaving the two states to drift apart.
+        if (typeof editor.setReadOnly === "function" && !editor.setReadOnly.__a11yWrapped) {
+            var origSetReadOnly = editor.setReadOnly;
+            var wrapped = function (v) {
+                var r = origSetReadOnly.apply(editor, arguments);
+                try { syncReadOnlyState(); } catch (e) { }
+                return r;
+            };
+            wrapped.__a11yWrapped = true;
+            editor.setReadOnly = wrapped;
+        }
 
         setup();
         try { editor.attachEvent("ready", setup); } catch (e) {}
@@ -78,6 +93,8 @@ function RTE_Plugin_KeyboardA11y() {
     function setup() {
         var root = shell();
         if (!root) return;
+        ensureLiveRegions();
+        syncReadOnlyState();
         bindEscapeHatch();
         applyRovingTabindex(root);
         syncToggleStates(root);
@@ -85,6 +102,97 @@ function RTE_Plugin_KeyboardA11y() {
         watch(root);
     }
 
+
+    // ------------------------------------------------- 4. status messages
+    //
+    // WCAG 4.1.3 Status Messages (Level AA): a change of state that is NOT
+    // given focus still has to reach assistive technology. Before this the
+    // editor had no live region at all -- not one aria-live node, in the page
+    // or in the iframe -- so a screen reader user got silence for every
+    // outcome the sighted user reads off the chrome: how many matches Find
+    // found, what the paste filter stripped, that the length limit was hit,
+    // that the document went read-only.
+    //
+    // Two regions, because politeness is not a detail: 'polite' waits for a
+    // pause in speech (counts, confirmations), 'assertive' interrupts (errors,
+    // refusals). aria-atomic="true" on both so the whole message is re-read
+    // rather than only the words that changed -- reading a diff aloud produces
+    // sentences that were never written.
+    //
+    // The region lives in the HOST document, not the editing iframe: a message
+    // announced from inside the document the user is editing would also become
+    // part of what they are editing.
+    var liveNodes = null;
+    function ensureLiveRegions() {
+        if (liveNodes && liveNodes.polite && liveNodes.polite.isConnected) return liveNodes;
+        var root = shell();
+        if (!root) return null;
+        function mk(politeness) {
+            var el = root.querySelector('[data-rte-live="' + politeness + '"]');
+            if (el) return el;
+            el = document.createElement("div");
+            el.setAttribute("data-rte-live", politeness);
+            el.setAttribute("aria-live", politeness);
+            el.setAttribute("aria-atomic", "true");
+            el.setAttribute("role", politeness === "assertive" ? "alert" : "status");
+            // Visually hidden but still rendered: display:none and
+            // visibility:hidden remove the node from the accessibility tree,
+            // which silences it. Clip is the technique that does not.
+            el.style.cssText = "position:absolute;width:1px;height:1px;margin:-1px;" +
+                "padding:0;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap;border:0;";
+            root.appendChild(el);
+            return el;
+        }
+        liveNodes = { polite: mk("polite"), assertive: mk("assertive") };
+        return liveNodes;
+    }
+
+    // editor.announce(text, {assertive}) -- also used by plugins.
+    function announce(text, opts) {
+        var msg = String(text == null ? "" : text).trim();
+        if (!msg) return false;
+        var nodes = ensureLiveRegions();
+        if (!nodes) return false;
+        var el = (opts && opts.assertive) ? nodes.assertive : nodes.polite;
+        // Re-announcing the SAME string is a no-op for most screen readers
+        // unless the node is cleared first, so "3 results" after "3 results"
+        // would be silent. Clear, then set on the next frame.
+        el.textContent = "";
+        setTimeout(function () { el.textContent = msg; }, 30);
+        return true;
+    }
+
+    // ------------------------------------------------- 5. read-only state
+    //
+    // setReadOnly() flips designMode, which genuinely blocks editing -- but
+    // designMode is invisible to assistive technology. The toolbar already
+    // marks its buttons aria-disabled; the editing region itself said nothing,
+    // so a screen reader user entered a field described as a rich text editor,
+    // typed, and got no response and no explanation. aria-readonly is the
+    // attribute that carries this, and the accessible name says it too because
+    // a name is what gets announced on entry.
+    var lastReadOnly = null;
+    function syncReadOnlyState() {
+        var ed;
+        try { ed = editor.getEditable(); } catch (e) { return; }
+        if (!ed) return;
+        var ro = false;
+        try { ro = !!(editor.getReadOnly ? editor.getReadOnly() : editor.isReadOnly && editor.isReadOnly()); } catch (e) { }
+        ed.setAttribute("aria-readonly", ro ? "true" : "false");
+        var suffix = config.a11yReadOnlySuffix || "Read only.";
+        // Plain string trimming rather than a built regex: the suffix is
+        // config-supplied and would otherwise need escaping to be safe.
+        var label = (ed.getAttribute("aria-label") || "");
+        if (label.length >= suffix.length && label.slice(-suffix.length) === suffix) {
+            label = label.slice(0, -suffix.length).replace(/\s+$/, "");
+        }
+        ed.setAttribute("aria-label", ro ? (label + " " + suffix) : label);
+        if (lastReadOnly !== null && lastReadOnly !== ro) {
+            announce(ro ? suffix : (config.a11yEditableAgain || "Editing enabled."));
+        }
+        lastReadOnly = ro;
+    }
+
     // ---------------------------------------------------- 1. keyboard trap
     //
     // Tab keeps its editing meaning (indent, next table cell) because that is

package/richtexteditor/plugins/pdfexport.js

@@ -415,7 +415,7 @@ function RTE_Plugin_PdfExport() {
         return px * 0.75;
     }
 
-        function block(node, style, indent, listMarker, listId, listOrdered) {
+        function block(node, style, indent, listMarker, listId, listOrdered, roleOverride) {
             var tag = node.tagName.toLowerCase();
             var s = styleOf(node, style);
             var align = "left";
@@ -441,12 +441,18 @@ function RTE_Plugin_PdfExport() {
                 // untagged still fails an accessibility audit: assistive
                 // technology gets a flat stream with no headings, no list
                 // structure and no reliable reading order.
-                role: HEADING_SCALE[tag] ? "H" + tag.charAt(1) : (tag === "blockquote" ? "BlockQuote" : "P"),
+                // roleOverride carries the quotation down to the paragraphs INSIDE a
+                // <blockquote>. The role was only ever emitted for a blockquote
+                // holding inline text directly - and the editor writes
+                // <blockquote><p>...</p></blockquote>, so in practice every
+                // blockquote we produce was tagged /P and the quotation was absent
+                // from the accessibility tree we publish claims about.
+                role: roleOverride || (HEADING_SCALE[tag] ? "H" + tag.charAt(1) : (tag === "blockquote" ? "BlockQuote" : "P")),
                 listId: listId || null, listOrdered: !!listOrdered
             });
         }
 
-        function walk(node, style, indent) {
+        function walk(node, style, indent, roleOverride) {
             for (var i = 0; i < node.childNodes.length; i++) {
                 var c = node.childNodes[i];
                 if (c.nodeType === 3) {
@@ -488,8 +494,9 @@ function RTE_Plugin_PdfExport() {
                 }
                 if (isBlockTag(tag)) {
                     var own = (tag === "blockquote" ? self.baseSize * 1.5 : 0) + cssIndentPt(c);
-                    if (hasBlockChildren(c)) { walk(c, styleOf(c, style), indent + own); continue; }
-                    block(c, style, indent + own, null);
+                    var childRole = (tag === "blockquote") ? "BlockQuote" : roleOverride;
+                    if (hasBlockChildren(c)) { walk(c, styleOf(c, style), indent + own, childRole); continue; }
+                    block(c, style, indent + own, null, null, false, childRole);
                     continue;
                 }
                 // Inline content sitting directly under a container.