@richscripts/richtexteditor 2.14.0 → 2.15.0

package/richtexteditor/plugins/restrictedediting.js

@@ -66,6 +66,86 @@ function RTE_Plugin_RestrictedEditing() {
         refreshStyles();
     };
 
+    // 2026-10-14 The lockdown is enforced, not only drawn. A paragraph that holds a field stays contenteditable so the
+    // caret can reach the field, which left the protected text around the field editable; Delete over a locked
+    // selection, Alt+Arrow (move block) and Ctrl+Shift+D (copy block) changed protected text too, because the core
+    // handles those keys itself. While the lockdown is on, a key or an input whose selection is not entirely inside
+    // one marked region is cancelled at the editing window, in the capture phase, before anything else sees it.
+    // Backspace at a field's start and Delete at its end would reach outside it, so they are cancelled as well.
+    // tools/restricted/restricted-audit.mjs
+    var guardedWindows = [];
+    function regionOf(node) {
+        var el = node && node.nodeType === 1 ? node : (node && node.parentNode);
+        while (el && el.nodeType === 1) {
+            if (el.getAttribute && el.getAttribute(editableAttr) === "true") return el;
+            el = el.parentNode;
+        }
+        return null;
+    }
+    // the marked region that holds the whole selection, or null
+    function selectionRegion(doc) {
+        var sel = doc.getSelection();
+        if (!sel || sel.rangeCount === 0) return null;
+        var r = sel.getRangeAt(0);
+        var a = regionOf(r.startContainer), b = regionOf(r.endContainer);
+        return a && a === b ? { region: a, range: r } : null;
+    }
+    function atEdge(doc, region, range, atStart) {
+        var probe = doc.createRange();
+        probe.selectNodeContents(region);
+        if (atStart) probe.setEnd(range.startContainer, range.startOffset);
+        else probe.setStart(range.endContainer, range.endOffset);
+        return probe.toString() === "";
+    }
+    function editsDocument(e) {
+        var k = e.key || "";
+        if (e.isComposing) return true;
+        if (k === "Backspace" || k === "Delete" || k === "Enter" || k === "Tab") return true;
+        if (e.altKey && (k === "ArrowUp" || k === "ArrowDown")) return true;
+        if (e.ctrlKey || e.metaKey) {
+            var c = k.toLowerCase();
+            return c === "x" || c === "v" || c === "b" || c === "i" || c === "u" || c === "d";
+        }
+        return k.length === 1 && !e.altKey;
+    }
+    function guardKey(e) {
+        if (!enabled || !editsDocument(e)) return;
+        var doc = e.target && (e.target.ownerDocument || e.target);
+        if (!doc || !doc.getSelection) return;
+        var hit = selectionRegion(doc);
+        var refuse = !hit;
+        if (hit && hit.range.collapsed) {
+            if (e.key === "Backspace" && atEdge(doc, hit.region, hit.range, true)) refuse = true;
+            if (e.key === "Delete" && atEdge(doc, hit.region, hit.range, false)) refuse = true;
+        }
+        if (hit && (e.altKey && (e.key === "ArrowUp" || e.key === "ArrowDown"))) refuse = true;
+        if (hit && (e.ctrlKey || e.metaKey) && e.shiftKey && String(e.key).toLowerCase() === "d") refuse = true;
+        if (!refuse) return;
+        e.preventDefault();
+        e.stopImmediatePropagation();
+    }
+    function guardInput(e) {
+        if (!enabled) return;
+        var type = e.inputType || "";
+        if (type.indexOf("history") === 0) return;
+        var doc = e.target && (e.target.ownerDocument || e.target);
+        if (!doc || !doc.getSelection) return;
+        if (selectionRegion(doc)) return;
+        e.preventDefault();
+        e.stopImmediatePropagation();
+    }
+    function ensureGuards() {
+        var body = getEditable();
+        var win = body && body.ownerDocument && body.ownerDocument.defaultView;
+        if (!win || guardedWindows.indexOf(win) >= 0) return;
+        guardedWindows.push(win);
+        win.addEventListener("keydown", guardKey, true);
+        win.addEventListener("beforeinput", guardInput, true);
+        win.addEventListener("cut", function (e) { if (enabled && !selectionRegion(e.target.ownerDocument || e.target)) { e.preventDefault(); e.stopImmediatePropagation(); } }, true);
+        win.addEventListener("paste", function (e) { if (enabled && !selectionRegion(e.target.ownerDocument || e.target)) { e.preventDefault(); e.stopImmediatePropagation(); } }, true);
+        win.addEventListener("drop", function (e) { if (enabled) { e.preventDefault(); e.stopImmediatePropagation(); } }, true);
+    }
+
     function getEditable() {
         return editor.getEditable ? editor.getEditable() : null;
     }
@@ -111,6 +191,7 @@ function RTE_Plugin_RestrictedEditing() {
         }
         // Make the body itself NOT editable; rely on per-element contenteditable.
         body.setAttribute("contenteditable", "false");
+        ensureGuards();
         refreshStyles();
         return true;
     }
