@ckeditor/ckeditor5-comments 39.0.0 → 39.0.2

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

@@ -20,4 +20,4 @@
  *
  *
  */
-const _0x3dbe=['setTemplate','blur','ck-annotation__main','length','listenTo','formatDateTime','actionBar','threeVerticalDots','isSystemComment','placeholder','ck-annotation__user','ck-comment--','execute','pencil','ck-comment','importWord','ck-comment__info-time','removeButton','items','getUserViewNotificationText','render','userView','@external','span','cancelConfirm','then','Show\x20more\x20items','set','Reply...','ck-comment__info-name','_attachActions','isEditMode','push','visibleView','Delete\x20comment?','add','ck-comment--edit','locale','ck-annotation__actions','dropdown','change:isEnabled','_createEditButton','some','_createRemoveButton','panelView','ck-comment__actions','showConfirm','getExternalCommentNote','createCollection','change:isRemovable','isEnabled','ck-comment--info','ck-annotation__info','creator','div','attributes','removeComment','switchToEditMode','Edit','authoredAt','isExternal','_createDropdown','label','edit','ck-comment__info','bindTemplate','remove','ck-annotation__content-wrapper','ck-annotation','withText','editButton','actionIndicator','Remove','resolvedAt','_model','bind','ck-annotation__info-time','EXTERNAL_COMMENT','_createCommentInputView','EXTERNAL_IMPORT_WORD_AVATAR','isVisible','buttonView','ck-comment__external','icon','_config','isRemovable','getTemplate','source','children','addMany','element','ck-comment--remove-confirmation','time','panelPosition'];(function(_0x45be70,_0x3dbe7a){const _0x58308f=function(_0x54996c){while(--_0x54996c){_0x45be70['push'](_0x45be70['shift']());}};_0x58308f(++_0x3dbe7a);}(_0x3dbe,0x189));const _0x5830=function(_0x45be70,_0x3dbe7a){_0x45be70=_0x45be70-0x0;let _0x58308f=_0x3dbe[_0x45be70];return _0x58308f;};import{ButtonView as _0x551c51,createDropdown as _0x11fa72,ListView as _0x1fb435,ListItemView as _0x1e5e94}from'ckeditor5/src/ui';import{icons as _0x318b2c}from'ckeditor5/src/core';import{UserView as _0x294716,ConfirmMixin as _0x4753e4}from'ckeditor5-collaboration/src/collaboration-core';import _0x29014e from'./basecommentview';import _0x36d3bc from'../../../../theme/icons/remove-comment.svg';import{getTranslation as _0x3c8b2e}from'../../../utils/common-translations';export default class ut extends _0x4753e4(_0x29014e){constructor(_0x1b48c2,_0x365d1,_0x58a8ae){super(_0x1b48c2,_0x365d1,_0x58a8ae),this[_0x5830('0xa')](_0x5830('0x36'),null),this[_0x5830('0xa')](_0x5830('0x56'),_0x3c8b2e(_0x1b48c2,_0x5830('0xb'))),this[_0x5830('0x3a')](_0x5830('0x2a'))['to'](_0x365d1),this['bind'](_0x5830('0x38'))['to'](_0x365d1),this[_0x5830('0x53')]=this[_0x5830('0x1f')](),this[_0x5830('0x55')]||(this[_0x5830('0x35')]=this['_createEditButton'](),this['removeButton']=this['_createRemoveButton'](),this['items']=this[_0x5830('0x1f')](),this[_0x5830('0x1')][_0x5830('0x48')]([this[_0x5830('0x35')],this[_0x5830('0x0')]]),this[_0x5830('0x16')]=this[_0x5830('0x2c')](),this[_0x5830('0x53')][_0x5830('0x12')](this[_0x5830('0x16')])),this[_0x5830('0x4')]=new _0x294716(_0x1b48c2,_0x365d1['author'],this[_0x5830('0x2')]()),this[_0x5830('0x4')]['extendTemplate']({'attributes':{'class':['ck-comment__user',_0x5830('0x57')]}}),this[_0x5830('0x51')](_0x365d1,_0x5830('0x20'),()=>this[_0x5830('0x7')]()),this[_0x5830('0x4d')](this['getTemplate']());}[_0x5830('0x45')](){const _0x57e52a=this[_0x5830('0x30')],_0x4f98d8=[{'tag':'div','attributes':{'class':[_0x5830('0x2f'),_0x5830('0x23')]},'children':[{'tag':_0x5830('0x6'),'children':[{'text':this[_0x5830('0x4')]['name']}],'attributes':{'class':[_0x5830('0xc'),'ck-annotation__info-name']}},{'tag':_0x5830('0x4b'),'attributes':{'datetime':_0x57e52a['to']('authoredAt'),'class':[_0x5830('0x5d'),_0x5830('0x3b')]},'children':[{'text':_0x57e52a['to'](_0x5830('0x2a'),_0x3c6709=>this[_0x5830('0x43')][_0x5830('0x52')](_0x3c6709))}]}]},{'tag':_0x5830('0x25'),'attributes':{'class':[_0x5830('0x1c'),_0x5830('0x15'),_0x57e52a['if'](_0x5830('0xe'),'ck-comment__actions--hidden'),_0x57e52a['if']('isEditMode','ck-annotation__actions--hidden')]},'children':this['actionBar']},{'tag':_0x5830('0x25'),'attributes':{'class':[_0x5830('0x32')]},'children':this[_0x5830('0x10')]}];return this['_model']['isExternal']&&_0x4f98d8[_0x5830('0xf')]({'tag':_0x5830('0x25'),'attributes':{'class':[_0x5830('0x41')]},'children':[{'text':this[_0x5830('0x1e')]()}]}),{'tag':'li','attributes':{'class':['ck-comment__wrapper',_0x57e52a['if']('isConfirm',_0x5830('0x4a'))],'tabindex':-0x1},'children':[{'tag':'div','attributes':{'class':[_0x5830('0x5b'),_0x5830('0x33'),_0x57e52a['if'](_0x5830('0xe'),'ck-comment--edit'),_0x57e52a['if'](_0x5830('0x55'),_0x5830('0x22')),_0x57e52a['to'](_0x5830('0x36'),_0x3dd824=>_0x3dd824?_0x5830('0x58')+_0x3dd824:'')],'data-author-id':this[_0x5830('0x39')]['author']['id'],'data-comment-id':this[_0x5830('0x39')]['id']},'children':[this[_0x5830('0x4')],{'tag':_0x5830('0x25'),'attributes':{'class':['ck-comment__main',_0x5830('0x4f')]},'children':_0x4f98d8}]}]};}[_0x5830('0x18')](){const _0x2fcf26=new _0x551c51(this[_0x5830('0x14')]);return _0x2fcf26[_0x5830('0x2d')]=_0x3c8b2e(this[_0x5830('0x14')],_0x5830('0x29')),_0x2fcf26[_0x5830('0x42')]=_0x318b2c[_0x5830('0x5a')],_0x2fcf26[_0x5830('0x34')]=!0x0,_0x2fcf26['extendTemplate']({'attributes':{'class':_0x5830('0x13')}}),_0x2fcf26['bind']('isEnabled')['to'](this[_0x5830('0x39')],'isReadOnly',_0x35ebf9=>!_0x35ebf9),_0x2fcf26[_0x5830('0x3a')]('isVisible')['to'](this['_model'],'isEditable'),_0x2fcf26['on']('execute',()=>this[_0x5830('0x28')]()),_0x2fcf26;}[_0x5830('0x1a')](){const _0x226b64=new _0x551c51(this[_0x5830('0x14')]);return _0x226b64['label']=_0x3c8b2e(this['locale'],_0x5830('0x37')),_0x226b64[_0x5830('0x42')]=_0x36d3bc,_0x226b64[_0x5830('0x34')]=!0x0,_0x226b64['extendTemplate']({'attributes':{'class':'ck-comment--remove'}}),_0x226b64['bind'](_0x5830('0x21'))['to'](this[_0x5830('0x39')],'isReadOnly',_0x54f59c=>!_0x54f59c),_0x226b64[_0x5830('0x3a')]('isVisible')['to'](this[_0x5830('0x39')],_0x5830('0x44')),_0x226b64['on'](_0x5830('0x59'),()=>{this[_0x5830('0x1d')](_0x3c8b2e(this[_0x5830('0x14')],_0x5830('0x11')),this[_0x5830('0x49')])[_0x5830('0x8')](()=>{this['fire'](_0x5830('0x27'),this[_0x5830('0x39')]['id']);});}),_0x226b64;}[_0x5830('0x2c')](){const _0x239cea=_0x11fa72(this[_0x5830('0x14')]),_0x5cd13c=_0x239cea[_0x5830('0x1b')]['children'],_0x3129ef=new _0x1fb435(this[_0x5830('0x14')]),_0x77c72=(_0x27330e,_0x341e28=-0x1)=>{const _0x53d68b=new _0x1e5e94(this[_0x5830('0x14')]);_0x53d68b[_0x5830('0x47')][_0x5830('0x12')](_0x27330e);const _0x48b32c=_0x341e28>-0x1?_0x341e28:_0x3129ef['items'][_0x5830('0x50')];_0x3129ef[_0x5830('0x1')]['add'](_0x53d68b,_0x48b32c),_0x239cea[_0x5830('0x51')](_0x27330e,_0x5830('0x17'),()=>{_0x239cea[_0x5830('0x21')]=[...this[_0x5830('0x1')]][_0x5830('0x19')](_0x4a4ff1=>_0x4a4ff1['isEnabled']);}),_0x239cea[_0x5830('0x51')](_0x27330e,'change:isVisible',()=>{_0x239cea[_0x5830('0x40')][_0x5830('0x3f')]=[...this[_0x5830('0x1')]][_0x5830('0x19')](_0x1ac130=>_0x1ac130[_0x5830('0x3f')]);});};_0x239cea[_0x5830('0x4c')]='sw',_0x239cea[_0x5830('0x40')][_0x5830('0xa')]({'label':_0x3c8b2e(this[_0x5830('0x14')],_0x5830('0x9')),'icon':_0x318b2c[_0x5830('0x54')]}),_0x239cea[_0x5830('0x21')]=[...this[_0x5830('0x1')]][_0x5830('0x19')](_0x3f7532=>_0x3f7532[_0x5830('0x21')]),_0x239cea[_0x5830('0x40')][_0x5830('0x3f')]=[...this['items']]['some'](_0x510618=>_0x510618[_0x5830('0x3f')]);for(const _0x41ca45 of this[_0x5830('0x1')])_0x77c72(_0x41ca45);return _0x5cd13c['add'](_0x3129ef),_0x239cea[_0x5830('0x51')](this['items'],_0x5830('0x12'),(_0x1ecce5,_0x308446,_0x520049)=>{_0x77c72(_0x308446,_0x520049);}),_0x239cea[_0x5830('0x51')](this[_0x5830('0x1')],_0x5830('0x31'),(_0x10e68e,_0x57c06a,_0x531351)=>{_0x3129ef[_0x5830('0x1')][_0x5830('0x31')](_0x531351);}),_0x239cea;}[_0x5830('0xd')](_0x40bf30,_0x45836f){const _0x5df962=_0x40bf30&&_0x40bf30[_0x5830('0x49')];_0x5df962&&(this[_0x5830('0x51')](_0x5df962,'mouseenter',()=>this[_0x5830('0x36')]=_0x45836f),this['listenTo'](_0x5df962,'focus',()=>this[_0x5830('0x36')]=_0x45836f),this['listenTo'](_0x5df962,'mouseleave',()=>this['actionIndicator']=null),this[_0x5830('0x51')](_0x5df962,_0x5830('0x4e'),()=>this[_0x5830('0x36')]=null));}[_0x5830('0x3d')](){const _0x6af77a=super[_0x5830('0x3d')]();return _0x6af77a['bind']('placeholder')['to'](this),_0x6af77a;}[_0x5830('0x1e')](){return _0x5830('0x5c')===this[_0x5830('0x39')][_0x5830('0x26')][_0x5830('0x5')][_0x5830('0x46')]?_0x3c8b2e(this['locale'],'EXTERNAL_IMPORT_WORD_COMMENT'):_0x3c8b2e(this[_0x5830('0x14')],_0x5830('0x3c'));}['getUserViewNotificationText'](){return this[_0x5830('0x39')][_0x5830('0x2b')]?_0x5830('0x5c')===this[_0x5830('0x39')][_0x5830('0x26')][_0x5830('0x5')][_0x5830('0x46')]?_0x3c8b2e(this[_0x5830('0x14')],_0x5830('0x3e'),this[_0x5830('0x39')][_0x5830('0x24')]['name']):_0x3c8b2e(this[_0x5830('0x14')],'EXTERNAL_AVATAR',this[_0x5830('0x39')][_0x5830('0x24')]['name']):null;}[_0x5830('0x3')](){super[_0x5830('0x3')](),this[_0x5830('0xd')](this[_0x5830('0x35')],_0x5830('0x2e')),this[_0x5830('0xd')](this['removeButton'],_0x5830('0x31'));}}
+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 _0xfedd=['requires'];(function(_0x466877,_0xfedd32){var _0x53a64d=function(_0x41b16b){while(--_0x41b16b){_0x466877['push'](_0x466877['shift']());}};_0x53a64d(++_0xfedd32);}(_0xfedd,0x18c));var _0x53a6=function(_0x466877,_0xfedd32){_0x466877=_0x466877-0x0;var _0x53a64d=_0xfedd[_0x466877];return _0x53a64d;};import{Plugin as _0x2037f4}from'ckeditor5/src/core';import _0x38634b from'./comments/commentsrepository';import _0x1115f7 from'./comments/commentsediting';import _0x4fff45 from'./comments/commentsui';import _0x5a252b from'./commentsonly';import _0x4f82d6 from'./annotations/widesidebar';import _0xee4d97 from'./annotations/narrowsidebar';import _0x41369c from'./annotations/inlineannotations';import _0x2e542e from'./comments/commentsarchiveui';import _0x441c2f from'./comments/commentsarchive';export default class f extends _0x2037f4{static get[_0x53a6('0x0')](){return[_0x38634b,_0x1115f7,_0x4fff45,_0x441c2f,_0x2e542e,_0x5a252b,_0x4f82d6,_0xee4d97,_0x41369c];}static get['pluginName'](){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 _0x3d0a=['forceDisabled','view','commentsOnlyMode','clipboardInput','commands','isEnabled','highest','requires','config','_disableCommentsOnlyMode','cut','editor','editing','stop','affectsData','_enableCommentsOnlyMode','change:isEnabled','DragDrop','commentsOnly','set','CommentsOnly','addCommentThread','afterInit','listenTo','stopListening','clearForceDisabled','plugins','get'];(function(_0x2e42ef,_0x3d0a67){const _0x32783f=function(_0xdc6ff){while(--_0xdc6ff){_0x2e42ef['push'](_0x2e42ef['shift']());}};_0x32783f(++_0x3d0a67);}(_0x3d0a,0x126));const _0x3278=function(_0x2e42ef,_0x3d0a67){_0x2e42ef=_0x2e42ef-0x0;let _0x32783f=_0x3d0a[_0x2e42ef];return _0x32783f;};import{Plugin as _0xb58c9e}from'ckeditor5/src/core';import _0x2bcc7e from'./comments/commentsediting';export default class n extends _0xb58c9e{static get['pluginName'](){return _0x3278('0x6');}static get[_0x3278('0x15')](){return[_0x2bcc7e];}constructor(_0x36d056){super(_0x36d056),this[_0x3278('0x5')](_0x3278('0x13'),!0x1),this['on'](_0x3278('0x2'),(_0x35822b,_0x4e363e,_0x5abe45)=>{_0x5abe45?this[_0x3278('0x1')]():this['_disableCommentsOnlyMode']();});}[_0x3278('0x8')](){!this[_0x3278('0x13')]&&this[_0x3278('0x19')][_0x3278('0x16')]['get'](_0x3278('0x4'))&&(this[_0x3278('0x13')]=!0x0);}[_0x3278('0x1')](){for(const [_0xce791c,_0x5839a1]of this[_0x3278('0x19')][_0x3278('0x12')])_0x5839a1['affectsData']&&_0x3278('0x7')!==_0xce791c&&_0x5839a1[_0x3278('0xe')](_0x3278('0x10'));this[_0x3278('0x19')][_0x3278('0xc')]['has'](_0x3278('0x3'))&&this[_0x3278('0x19')][_0x3278('0xc')][_0x3278('0xd')](_0x3278('0x3'))[_0x3278('0xe')](_0x3278('0x10'));const _0x1cc0f2=this[_0x3278('0x19')][_0x3278('0x1a')][_0x3278('0xf')]['document'];this[_0x3278('0x9')](_0x1cc0f2,_0x3278('0x18'),_0x4300af=>_0x4300af[_0x3278('0x1b')](),{'priority':_0x3278('0x14')}),this[_0x3278('0x9')](_0x1cc0f2,_0x3278('0x11'),_0x2f1c56=>_0x2f1c56[_0x3278('0x1b')](),{'priority':'highest'}),this[_0x3278('0x9')](_0x1cc0f2,'delete',_0x2c9988=>_0x2c9988['stop'](),{'priority':'highest'});}[_0x3278('0x17')](){for(const [_0x341290,_0x302b5f]of this['editor'][_0x3278('0x12')])_0x302b5f[_0x3278('0x0')]&&_0x3278('0x7')!==_0x341290&&_0x302b5f[_0x3278('0xb')](_0x3278('0x10'));this[_0x3278('0xa')](this['editor'][_0x3278('0x1a')][_0x3278('0xf')]['document']);}}
+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(_0x53200d,_0x134ddf,_0x5316f8){const t=_0x53200d['t'];switch(_0x134ddf){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'},_0x5316f8);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'},_0x5316f8);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'},_0x5316f8);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'},_0x5316f8);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 _0x47a3=['attributes','cancel','characterData','childList','attributeName','observe','type','disconnect','class'];(function(_0x462c1b,_0x47a3af){const _0x2acdf3=function(_0x31ad25){while(--_0x31ad25){_0x462c1b['push'](_0x462c1b['shift']());}};_0x2acdf3(++_0x47a3af);}(_0x47a3,0x18b));const _0x2acd=function(_0x462c1b,_0x47a3af){_0x462c1b=_0x462c1b-0x0;let _0x2acdf3=_0x47a3[_0x462c1b];return _0x2acdf3;};import{throttle as _0x541042}from'lodash-es';export default function Dt(_0x5d449a){const _0x5447a0=_0x541042(_0x5d449a,0x1e),_0x3313a8=new MutationObserver(_0x2dc140=>{for(const _0x2904c7 of _0x2dc140)(_0x2acd('0x1')==_0x2904c7[_0x2acd('0x7')]&&_0x2acd('0x0')==_0x2904c7[_0x2acd('0x5')]||_0x2acd('0x4')==_0x2904c7['type']||_0x2acd('0x3')==_0x2904c7[_0x2acd('0x7')])&&_0x5447a0();});return{'attach'(_0x2aee37){_0x3313a8[_0x2acd('0x6')](_0x2aee37,{'attributes':!0x0,'childList':!0x0,'subtree':!0x0,'characterData':!0x0});},'detach'(){_0x3313a8[_0x2acd('0x8')](),_0x5447a0[_0x2acd('0x2')]();}};}
+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);
+}