@ckeditor/ckeditor5-comments 39.0.1 → 39.0.2

package/src/comments/ui/view/commentview.js

@@ -20,4 +20,4 @@
  *
  *
  */
-const _0x283f=['ck-annotation__content-wrapper','ck-annotation__main','push','ck-comment__actions','icon','add','bind','EXTERNAL_IMPORT_WORD_COMMENT','@external','remove','set','Delete\x20comment?','visibleView','ck-comment__info-time','bindTemplate','then','authoredAt','label','setTemplate','source','items','length','actionBar','isVisible','some','buttonView','render','getUserViewNotificationText','Show\x20more\x20items','threeVerticalDots','fire','Edit','panelPosition','creator','edit','ck-annotation__actions','isRemovable','name','isEditable','div','listenTo','switchToEditMode','ck-comment--remove','userView','placeholder','locale','_createEditButton','ck-annotation','ck-comment__info','ck-annotation__info-time','isEnabled','actionIndicator','cancelConfirm','addMany','_model','ck-comment--edit','removeComment','Remove','panelView','isReadOnly','mouseenter','ck-comment--','_createDropdown','change:isVisible','_config','ck-annotation__user','element','editButton','attributes','getTemplate','isSystemComment','ck-comment__external','Reply...','_attachActions','span','isConfirm','ck-annotation__info','createCollection','_createCommentInputView','_createRemoveButton','change:isRemovable','blur','importWord','showConfirm','author','execute','mouseleave','extendTemplate','change:isEnabled','isEditMode','withText','focus','EXTERNAL_AVATAR','isExternal','ck-comment__user','removeButton'];(function(_0x28118d,_0x283fc8){const _0x5b7a01=function(_0x3c4d2b){while(--_0x3c4d2b){_0x28118d['push'](_0x28118d['shift']());}};_0x5b7a01(++_0x283fc8);}(_0x283f,0x10c));const _0x5b7a=function(_0x28118d,_0x283fc8){_0x28118d=_0x28118d-0x0;let _0x5b7a01=_0x283f[_0x28118d];return _0x5b7a01;};import{ButtonView as _0x479ce7,createDropdown as _0x3b2926,ListView as _0x3a7fb2,ListItemView as _0x3ef960}from'ckeditor5/src/ui';import{icons as _0x4bb238}from'ckeditor5/src/core';import{UserView as _0x855dec,ConfirmMixin as _0x39e3b4}from'ckeditor5-collaboration/src/collaboration-core';import _0x209590 from'./basecommentview';import _0x31b80c from'../../../../theme/icons/remove-comment.svg';import{getTranslation as _0x3d446c}from'../../../utils/common-translations';export default class ut extends _0x39e3b4(_0x209590){constructor(_0xf4310a,_0x2854d8,_0x28cf05){super(_0xf4310a,_0x2854d8,_0x28cf05),this[_0x5b7a('0x1e')](_0x5b7a('0x47'),null),this[_0x5b7a('0x1e')](_0x5b7a('0x40'),_0x3d446c(_0xf4310a,_0x5b7a('0x5c'))),this[_0x5b7a('0x1a')]('authoredAt')['to'](_0x2854d8),this[_0x5b7a('0x1a')]('resolvedAt')['to'](_0x2854d8),this[_0x5b7a('0x2a')]=this[_0x5b7a('0x1')](),this['isSystemComment']||(this[_0x5b7a('0x57')]=this[_0x5b7a('0x42')](),this[_0x5b7a('0x13')]=this[_0x5b7a('0x3')](),this['items']=this[_0x5b7a('0x1')](),this[_0x5b7a('0x28')][_0x5b7a('0x49')]([this['editButton'],this[_0x5b7a('0x13')]]),this['dropdown']=this[_0x5b7a('0x52')](),this[_0x5b7a('0x2a')][_0x5b7a('0x19')](this['dropdown'])),this[_0x5b7a('0x3f')]=new _0x855dec(_0xf4310a,_0x2854d8[_0x5b7a('0x8')],this[_0x5b7a('0x2f')]()),this['userView'][_0x5b7a('0xb')]({'attributes':{'class':[_0x5b7a('0x12'),_0x5b7a('0x55')]}}),this[_0x5b7a('0x3c')](_0x2854d8,_0x5b7a('0x4'),()=>this[_0x5b7a('0x48')]()),this[_0x5b7a('0x26')](this[_0x5b7a('0x59')]());}[_0x5b7a('0x59')](){const _0x2142d1=this[_0x5b7a('0x22')],_0x3d46b3=[{'tag':_0x5b7a('0x3b'),'attributes':{'class':[_0x5b7a('0x44'),_0x5b7a('0x0')]},'children':[{'tag':_0x5b7a('0x5e'),'children':[{'text':this[_0x5b7a('0x3f')][_0x5b7a('0x39')]}],'attributes':{'class':['ck-comment__info-name','ck-annotation__info-name']}},{'tag':'time','attributes':{'datetime':_0x2142d1['to']('authoredAt'),'class':[_0x5b7a('0x21'),_0x5b7a('0x45')]},'children':[{'text':_0x2142d1['to'](_0x5b7a('0x24'),_0x552db3=>this[_0x5b7a('0x54')]['formatDateTime'](_0x552db3))}]}]},{'tag':_0x5b7a('0x3b'),'attributes':{'class':[_0x5b7a('0x17'),_0x5b7a('0x37'),_0x2142d1['if'](_0x5b7a('0xd'),'ck-comment__actions--hidden'),_0x2142d1['if'](_0x5b7a('0xd'),'ck-annotation__actions--hidden')]},'children':this['actionBar']},{'tag':_0x5b7a('0x3b'),'attributes':{'class':[_0x5b7a('0x14')]},'children':this[_0x5b7a('0x20')]}];return this['_model'][_0x5b7a('0x11')]&&_0x3d46b3[_0x5b7a('0x16')]({'tag':_0x5b7a('0x3b'),'attributes':{'class':[_0x5b7a('0x5b')]},'children':[{'text':this['getExternalCommentNote']()}]}),{'tag':'li','attributes':{'class':['ck-comment__wrapper',_0x2142d1['if'](_0x5b7a('0x5f'),'ck-comment--remove-confirmation')],'tabindex':-0x1},'children':[{'tag':_0x5b7a('0x3b'),'attributes':{'class':['ck-comment',_0x5b7a('0x43'),_0x2142d1['if'](_0x5b7a('0xd'),_0x5b7a('0x4b')),_0x2142d1['if'](_0x5b7a('0x5a'),'ck-comment--info'),_0x2142d1['to']('actionIndicator',_0x17f8de=>_0x17f8de?_0x5b7a('0x51')+_0x17f8de:'')],'data-author-id':this[_0x5b7a('0x4a')][_0x5b7a('0x8')]['id'],'data-comment-id':this[_0x5b7a('0x4a')]['id']},'children':[this[_0x5b7a('0x3f')],{'tag':_0x5b7a('0x3b'),'attributes':{'class':['ck-comment__main',_0x5b7a('0x15')]},'children':_0x3d46b3}]}]};}['_createEditButton'](){const _0x2e5d51=new _0x479ce7(this[_0x5b7a('0x41')]);return _0x2e5d51[_0x5b7a('0x25')]=_0x3d446c(this[_0x5b7a('0x41')],_0x5b7a('0x33')),_0x2e5d51[_0x5b7a('0x18')]=_0x4bb238['pencil'],_0x2e5d51[_0x5b7a('0xe')]=!0x0,_0x2e5d51['extendTemplate']({'attributes':{'class':_0x5b7a('0x4b')}}),_0x2e5d51['bind'](_0x5b7a('0x46'))['to'](this[_0x5b7a('0x4a')],_0x5b7a('0x4f'),_0x5df5bb=>!_0x5df5bb),_0x2e5d51[_0x5b7a('0x1a')](_0x5b7a('0x2b'))['to'](this[_0x5b7a('0x4a')],_0x5b7a('0x3a')),_0x2e5d51['on'](_0x5b7a('0x9'),()=>this[_0x5b7a('0x3d')]()),_0x2e5d51;}[_0x5b7a('0x3')](){const _0x4f012f=new _0x479ce7(this['locale']);return _0x4f012f[_0x5b7a('0x25')]=_0x3d446c(this[_0x5b7a('0x41')],_0x5b7a('0x4d')),_0x4f012f[_0x5b7a('0x18')]=_0x31b80c,_0x4f012f[_0x5b7a('0xe')]=!0x0,_0x4f012f[_0x5b7a('0xb')]({'attributes':{'class':_0x5b7a('0x3e')}}),_0x4f012f['bind']('isEnabled')['to'](this[_0x5b7a('0x4a')],_0x5b7a('0x4f'),_0x4bbcfa=>!_0x4bbcfa),_0x4f012f[_0x5b7a('0x1a')](_0x5b7a('0x2b'))['to'](this[_0x5b7a('0x4a')],_0x5b7a('0x38')),_0x4f012f['on'](_0x5b7a('0x9'),()=>{this[_0x5b7a('0x7')](_0x3d446c(this[_0x5b7a('0x41')],_0x5b7a('0x1f')),this[_0x5b7a('0x56')])[_0x5b7a('0x23')](()=>{this[_0x5b7a('0x32')](_0x5b7a('0x4c'),this[_0x5b7a('0x4a')]['id']);});}),_0x4f012f;}['_createDropdown'](){const _0x408349=_0x3b2926(this[_0x5b7a('0x41')]),_0xf07b35=_0x408349[_0x5b7a('0x4e')]['children'],_0xfbbada=new _0x3a7fb2(this['locale']),_0x29b6d2=(_0x144bb0,_0x3c7119=-0x1)=>{const _0x2c3712=new _0x3ef960(this[_0x5b7a('0x41')]);_0x2c3712['children'][_0x5b7a('0x19')](_0x144bb0);const _0x3720cc=_0x3c7119>-0x1?_0x3c7119:_0xfbbada[_0x5b7a('0x28')][_0x5b7a('0x29')];_0xfbbada[_0x5b7a('0x28')][_0x5b7a('0x19')](_0x2c3712,_0x3720cc),_0x408349['listenTo'](_0x144bb0,_0x5b7a('0xc'),()=>{_0x408349[_0x5b7a('0x46')]=[...this['items']][_0x5b7a('0x2c')](_0x40117a=>_0x40117a['isEnabled']);}),_0x408349['listenTo'](_0x144bb0,_0x5b7a('0x53'),()=>{_0x408349['buttonView'][_0x5b7a('0x2b')]=[...this[_0x5b7a('0x28')]]['some'](_0x4e7f98=>_0x4e7f98[_0x5b7a('0x2b')]);});};_0x408349[_0x5b7a('0x34')]='sw',_0x408349[_0x5b7a('0x2d')]['set']({'label':_0x3d446c(this[_0x5b7a('0x41')],_0x5b7a('0x30')),'icon':_0x4bb238[_0x5b7a('0x31')]}),_0x408349[_0x5b7a('0x46')]=[...this['items']][_0x5b7a('0x2c')](_0x5cbc36=>_0x5cbc36[_0x5b7a('0x46')]),_0x408349['buttonView']['isVisible']=[...this['items']][_0x5b7a('0x2c')](_0x2d445b=>_0x2d445b[_0x5b7a('0x2b')]);for(const _0x284273 of this['items'])_0x29b6d2(_0x284273);return _0xf07b35['add'](_0xfbbada),_0x408349[_0x5b7a('0x3c')](this[_0x5b7a('0x28')],'add',(_0x4dc274,_0x1e1edb,_0x263501)=>{_0x29b6d2(_0x1e1edb,_0x263501);}),_0x408349[_0x5b7a('0x3c')](this['items'],_0x5b7a('0x1d'),(_0x364c70,_0x2165b6,_0x1df840)=>{_0xfbbada[_0x5b7a('0x28')][_0x5b7a('0x1d')](_0x1df840);}),_0x408349;}[_0x5b7a('0x5d')](_0x4aaed5,_0x31b314){const _0x194471=_0x4aaed5&&_0x4aaed5[_0x5b7a('0x56')];_0x194471&&(this[_0x5b7a('0x3c')](_0x194471,_0x5b7a('0x50'),()=>this[_0x5b7a('0x47')]=_0x31b314),this[_0x5b7a('0x3c')](_0x194471,_0x5b7a('0xf'),()=>this[_0x5b7a('0x47')]=_0x31b314),this[_0x5b7a('0x3c')](_0x194471,_0x5b7a('0xa'),()=>this[_0x5b7a('0x47')]=null),this[_0x5b7a('0x3c')](_0x194471,_0x5b7a('0x5'),()=>this[_0x5b7a('0x47')]=null));}[_0x5b7a('0x2')](){const _0x76190d=super[_0x5b7a('0x2')]();return _0x76190d['bind']('placeholder')['to'](this),_0x76190d;}['getExternalCommentNote'](){return _0x5b7a('0x6')===this[_0x5b7a('0x4a')][_0x5b7a('0x58')]['@external'][_0x5b7a('0x27')]?_0x3d446c(this[_0x5b7a('0x41')],_0x5b7a('0x1b')):_0x3d446c(this[_0x5b7a('0x41')],'EXTERNAL_COMMENT');}[_0x5b7a('0x2f')](){return this['_model'][_0x5b7a('0x11')]?_0x5b7a('0x6')===this[_0x5b7a('0x4a')][_0x5b7a('0x58')][_0x5b7a('0x1c')][_0x5b7a('0x27')]?_0x3d446c(this[_0x5b7a('0x41')],'EXTERNAL_IMPORT_WORD_AVATAR',this[_0x5b7a('0x4a')][_0x5b7a('0x35')][_0x5b7a('0x39')]):_0x3d446c(this['locale'],_0x5b7a('0x10'),this[_0x5b7a('0x4a')]['creator'][_0x5b7a('0x39')]):null;}[_0x5b7a('0x2e')](){super['render'](),this[_0x5b7a('0x5d')](this['editButton'],_0x5b7a('0x36')),this[_0x5b7a('0x5d')](this[_0x5b7a('0x13')],_0x5b7a('0x1d'));}}
+const _0x4ea3=['div','isConfirm','ck-annotation__actions--hidden','setTemplate','Edit','ck-comment__external','edit','Reply...','ck-annotation__info-name','element','ck-comment--edit','formatDateTime','attributes','bind','_model','isSystemComment','change:isEnabled','some','authoredAt','createCollection','dropdown','creator','visibleView','ck-annotation','EXTERNAL_AVATAR','remove','icon','_config','Remove','_createEditButton','name','children','add','ck-comment__main','blur','author','locale','switchToEditMode','cancelConfirm','render','label','importWord','ck-comment--info','removeComment','mouseenter','set','editButton','execute','placeholder','ck-annotation__info-time','ck-comment','ck-comment__actions','_attachActions','extendTemplate','items','resolvedAt','ck-annotation__actions','ck-comment__info-name','buttonView','actionBar','panelPosition','ck-comment__info-time','getUserViewNotificationText','length','EXTERNAL_IMPORT_WORD_COMMENT','withText','time','isVisible','ck-annotation__main','removeButton','push','ck-comment--remove','source','userView','ck-comment__wrapper','ck-annotation__info','getExternalCommentNote','change:isVisible','@external','addMany','change:isRemovable','actionIndicator','isExternal','threeVerticalDots','getTemplate','_createRemoveButton','listenTo','EXTERNAL_COMMENT','isEnabled','isReadOnly','panelView','isEditMode','ck-annotation__content-wrapper'];(function(_0x44a862,_0x4ea341){const _0x15ad23=function(_0x1b22e3){while(--_0x1b22e3){_0x44a862['push'](_0x44a862['shift']());}};_0x15ad23(++_0x4ea341);}(_0x4ea3,0x184));const _0x15ad=function(_0x44a862,_0x4ea341){_0x44a862=_0x44a862-0x0;let _0x15ad23=_0x4ea3[_0x44a862];return _0x15ad23;};import{ButtonView as _0x1fe661,createDropdown as _0x3fa574,ListView as _0x5bde5b,ListItemView as _0x2bfa7d}from'ckeditor5/src/ui';import{icons as _0x26690e}from'ckeditor5/src/core';import{UserView as _0x567d64,ConfirmMixin as _0x58ef37}from'ckeditor5-collaboration/src/collaboration-core';import _0x15b155 from'./basecommentview';import _0x176189 from'../../../../theme/icons/remove-comment.svg';import{getTranslation as _0x4a6ef5}from'../../../utils/common-translations';export default class ut extends _0x58ef37(_0x15b155){constructor(_0x1df67a,_0x3436e6,_0x4126ad){super(_0x1df67a,_0x3436e6,_0x4126ad),this[_0x15ad('0x1d')](_0x15ad('0x41'),null),this['set'](_0x15ad('0x20'),_0x4a6ef5(_0x1df67a,_0x15ad('0x54'))),this[_0x15ad('0x5a')](_0x15ad('0x2'))['to'](_0x3436e6),this[_0x15ad('0x5a')](_0x15ad('0x27'))['to'](_0x3436e6),this[_0x15ad('0x2b')]=this['createCollection'](),this[_0x15ad('0x5c')]||(this['editButton']=this[_0x15ad('0xd')](),this['removeButton']=this['_createRemoveButton'](),this[_0x15ad('0x26')]=this[_0x15ad('0x3')](),this[_0x15ad('0x26')][_0x15ad('0x3f')]([this[_0x15ad('0x1e')],this[_0x15ad('0x35')]]),this[_0x15ad('0x4')]=this['_createDropdown'](),this[_0x15ad('0x2b')][_0x15ad('0x10')](this['dropdown'])),this[_0x15ad('0x39')]=new _0x567d64(_0x1df67a,_0x3436e6[_0x15ad('0x13')],this[_0x15ad('0x2e')]()),this[_0x15ad('0x39')][_0x15ad('0x25')]({'attributes':{'class':['ck-comment__user','ck-annotation__user']}}),this[_0x15ad('0x46')](_0x3436e6,_0x15ad('0x40'),()=>this[_0x15ad('0x16')]()),this[_0x15ad('0x50')](this[_0x15ad('0x44')]());}[_0x15ad('0x44')](){const _0x5bf2da=this['bindTemplate'],_0x5bbff8=[{'tag':_0x15ad('0x4d'),'attributes':{'class':['ck-comment__info',_0x15ad('0x3b')]},'children':[{'tag':'span','children':[{'text':this[_0x15ad('0x39')]['name']}],'attributes':{'class':[_0x15ad('0x29'),_0x15ad('0x55')]}},{'tag':_0x15ad('0x32'),'attributes':{'datetime':_0x5bf2da['to'](_0x15ad('0x2')),'class':[_0x15ad('0x2d'),_0x15ad('0x21')]},'children':[{'text':_0x5bf2da['to']('authoredAt',_0x5acb23=>this[_0x15ad('0xb')][_0x15ad('0x58')](_0x5acb23))}]}]},{'tag':_0x15ad('0x4d'),'attributes':{'class':[_0x15ad('0x23'),_0x15ad('0x28'),_0x5bf2da['if'](_0x15ad('0x4b'),'ck-comment__actions--hidden'),_0x5bf2da['if'](_0x15ad('0x4b'),_0x15ad('0x4f'))]},'children':this['actionBar']},{'tag':'div','attributes':{'class':[_0x15ad('0x4c')]},'children':this[_0x15ad('0x6')]}];return this[_0x15ad('0x5b')][_0x15ad('0x42')]&&_0x5bbff8[_0x15ad('0x36')]({'tag':_0x15ad('0x4d'),'attributes':{'class':[_0x15ad('0x52')]},'children':[{'text':this['getExternalCommentNote']()}]}),{'tag':'li','attributes':{'class':[_0x15ad('0x3a'),_0x5bf2da['if'](_0x15ad('0x4e'),'ck-comment--remove-confirmation')],'tabindex':-0x1},'children':[{'tag':_0x15ad('0x4d'),'attributes':{'class':[_0x15ad('0x22'),_0x15ad('0x7'),_0x5bf2da['if'](_0x15ad('0x4b'),'ck-comment--edit'),_0x5bf2da['if']('isSystemComment',_0x15ad('0x1a')),_0x5bf2da['to'](_0x15ad('0x41'),_0x207d2d=>_0x207d2d?'ck-comment--'+_0x207d2d:'')],'data-author-id':this[_0x15ad('0x5b')][_0x15ad('0x13')]['id'],'data-comment-id':this[_0x15ad('0x5b')]['id']},'children':[this[_0x15ad('0x39')],{'tag':_0x15ad('0x4d'),'attributes':{'class':[_0x15ad('0x11'),_0x15ad('0x34')]},'children':_0x5bbff8}]}]};}[_0x15ad('0xd')](){const _0x3cd051=new _0x1fe661(this[_0x15ad('0x14')]);return _0x3cd051['label']=_0x4a6ef5(this[_0x15ad('0x14')],_0x15ad('0x51')),_0x3cd051[_0x15ad('0xa')]=_0x26690e['pencil'],_0x3cd051['withText']=!0x0,_0x3cd051[_0x15ad('0x25')]({'attributes':{'class':_0x15ad('0x57')}}),_0x3cd051[_0x15ad('0x5a')]('isEnabled')['to'](this['_model'],_0x15ad('0x49'),_0x45c376=>!_0x45c376),_0x3cd051[_0x15ad('0x5a')](_0x15ad('0x33'))['to'](this[_0x15ad('0x5b')],'isEditable'),_0x3cd051['on'](_0x15ad('0x1f'),()=>this[_0x15ad('0x15')]()),_0x3cd051;}[_0x15ad('0x45')](){const _0x202772=new _0x1fe661(this['locale']);return _0x202772[_0x15ad('0x18')]=_0x4a6ef5(this[_0x15ad('0x14')],_0x15ad('0xc')),_0x202772[_0x15ad('0xa')]=_0x176189,_0x202772[_0x15ad('0x31')]=!0x0,_0x202772[_0x15ad('0x25')]({'attributes':{'class':_0x15ad('0x37')}}),_0x202772['bind']('isEnabled')['to'](this[_0x15ad('0x5b')],'isReadOnly',_0x68e0d9=>!_0x68e0d9),_0x202772[_0x15ad('0x5a')](_0x15ad('0x33'))['to'](this[_0x15ad('0x5b')],'isRemovable'),_0x202772['on'](_0x15ad('0x1f'),()=>{this['showConfirm'](_0x4a6ef5(this[_0x15ad('0x14')],'Delete\x20comment?'),this[_0x15ad('0x56')])['then'](()=>{this['fire'](_0x15ad('0x1b'),this[_0x15ad('0x5b')]['id']);});}),_0x202772;}['_createDropdown'](){const _0x5e8461=_0x3fa574(this[_0x15ad('0x14')]),_0x28b0ab=_0x5e8461[_0x15ad('0x4a')][_0x15ad('0xf')],_0xee366e=new _0x5bde5b(this['locale']),_0x2eb37c=(_0x15729d,_0x52de11=-0x1)=>{const _0x25d32d=new _0x2bfa7d(this['locale']);_0x25d32d[_0x15ad('0xf')][_0x15ad('0x10')](_0x15729d);const _0x4fb6a9=_0x52de11>-0x1?_0x52de11:_0xee366e[_0x15ad('0x26')][_0x15ad('0x2f')];_0xee366e[_0x15ad('0x26')][_0x15ad('0x10')](_0x25d32d,_0x4fb6a9),_0x5e8461[_0x15ad('0x46')](_0x15729d,_0x15ad('0x0'),()=>{_0x5e8461[_0x15ad('0x48')]=[...this['items']][_0x15ad('0x1')](_0x30bf1a=>_0x30bf1a[_0x15ad('0x48')]);}),_0x5e8461[_0x15ad('0x46')](_0x15729d,_0x15ad('0x3d'),()=>{_0x5e8461['buttonView'][_0x15ad('0x33')]=[...this[_0x15ad('0x26')]][_0x15ad('0x1')](_0x2046b0=>_0x2046b0[_0x15ad('0x33')]);});};_0x5e8461[_0x15ad('0x2c')]='sw',_0x5e8461[_0x15ad('0x2a')]['set']({'label':_0x4a6ef5(this[_0x15ad('0x14')],'Show\x20more\x20items'),'icon':_0x26690e[_0x15ad('0x43')]}),_0x5e8461[_0x15ad('0x48')]=[...this[_0x15ad('0x26')]]['some'](_0x6f7172=>_0x6f7172['isEnabled']),_0x5e8461[_0x15ad('0x2a')][_0x15ad('0x33')]=[...this[_0x15ad('0x26')]][_0x15ad('0x1')](_0xf59733=>_0xf59733[_0x15ad('0x33')]);for(const _0x3ade5c of this['items'])_0x2eb37c(_0x3ade5c);return _0x28b0ab[_0x15ad('0x10')](_0xee366e),_0x5e8461[_0x15ad('0x46')](this[_0x15ad('0x26')],_0x15ad('0x10'),(_0x14cede,_0x1b2906,_0xe03262)=>{_0x2eb37c(_0x1b2906,_0xe03262);}),_0x5e8461[_0x15ad('0x46')](this[_0x15ad('0x26')],_0x15ad('0x9'),(_0x341c95,_0x53f78b,_0x51cacc)=>{_0xee366e[_0x15ad('0x26')][_0x15ad('0x9')](_0x51cacc);}),_0x5e8461;}[_0x15ad('0x24')](_0x11a505,_0x4621f4){const _0x23a05e=_0x11a505&&_0x11a505[_0x15ad('0x56')];_0x23a05e&&(this['listenTo'](_0x23a05e,_0x15ad('0x1c'),()=>this[_0x15ad('0x41')]=_0x4621f4),this['listenTo'](_0x23a05e,'focus',()=>this[_0x15ad('0x41')]=_0x4621f4),this['listenTo'](_0x23a05e,'mouseleave',()=>this['actionIndicator']=null),this[_0x15ad('0x46')](_0x23a05e,_0x15ad('0x12'),()=>this[_0x15ad('0x41')]=null));}['_createCommentInputView'](){const _0x36f230=super['_createCommentInputView']();return _0x36f230[_0x15ad('0x5a')](_0x15ad('0x20'))['to'](this),_0x36f230;}[_0x15ad('0x3c')](){return _0x15ad('0x19')===this[_0x15ad('0x5b')][_0x15ad('0x59')][_0x15ad('0x3e')][_0x15ad('0x38')]?_0x4a6ef5(this[_0x15ad('0x14')],_0x15ad('0x30')):_0x4a6ef5(this[_0x15ad('0x14')],_0x15ad('0x47'));}[_0x15ad('0x2e')](){return this['_model'][_0x15ad('0x42')]?'importWord'===this[_0x15ad('0x5b')][_0x15ad('0x59')]['@external']['source']?_0x4a6ef5(this[_0x15ad('0x14')],'EXTERNAL_IMPORT_WORD_AVATAR',this[_0x15ad('0x5b')][_0x15ad('0x5')][_0x15ad('0xe')]):_0x4a6ef5(this[_0x15ad('0x14')],_0x15ad('0x8'),this[_0x15ad('0x5b')]['creator'][_0x15ad('0xe')]):null;}[_0x15ad('0x17')](){super[_0x15ad('0x17')](),this[_0x15ad('0x24')](this[_0x15ad('0x1e')],_0x15ad('0x53')),this[_0x15ad('0x24')](this['removeButton'],'remove');}}

