Skip to content

Commit cd14de2

Browse files
committed
Merge remote-tracking branch 'origin/release' into ck/18774-update-metadata-in-list
2 parents f0bc7cb + 85993cc commit cd14de2

File tree

72 files changed

+1504
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1504
-145
lines changed

docs/features/feature-digest.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,17 @@ Core editing capability provides tools to create, edit, and style content. Here
378378
the image load much faster and saves bandwidth.
379379
</td>
380380
</tr>
381+
<tr id="line-height" class="feature">
382+
<td>
383+
{@link features/line-height Links<span class="tree__item__badge tree__item__badge_premium" data-badge-tooltip="Premium feature">
384+
<span class="tree__item__badge__text">Premium feature</span></span>
385+
}
386+
</td>
387+
<td>
388+
The line height feature lets you adjust the vertical spacing between lines of text,
389+
controlling how tightly or loosely text is packed within paragraphs.
390+
</td>
391+
</tr>
381392
<tr id="links" class="feature">
382393
<td>
383394
{@link features/link Links}

docs/getting-started/setup/csp.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ Some CSP directives have an impact on certain rich-text editor features. Here is
4949
* `style-src 'self' 'unsafe-inline'`:
5050
* The `self` directive allows to load styles from the site's own domain. Since v42.0.0, the editor {@link getting-started/setup/css distributes its stylesheets}. If you need to load styles from some other domain, add them explicitly: `style-src https://trusted-styles.example.com;`.
5151
* The directive `unsafe-inline` is required to make the styles of certain features work properly. For instance, you are going to need it if you want to enable such editor features as {@link features/font font} or {@link features/text-alignment text alignment} or any other feature that uses the inline `style="..."` attributes in the content.
52+
53+
**Note**: Inline styles are also required when using {@link features/lists#list-item-marker-formatting list item marker formatting}. For example, if you apply font color, size, or family to list markers, the editor uses inline style attributes to render them. Because of this, `unsafe-inline` must be allowed for the styles to display correctly.
54+
5255
* `frame-src *`: Necessary for the {@link features/media-embed media embed} feature to load media with previews (containing `<iframe>`).
5356

5457
**Note**: Use the more strict `frame-src 'self'` if all the media in the edited content come from the same domain as your application.

docs/umberto.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"api/module_html-embed_updatehtmlembedcommand.html": "api/module_html-embed_htmlembedcommand.html",
4949
"api/module_html-embed_updatehtmlembedcommand-UpdateHtmlEmbedCommand.html": "api/module_html-embed_htmlembedcommand-HtmlEmbedCommand.html",
5050
"api/module_link_utils-ManualDecorator.html": "api/module_link_utils_manualdecorator-LinkManualDecorator.html",
51-
"api/module_link_utils-AutomaticDecorators.html": "api/module_link_utils_automaticdecorators-AutomaticDecorators.html",
51+
"api/module_link_utils-AutomaticDecorators.html": "api/module_link_utils_automaticdecorators-AutomaticLinkDecorators.html",
5252
"api/module_list_checktodolistcommand.html": "api/module_list_todolist_checktodolistcommand.html",
5353
"api/module_list_checktodolistcommand-CheckTodoListCommand.html": "api/module_list_todolist_checktodolistcommand-CheckTodoListCommand.html",
5454
"api/module_list_converters.html": "api/module_list_list_converters.html",

docs/updating/nim-migration/migrating-exports.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,11 +1122,11 @@ Listed below are exports introduced with NIM.
11221122

11231123
### @ckeditor/ckeditor5-engine
11241124

1125-
| file | exported name |
1126-
|------|----------------|
1127-
| conversion/conversion.ts | ConversionType |
1125+
| file | exported name |
1126+
|------|----------------------------|
1127+
| conversion/conversion.ts | ConversionType |
11281128
| conversion/downcastdispatcher.ts | DowncastDispatcherEventMap |
1129-
| view/domconverter.ts | BlockFillerMode |
1129+
| view/domconverter.ts | ViewBlockFillerMode |
11301130

11311131
### @ckeditor/ckeditor5-table
11321132

packages/ckeditor5-autosave/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@ckeditor/ckeditor5-core": "45.2.1",
1717
"@ckeditor/ckeditor5-utils": "45.2.1",
1818
"ckeditor5": "45.2.1",
19-
"es-toolkit": "1.38.0"
19+
"es-toolkit": "1.39.5"
2020
},
2121
"devDependencies": {
2222
"@ckeditor/ckeditor5-dev-utils": "^50.0.0",

packages/ckeditor5-autosave/src/autosave.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { DomEmitterMixin, type DomEmitter } from 'ckeditor5/src/utils.js';
2020

2121
import type { ModelDocumentChangeEvent } from 'ckeditor5/src/engine.js';
2222

23-
import { debounce, type DebouncedFunction } from 'es-toolkit/compat';
23+
import { debounce, type DebouncedFunc } from 'es-toolkit/compat';
2424

2525
/**
2626
* The {@link module:autosave/autosave~Autosave} plugin allows you to automatically save the data (e.g. send it to the server)
@@ -79,7 +79,7 @@ export class Autosave extends Plugin {
7979
* Debounced save method. The `save()` method is called the specified `waitingTime` after `debouncedSave()` is called,
8080
* unless a new action happens in the meantime.
8181
*/
82-
private _debouncedSave: DebouncedFunction<( () => Promise<void> )>;
82+
private _debouncedSave: DebouncedFunc<( () => Promise<void> )>;
8383

8484
/**
8585
* The last saved document version.

packages/ckeditor5-ckbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@ckeditor/ckeditor5-utils": "45.2.1",
2424
"ckeditor5": "45.2.1",
2525
"blurhash": "2.0.5",
26-
"es-toolkit": "1.38.0"
26+
"es-toolkit": "1.39.5"
2727
},
2828
"devDependencies": {
2929
"@ckeditor/ckeditor5-autosave": "45.2.1",

packages/ckeditor5-clipboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@ckeditor/ckeditor5-ui": "45.2.1",
1919
"@ckeditor/ckeditor5-utils": "45.2.1",
2020
"@ckeditor/ckeditor5-widget": "45.2.1",
21-
"es-toolkit": "1.38.0"
21+
"es-toolkit": "1.39.5"
2222
},
2323
"devDependencies": {
2424
"@ckeditor/ckeditor5-alignment": "45.2.1",

packages/ckeditor5-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@ckeditor/ckeditor5-ui": "45.2.1",
2929
"@ckeditor/ckeditor5-utils": "45.2.1",
3030
"@ckeditor/ckeditor5-watchdog": "45.2.1",
31-
"es-toolkit": "1.38.0"
31+
"es-toolkit": "1.39.5"
3232
},
3333
"devDependencies": {
3434
"@ckeditor/ckeditor5-autoformat": "45.2.1",

packages/ckeditor5-editor-balloon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@ckeditor/ckeditor5-ui": "45.2.1",
1818
"@ckeditor/ckeditor5-utils": "45.2.1",
1919
"ckeditor5": "45.2.1",
20-
"es-toolkit": "1.38.0"
20+
"es-toolkit": "1.39.5"
2121
},
2222
"devDependencies": {
2323
"@ckeditor/ckeditor5-basic-styles": "45.2.1",

0 commit comments

Comments
 (0)