@ckeditor/ckeditor5-collaboration-core 42.0.2-alpha.2 → 43.0.0-alpha.0

package/src/utils/surroundingmarkersdetector.js

@@ -20,4 +20,4 @@
  *
  *
  */
-function _0x45da(_0x56323c,_0x2fed61){const _0x2b886f=_0x2b88();return _0x45da=function(_0x45da64,_0x4c3249){_0x45da64=_0x45da64-0x195;let _0xbb6a5f=_0x2b886f[_0x45da64];return _0xbb6a5f;},_0x45da(_0x56323c,_0x2fed61);}(function(_0x4b0b6f,_0x422bd7){const _0x2cdb37=_0x45da,_0x3658b3=_0x4b0b6f();while(!![]){try{const _0x29b475=parseInt(_0x2cdb37(0x1a3))/0x1+parseInt(_0x2cdb37(0x19e))/0x2+parseInt(_0x2cdb37(0x1ac))/0x3*(parseInt(_0x2cdb37(0x1a5))/0x4)+parseInt(_0x2cdb37(0x1a2))/0x5*(-parseInt(_0x2cdb37(0x197))/0x6)+-parseInt(_0x2cdb37(0x1a9))/0x7+parseInt(_0x2cdb37(0x19d))/0x8*(-parseInt(_0x2cdb37(0x1aa))/0x9)+parseInt(_0x2cdb37(0x195))/0xa*(-parseInt(_0x2cdb37(0x1a4))/0xb);if(_0x29b475===_0x422bd7)break;else _0x3658b3['push'](_0x3658b3['shift']());}catch(_0x247880){_0x3658b3['push'](_0x3658b3['shift']());}}}(_0x2b88,0xcb1ca));function _0x2b88(){const _0x32b6a1=['markers','selection','32BeTUTk','2477148WqABsx','containsPosition','focus','change:range','1060LmcCkd','138696vtmmky','44xnWZEk','100FYtamb','length','document','end','9699683tjqlUF','209691PBUfOl','push','194343zYyMLR','871730YqVYcv','isEqual','9546OKciVf','start','getRange','includes'];_0x2b88=function(){return _0x32b6a1;};return _0x2b88();}export default function z(_0x402ab9,_0x49c123){const _0x25c0f0=_0x45da,_0x379220=[];_0x402ab9[_0x25c0f0(0x1a7)][_0x25c0f0(0x19c)]['on'](_0x25c0f0(0x1a1),()=>{const _0x18025e=_0x25c0f0,_0xf27360=function(_0x42f825,_0x2a0117){const _0x34fa60=_0x45da,_0x2e6a75=[];for(const _0x5373fb of _0x42f825[_0x34fa60(0x19b)]){const _0x5499aa=_0x5373fb[_0x34fa60(0x199)]();(_0x5499aa[_0x34fa60(0x19f)](_0x2a0117)||_0x5499aa[_0x34fa60(0x198)][_0x34fa60(0x196)](_0x2a0117)||_0x5499aa[_0x34fa60(0x1a8)][_0x34fa60(0x196)](_0x2a0117))&&_0x2e6a75[_0x34fa60(0x1ab)](_0x5373fb);}return _0x2e6a75;}(_0x402ab9,_0x402ab9[_0x18025e(0x1a7)][_0x18025e(0x19c)][_0x18025e(0x1a0)]),_0x1cefcc=[],_0x4ac8ef=[],_0x25b6af=[];for(const _0x13bd79 of _0x379220)_0xf27360[_0x18025e(0x19a)](_0x13bd79)||_0x1cefcc[_0x18025e(0x1ab)](_0x13bd79);for(const _0x572a47 of _0xf27360)_0x379220[_0x18025e(0x19a)](_0x572a47)||_0x4ac8ef[_0x18025e(0x1ab)](_0x572a47),_0x25b6af[_0x18025e(0x1ab)](_0x572a47);(_0x1cefcc[_0x18025e(0x1a6)]||_0x4ac8ef[_0x18025e(0x1a6)])&&_0x49c123({'left':_0x1cefcc,'entered':_0x4ac8ef}),_0x379220[_0x18025e(0x1a6)]=0x0,_0x379220[_0x18025e(0x1ab)](..._0x25b6af);});}
+function _0x1247(_0x54582b,_0x10068d){const _0x2db7d9=_0x2db7();return _0x1247=function(_0x1247ec,_0x569c9a){_0x1247ec=_0x1247ec-0x1a7;let _0xbd1985=_0x2db7d9[_0x1247ec];return _0xbd1985;},_0x1247(_0x54582b,_0x10068d);}function _0x2db7(){const _0x56599f=['isEqual','350HBBBbv','getRange','1212MgCwdx','document','focus','337216iBzLUP','135738gSztks','markers','length','change:range','872952mWWZqv','push','1197455cJBbzE','end','containsPosition','81426VXOTZp','441pHzuZi','8oPETOs','includes','selection','start','1515045vrEapN'];_0x2db7=function(){return _0x56599f;};return _0x2db7();}(function(_0x10d708,_0x1b5999){const _0x387771=_0x1247,_0x17e3af=_0x10d708();while(!![]){try{const _0x4b45e3=-parseInt(_0x387771(0x1ae))/0x1+-parseInt(_0x387771(0x1b8))/0x2+-parseInt(_0x387771(0x1b9))/0x3*(-parseInt(_0x387771(0x1ab))/0x4)+parseInt(_0x387771(0x1a7))/0x5+-parseInt(_0x387771(0x1b3))/0x6+parseInt(_0x387771(0x1b5))/0x7*(-parseInt(_0x387771(0x1ba))/0x8)+parseInt(_0x387771(0x1af))/0x9*(parseInt(_0x387771(0x1a9))/0xa);if(_0x4b45e3===_0x1b5999)break;else _0x17e3af['push'](_0x17e3af['shift']());}catch(_0x1ebb28){_0x17e3af['push'](_0x17e3af['shift']());}}}(_0x2db7,0x2c2c6));export default function B(_0x2f4f8e,_0x317325){const _0x5e1872=_0x1247,_0x36304d=[];_0x2f4f8e[_0x5e1872(0x1ac)][_0x5e1872(0x1bc)]['on'](_0x5e1872(0x1b2),()=>{const _0x4a6eff=_0x5e1872,_0x81cd51=function(_0x3a3581,_0x57283b){const _0xa896b3=_0x1247,_0x122603=[];for(const _0x24b61b of _0x3a3581[_0xa896b3(0x1b0)]){const _0x1fe780=_0x24b61b[_0xa896b3(0x1aa)]();(_0x1fe780[_0xa896b3(0x1b7)](_0x57283b)||_0x1fe780[_0xa896b3(0x1bd)][_0xa896b3(0x1a8)](_0x57283b)||_0x1fe780[_0xa896b3(0x1b6)][_0xa896b3(0x1a8)](_0x57283b))&&_0x122603[_0xa896b3(0x1b4)](_0x24b61b);}return _0x122603;}(_0x2f4f8e,_0x2f4f8e[_0x4a6eff(0x1ac)][_0x4a6eff(0x1bc)][_0x4a6eff(0x1ad)]),_0xc649a7=[],_0x2df29c=[],_0x4329e6=[];for(const _0x9dd725 of _0x36304d)_0x81cd51[_0x4a6eff(0x1bb)](_0x9dd725)||_0xc649a7[_0x4a6eff(0x1b4)](_0x9dd725);for(const _0x4f1a76 of _0x81cd51)_0x36304d[_0x4a6eff(0x1bb)](_0x4f1a76)||_0x2df29c[_0x4a6eff(0x1b4)](_0x4f1a76),_0x4329e6[_0x4a6eff(0x1b4)](_0x4f1a76);(_0xc649a7[_0x4a6eff(0x1b1)]||_0x2df29c[_0x4a6eff(0x1b1)])&&_0x317325({'left':_0xc649a7,'entered':_0x2df29c}),_0x36304d[_0x4a6eff(0x1b1)]=0x0,_0x36304d[_0x4a6eff(0x1b4)](..._0x4329e6);});}