package/src/comments.js

@@ -20,4 +20,4 @@
  *
  *
  */
-var _0x3506=['requires','pluginName'];(function(_0x516f74,_0x3506fe){var _0x265b37=function(_0xbabfd4){while(--_0xbabfd4){_0x516f74['push'](_0x516f74['shift']());}};_0x265b37(++_0x3506fe);}(_0x3506,0x1ba));var _0x265b=function(_0x516f74,_0x3506fe){_0x516f74=_0x516f74-0x0;var _0x265b37=_0x3506[_0x516f74];return _0x265b37;};import{Plugin as _0x20825f}from'ckeditor5/src/core';import _0x3b6d1a from'./comments/commentsrepository';import _0x38a97e from'./comments/commentsediting';import _0x4ef95f from'./comments/commentsui';import _0x277b46 from'./commentsonly';import _0x359663 from'./annotations/widesidebar';import _0x36757c from'./annotations/narrowsidebar';import _0x4fbd1b from'./annotations/inlineannotations';import _0x3fa7f8 from'./comments/commentsarchiveui';import _0x51da30 from'./comments/commentsarchive';export default class f extends _0x20825f{static get[_0x265b('0x0')](){return[_0x3b6d1a,_0x38a97e,_0x4ef95f,_0x51da30,_0x3fa7f8,_0x277b46,_0x359663,_0x36757c,_0x4fbd1b];}static get[_0x265b('0x1')](){return'Comments';}}
+var _0x13a3=['requires','Comments'];(function(_0x34d9e7,_0x13a3d8){var _0x317c40=function(_0x375eaa){while(--_0x375eaa){_0x34d9e7['push'](_0x34d9e7['shift']());}};_0x317c40(++_0x13a3d8);}(_0x13a3,0x142));var _0x317c=function(_0x34d9e7,_0x13a3d8){_0x34d9e7=_0x34d9e7-0x0;var _0x317c40=_0x13a3[_0x34d9e7];return _0x317c40;};import{Plugin as _0x5bdc40}from'ckeditor5/src/core';import _0x18b493 from'./comments/commentsrepository';import _0x493a58 from'./comments/commentsediting';import _0x328fe4 from'./comments/commentsui';import _0x40452c from'./commentsonly';import _0x4d7dfe from'./annotations/widesidebar';import _0x3b0414 from'./annotations/narrowsidebar';import _0x2a30d9 from'./annotations/inlineannotations';import _0x408ce8 from'./comments/commentsarchiveui';import _0x59df99 from'./comments/commentsarchive';export default class f extends _0x5bdc40{static get[_0x317c('0x0')](){return[_0x18b493,_0x493a58,_0x328fe4,_0x59df99,_0x408ce8,_0x40452c,_0x4d7dfe,_0x3b0414,_0x2a30d9];}static get['pluginName'](){return _0x317c('0x1');}}