@@ -139,6 +220,38 @@ function RTE_Plugin_RestrictedEditing() {
         if (!sel || sel.rangeCount === 0) return null;
         var range = sel.getRangeAt(0);
         if (range.collapsed) return null;
+        // 2026-10-02 A selection that crosses blocks marks the selected text of EACH block. One span
+        // went AROUND the blocks: two paragraphs became four (<p>al</p><span><p>pha</p><p>be</p>
+        // </span><p>ta</p>), list items and table cells got a span inside <ul> / <tr> - and that
+        // span, a direct child of the body, was LOCKED by enable() (it looks for a region among a
+        // child's descendants): the region could not be typed into. Returns the first region.
+        // tools/restricted/mark-across-blocks.mjs
+        var runs = crossBlockRuns(doc, range);
+        if (runs) {
+            var regions = [];
+            // from the last run back: wrapping one never moves the text of a run still to come
+            for (var ri = runs.length - 1; ri >= 0; ri--) {
+                var sub = doc.createRange();
+                sub.setStart(runs[ri].sn, runs[ri].so);
+                sub.setEnd(runs[ri].en, runs[ri].eo);
+                widenToInlineEdges(sub, runs[ri].block);
+                var part = doc.createElement("span");
+                part.setAttribute(editableAttr, "true");
+                if (options.label) part.setAttribute("aria-label", options.label);
+                part.appendChild(sub.extractContents());
+                sub.insertNode(part);
+                regions.unshift(part);
+            }
+            if (!regions.length) return null;
+            var all = doc.createRange();
+            all.setStart(regions[0], 0);
+            all.setEnd(regions[regions.length - 1], regions[regions.length - 1].childNodes.length);
+            sel.removeAllRanges();
+            sel.addRange(all);
+            refreshStyles();
+            if (enabled) enable();
+            return regions[0];
+        }
         var span = doc.createElement("span");
         span.setAttribute(editableAttr, "true");
         if (options.label) span.setAttribute("aria-label", options.label);
@@ -161,6 +274,59 @@ function RTE_Plugin_RestrictedEditing() {
         return span;
     }
 
+    // The runs of selected text that share a block, when the selection crosses blocks; null when it
+    // starts and ends in one block (that keeps the single-span path). Whitespace-only runs (the line
+    // break between two blocks) are dropped; text inside a non-editable element moves with its run.
+    var BLOCK_RE = /^(P|DIV|LI|UL|OL|DL|DT|DD|TABLE|TBODY|THEAD|TFOOT|TR|TD|TH|CAPTION|H[1-6]|PRE|BLOCKQUOTE|ADDRESS|FIGURE|FIGCAPTION|SECTION|ARTICLE|ASIDE|HEADER|FOOTER|NAV|MAIN|DETAILS|SUMMARY|FORM|FIELDSET|LEGEND|HR|BODY)$/;
+    function blockOf(node) {
+        for (var n = node; n; n = n.parentNode)
+            if (n.nodeType === 1 && BLOCK_RE.test(n.nodeName)) return n;
+        return null;
+    }
+    function crossBlockRuns(doc, range) {
+        if (blockOf(range.startContainer) === blockOf(range.endContainer)) return null;
+        var root = range.commonAncestorContainer;
+        if (root.nodeType !== 1) root = root.parentNode;
+        var runs = [], cur = null;
+        var w = doc.createTreeWalker(root, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT, {
+            acceptNode: function (n) { return n.nodeType === 1 && n.getAttribute("contenteditable") === "false" ? NodeFilter.FILTER_REJECT : NodeFilter.FILTER_ACCEPT; }
+        });
+        for (var n = w.nextNode(); n; n = w.nextNode()) {
+            if (n.nodeType === 1) {
+                if (BLOCK_RE.test(n.nodeName)) cur = null;
+                continue;
+            }
+            if (!range.intersectsNode(n)) continue;
+            var a = n === range.startContainer ? range.startOffset : 0, b = n === range.endContainer ? range.endOffset : n.data.length;
+            if (b <= a) continue;
+            var blk = blockOf(n);
+            if (!cur || cur.block !== blk) {
+                cur = { block: blk, sn: n, so: a, text: "" };
+                runs.push(cur);
+            }
+            cur.en = n;
+            cur.eo = b;
+            cur.text += n.data.substring(a, b);
+        }
+        var keep = [];
+        for (var i = 0; i < runs.length; i++) if (/\S/.test(runs[i].text)) keep.push(runs[i]);
+        return keep;
+    }
+    // A run starting or ending at the edge of an inline element (<b>) takes the whole element, so
+    // no empty <b></b> is left behind by extractContents.
+    function widenToInlineEdges(range, block) {
+        var n = range.startContainer;
+        if (n.nodeType === 3 && range.startOffset === 0) {
+            while (n.parentNode && n.parentNode !== block && !n.previousSibling && !BLOCK_RE.test(n.parentNode.nodeName)) n = n.parentNode;
+            range.setStartBefore(n);
+        }
+        n = range.endContainer;
+        if (n.nodeType === 3 && range.endOffset === n.data.length) {
+            while (n.parentNode && n.parentNode !== block && !n.nextSibling && !BLOCK_RE.test(n.parentNode.nodeName)) n = n.parentNode;
+            range.setEndAfter(n);
+        }
+    }
+
     function unmark(node) {
         node = node || (function () {
             var body = getEditable();

package/richtexteditor/plugins/restrictedediting.min.js

@@ -1,2 +1,2 @@
-window.RTE_DefaultConfig||(window.RTE_DefaultConfig={}),RTE_DefaultConfig.svgCode_restrictedediting||(RTE_DefaultConfig.svgCode_restrictedediting='<svg viewBox="0 0 24 24" fill="none" stroke="#5F6368" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="5" y="11" width="14" height="9" rx="1.5"/><path d="M8 11V8a4 4 0 0 1 8 0v3"/></svg>'),RTE_DefaultConfig.plugin_restrictedediting=RTE_Plugin_RestrictedEditing;function RTE_Plugin_RestrictedEditing(){var v=this,l,o,u=!1,d="data-rte-editable";v.PluginName="RestrictedEditing",v.InitConfig=function(e){l=e,l.text_restrictedediting=l.text_restrictedediting||"Restricted editing",l.text_restrictedediting_mark=l.text_restrictedediting_mark||"Mark as editable",l.text_restrictedediting_next=l.text_restrictedediting_next||"Next editable region",l.text_restrictedediting_hint=l.text_restrictedediting_hint||"Lock the document; only marked regions accept input."},v.InitEditor=function(e){o=e,u=!!l.restrictedEditingMode,o.restrictedEditing={isEnabled:function(){return u},enable:g,disable:_,toggle:function(){return u?_():g()},markSelection:m,unmark:x,list:p,goToNext:function(){return y(1)},goToPrev:function(){return y(-1)}},o.attachEvent("exec_command_restrictedediting",function(t){t.returnValue=!0,t.stopBubble=!0,o.restrictedEditing.toggle()}),u&&g(),o.attachEvent("change",f),f()};function c(){return o.getEditable?o.getEditable():null}function f(){var e=c();if(e){var t=e.ownerDocument;if(!(!t||t.getElementById("__rte_restrictedediting_styles"))){var r=t.createElement("style");r.id="__rte_restrictedediting_styles",r.textContent=["["+d+"='true']{background:rgba(34,197,94,.10);outline:1px dashed rgba(34,197,94,.55);outline-offset:1px;border-radius:2px;padding:1px 2px}","body.rte-restricted [contenteditable='false']{cursor:not-allowed}","body.rte-restricted ["+d+"='true']{background:rgba(34,197,94,.16)}"].join(`
-`),(t.head||t.getElementsByTagName("head")[0]).appendChild(r),o&&typeof o.ensureStyleSheetLive=="function"&&o.ensureStyleSheetLive(t,r,"__rte_restrictedediting_styles",r.textContent)}}}function g(){var e=c();if(!e)return!1;u=!0,e.classList.add("rte-restricted");for(var t=0;t<e.children.length;t++){var r=e.children[t];r.querySelector("["+d+"='true']")?(r.setAttribute("contenteditable","true"),r.setAttribute(d+"-wrapper","true")):r.setAttribute("contenteditable","false")}return e.setAttribute("contenteditable","false"),f(),!0}function _(){var e=c();if(!e)return!1;u=!1,e.classList.remove("rte-restricted");for(var t=e.querySelectorAll("[contenteditable]"),r=0;r<t.length;r++)t[r].removeAttribute("contenteditable"),t[r].removeAttribute(d+"-wrapper");return e.setAttribute("contenteditable","true"),!0}function m(e){e=e||{};var t=c();if(!t)return null;var r=t.ownerDocument,a=r.getSelection();if(!a||a.rangeCount===0)return null;var n=a.getRangeAt(0);if(n.collapsed)return null;var i=r.createElement("span");i.setAttribute(d,"true"),e.label&&i.setAttribute("aria-label",e.label);try{n.surroundContents(i)}catch{var h=n.extractContents();i.appendChild(h),n.insertNode(i)}var s=r.createRange();return s.selectNodeContents(i),a.removeAllRanges(),a.addRange(s),f(),u&&g(),i}function x(e){if(e=e||(function(){var r=c(),a=r&&r.ownerDocument.getSelection();if(!a||a.rangeCount===0)return null;for(var n=a.anchorNode;n&&n!==r;){if(n.nodeType===1&&n.getAttribute&&n.getAttribute(d)==="true")return n;n=n.parentNode}return null})(),!e)return!1;for(var t=e.parentNode;e.firstChild;)t.insertBefore(e.firstChild,e);return t.removeChild(e),u&&g(),!0}function p(){var e=c();return e?Array.prototype.slice.call(e.querySelectorAll("["+d+"='true']")):[]}function y(e){var t=p();if(t.length===0)return null;var r=c(),a=r&&r.ownerDocument.getSelection(),n=null;if(a&&a.anchorNode)for(var i=a.anchorNode;i&&i!==r;){if(i.nodeType===1&&i.getAttribute&&i.getAttribute(d)==="true"){n=i;break}i=i.parentNode}var h=n?t.indexOf(n):-1,s=t[(h+e+t.length)%t.length];if(!s)return null;var b=r.ownerDocument.createRange();return b.selectNodeContents(s),b.collapse(!1),a.removeAllRanges(),a.addRange(b),s.scrollIntoView({block:"center",behavior:"smooth"}),s}}
+window.RTE_DefaultConfig||(window.RTE_DefaultConfig={}),RTE_DefaultConfig.svgCode_restrictedediting||(RTE_DefaultConfig.svgCode_restrictedediting='<svg viewBox="0 0 24 24" fill="none" stroke="#5F6368" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><rect x="5" y="11" width="14" height="9" rx="1.5"/><path d="M8 11V8a4 4 0 0 1 8 0v3"/></svg>'),RTE_DefaultConfig.plugin_restrictedediting=RTE_Plugin_RestrictedEditing;function RTE_Plugin_RestrictedEditing(){var N=this,c,g,d=!1,f="data-rte-editable";N.PluginName="RestrictedEditing",N.InitConfig=function(t){c=t,c.text_restrictedediting=c.text_restrictedediting||"Restricted editing",c.text_restrictedediting_mark=c.text_restrictedediting_mark||"Mark as editable",c.text_restrictedediting_next=c.text_restrictedediting_next||"Next editable region",c.text_restrictedediting_hint=c.text_restrictedediting_hint||"Lock the document; only marked regions accept input."},N.InitEditor=function(t){g=t,d=!!c.restrictedEditingMode,g.restrictedEditing={isEnabled:function(){return d},enable:b,disable:D,toggle:function(){return d?D():b()},markSelection:B,unmark:K,list:R,goToNext:function(){return x(1)},goToPrev:function(){return x(-1)}},g.attachEvent("exec_command_restrictedediting",function(r){r.returnValue=!0,r.stopBubble=!0,g.restrictedEditing.toggle()}),d&&b(),g.attachEvent("change",h),h()};var A=[];function _(t){for(var r=t&&t.nodeType===1?t:t&&t.parentNode;r&&r.nodeType===1;){if(r.getAttribute&&r.getAttribute(f)==="true")return r;r=r.parentNode}return null}function y(t){var r=t.getSelection();if(!r||r.rangeCount===0)return null;var e=r.getRangeAt(0),n=_(e.startContainer),i=_(e.endContainer);return n&&n===i?{region:n,range:e}:null}function w(t,r,e,n){var i=t.createRange();return i.selectNodeContents(r),n?i.setEnd(e.startContainer,e.startOffset):i.setStart(e.endContainer,e.endOffset),i.toString()===""}function k(t){var r=t.key||"";if(t.isComposing||r==="Backspace"||r==="Delete"||r==="Enter"||r==="Tab"||t.altKey&&(r==="ArrowUp"||r==="ArrowDown"))return!0;if(t.ctrlKey||t.metaKey){var e=r.toLowerCase();return e==="x"||e==="v"||e==="b"||e==="i"||e==="u"||e==="d"}return r.length===1&&!t.altKey}function O(t){if(!(!d||!k(t))){var r=t.target&&(t.target.ownerDocument||t.target);if(!(!r||!r.getSelection)){var e=y(r),n=!e;e&&e.range.collapsed&&(t.key==="Backspace"&&w(r,e.region,e.range,!0)&&(n=!0),t.key==="Delete"&&w(r,e.region,e.range,!1)&&(n=!0)),e&&t.altKey&&(t.key==="ArrowUp"||t.key==="ArrowDown")&&(n=!0),e&&(t.ctrlKey||t.metaKey)&&t.shiftKey&&String(t.key).toLowerCase()==="d"&&(n=!0),n&&(t.preventDefault(),t.stopImmediatePropagation())}}}function L(t){if(d){var r=t.inputType||"";if(r.indexOf("history")!==0){var e=t.target&&(t.target.ownerDocument||t.target);!e||!e.getSelection||y(e)||(t.preventDefault(),t.stopImmediatePropagation())}}}function I(){var t=v(),r=t&&t.ownerDocument&&t.ownerDocument.defaultView;!r||A.indexOf(r)>=0||(A.push(r),r.addEventListener("keydown",O,!0),r.addEventListener("beforeinput",L,!0),r.addEventListener("cut",function(e){d&&!y(e.target.ownerDocument||e.target)&&(e.preventDefault(),e.stopImmediatePropagation())},!0),r.addEventListener("paste",function(e){d&&!y(e.target.ownerDocument||e.target)&&(e.preventDefault(),e.stopImmediatePropagation())},!0),r.addEventListener("drop",function(e){d&&(e.preventDefault(),e.stopImmediatePropagation())},!0))}function v(){return g.getEditable?g.getEditable():null}function h(){var t=v();if(t){var r=t.ownerDocument;if(!(!r||r.getElementById("__rte_restrictedediting_styles"))){var e=r.createElement("style");e.id="__rte_restrictedediting_styles",e.textContent=["["+f+"='true']{background:rgba(34,197,94,.10);outline:1px dashed rgba(34,197,94,.55);outline-offset:1px;border-radius:2px;padding:1px 2px}","body.rte-restricted [contenteditable='false']{cursor:not-allowed}","body.rte-restricted ["+f+"='true']{background:rgba(34,197,94,.16)}"].join(`
+`),(r.head||r.getElementsByTagName("head")[0]).appendChild(e),g&&typeof g.ensureStyleSheetLive=="function"&&g.ensureStyleSheetLive(r,e,"__rte_restrictedediting_styles",e.textContent)}}}function b(){var t=v();if(!t)return!1;d=!0,t.classList.add("rte-restricted");for(var r=0;r<t.children.length;r++){var e=t.children[r];e.querySelector("["+f+"='true']")?(e.setAttribute("contenteditable","true"),e.setAttribute(f+"-wrapper","true")):e.setAttribute("contenteditable","false")}return t.setAttribute("contenteditable","false"),I(),h(),!0}function D(){var t=v();if(!t)return!1;d=!1,t.classList.remove("rte-restricted");for(var r=t.querySelectorAll("[contenteditable]"),e=0;e<r.length;e++)r[e].removeAttribute("contenteditable"),r[e].removeAttribute(f+"-wrapper");return t.setAttribute("contenteditable","true"),!0}function B(t){t=t||{};var r=v();if(!r)return null;var e=r.ownerDocument,n=e.getSelection();if(!n||n.rangeCount===0)return null;var i=n.getRangeAt(0);if(i.collapsed)return null;var o=F(e,i);if(o){for(var a=[],u=o.length-1;u>=0;u--){var l=e.createRange();l.setStart(o[u].sn,o[u].so),l.setEnd(o[u].en,o[u].eo),P(l,o[u].block);var p=e.createElement("span");p.setAttribute(f,"true"),t.label&&p.setAttribute("aria-label",t.label),p.appendChild(l.extractContents()),l.insertNode(p),a.unshift(p)}if(!a.length)return null;var E=e.createRange();return E.setStart(a[0],0),E.setEnd(a[a.length-1],a[a.length-1].childNodes.length),n.removeAllRanges(),n.addRange(E),h(),d&&b(),a[0]}var s=e.createElement("span");s.setAttribute(f,"true"),t.label&&s.setAttribute("aria-label",t.label);try{i.surroundContents(s)}catch{var C=i.extractContents();s.appendChild(C),i.insertNode(s)}var S=e.createRange();return S.selectNodeContents(s),n.removeAllRanges(),n.addRange(S),h(),d&&b(),s}var m=/^(P|DIV|LI|UL|OL|DL|DT|DD|TABLE|TBODY|THEAD|TFOOT|TR|TD|TH|CAPTION|H[1-6]|PRE|BLOCKQUOTE|ADDRESS|FIGURE|FIGCAPTION|SECTION|ARTICLE|ASIDE|HEADER|FOOTER|NAV|MAIN|DETAILS|SUMMARY|FORM|FIELDSET|LEGEND|HR|BODY)$/;function T(t){for(var r=t;r;r=r.parentNode)if(r.nodeType===1&&m.test(r.nodeName))return r;return null}function F(t,r){if(T(r.startContainer)===T(r.endContainer))return null;var e=r.commonAncestorContainer;e.nodeType!==1&&(e=e.parentNode);for(var n=[],i=null,o=t.createTreeWalker(e,NodeFilter.SHOW_ELEMENT|NodeFilter.SHOW_TEXT,{acceptNode:function(C){return C.nodeType===1&&C.getAttribute("contenteditable")==="false"?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT}}),a=o.nextNode();a;a=o.nextNode()){if(a.nodeType===1){m.test(a.nodeName)&&(i=null);continue}if(r.intersectsNode(a)){var u=a===r.startContainer?r.startOffset:0,l=a===r.endContainer?r.endOffset:a.data.length;if(!(l<=u)){var p=T(a);(!i||i.block!==p)&&(i={block:p,sn:a,so:u,text:""},n.push(i)),i.en=a,i.eo=l,i.text+=a.data.substring(u,l)}}}for(var E=[],s=0;s<n.length;s++)/\S/.test(n[s].text)&&E.push(n[s]);return E}function P(t,r){var e=t.startContainer;if(e.nodeType===3&&t.startOffset===0){for(;e.parentNode&&e.parentNode!==r&&!e.previousSibling&&!m.test(e.parentNode.nodeName);)e=e.parentNode;t.setStartBefore(e)}if(e=t.endContainer,e.nodeType===3&&t.endOffset===e.data.length){for(;e.parentNode&&e.parentNode!==r&&!e.nextSibling&&!m.test(e.parentNode.nodeName);)e=e.parentNode;t.setEndAfter(e)}}function K(t){if(t=t||(function(){var e=v(),n=e&&e.ownerDocument.getSelection();if(!n||n.rangeCount===0)return null;for(var i=n.anchorNode;i&&i!==e;){if(i.nodeType===1&&i.getAttribute&&i.getAttribute(f)==="true")return i;i=i.parentNode}return null})(),!t)return!1;for(var r=t.parentNode;t.firstChild;)r.insertBefore(t.firstChild,t);return r.removeChild(t),d&&b(),!0}function R(){var t=v();return t?Array.prototype.slice.call(t.querySelectorAll("["+f+"='true']")):[]}function x(t){var r=R();if(r.length===0)return null;var e=v(),n=e&&e.ownerDocument.getSelection(),i=null;if(n&&n.anchorNode)for(var o=n.anchorNode;o&&o!==e;){if(o.nodeType===1&&o.getAttribute&&o.getAttribute(f)==="true"){i=o;break}o=o.parentNode}var a=i?r.indexOf(i):-1,u=r[(a+t+r.length)%r.length];if(!u)return null;var l=e.ownerDocument.createRange();return l.selectNodeContents(u),l.collapse(!1),n.removeAllRanges(),n.addRange(l),u.scrollIntoView({block:"center",behavior:"smooth"}),u}}

package/richtexteditor/plugins/revisionhistory.js

@@ -75,7 +75,8 @@ function RTE_Plugin_RevisionHistory() {
 
         // Auto-snapshot on idle typing (opt-in).
         if (config.revisionHistoryAutoSnapshotMs > 0) {
-            editor.getDocument().addEventListener("input", function () {
+            // 2026-10-17 bound through the core (follows the live editing document). tools/keyboard/plugin-listeners-live.mjs
+            (editor.bindDocumentEvent ? function (fn) { editor.bindDocumentEvent("input", fn, true); } : function (fn) { editor.getDocument().addEventListener("input", fn, true); })(function () {
                 if (autoSnapshotTimer) clearTimeout(autoSnapshotTimer);
                 autoSnapshotTimer = setTimeout(function () {
                     var currentHtml = editor.getHTML();
@@ -83,16 +84,18 @@ function RTE_Plugin_RevisionHistory() {
                         snapshot("Auto", { auto: true });
                     }
                 }, config.revisionHistoryAutoSnapshotMs);
-            }, true);
+            });
         }
 
-        // Keyboard shortcut: Ctrl/Cmd + Shift + H opens the browser.
-        editor.getDocument().addEventListener("keydown", function (e) {
-            if ((e.ctrlKey || e.metaKey) && e.shiftKey && (e.key === "H" || e.key === "h")) {
+        // Keyboard shortcut: Ctrl/Cmd + Alt + Shift + H opens the browser (Google Docs' version-history keys).
+        // 2026-10-15 it was Ctrl+Shift+H, which is also Highlight: highlighting opened this modal over the page and,
+        // once the dialog took focus, the highlight could not be toggled off. tools/keyboard/shortcut-collisions.mjs
+        (editor.bindDocumentEvent ? function (fn) { editor.bindDocumentEvent("keydown", fn, true); } : function (fn) { editor.getDocument().addEventListener("keydown", fn, true); })(function (e) {
+            if ((e.ctrlKey || e.metaKey) && e.altKey && e.shiftKey && (e.key === "H" || e.key === "h" || e.code === "KeyH")) {
                 e.preventDefault();
                 openDialog();
             }
-        }, true);
+        });
     };
 
     function appendToolbarCommand(toolbar, item) {
@@ -106,9 +109,50 @@ function RTE_Plugin_RevisionHistory() {
         return { id: "user", name: "User", color: "#64748b" };
     }
 
+    // 2026-10-03 One store per DOCUMENT. The key was "RTE.Revisions." + (aiToolkitPersistenceKey ||
+    // "default"), so without that key every editor and every document on a site shared one list: two
+    // editors on a page overwrote each other's saved versions, and a version taken on one document was
+    // listed - and restorable, replacing the content - on every other one (localdraft had the same
+    // defect). An explicit key wins (config.revisionHistoryKey, or aiToolkitPersistenceKey as
+    // before); otherwise the page (path + query, which tells /edit?id=1 from ?id=2) and, with several
+    // editors on it, the editor's own name. tools/revisions/revision-keys.mjs
+    var cachedStoreKey = null;
+    var LEGACY_STORE_KEY = "RTE.Revisions.default";
+
     function getStoreKey() {
-        var key = config.aiToolkitPersistenceKey || "default";
-        return "RTE.Revisions." + key;
+        if (config.revisionHistoryKey) return "RTE.Revisions." + config.revisionHistoryKey;
+        if (config.aiToolkitPersistenceKey) return "RTE.Revisions." + config.aiToolkitPersistenceKey;
+        if (cachedStoreKey) return cachedStoreKey;
+        var page = "default";
+        try { page = location.pathname + location.search; } catch (e) { }
+        var name = "";
+        try {
+            var inp = editor.input;
+            if (inp) name = inp.id || inp.getAttribute("name") || "";
+            if (!name && editor.container && editor.container.id) name = editor.container.id;
+            if (!name) {
+                var all = document.querySelectorAll(".richtexteditor");
+                for (var i = 1; i < all.length; i++) if (all[i] === editor.container) { name = "editor-" + i; break; }
+            }
+        } catch (e) { }
+        return (cachedStoreKey = "RTE.Revisions." + page + (name ? "#" + name : ""));
+    }
+
+    // Versions saved under the old shared key belong to this editor only when it is the page's only
+    // one (checked once every editor on the page exists); then they move to this editor's key.
+    function takeLegacyRevisions() {
+        if (config.revisionHistoryKey || config.aiToolkitPersistenceKey || getStore().length) return;
+        try {
+            if (!window.localStorage || document.querySelectorAll(".richtexteditor").length !== 1) return;
+            var key = getStoreKey(), raw = window.localStorage.getItem(LEGACY_STORE_KEY);
+            if (!raw || key === LEGACY_STORE_KEY || window.localStorage.getItem(key)) return;
+            var parsed = JSON.parse(raw);
+            if (!Array.isArray(parsed)) return;
+            window.localStorage.setItem(key, raw);
+            window.localStorage.removeItem(LEGACY_STORE_KEY);
+            editor.__revisions = parsed;
+            if (dialog && dialog.isConnected) renderDialog();
+        } catch (ignore) { }
     }
 
     function getStore() {
@@ -188,6 +232,9 @@ function RTE_Plugin_RevisionHistory() {
     }
 
     function restoreStore() {
+        // other editors on the page are created after this one: decide about the old shared
+        // versions once they all exist
+        setTimeout(takeLegacyRevisions, 0);
         try {
             if (!window.localStorage) return;
             var raw = window.localStorage.getItem(getStoreKey());
@@ -222,10 +269,16 @@ function RTE_Plugin_RevisionHistory() {
 
     // Prompt the user for a snapshot name via native window.prompt, then take a snapshot.
     // Returns the entry (or null if the user cancelled).
+    // 2026-10-18 the history's words read config.text_ keys (language packs), English as the fallback; {0} fills a
+    // template. tools/i18n/revision-history-language.mjs
+    function rhText(key, fallback, arg) {
+        var s = (config && config["text_" + key]) || fallback;
+        return arg === undefined ? s : s.split("{0}").join(String(arg));
+    }
     function promptAndSnapshot(defaultLabel) {
         var iframeDoc = editor.iframe ? editor.iframe.ownerDocument : document;
         var win = iframeDoc.defaultView || window;
-        var value = win.prompt("Name this version (e.g. \"Draft sent to legal\"):", defaultLabel || "");
+        var value = win.prompt(rhText("rh_nameversion", "Name this version (e.g. \"Draft sent to legal\"):"), defaultLabel || "");
         if (value === null) return null;
         var trimmed = (value || "").trim();
         if (!trimmed) return null;
@@ -277,13 +330,31 @@ function RTE_Plugin_RevisionHistory() {
         opts = opts || {};
         var entry = findById(id);
         if (!entry) return false;
+        // 2026-10-03 Restoring replaces the content with setHTMLCode, which is not an undo step, and saved
+        // nothing first - restoring a version by mistake threw away everything written since it, for
+        // good. The current content is now kept as a (named) version first, unless the newest version
+        // already holds it; config.revisionHistorySnapshotBeforeRestore: false for the old behaviour.
+        // tools/revisions/restore-safety.mjs
+        var keep = config.revisionHistorySnapshotBeforeRestore !== false;
         if (!opts.skipConfirm) {
             var doc = editor.iframe ? editor.iframe.ownerDocument : document;
-            if (!doc.defaultView.confirm("Restore this version? Your current content will be replaced (this itself is not auto-snapshotted).")) {
+            var message = keep
+                ? rhText("rh_restorekeep", "Restore this version? Your current content is kept as a version first, so you can go back to it.")
+                : rhText("rh_restorereplace", "Restore this version? Your current content will be replaced (this itself is not auto-snapshotted).");
+            if (!doc.defaultView.confirm(message)) {
                 return false;
             }
         }
-        if (editor.setHTMLCode) editor.setHTMLCode(entry.html);
+        if (keep) {
+            var current = editor.getHTML ? editor.getHTML() : (editor.getHTMLCode ? editor.getHTMLCode() : "");
+            var newest = null, store = getStore();
+            for (var i = 0; i < store.length; i++) if (!newest || (store[i].createdAt || 0) >= (newest.createdAt || 0)) newest = store[i];
+            if (current !== entry.html && (!newest || newest.html !== current)) {
+                snapshot(rhText("rh_beforerestore", "Before restoring {0}", entry.label), { beforeRestore: entry.id });
+            }
+        }
+        // undoable: Ctrl+Z after a restore gives back exactly the document it replaced (import-undo.mjs)
+        if (editor.setHTMLCode) editor.setHTMLCode(entry.html, { undoable: true });
         else if (editor.setHTML) editor.setHTML(entry.html);
         lastSnapshotHtml = entry.html;
         if (dialog && dialog.isConnected) closeDialog();
@@ -406,13 +477,68 @@ function RTE_Plugin_RevisionHistory() {
         panel.className = "rte-rev-panel";
         backdrop.appendChild(panel);
         dialog.appendChild(backdrop);
+        // 2026-10-15 keyboard: the dialog is modal, so focus moves in, Tab stays in, Escape closes, and focus goes back
+        // to where it was. Escape did nothing and the backdrop kept blocking the page. tools/a11y/revision-dialog-keyboard.mjs
+        dialogReturnFocus = host.activeElement;
+        dialog.addEventListener("keydown", onDialogKey, true);
         host.body.appendChild(dialog);
         renderDialog();
+        // the toolbar returns focus to the editor just after a command runs; move in after that, and once more
+        // if something took it back
+        setTimeout(focusFirstInDialog, 0);
+        setTimeout(function () { if (dialog && !dialog.contains(dialog.ownerDocument.activeElement)) focusFirstInDialog(); }, 250);
+    }
+
+    var dialogReturnFocus = null;
+    function dialogFocusables() {
+        if (!dialog) return [];
+        var all = dialog.querySelectorAll("button, input, select, textarea, a[href], [tabindex]:not([tabindex='-1'])");
+        var out = [];
+        for (var i = 0; i < all.length; i++) if (!all[i].disabled && all[i].offsetParent !== null) out.push(all[i]);
+        return out;
+    }
+    function focusFirstInDialog() {
+        var f = dialogFocusables();
+        if (f.length) { try { f[0].focus(); } catch (e) { /* ignore */ } }
+    }
+    // 2026-10-18 a dialog control runs its action on click, so Enter and Space work (they fire click, not mousedown;
+    // these ran on mousedown only and did nothing from the keyboard). mousedown still prevents default so a mouse
+    // press keeps the editor's selection. The action usually re-renders the dialog; after a keyboard press, focus
+    // goes back to the control with the same key. tools/a11y/revision-buttons-keyboard.mjs
+    function onActivate(el, key, fn) {
+        el.setAttribute("data-rte-rev-key", key);
+        el.addEventListener("mousedown", function (e) { e.preventDefault(); });
+        el.addEventListener("click", function (e) {
+            e.preventDefault();
+            var fromKeyboard = e.detail === 0;
+            fn();
+            if (!fromKeyboard || !dialog) return;
+            var all = dialog.querySelectorAll("[data-rte-rev-key]");
+            for (var i = 0; i < all.length; i++) {
+                if (all[i].getAttribute("data-rte-rev-key") === key) { try { all[i].focus(); } catch (x) { /* ignore */ } return; }
+            }
+            if (!dialog.contains(dialog.ownerDocument.activeElement)) focusFirstInDialog();
+        });
+    }
+    function onDialogKey(e) {
+        if (e.key === "Escape" || e.key === "Esc") { e.preventDefault(); e.stopPropagation(); closeDialog(); return; }
+        if (e.key !== "Tab") return;
+        var f = dialogFocusables();
+        if (!f.length) return;
+        var a = dialog.ownerDocument.activeElement, i = f.indexOf(a);
+        if (e.shiftKey && (i <= 0)) { e.preventDefault(); f[f.length - 1].focus(); }
+        else if (!e.shiftKey && (i === -1 || i === f.length - 1)) { e.preventDefault(); f[0].focus(); }
     }
 
     function closeDialog() {
         if (dialog && dialog.parentNode) dialog.parentNode.removeChild(dialog);
         dialog = null;
+        var back = dialogReturnFocus;
+        dialogReturnFocus = null;
+        try {
+            if (back && back.isConnected && back.tagName !== "IFRAME" && back !== back.ownerDocument.body) back.focus();
+            else if (typeof editor.focus === "function") editor.focus();
+        } catch (e) { /* ignore */ }
     }
 
     var dialogSelectedId = null;
@@ -433,17 +559,16 @@ function RTE_Plugin_RevisionHistory() {
         var title = host.createElement("div");
         title.id = "rte-rev-dialog-title";
         title.className = "rte-rev-title";
-        title.textContent = "Revision history";
+        title.textContent = rhText("revisionhistory", "Revision history");
         header.appendChild(title);
         var actions = host.createElement("div");
         actions.className = "rte-rev-header-actions";
         var snapBtn = host.createElement("button");
         snapBtn.type = "button";
         snapBtn.className = "rte-rev-btn rte-rev-btn-ghost";
-        snapBtn.textContent = "Save version now";
-        snapBtn.addEventListener("mousedown", function (e) {
-            e.preventDefault();
-            var label = host.defaultView.prompt("Label this version (optional):", "");
+        snapBtn.textContent = rhText("rh_savenow", "Save version now");
+        onActivate(snapBtn, "save", function () {
+            var label = host.defaultView.prompt(rhText("rh_labelversion", "Label this version (optional):"), "");
             if (label === null) return; // cancelled
             snapshot(label || "");
         });
@@ -451,9 +576,9 @@ function RTE_Plugin_RevisionHistory() {
         var closeBtn = host.createElement("button");
         closeBtn.type = "button";
         closeBtn.className = "rte-rev-btn rte-rev-btn-ghost";
-        closeBtn.textContent = "Close";
-        closeBtn.setAttribute("aria-label", "Close revision history");
-        closeBtn.addEventListener("mousedown", function (e) { e.preventDefault(); closeDialog(); });
+        closeBtn.textContent = rhText("close", "Close");
+        closeBtn.setAttribute("aria-label", rhText("rh_closehistory", "Close revision history"));
+        onActivate(closeBtn, "close", closeDialog);
         actions.appendChild(closeBtn);
         header.appendChild(actions);
         panel.appendChild(header);
@@ -464,13 +589,17 @@ function RTE_Plugin_RevisionHistory() {
         // Left: list
         var list = host.createElement("div");
         list.className = "rte-rev-list";
-        list.setAttribute("role", "listbox");
-        list.setAttribute("aria-label", "Saved revisions");
         var entries = editor.revisionHistory.list();
+        // 2026-10-15 a listbox only when it lists revisions: the empty message inside role=listbox left a listbox with
+        // no options (axe aria-required-children) that read as an empty list. tools/a11y/revision-list-roles.mjs
+        if (entries.length) {
+            list.setAttribute("role", "listbox");
+            list.setAttribute("aria-label", rhText("rh_saved", "Saved revisions"));
+        }
         if (!entries.length) {
             var empty = host.createElement("div");
             empty.className = "rte-rev-empty";
-            empty.textContent = "No revisions yet. Click \"Save version now\" to capture the current document.";
+            empty.textContent = rhText("rh_empty", "No revisions yet. Click \"Save version now\" to capture the current document.");
             list.appendChild(empty);
         } else {
             if (!dialogSelectedId || !findById(dialogSelectedId)) {
@@ -488,7 +617,7 @@ function RTE_Plugin_RevisionHistory() {
                     dot.style.background = (e.author && e.author.color) || "#64748b";
                     var who = host.createElement("div");
                     who.className = "rte-rev-row-who";
-                    who.textContent = (e.author && e.author.name) || "User";
+                    who.textContent = (e.author && e.author.name) || rhText("rh_user", "User");
                     var when = host.createElement("div");
                     when.className = "rte-rev-row-when";
                     when.textContent = formatDate(e.createdAt) + " \u00B7 " + (e.label || "");
@@ -498,8 +627,7 @@ function RTE_Plugin_RevisionHistory() {
                     col.appendChild(when);
                     row.appendChild(dot);
                     row.appendChild(col);
-                    row.addEventListener("mousedown", function (ev) {
-                        ev.preventDefault();
+                    onActivate(row, "row-" + e.id, function () {
                         dialogSelectedId = e.id;
                         renderDialog();
                     });
@@ -518,21 +646,21 @@ function RTE_Plugin_RevisionHistory() {
             var tabs = host.createElement("div");
             tabs.className = "rte-rev-tabs";
             tabs.setAttribute("role", "tablist");
-            tabs.setAttribute("aria-label", "Revision view");
+            tabs.setAttribute("aria-label", rhText("rh_view", "Revision view"));
             var tabPreview = host.createElement("button");
             tabPreview.type = "button";
             tabPreview.className = "rte-rev-tab" + (dialogView === "preview" ? " rte-rev-tab-active" : "");
             tabPreview.setAttribute("role", "tab");
             tabPreview.setAttribute("aria-selected", dialogView === "preview" ? "true" : "false");
-            tabPreview.textContent = "Preview";
-            tabPreview.addEventListener("mousedown", function (e) { e.preventDefault(); dialogView = "preview"; renderDialog(); });
+            tabPreview.textContent = rhText("rh_preview", "Preview");
+            onActivate(tabPreview, "tab-preview", function () { dialogView = "preview"; renderDialog(); });
             var tabDiff = host.createElement("button");
             tabDiff.type = "button";
             tabDiff.className = "rte-rev-tab" + (dialogView === "diff" ? " rte-rev-tab-active" : "");
             tabDiff.setAttribute("role", "tab");
             tabDiff.setAttribute("aria-selected", dialogView === "diff" ? "true" : "false");
-            tabDiff.textContent = "Diff vs current";
-            tabDiff.addEventListener("mousedown", function (e) { e.preventDefault(); dialogView = "diff"; renderDialog(); });
+            tabDiff.textContent = rhText("rh_diff", "Diff vs current");
+            onActivate(tabDiff, "tab-diff", function () { dialogView = "diff"; renderDialog(); });
             tabs.appendChild(tabPreview);
             tabs.appendChild(tabDiff);
             pane.appendChild(tabs);
@@ -542,7 +670,7 @@ function RTE_Plugin_RevisionHistory() {
             if (dialogView === "preview") {
                 var iframe = host.createElement("iframe");
                 iframe.className = "rte-rev-preview-frame";
-                iframe.setAttribute("title", "Revision preview");
+                iframe.setAttribute("title", rhText("rh_previewframe", "Revision preview"));
                 iframe.setAttribute("sandbox", "allow-same-origin");
                 content.appendChild(iframe);
                 // Write after appending so document is available.
@@ -576,18 +704,18 @@ function RTE_Plugin_RevisionHistory() {
             footer.className = "rte-rev-footer";
             var labelInfo = host.createElement("div");
             labelInfo.className = "rte-rev-footer-info";
-            labelInfo.textContent = selected.label ? "Label: " + selected.label : "";
+            labelInfo.textContent = selected.label ? rhText("rh_label", "Label: {0}", selected.label) : "";
             var footerBtns = host.createElement("div");
             footerBtns.className = "rte-rev-footer-btns";
             var delBtn = host.createElement("button");
             delBtn.type = "button";
             delBtn.className = "rte-rev-btn rte-rev-btn-danger";
-            delBtn.textContent = "Delete";
-            delBtn.addEventListener("mousedown", function (e) { e.preventDefault(); deleteEntry(selected.id); });
+            delBtn.textContent = rhText("delete", "Delete");
+            onActivate(delBtn, "delete", function () { deleteEntry(selected.id); });
             var restoreBtn = host.createElement("button");
             restoreBtn.type = "button";
             restoreBtn.className = "rte-rev-btn rte-rev-btn-primary";
-            restoreBtn.textContent = "Restore this version";
+            restoreBtn.textContent = rhText("rh_restore", "Restore this version");
             restoreBtn.addEventListener("mousedown", function (e) { e.preventDefault(); });
             restoreBtn.addEventListener("click", function (e) {
                 e.preventDefault();
@@ -599,7 +727,10 @@ function RTE_Plugin_RevisionHistory() {
             footer.appendChild(footerBtns);
             pane.appendChild(footer);
         }
-        body.appendChild(pane);
+        // 2026-10-18 nothing to preview: no empty pane (a blank half on desktop, a 360px block on a phone); the
+        // no-revisions message spans the dialog instead. tools/ui/revision-empty-state.mjs
+        if (entries.length) body.appendChild(pane);
+        else list.classList.add("rte-rev-list-solo");
         panel.appendChild(body);
     }
 
@@ -609,7 +740,7 @@ function RTE_Plugin_RevisionHistory() {
         var now = new Date();
         function pad(n) { return n < 10 ? "0" + n : "" + n; }
         var time = pad(d.getHours()) + ":" + pad(d.getMinutes());
-        if (d.toDateString() === now.toDateString()) return "Today " + time;
+        if (d.toDateString() === now.toDateString()) return rhText("rh_today", "Today {0}", time);
         return d.getFullYear() + "-" + pad(d.getMonth() + 1) + "-" + pad(d.getDate()) + " " + time;
     }
 
@@ -646,6 +777,7 @@ function RTE_Plugin_RevisionHistory() {
             ".rte-rev-row-who{font-weight:720;font-size:12px;line-height:1.25;color:#172033}",
             ".rte-rev-row-when{margin-top:2px;font-size:11px;color:#637487;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}",
             ".rte-rev-pane{flex:1;display:flex;flex-direction:column;min-width:0;padding:10px}",
+            ".rte-rev-list.rte-rev-list-solo{flex:1 1 auto;width:auto;max-height:none;border-right:0;border-bottom:0}",
             ".rte-rev-tabs{display:flex;align-self:flex-start;gap:3px;padding:3px;margin:0 0 10px;border:1px solid rgba(117,137,163,.2);border-radius:7px;background:#eef3f8}",
             ".rte-rev-tab{padding:7px 12px;border:0;border-radius:6px;background:transparent;font:inherit;font-size:12px;font-weight:680;color:#637487;cursor:pointer}",
             ".rte-rev-tab:hover{color:#1d3557;background:rgba(255,255,255,.58)}",