package/src/utils/trim-html.d.ts

@@ -2,6 +2,9 @@
  * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
+/**
+ * @module collaboration-core/utils/trim-html
+ */
 /**
  * Trims text inside a html tags and takes care of all closing tags.
  *

package/src/utils/trim-html.js

@@ -20,4 +20,4 @@
  *
  *
  */
-const _0x4c05bb=_0x4e1d;(function(_0xc62d6f,_0x17ecc4){const _0xcae74b=_0x4e1d,_0x15f6bc=_0xc62d6f();while(!![]){try{const _0x244565=parseInt(_0xcae74b(0xf9))/0x1*(-parseInt(_0xcae74b(0x104))/0x2)+parseInt(_0xcae74b(0x10a))/0x3+-parseInt(_0xcae74b(0x107))/0x4+-parseInt(_0xcae74b(0x106))/0x5*(parseInt(_0xcae74b(0xf6))/0x6)+-parseInt(_0xcae74b(0xf7))/0x7*(-parseInt(_0xcae74b(0x100))/0x8)+-parseInt(_0xcae74b(0x103))/0x9+parseInt(_0xcae74b(0xff))/0xa;if(_0x244565===_0x17ecc4)break;else _0x15f6bc['push'](_0x15f6bc['shift']());}catch(_0x1bd77e){_0x15f6bc['push'](_0x15f6bc['shift']());}}}(_0x25cc,0x4b7fb));export default function Z(_0xc353f,{limit:_0x4eb770,suffix:_0x17131b=_0x4c05bb(0x101)}){const _0x190337=_0x4c05bb,_0x970315=[];let _0x14d474=0x0;const _0x2a6621=_0xc353f[_0x190337(0x109)](/</g,'\x0a<')[_0x190337(0x109)](/>/g,'>\x0a')[_0x190337(0x109)](/^\n/g,'')[_0x190337(0x109)](/\n$/g,'')[_0x190337(0xfb)]('\x0a');for(let _0x3e21ad=0x0;_0x3e21ad<_0x2a6621[_0x190337(0xfa)];_0x3e21ad++){let _0x28c008=_0x2a6621[_0x3e21ad];const _0x4e792e=$(_0x28c008);if(_0x28c008[_0x190337(0xfe)]('<')){if(_0x14d474>=_0x4eb770){const _0xa31815=_0x28c008[_0x190337(0xf8)](/[a-zA-Z]+/);if(!_0xa31815){_0x2a6621[_0x3e21ad]='';continue;}const _0x5aafb1=_0xa31815[0x0];_0x28c008[_0x190337(0xfe)]('</')?(_0x970315[_0x190337(0xfa)]&&(_0x28c008=''),_0x970315[_0x190337(0x10b)]()):(_0x970315[_0x190337(0xfc)](_0x5aafb1),_0x28c008='');}}else{if(_0x14d474>=_0x4eb770)_0x28c008='';else{if(_0x14d474+_0x4e792e[_0x190337(0xfa)]>=_0x4eb770){let _0x57be9f=_0x4eb770-_0x14d474;if('\x20'===_0x4e792e[_0x57be9f-0x1])_0x57be9f--;else{const _0x366a0b=_0x4e792e[_0x190337(0x102)](_0x57be9f)[_0x190337(0xfd)]('\x20');-0x1!==_0x366a0b?_0x57be9f+=_0x366a0b:_0x57be9f=_0x28c008[_0x190337(0xfa)];}_0x28c008=_0x4e792e[_0x190337(0x102)](0x0,_0x57be9f)[_0x190337(0x108)]('')+_0x17131b,_0x14d474=_0x4eb770;}else _0x14d474+=_0x4e792e[_0x190337(0xfa)];}}_0x2a6621[_0x3e21ad]=_0x28c008;}return _0x2a6621[_0x190337(0x108)]('\x0a')[_0x190337(0x109)](/\n/g,'');}function $(_0xf37937){const _0x2d45e9=_0x4c05bb,_0xbfacad=[];for(let _0x4f6b7d=0x0;_0x4f6b7d<_0xf37937[_0x2d45e9(0xfa)];_0x4f6b7d++){const _0x5e57c4=_0xf37937[_0x2d45e9(0x105)](_0x4f6b7d)[_0x2d45e9(0xf8)](/^&[a-z0-9#]+;/);if(_0x5e57c4){const _0x5152a2=_0x5e57c4[0x0];_0xbfacad[_0x2d45e9(0xfc)](_0x5152a2),_0x4f6b7d+=_0x5152a2[_0x2d45e9(0xfa)]-0x1;}else _0xbfacad[_0x2d45e9(0xfc)](_0xf37937[_0x4f6b7d]);}return _0xbfacad;}function _0x4e1d(_0x252307,_0x19dcd1){const _0x25cca6=_0x25cc();return _0x4e1d=function(_0x4e1d89,_0x21f81c){_0x4e1d89=_0x4e1d89-0xf6;let _0x3fffd2=_0x25cca6[_0x4e1d89];return _0x3fffd2;},_0x4e1d(_0x252307,_0x19dcd1);}function _0x25cc(){const _0x4a17b7=['indexOf','startsWith','9317120zcOZly','104CyFSkb','...','slice','3402954nIBlfm','4170VTNxJy','substring','11410cvNAHK','851016emjZRU','join','replace','96438JitVAY','pop','84ibYeAd','282632RefXmK','match','267qQOFMd','length','split','push'];_0x25cc=function(){return _0x4a17b7;};return _0x25cc();}
+function _0x28c3(){const _0x4797f7=['10SUIwYA','200baACPn','1092YrxuuI','122788ZaZATk','114825uluAAZ','62500kPiBUq','startsWith','indexOf','241590KWhMcF','push','...','length','replace','slice','66jGovkA','split','pop','match','271104kfGsMy','substring','2875848PFLMum','135djHJOV','33152vEqfPu','join'];_0x28c3=function(){return _0x4797f7;};return _0x28c3();}const _0x528769=_0x225d;(function(_0x5d68c0,_0x28fb1f){const _0x396a4a=_0x225d,_0x5237ec=_0x5d68c0();while(!![]){try{const _0x355d27=-parseInt(_0x396a4a(0x12f))/0x1*(parseInt(_0x396a4a(0x12c))/0x2)+parseInt(_0x396a4a(0x130))/0x3+parseInt(_0x396a4a(0x131))/0x4*(-parseInt(_0x396a4a(0x12d))/0x5)+-parseInt(_0x396a4a(0x12e))/0x6*(-parseInt(_0x396a4a(0x12a))/0x7)+parseInt(_0x396a4a(0x128))/0x8+-parseInt(_0x396a4a(0x129))/0x9*(-parseInt(_0x396a4a(0x11c))/0xa)+-parseInt(_0x396a4a(0x122))/0xb*(-parseInt(_0x396a4a(0x126))/0xc);if(_0x355d27===_0x28fb1f)break;else _0x5237ec['push'](_0x5237ec['shift']());}catch(_0x1f25ea){_0x5237ec['push'](_0x5237ec['shift']());}}}(_0x28c3,0x7ea31));export default function Z(_0x6746ef,{limit:_0x1b4e2a,suffix:_0x1eeefa=_0x528769(0x11e)}){const _0x33ba1b=_0x528769,_0x2a86e8=[];let _0x5d8dae=0x0;const _0x5e4d3f=_0x6746ef[_0x33ba1b(0x120)](/</g,'\x0a<')[_0x33ba1b(0x120)](/>/g,'>\x0a')[_0x33ba1b(0x120)](/^\n/g,'')[_0x33ba1b(0x120)](/\n$/g,'')[_0x33ba1b(0x123)]('\x0a');for(let _0x414d79=0x0;_0x414d79<_0x5e4d3f[_0x33ba1b(0x11f)];_0x414d79++){let _0x5f159a=_0x5e4d3f[_0x414d79];const _0x14a72f=$(_0x5f159a);if(_0x5f159a[_0x33ba1b(0x132)]('<')){if(_0x5d8dae>=_0x1b4e2a){const _0x4ea01b=_0x5f159a[_0x33ba1b(0x125)](/[a-zA-Z]+/);if(!_0x4ea01b){_0x5e4d3f[_0x414d79]='';continue;}const _0x2fe8a4=_0x4ea01b[0x0];_0x5f159a[_0x33ba1b(0x132)]('</')?(_0x2a86e8[_0x33ba1b(0x11f)]&&(_0x5f159a=''),_0x2a86e8[_0x33ba1b(0x124)]()):(_0x2a86e8[_0x33ba1b(0x11d)](_0x2fe8a4),_0x5f159a='');}}else{if(_0x5d8dae>=_0x1b4e2a)_0x5f159a='';else{if(_0x5d8dae+_0x14a72f[_0x33ba1b(0x11f)]>=_0x1b4e2a){let _0x40aea6=_0x1b4e2a-_0x5d8dae;if('\x20'===_0x14a72f[_0x40aea6-0x1])_0x40aea6--;else{const _0x15725b=_0x14a72f[_0x33ba1b(0x121)](_0x40aea6)[_0x33ba1b(0x11b)]('\x20');-0x1!==_0x15725b?_0x40aea6+=_0x15725b:_0x40aea6=_0x5f159a[_0x33ba1b(0x11f)];}_0x5f159a=_0x14a72f[_0x33ba1b(0x121)](0x0,_0x40aea6)[_0x33ba1b(0x12b)]('')+_0x1eeefa,_0x5d8dae=_0x1b4e2a;}else _0x5d8dae+=_0x14a72f[_0x33ba1b(0x11f)];}}_0x5e4d3f[_0x414d79]=_0x5f159a;}return _0x5e4d3f[_0x33ba1b(0x12b)]('\x0a')[_0x33ba1b(0x120)](/\n/g,'');}function _0x225d(_0x180e3b,_0x4156fe){const _0x28c398=_0x28c3();return _0x225d=function(_0x225d81,_0x57b555){_0x225d81=_0x225d81-0x11b;let _0x193496=_0x28c398[_0x225d81];return _0x193496;},_0x225d(_0x180e3b,_0x4156fe);}function $(_0x22f7f6){const _0xd8a51=_0x528769,_0x14ca65=[];for(let _0x225e8f=0x0;_0x225e8f<_0x22f7f6[_0xd8a51(0x11f)];_0x225e8f++){const _0x36ac97=_0x22f7f6[_0xd8a51(0x127)](_0x225e8f)[_0xd8a51(0x125)](/^&[a-z0-9#]+;/);if(_0x36ac97){const _0x4deab1=_0x36ac97[0x0];_0x14ca65[_0xd8a51(0x11d)](_0x4deab1),_0x225e8f+=_0x4deab1[_0xd8a51(0x11f)]-0x1;}else _0x14ca65[_0xd8a51(0x11d)](_0x22f7f6[_0x225e8f]);}return _0x14ca65;}

package/theme/ariadescription.css

@@ -0,0 +1,12 @@
+/*
+ * What you're currently looking at is the source code of a legally protected, proprietary software.
+ * CKEditor 5 Collaboration is licensed under a commercial license and protected by copyright law. Where not otherwise indicated,
+ * all CKEditor 5 Collaboration content is authored by CKSource engineers and consists of CKSource-owned intellectual property.
+ *
+ * Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+.ck.ck-aria-description {
+	display: none;
+}

package/theme/integrations/mergefields.css

@@ -0,0 +1,67 @@
+/*
+ * What you're currently looking at is the source code of a legally protected, proprietary software.
+ * CKEditor 5 Collaboration is licensed under a commercial license and protected by copyright law. Where not otherwise indicated,
+ * all CKEditor 5 Collaboration content is authored by CKSource engineers and consists of CKSource-owned intellectual property.
+ *
+ * Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+.ck-content .ck-suggestion-marker.ck-widget.ck-merge-field,
+.ck-content .ck-comment-marker.ck-widget.ck-merge-field {
+	/* Note that comments markers have transparent border to be better aligned with suggestions markers. */
+	border-width: 2px;
+	border-left: none;
+	border-right: none;
+	padding-top: 0;
+	padding-bottom: 0;
+}
+
+.ck-content .ck-suggestion-marker-deletion.ck-widget.ck-merge-field {
+	border-top-color: var(--ck-color-suggestion-marker-deletion-border);
+	border-bottom-color: var(--ck-color-suggestion-marker-deletion-border);
+
+	background: var(--ck-color-suggestion-marker-deletion-background);
+
+	& :not(.ck-merge-field__affix),
+	&.ck-merge-field_with-value,
+	&.ck-merge-field_with-warning {
+		text-decoration: line-through;
+		text-decoration-color: var(--ck-color-suggestion-marker-deletion-stroke);
+		text-decoration-thickness: 3px;
+	}
+
+	&.ck-suggestion-marker--active {
+		background-color: var(--ck-color-suggestion-marker-deletion-background-active);
+	}
+}
+
+.ck-content .ck-suggestion-marker-insertion.ck-widget.ck-merge-field {
+	background-color: var(--ck-color-suggestion-marker-insertion-background);
+
+	&.ck-suggestion-marker--active {
+		background-color: var(--ck-color-suggestion-marker-insertion-background-active);
+	}
+}
+
+.ck-content .ck-comment-marker.ck-widget.ck-merge-field {
+	background: var(--ck-color-comment-marker);
+
+	&.ck-comment-marker--active {
+		background: var(--ck-color-comment-marker-active);
+	}
+}
+
+/*
+	This is a hack for a specific situation. The selector targets all regular markers made on text that are just before
+	a merge field (also in marker). This is a common situation. For example, if you have some text and a merge field
+	just after and all that is in a suggestion. Without this hack, there is a 1px spacing between the span and the merge
+	field, because the merge field has margin. The margin is needed because otherwise caret does not display. To
+	"remove" the spacing, we extend the span before the merge field by 1px using padding, but we need to compensate
+	by using negative margin, so that the whole content does not change its position.
+ */
+.ck-content span.ck-comment-marker:has(+.ck-comment-marker.ck-widget.ck-merge-field),
+.ck-content span.ck-suggestion-marker:has(+.ck-suggestion-marker.ck-widget.ck-merge-field) {
+	padding-right: 1px;
+	margin-right: -1px;
+}

package/theme/suggestion.css

@@ -7,6 +7,10 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_focus.css";
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_shadow.css";
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_rounded.css";
+
 :root {
 	--ck-color-comment-box-border: hsl(55, 98%, 48%);
 	--ck-color-suggestion-box-deletion-border: hsl(345, 62%, 60%);
@@ -55,8 +59,32 @@ With track-changes feature enabled, we need to distinguish various types of anno
 }
 
 .ck .ck-suggestion-wrapper {
-	outline: 0;
+	@mixin ck-rounded-corners;
+
 	overflow: hidden;
+
+	&:focus {
+		/*
+		 * We cannot use the ck-focus-ring mixin here because it adds a border that would need to stay transparent
+		 * in non-focused state and create an odd space inside the surrounding annotation container.
+		 */
+		outline: var(--ck-focus-ring);
+
+		/*
+		 * We cannot use the ck-box-shadow mixin because we're using outline instead of border (see the comment above).
+		 * And the shadow size has to be custom because outline is rendered on top of the shadow.
+		 */
+		box-shadow: 0 0 0 4px var(--ck-color-focus-outer-shadow);
+	}
+}
+
+/*
+ * In case of inline annotations, their focus styles get hoisted to the balloon panel to work around overflow that would
+ * otherwise get them cropped..
+ */
+.ck-balloon-panel:has( .ck-suggestion-wrapper:focus ) {
+	@mixin ck-focus-ring;
+	@mixin ck-box-shadow var(--ck-drop-shadow), var(--ck-focus-outer-shadow);
 }
 
 .ck .ck-suggestion-type {