package/src/commentsonly.js

@@ -20,4 +20,4 @@
  *
  *
  */
-const _0x1f4d=['affectsData','requires','afterInit','addCommentThread','editor','config','get','has','commentsOnlyMode','isEnabled','CommentsOnly','commentsOnly','plugins','highest','commands','stop','view','set','editing','listenTo','pluginName','_disableCommentsOnlyMode','change:isEnabled','_enableCommentsOnlyMode','clearForceDisabled','DragDrop','document','forceDisabled','clipboardInput'];(function(_0x527184,_0x1f4d86){const _0x33db7f=function(_0x1d0122){while(--_0x1d0122){_0x527184['push'](_0x527184['shift']());}};_0x33db7f(++_0x1f4d86);}(_0x1f4d,0x1be));const _0x33db=function(_0x527184,_0x1f4d86){_0x527184=_0x527184-0x0;let _0x33db7f=_0x1f4d[_0x527184];return _0x33db7f;};import{Plugin as _0x38f1c7}from'ckeditor5/src/core';import _0x4e490b from'./comments/commentsediting';export default class n extends _0x38f1c7{static get[_0x33db('0x9')](){return _0x33db('0x1c');}static get[_0x33db('0x13')](){return[_0x4e490b];}constructor(_0x2c1ff1){super(_0x2c1ff1),this[_0x33db('0x6')](_0x33db('0x1b'),!0x1),this['on'](_0x33db('0xb'),(_0x200dfe,_0x21e1ff,_0x4b3edb)=>{_0x4b3edb?this['_enableCommentsOnlyMode']():this['_disableCommentsOnlyMode']();});}[_0x33db('0x14')](){!this[_0x33db('0x1b')]&&this[_0x33db('0x16')][_0x33db('0x17')]['get'](_0x33db('0x0'))&&(this['isEnabled']=!0x0);}[_0x33db('0xc')](){for(const [_0x2d0abc,_0x4ea5a1]of this[_0x33db('0x16')][_0x33db('0x3')])_0x4ea5a1[_0x33db('0x12')]&&_0x33db('0x15')!==_0x2d0abc&&_0x4ea5a1[_0x33db('0x10')](_0x33db('0x1a'));this[_0x33db('0x16')][_0x33db('0x1')][_0x33db('0x19')]('DragDrop')&&this[_0x33db('0x16')][_0x33db('0x1')][_0x33db('0x18')](_0x33db('0xe'))['forceDisabled'](_0x33db('0x1a'));const _0x35088b=this[_0x33db('0x16')][_0x33db('0x7')]['view'][_0x33db('0xf')];this[_0x33db('0x8')](_0x35088b,'cut',_0x4b91a7=>_0x4b91a7['stop'](),{'priority':_0x33db('0x2')}),this[_0x33db('0x8')](_0x35088b,_0x33db('0x11'),_0x550297=>_0x550297[_0x33db('0x4')](),{'priority':_0x33db('0x2')}),this[_0x33db('0x8')](_0x35088b,'delete',_0x5605a8=>_0x5605a8[_0x33db('0x4')](),{'priority':_0x33db('0x2')});}[_0x33db('0xa')](){for(const [_0x4a368a,_0x2e80b0]of this[_0x33db('0x16')][_0x33db('0x3')])_0x2e80b0[_0x33db('0x12')]&&'addCommentThread'!==_0x4a368a&&_0x2e80b0[_0x33db('0xd')]('commentsOnlyMode');this['stopListening'](this[_0x33db('0x16')][_0x33db('0x7')][_0x33db('0x5')][_0x33db('0xf')]);}}
+const _0x3af4=['forceDisabled','editor','plugins','view','set','affectsData','pluginName','clipboardInput','clearForceDisabled','_disableCommentsOnlyMode','commentsOnlyMode','isEnabled','get','DragDrop','_enableCommentsOnlyMode','highest','addCommentThread','cut','listenTo','delete','CommentsOnly','afterInit','stop','document','commentsOnly','commands','requires'];(function(_0x19e78d,_0x3af452){const _0x56a8f6=function(_0x593731){while(--_0x593731){_0x19e78d['push'](_0x19e78d['shift']());}};_0x56a8f6(++_0x3af452);}(_0x3af4,0xd0));const _0x56a8=function(_0x19e78d,_0x3af452){_0x19e78d=_0x19e78d-0x0;let _0x56a8f6=_0x3af4[_0x19e78d];return _0x56a8f6;};import{Plugin as _0x52b64e}from'ckeditor5/src/core';import _0x5491dd from'./comments/commentsediting';export default class n extends _0x52b64e{static get[_0x56a8('0xe')](){return _0x56a8('0x1');}static get[_0x56a8('0x7')](){return[_0x5491dd];}constructor(_0x20c964){super(_0x20c964),this[_0x56a8('0xc')](_0x56a8('0x13'),!0x1),this['on']('change:isEnabled',(_0x5c6f7e,_0xc9d358,_0x2ab83f)=>{_0x2ab83f?this['_enableCommentsOnlyMode']():this[_0x56a8('0x11')]();});}[_0x56a8('0x2')](){!this[_0x56a8('0x13')]&&this[_0x56a8('0x9')]['config'][_0x56a8('0x14')](_0x56a8('0x5'))&&(this['isEnabled']=!0x0);}[_0x56a8('0x16')](){for(const [_0x2aa2ff,_0x1185a0]of this[_0x56a8('0x9')][_0x56a8('0x6')])_0x1185a0['affectsData']&&_0x56a8('0x18')!==_0x2aa2ff&&_0x1185a0['forceDisabled'](_0x56a8('0x12'));this[_0x56a8('0x9')]['plugins']['has'](_0x56a8('0x15'))&&this[_0x56a8('0x9')][_0x56a8('0xa')]['get']('DragDrop')[_0x56a8('0x8')]('commentsOnlyMode');const _0x53206a=this[_0x56a8('0x9')]['editing'][_0x56a8('0xb')]['document'];this[_0x56a8('0x1a')](_0x53206a,_0x56a8('0x19'),_0x1188c7=>_0x1188c7['stop'](),{'priority':_0x56a8('0x17')}),this[_0x56a8('0x1a')](_0x53206a,_0x56a8('0xf'),_0x4b92b5=>_0x4b92b5[_0x56a8('0x3')](),{'priority':_0x56a8('0x17')}),this[_0x56a8('0x1a')](_0x53206a,_0x56a8('0x0'),_0x5b1904=>_0x5b1904[_0x56a8('0x3')](),{'priority':_0x56a8('0x17')});}['_disableCommentsOnlyMode'](){for(const [_0x1e8920,_0x294bff]of this[_0x56a8('0x9')][_0x56a8('0x6')])_0x294bff[_0x56a8('0xd')]&&_0x56a8('0x18')!==_0x1e8920&&_0x294bff[_0x56a8('0x10')](_0x56a8('0x12'));this['stopListening'](this[_0x56a8('0x9')]['editing']['view'][_0x56a8('0x4')]);}}

