Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: e1355827a6a05ff733e8cbe23dc2596ffb0ec564 https://github.com/xwiki/xwiki-platform/commit/e1355827a6a05ff733e8cbe23dc25... Author: Marius Dumitru Florea <[email protected]> Date: 2025-12-04 (Thu, 04 Dec 2025) Changed paths: M xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Script.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-selection/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/test/javascript/xwiki-source.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/javascript.vm M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/RealtimeTestUtils.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/patches.js M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/MultiUserTestUtils.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/TestUtils.java A xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/require/node-module.js Log Message: ----------- XWIKI-21660: RealtimeWYSIWYGEditorIT#applyInlineStylesOnTheSameParagraph is flickering XWIKI-22178: RealtimeWYSIWYGEditorIT#editWithSelf is flickering XWIKI-21661: RealtimeWYSIWYGEditorIT#inplaceEditableMacro is flickering XWIKI-22035: RealtimeWYSIWYGEditorIT#editAlone is flickering XWIKI-21605: RealtimeWYSIWYGEditorIT#editDifferentParagraphs is flickering XWIKI-22619: RealtimeWYSIWYGEditorIT#dragAndDropFilesAtTheSameTime is flickering XWIKI-23488: RealtimeWYSIWYGEditorIT#imageWithCaption is flickering XWIKI-23417: RealtimeWYSIWYGEditorIT#editPageTranslations is flickering XWIKI-23418: RealtimeWYSIWYGEditorIT#saveAndViewNoMergeConflict is flickering XWIKI-22819: RealtimeWYSIWYGEditorIT#editSameParagraph is flickering XWIKI-22614: RealtimeWYSIWYGEditorIT#editSource is flickering XWIKI-22918: RealtimeWYSIWYGEditorIT#reloadEditorsSilentMergeConflictManualSave is flickering XWIKI-23308: RealtimeWYSIWYGEditorIT#restrictScriptMacroExecution is flickering * Restoring the selection after applying a remote patch can't be asynchronous because the selection / caret can end-up in unexpected places after the remote patch is applied. We noticed during test execution that it can end up outside the editable area, causing keyboard events triggered by the test to be ignored until the selection is restored. * Refactor the TextSelection module to support both sync and async (WebWorker-based) restore. * Stop trying to fix / workaround poor handling of nested editable areas in Firefox (you can't use the keyboard to leave a focused nested editable area) because it leads to unexpected side effects (keyboard events are sent to the root editable area in tests, instead of the active nested editable area). * Force selection change on all browsers (not just for in-place editor with Firefox) after sending keys to the rich text area, because we have code that reads the selection from CKEditor, which is updated with a delay (async). * Send keys to the active nested editable in Firefox as well, even if that makes it harder for tests to move outside the nested editable using the keyboard. At least the typed text end up in the right place. * Publish the 'node-module' RequireJS loader plugin because it is used in two places. * Bulletproof RealtimeTestUtils#simulateFailedWebSocketConnection() to support repeated executions (when some execution may fail) * Don't mix chorded keys with normal keys because it looks like Firefox driver sometimes keeps the modifier keys pressed for the following normal keys. * Improve the selection restore: text/diff-based selection restore can be costly and we can't do it async so we need to avoid it as much as possible; save a tree/path-based selection and update/invalidate it while applying a remote patch, which should reduce the need to restore the text/diff-based selection. * Fix MultiUserTestUtils#closeTabs() which was "leaking" the secret token from one test execution to the next, for the main browser tab. * Fix TestUtils#leaveEditMode() to wait for the Cancel button to be enabled before sending the shortcut key, since it can be disabled temporarily by an auto-save. To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications