XWIKI-17664: When adding an annotation the focus should be inside WYSIWYG by default

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Macros.xml

@@ -356,6 +356,10 @@
 
 #macro(displayAnnotationProperty $annotatedDocument $annotationObject $annotationProperty $mode)
   #if ($mode == 'edit' || $mode == 'create')
+    ## This startupFocus parameter is used by the CKEditor WYSIWYG editor.
+    #set ($wysiwygEditorConfig = {
+      'startupFocus': true
+    })
     ## We use displayEdit and not display('edit') because we want the input field name to be just the property name
     ## (without the "DocumentReference_objectNumber_" prefix).
     $annotatedDocument.displayEdit($annotationProperty, '', $annotationObject)

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/src/main/resources/AnnotationCode/Script.xml

@@ -1710,7 +1710,7 @@ XWiki.Annotation = Class.create({
     if (!this.safeUpdate(this.createPanel, panelContent)) {
       return;
     }
-    // set the focus in the first element of type input
+    // Set the focus in the first element of type input, useful when not using the WYSIWYG editor CKEditor.
     this.createPanel.select('form').first().focusFirstElement();
     // and add the button observers
     this.createPanel.down('input[type=submit]').observe('click', this.onAnnotationAdd.bindAsEventListener(this));

xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml

@@ -181,9 +181,11 @@ define('xwiki-ckeditor', [
     }
 
     var uploadDisabled = element.hasAttribute('data-upload-disabled');
+    var startupFocus = element.hasAttribute('data-startup-focus');
 
     var config = {
       filebrowserUploadUrl: uploadDisabled ? '' : getUploadURL(sourceDocument, 'filebrowser'),
+      startupFocus,
       height: $(element).height(),
       // Used to resolve and serialize relative references. Also used to make HTTP requests with the right context.
       sourceDocument: sourceDocument,

xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/VelocityMacros.xml

@@ -174,6 +174,12 @@
   #if ($source.restricted == 'true' && !$services.security.authorization.hasAccess('edit', $source.documentReference))
     #set ($parameters.attributes.data-upload-disabled = 'true')
   #end
+  ## We use the velocity template context to convey the startupFocus parameter to CKEditor.
+  #if ($wysiwygEditorConfig.startupFocus)
+    #set ($parameters.attributes.data-startup-focus = 'true')
+    ## We make sure to clear this context so that it doesn't interfere with CKEditors opened later.
+    #set ($wysiwygEditorConfig.startupFocus = false)
+  #end
   ##
   <textarea
     #foreach ($entry in $parameters.attributes.entrySet())

xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/commentfield.vm

@@ -72,6 +72,10 @@
 
 <label for="$name">$services.localization.render('core.viewers.comments.add.comment.label')</label>
 #initRequiredSkinExtensions()
+## This startupFocus parameter is used by the CKEditor WYSIWYG editor.
+  #set ($wysiwygEditorConfig = {
+    'startupFocus': true
+  })
 ## display of the comment field
 $doc.displayEdit($fieldToDisplay, '', $commentObj)
 

xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/uicomponents/viewers/comments.js

@@ -599,9 +599,6 @@ viewers.Comments = Class.create({
 
     require(['jquery', 'xwiki-events-bridge'], function ($) {
       if ($(".commenteditor").length) {
-        if(typeof CKEDITOR !== 'undefined') {
-          CKEDITOR.config.startupFocus = true;
-        }
         $.post(new XWiki.Document().getURL("get") + '?' + $.param({
           xpage: 'xpart',
           vm: 'commentfield.vm',