package/src/utils/common-translations.js

@@ -20,4 +20,4 @@
  *
  *
  */
-export function getTranslation(_0x566be7,_0x525cff,_0x30a043){const t=_0x566be7['t'];switch(_0x525cff){case'PENDING_ACTION_COMMENT_THREAD':return t({'string':'Unsaved\x20change\x20in\x20comment\x20thread.','id':'PENDING_ACTION_COMMENT_THREAD'});case'Comment':return t('Comment');case'Reply...':return t('Reply...');case'Reply\x20to\x20reopen\x20discussion...':return t('Reply\x20to\x20reopen\x20discussion...');case'Write\x20a\x20comment...':return t('Write\x20a\x20comment...');case'Comment\x20was\x20made\x20on\x20an\x20element':return t('Comment\x20was\x20made\x20on\x20an\x20element');case'Comment\x20editor':return t('Comment\x20editor');case'Delete\x20comment\x20thread?':return t('Delete\x20comment\x20thread?');case'Delete\x20comment?':return t('Delete\x20comment?');case'Marked\x20as\x20resolved':return t('Marked\x20as\x20resolved');case'Show\x20more\x20items':return t('Show\x20more\x20items');case'Cancel':return t('Cancel');case'Edit':return t('Edit');case'Resolve':return t('Resolve');case'Reopen':return t('Reopen');case'Remove':return t('Remove');case'Reply':return t('Reply');case'Save':return t('Save');case'NUMBER_OF_COMMENTS':return t({'string':'%0\x20Comment','plural':'%0\x20Comments','id':'NUMBER_OF_COMMENTS'},_0x30a043);case'TOO_LONG_COMMENT_ALERT':return t({'string':'Comment\x20content\x20is\x20too\x20long.\x20Your\x20comment\x20has\x20%0\x20characters\x20but\x20the\x20limit\x20is\x20%1\x20characters.','id':'TOO_LONG_COMMENT_ALERT'},_0x30a043);case'EXTERNAL_COMMENT':return t({'string':'This\x20comment\x20comes\x20from\x20an\x20external\x20source.','id':'EXTERNAL_COMMENT'});case'EXTERNAL_IMPORT_WORD_COMMENT':return t({'string':'This\x20comment\x20comes\x20from\x20an\x20imported\x20Word\x20file.','id':'EXTERNAL_IMPORT_WORD_COMMENT'});case'EXTERNAL_AVATAR':return t({'string':'Displayed\x20author\x20name\x20comes\x20from\x20external\x20source\x20(added\x20by\x20%0)','id':'EXTERNAL_AVATAR'},_0x30a043);case'EXTERNAL_IMPORT_WORD_AVATAR':return t({'string':'Displayed\x20author\x20name\x20comes\x20from\x20a\x20Word\x20document\x20imported\x20by\x20%0','id':'EXTERNAL_IMPORT_WORD_AVATAR'},_0x30a043);case'COMMENTS_ARCHIVE':return t({'string':'Comments\x20archive','id':'COMMENTS_ARCHIVE'});case'EMPTY_COMMENTS_ARCHIVE':return t({'string':'There\x20are\x20no\x20archived\x20comment\x20threads.','id':'EMPTY_COMMENTS_ARCHIVE'});default:return'';}}
+export function getTranslation(_0x280819,_0x4474c1,_0x4f9eb3){const t=_0x280819['t'];switch(_0x4474c1){case'PENDING_ACTION_COMMENT_THREAD':return t({'string':'Unsaved\x20change\x20in\x20comment\x20thread.','id':'PENDING_ACTION_COMMENT_THREAD'});case'Comment':return t('Comment');case'Reply...':return t('Reply...');case'Reply\x20to\x20reopen\x20discussion...':return t('Reply\x20to\x20reopen\x20discussion...');case'Write\x20a\x20comment...':return t('Write\x20a\x20comment...');case'Comment\x20was\x20made\x20on\x20an\x20element':return t('Comment\x20was\x20made\x20on\x20an\x20element');case'Comment\x20editor':return t('Comment\x20editor');case'Delete\x20comment\x20thread?':return t('Delete\x20comment\x20thread?');case'Delete\x20comment?':return t('Delete\x20comment?');case'Marked\x20as\x20resolved':return t('Marked\x20as\x20resolved');case'Show\x20more\x20items':return t('Show\x20more\x20items');case'Cancel':return t('Cancel');case'Edit':return t('Edit');case'Resolve':return t('Resolve');case'Reopen':return t('Reopen');case'Remove':return t('Remove');case'Reply':return t('Reply');case'Save':return t('Save');case'NUMBER_OF_COMMENTS':return t({'string':'%0\x20Comment','plural':'%0\x20Comments','id':'NUMBER_OF_COMMENTS'},_0x4f9eb3);case'TOO_LONG_COMMENT_ALERT':return t({'string':'Comment\x20content\x20is\x20too\x20long.\x20Your\x20comment\x20has\x20%0\x20characters\x20but\x20the\x20limit\x20is\x20%1\x20characters.','id':'TOO_LONG_COMMENT_ALERT'},_0x4f9eb3);case'EXTERNAL_COMMENT':return t({'string':'This\x20comment\x20comes\x20from\x20an\x20external\x20source.','id':'EXTERNAL_COMMENT'});case'EXTERNAL_IMPORT_WORD_COMMENT':return t({'string':'This\x20comment\x20comes\x20from\x20an\x20imported\x20Word\x20file.','id':'EXTERNAL_IMPORT_WORD_COMMENT'});case'EXTERNAL_AVATAR':return t({'string':'Displayed\x20author\x20name\x20comes\x20from\x20external\x20source\x20(added\x20by\x20%0)','id':'EXTERNAL_AVATAR'},_0x4f9eb3);case'EXTERNAL_IMPORT_WORD_AVATAR':return t({'string':'Displayed\x20author\x20name\x20comes\x20from\x20a\x20Word\x20document\x20imported\x20by\x20%0','id':'EXTERNAL_IMPORT_WORD_AVATAR'},_0x4f9eb3);case'COMMENTS_ARCHIVE':return t({'string':'Comments\x20archive','id':'COMMENTS_ARCHIVE'});case'EMPTY_COMMENTS_ARCHIVE':return t({'string':'There\x20are\x20no\x20archived\x20comment\x20threads.','id':'EMPTY_COMMENTS_ARCHIVE'});default:return'';}}

package/src/utils/createmutationobserver.js

@@ -20,4 +20,4 @@
  *
  *
  */
-const _0x9f2d=['attributeName','cancel','childList','characterData','attributes','type'];(function(_0x155337,_0x9f2de2){const _0x39ddfd=function(_0x21c7d9){while(--_0x21c7d9){_0x155337['push'](_0x155337['shift']());}};_0x39ddfd(++_0x9f2de2);}(_0x9f2d,0xbd));const _0x39dd=function(_0x155337,_0x9f2de2){_0x155337=_0x155337-0x0;let _0x39ddfd=_0x9f2d[_0x155337];return _0x39ddfd;};import{throttle as _0x5594c7}from'lodash-es';export default function Dt(_0x480c73){const _0x479abd=_0x5594c7(_0x480c73,0x1e),_0x4ef2f3=new MutationObserver(_0x54481b=>{for(const _0x367272 of _0x54481b)(_0x39dd('0x1')==_0x367272[_0x39dd('0x2')]&&'class'==_0x367272[_0x39dd('0x3')]||_0x39dd('0x5')==_0x367272[_0x39dd('0x2')]||_0x39dd('0x0')==_0x367272[_0x39dd('0x2')])&&_0x479abd();});return{'attach'(_0x420383){_0x4ef2f3['observe'](_0x420383,{'attributes':!0x0,'childList':!0x0,'subtree':!0x0,'characterData':!0x0});},'detach'(){_0x4ef2f3['disconnect'](),_0x479abd[_0x39dd('0x4')]();}};}
+const _0x171e=['class','disconnect','characterData','cancel','attributeName','type','attributes'];(function(_0x2843f7,_0x171e7a){const _0x2bc9c9=function(_0x3a7d4e){while(--_0x3a7d4e){_0x2843f7['push'](_0x2843f7['shift']());}};_0x2bc9c9(++_0x171e7a);}(_0x171e,0x10d));const _0x2bc9=function(_0x2843f7,_0x171e7a){_0x2843f7=_0x2843f7-0x0;let _0x2bc9c9=_0x171e[_0x2843f7];return _0x2bc9c9;};import{throttle as _0x1875e8}from'lodash-es';export default function Dt(_0x4976fd){const _0x1ded84=_0x1875e8(_0x4976fd,0x1e),_0x39f067=new MutationObserver(_0xb4759c=>{for(const _0x13a24f of _0xb4759c)(_0x2bc9('0x3')==_0x13a24f[_0x2bc9('0x2')]&&_0x2bc9('0x4')==_0x13a24f[_0x2bc9('0x1')]||'childList'==_0x13a24f[_0x2bc9('0x2')]||_0x2bc9('0x6')==_0x13a24f[_0x2bc9('0x2')])&&_0x1ded84();});return{'attach'(_0x402197){_0x39f067['observe'](_0x402197,{'attributes':!0x0,'childList':!0x0,'subtree':!0x0,'characterData':!0x0});},'detach'(){_0x39f067[_0x2bc9('0x5')](),_0x1ded84[_0x2bc9('0x0')]();}};}

package/theme/annotation.css

@@ -26,9 +26,7 @@
 	transition: background-color 300ms ease;
 	padding: var(--ck-spacing-standard);
 	white-space: normal;
-}
 
-.ck .ck-annotation {
 	& .ck-button {
 		/* Overwrite CK5 button default styles. */
 		background-color: transparent;

package/theme/comment.css

@@ -41,7 +41,7 @@
 
 			/* Half width of line. */
 			- 2px
-			);
+		);
 		width: 4px;
 		height: 100%;
 		background-color: var(--ck-color-comment-separator);
@@ -68,48 +68,16 @@
 	}
 }
 
-.ck .ck-comment--info {
-	& .ck-comment__content {
-		font-style: italic;
-	}
-}
-
-.ck .ck-comment__main {
-	& .ck-comment__input-wrapper {
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		transition: all 300ms linear;
-
-		& .ck-comment__input {
-			padding: 0;
-		}
-	}
-}
-
 .ck .ck-comment__content {
 	word-break: break-word;
 }
 
-.ck .ck-comment__user {
-	/* Display user above vertical line. */
-	z-index: var(--ck-z-default);
-}
-
-	/* We need specificity 030 to beat styles in `commentinput.css`. */
-.ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--submit {
-	background: var(--ck-color-base-action);
-	color: white;
-
-	&:hover {
-		background: var(--ck-color-button-save);
+.ck .ck-comment--info {
+	& .ck-comment__content {
+		font-style: italic;
 	}
 }
 
-.ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--cancel {
-	color: var(--ck-color-text);
-}
-
 /* Common styles for typography inside comment element and editable input.
 We are styling resetting list-style because of parent <ul> element. */
 .ck .ck-comment,
@@ -139,6 +107,38 @@ We are styling resetting list-style because of parent <ul> element. */
 	}
 }
 
+.ck .ck-comment__main {
+	& .ck-comment__input-wrapper {
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		transition: all 300ms linear;
+
+		& .ck-comment__input {
+			padding: 0;
+		}
+	}
+}
+
+.ck .ck-comment__user {
+	/* Display user above vertical line. */
+	z-index: var(--ck-z-default);
+}
+
+/* We need specificity 030 to beat styles in `commentinput.css`. */
+.ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--submit {
+	background: var(--ck-color-base-action);
+	color: hsl(0, 0%, 100%);
+
+	&:hover {
+		background: var(--ck-color-button-save);
+	}
+}
+
+.ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--cancel {
+	color: var(--ck-color-text);
+}
+
 .ck .ck-comment__external {
 	font-style: italic;
 	color: var(--ck-color-annotation-info);
@@ -167,6 +167,6 @@ We are styling resetting list-style because of parent <ul> element. */
 			& .ck-button__label {
 				margin: 0 var(--ck-spacing-large);
 			}
-	 	}
+		}
 	}
 }

package/theme/commentmarker.css

@@ -28,6 +28,11 @@
 .ck-comment-marker--active {
 	background: var(--ck-color-comment-marker-active);
 
+	/* See #2469. Inactive comment marker inside an active one should be highlighted too. */
+	& .ck-comment-marker {
+		background: var(--ck-color-comment-marker-active);
+	}
+
 	&.ck-widget {
 		border-color: var(--ck-color-comment-marker-active);
 
@@ -36,9 +41,4 @@
 			background-color: var(--ck-color-comment-marker);
 		}
 	}
-
-	/* See #2469. Inactive comment marker inside an active one should be highlighted too. */
-	& .ck-comment-marker {
-		background: var(--ck-color-comment-marker-active);
-	}
 }

package/theme/commentthread.css

@@ -10,8 +10,8 @@
 	--ck-color-thread-remove-background: var(--ck-color-comment-remove-background);
 	--ck-color-comment-count: hsl(210, 52%, 57%);
 
-	--ck-color-thread-header-background: #FDFADF;
-	--ck-color-thread-header-active-background: #FFF4A8;
+	--ck-color-thread-header-background: hsl(54, 88%, 93%);
+	--ck-color-thread-header-active-background: hsl(52, 100%, 83%);
 }
 
 .ck .ck-thread {
@@ -76,7 +76,7 @@
 			z-index: 2;
 
 			background: var(--ck-color-base-background);
-			box-shadow: 0 2px 3px rgba(0, 0, 0, 0.2);
+			box-shadow: 0 2px 3px hsla(0, 0%, 100%, 0.2);
 			border-radius: 2px;
 			white-space: normal;
 			box-sizing: border-box;
@@ -84,28 +84,6 @@
 	}
 }
 
-/* Handle visibility of vertical line below avatars. */
-.ck .ck-thread__comments .ck-comment__wrapper {
-	&:last-of-type {
-		& .ck-comment::after {
-			opacity: 0;
-		}
-	}
-}
-
-.ck .ck-thread__container {
-	transition: transform 300ms ease;
-}
-
-.ck .ck-thread__comments {
-	position: relative;
-	z-index: var(--ck-z-default);
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	border-radius: var(--ck-border-radius);
-}
-
 .ck .ck-thread__comment-count {
 	/* Make avatar size in the comment smaller than in presence list. */
 	--ck-user-avatar-size: 28px;
@@ -126,21 +104,6 @@
 	}
 }
 
-.ck .ck-thread--active {
-	& .ck-comment__options.ck-dropdown {
-		display: block;
-	}
-
-	& .ck-thread__input {
-		display: block;
-		background-color: var(--ck-color-comment-background);
-	}
-
-	& .ck-thread__header {
-		background-color: var(--ck-color-thread-header-active-background);
-	}
-}
-
 .ck .ck-thread--remove {
 	& .ck-comment {
 		background-color: var(--ck-color-comment-remove-background);
@@ -166,6 +129,59 @@
 	}
 }
 
+/* Handle visibility of vertical line below avatars. */
+.ck .ck-thread__comments .ck-comment__wrapper {
+	&:last-of-type {
+		& .ck-comment::after {
+			opacity: 0;
+		}
+	}
+}
+
+.ck .ck-thread__container {
+	transition: transform 300ms ease;
+}
+
+.ck .ck-thread__comments {
+	position: relative;
+	z-index: var(--ck-z-default);
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border-radius: var(--ck-border-radius);
+}
+
+.ck .ck-thread__input {
+	/* #1829. Firefox is wrongly rendering flex container width 100% with overflowed (non-spaced) text. */
+	width: calc( 100% - var(--ck-user-avatar-size) );
+	white-space: normal;
+
+	transition: background-color 200ms ease-in-out;
+	border-radius: var(--ck-border-radius);
+
+	/*
+		This is equal to the height of the wrapper when the editor instance is loaded.
+		Editor instance is loaded _after_ the comment view is created,
+		so the min-height is set to avoid jitter.
+	*/
+	min-height: 38px;
+}
+
+.ck .ck-thread--active {
+	& .ck-comment__options.ck-dropdown {
+		display: block;
+	}
+
+	& .ck-thread__input {
+		display: block;
+		background-color: var(--ck-color-comment-background);
+	}
+
+	& .ck-thread__header {
+		background-color: var(--ck-color-thread-header-active-background);
+	}
+}
+
 .ck .ck-thread--remove-confirmation {
 	& .ck-thread__container {
 		transform: translate3d( -100%, 0, 0 );
@@ -210,19 +226,3 @@
 		margin: 0;
 	}
 }
-
-.ck .ck-thread__input {
-	/* #1829. Firefox is wrongly rendering flex container width 100% with overflowed (non-spaced) text. */
-	width: calc( 100% - var(--ck-user-avatar-size) );
-	white-space: normal;
-
-	transition: background-color 200ms ease-in-out;
-	border-radius: var(--ck-border-radius);
-
-	/*
-		This is equal to the height of the wrapper when the editor instance is loaded.
-		Editor instance is loaded _after_ the comment view is created,
-		so the min-height is set to avoid jitter.
-	*/
-	min-height: 38px;
-}

package/theme/sidebar-narrow.css

@@ -47,14 +47,14 @@
 	height: 16px;
 	background: hsl(0, 0%, 20%);
 	font-weight: bold;
-	color: #fff;
+	color: hsl(0, 0%, 100%);
 	font-size: var(--ck-annotation-counter-number-size);
 	font-family: var(--ck-font-face);
 	right: 0;
 	top: -6px;
 
 	/* Improve visibility of counter number. */
-	text-shadow: -1px 0 2px #444, 1px 0 2px #444;
+	text-shadow: -1px 0 2px hsl(0, 0%, 27%), 1px 0 2px hsl(0, 0%, 27%);
 
 	/* Display number perfectly center of circle. */
 	display: flex;

package/theme/sidebar.css

@@ -34,17 +34,8 @@
 	box-shadow: var(--ck-color-annotation-wrapper-drop-shadow);
 }
 
-/* Handle case where annotation is inactive and users hover them. */
-.ck.ck-annotation-wrapper:not(.ck-annotation-wrapper--active):hover {
-	box-shadow: var(--ck-drop-shadow);
-}
-
-.ck.ck-annotation-wrapper--active {
-	box-shadow: var(--ck-drop-shadow-active);
-}
-
-.ck.ck-annotation-wrapper:hover,
-.ck.ck-annotation-wrapper--active {
+.ck.ck-annotation-wrapper--active,
+.ck.ck-annotation-wrapper:hover{
 	& .ck-annotation__actions {
 		opacity: 1;
 
@@ -61,3 +52,12 @@
 		color: var(--ck-color-button-cancel)
 	}
 }
+
+/* Handle case where annotation is inactive and users hover them. */
+.ck.ck-annotation-wrapper:not(.ck-annotation-wrapper--active):hover {
+	box-shadow: var(--ck-drop-shadow);
+}
+
+.ck.ck-annotation-wrapper--active {
+	box-shadow: var(--ck-drop-shadow-active);
+}