Skip to content

Commit

Permalink
Merge branch 'master' into ck/5465-sticky-panel-overflowed-ancestors
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed Jul 12, 2023
2 parents fcb6abb + d361390 commit 59c57a3
Show file tree
Hide file tree
Showing 99 changed files with 1,704 additions and 1,347 deletions.
200 changes: 101 additions & 99 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ In your HTML page, add an element that CKEditor should replace:
Load the classic editor build (you can choose between the [CDN](https://cdn.ckeditor.com/#ckeditor5), [npm](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/predefined-builds.html#npm), and [zip downloads](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/predefined-builds.html#zip-download)):

```html
<script src="https://cdn.ckeditor.com/ckeditor5/38.1.0/classic/ckeditor.js"></script>
<script src="https://cdn.ckeditor.com/ckeditor5/38.1.1/classic/ckeditor.js"></script>
```

Call the [`ClassicEditor.create()`](https://ckeditor.com/docs/ckeditor5/latest/api/module_editor-classic_classiceditor-ClassicEditor.html#static-function-create) method:
Expand Down
29 changes: 8 additions & 21 deletions docs/_snippets/examples/bottom-toolbar-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { List } from '@ckeditor/ckeditor5-list';
import { Alignment } from '@ckeditor/ckeditor5-alignment';
import { Autoformat } from '@ckeditor/ckeditor5-autoformat';
import { BlockQuote } from '@ckeditor/ckeditor5-block-quote';
import { DropdownView, DropdownButtonView, DropdownPanelView, ToolbarView, clickOutsideHandler } from '@ckeditor/ckeditor5-ui';
import { DropdownView, ToolbarView, createDropdown } from '@ckeditor/ckeditor5-ui';
import { EasyImage } from '@ckeditor/ckeditor5-easy-image';
import { Essentials } from '@ckeditor/ckeditor5-essentials';
import { Heading } from '@ckeditor/ckeditor5-heading';
Expand Down Expand Up @@ -46,9 +46,7 @@ class FormattingOptions extends Plugin {

editor.ui.componentFactory.add( 'formattingOptions', locale => {
const t = locale.t;
const buttonView = new DropdownButtonView( locale );
const panelView = new DropdownPanelView( locale );
const dropdownView = new DropdownView( locale, buttonView, panelView );
const dropdownView = createDropdown( locale );
const toolbarView = this.toolbarView = dropdownView.toolbarView = new ToolbarView( locale );

// Accessibility: Give the toolbar a human-readable ARIA label.
Expand Down Expand Up @@ -88,26 +86,15 @@ class FormattingOptions extends Plugin {
// * the dropdown or it contents,
// * any editing root,
// * any floating UI in the "body" collection
// It should close, for instance, when another (main) toolbar button was pressed, though.
dropdownView.on( 'render', () => {
clickOutsideHandler( {
emitter: dropdownView,
activator: () => dropdownView.isOpen,
callback: () => { dropdownView.isOpen = false; },
contextElements: [
dropdownView.element,
...[ ...editor.ui.getEditableElementsNames() ].map( name => editor.ui.getEditableElement( name ) ),
document.querySelector( '.ck-body-wrapper' )
]
} );
} );
const focusableElements = [
...[ ...editor.ui.getEditableElementsNames() ].map( name => editor.ui.getEditableElement( name ) ),
document.querySelector( '.ck-body-wrapper' )
];

// The main button of the dropdown should be bound to the state of the dropdown.
buttonView.bind( 'isOn' ).to( dropdownView, 'isOpen' );
buttonView.bind( 'isEnabled' ).to( dropdownView );
focusableElements.forEach( el => dropdownView.focusTracker.add( el ) );

// Using the font color icon to visually represent the formatting.
buttonView.set( {
dropdownView.buttonView.set( {
tooltip: t( 'Formatting options' ),
icon: fontColorIcon
} );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ If you want to see the final product of this tutorial before you plunge in, chec

## Let's start!

The easiest way to set up your project is to grab the starter files from our [Github repository for this tutorial](https://github.com/ckeditor/ckeditor5-tutorials-examples/tree/main/abbreviation-plugin/starter-files). We gathered all the necessary dependencies there, including some CKEditor 5 packages and other files needed to build the editor.
The easiest way to set up your project is to grab the starter files from our [Github repository for this tutorial](https://github.com/ckeditor/ckeditor5-tutorials-examples/tree/main/abbreviation-plugin). We gathered all the necessary dependencies there, including some CKEditor 5 packages and other files needed to build the editor.

The editor has already been created in the `app.js` file with some basic plugins. All you need to do, is clone the repository, run the `npm install` command, and you can start coding right away.
The editor has already been created in the `app.js` file with some basic plugins. All you need to do is clone the repository, navigate to the [starter-files directory](https://github.com/ckeditor/ckeditor5-tutorials-examples/tree/main/abbreviation-plugin/starter-files), run the `npm install` command, and you can start coding right away.

The webpack is also already configured, so you can just use the `npm run build` command to build your application. Whenever you want to check anything in the browser, save the changes and run build again. Then, refresh the page in your browser (remember to turn off caching, so that new changes are displayed instantly).

Expand Down
15 changes: 15 additions & 0 deletions docs/installation/integrations/angular.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,21 @@ This tutorial assumes that you picked [`@ckeditor/ckeditor5-build-classic`](http
npm install --save @ckeditor/ckeditor5-build-classic
```

The [`@ckeditor/ckeditor5-angular`](https://www.npmjs.com/package/@ckeditor/ckeditor5-angular) package requires the following peer dependencies, with a version of at least 37.0.0:

* [`@ckeditor/ckeditor5-core`](https://www.npmjs.com/package/@ckeditor/ckeditor5-core),
* [`@ckeditor/ckeditor5-engine`](https://www.npmjs.com/package/@ckeditor/ckeditor5-engine),
* [`@ckeditor/ckeditor5-utils`](https://www.npmjs.com/package/@ckeditor/ckeditor5-utils),
* [`@ckeditor/ckeditor5-watchdog`](https://www.npmjs.com/package/@ckeditor/ckeditor5-watchdog).

Keep in mind that they {@link installation/plugins/installing-plugins#requirements must have the same version as the editor build}.

Install all the required peer dependencies:

```bash
npm install --save @ckeditor/ckeditor5-core @ckeditor/ckeditor5-engine @ckeditor/ckeditor5-utils @ckeditor/ckeditor5-watchdog
```

Now, add `CKEditorModule` to modules whose components will be using the `<ckeditor>` component in their templates.

```ts
Expand Down
151 changes: 76 additions & 75 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ckeditor5",
"version": "38.1.0",
"version": "38.1.1",
"description": "The development environment of CKEditor 5 - the best browser-based rich text editor.",
"private": true,
"keywords": [
Expand All @@ -21,70 +21,71 @@
"framework"
],
"dependencies": {
"@ckeditor/ckeditor5-adapter-ckfinder": "38.1.0",
"@ckeditor/ckeditor5-alignment": "38.1.0",
"@ckeditor/ckeditor5-autoformat": "38.1.0",
"@ckeditor/ckeditor5-autosave": "38.1.0",
"@ckeditor/ckeditor5-basic-styles": "38.1.0",
"@ckeditor/ckeditor5-block-quote": "38.1.0",
"@ckeditor/ckeditor5-build-balloon": "38.1.0",
"@ckeditor/ckeditor5-build-balloon-block": "38.1.0",
"@ckeditor/ckeditor5-build-classic": "38.1.0",
"@ckeditor/ckeditor5-build-decoupled-document": "38.1.0",
"@ckeditor/ckeditor5-build-inline": "38.1.0",
"@ckeditor/ckeditor5-build-multi-root": "38.1.0",
"@ckeditor/ckeditor5-ckfinder": "38.1.0",
"@ckeditor/ckeditor5-clipboard": "38.1.0",
"@ckeditor/ckeditor5-cloud-services": "38.1.0",
"@ckeditor/ckeditor5-code-block": "38.1.0",
"@ckeditor/ckeditor5-core": "38.1.0",
"@ckeditor/ckeditor5-easy-image": "38.1.0",
"@ckeditor/ckeditor5-editor-balloon": "38.1.0",
"@ckeditor/ckeditor5-editor-classic": "38.1.0",
"@ckeditor/ckeditor5-editor-decoupled": "38.1.0",
"@ckeditor/ckeditor5-editor-inline": "38.1.0",
"@ckeditor/ckeditor5-editor-multi-root": "38.1.0",
"@ckeditor/ckeditor5-engine": "38.1.0",
"@ckeditor/ckeditor5-enter": "38.1.0",
"@ckeditor/ckeditor5-essentials": "38.1.0",
"@ckeditor/ckeditor5-find-and-replace": "38.1.0",
"@ckeditor/ckeditor5-font": "38.1.0",
"@ckeditor/ckeditor5-heading": "38.1.0",
"@ckeditor/ckeditor5-highlight": "38.1.0",
"@ckeditor/ckeditor5-horizontal-line": "38.1.0",
"@ckeditor/ckeditor5-html-embed": "38.1.0",
"@ckeditor/ckeditor5-html-support": "38.1.0",
"@ckeditor/ckeditor5-image": "38.1.0",
"@ckeditor/ckeditor5-indent": "38.1.0",
"@ckeditor/ckeditor5-language": "38.1.0",
"@ckeditor/ckeditor5-link": "38.1.0",
"@ckeditor/ckeditor5-list": "38.1.0",
"@ckeditor/ckeditor5-markdown-gfm": "38.1.0",
"@ckeditor/ckeditor5-media-embed": "38.1.0",
"@ckeditor/ckeditor5-mention": "38.1.0",
"@ckeditor/ckeditor5-minimap": "38.1.0",
"@ckeditor/ckeditor5-page-break": "38.1.0",
"@ckeditor/ckeditor5-paragraph": "38.1.0",
"@ckeditor/ckeditor5-paste-from-office": "38.1.0",
"@ckeditor/ckeditor5-remove-format": "38.1.0",
"@ckeditor/ckeditor5-restricted-editing": "38.1.0",
"@ckeditor/ckeditor5-select-all": "38.1.0",
"@ckeditor/ckeditor5-source-editing": "38.1.0",
"@ckeditor/ckeditor5-special-characters": "38.1.0",
"@ckeditor/ckeditor5-style": "38.1.0",
"@ckeditor/ckeditor5-table": "38.1.0",
"@ckeditor/ckeditor5-theme-lark": "38.1.0",
"@ckeditor/ckeditor5-typing": "38.1.0",
"@ckeditor/ckeditor5-ui": "38.1.0",
"@ckeditor/ckeditor5-undo": "38.1.0",
"@ckeditor/ckeditor5-upload": "38.1.0",
"@ckeditor/ckeditor5-utils": "38.1.0",
"@ckeditor/ckeditor5-watchdog": "38.1.0",
"@ckeditor/ckeditor5-widget": "38.1.0",
"@ckeditor/ckeditor5-word-count": "38.1.0"
"@ckeditor/ckeditor5-adapter-ckfinder": "38.1.1",
"@ckeditor/ckeditor5-alignment": "38.1.1",
"@ckeditor/ckeditor5-autoformat": "38.1.1",
"@ckeditor/ckeditor5-autosave": "38.1.1",
"@ckeditor/ckeditor5-basic-styles": "38.1.1",
"@ckeditor/ckeditor5-block-quote": "38.1.1",
"@ckeditor/ckeditor5-build-balloon": "38.1.1",
"@ckeditor/ckeditor5-build-balloon-block": "38.1.1",
"@ckeditor/ckeditor5-build-classic": "38.1.1",
"@ckeditor/ckeditor5-build-decoupled-document": "38.1.1",
"@ckeditor/ckeditor5-build-inline": "38.1.1",
"@ckeditor/ckeditor5-build-multi-root": "38.1.1",
"@ckeditor/ckeditor5-ckfinder": "38.1.1",
"@ckeditor/ckeditor5-clipboard": "38.1.1",
"@ckeditor/ckeditor5-cloud-services": "38.1.1",
"@ckeditor/ckeditor5-code-block": "38.1.1",
"@ckeditor/ckeditor5-core": "38.1.1",
"@ckeditor/ckeditor5-easy-image": "38.1.1",
"@ckeditor/ckeditor5-editor-balloon": "38.1.1",
"@ckeditor/ckeditor5-editor-classic": "38.1.1",
"@ckeditor/ckeditor5-editor-decoupled": "38.1.1",
"@ckeditor/ckeditor5-editor-inline": "38.1.1",
"@ckeditor/ckeditor5-editor-multi-root": "38.1.1",
"@ckeditor/ckeditor5-engine": "38.1.1",
"@ckeditor/ckeditor5-enter": "38.1.1",
"@ckeditor/ckeditor5-essentials": "38.1.1",
"@ckeditor/ckeditor5-find-and-replace": "38.1.1",
"@ckeditor/ckeditor5-font": "38.1.1",
"@ckeditor/ckeditor5-heading": "38.1.1",
"@ckeditor/ckeditor5-highlight": "38.1.1",
"@ckeditor/ckeditor5-horizontal-line": "38.1.1",
"@ckeditor/ckeditor5-html-embed": "38.1.1",
"@ckeditor/ckeditor5-html-support": "38.1.1",
"@ckeditor/ckeditor5-image": "38.1.1",
"@ckeditor/ckeditor5-indent": "38.1.1",
"@ckeditor/ckeditor5-language": "38.1.1",
"@ckeditor/ckeditor5-link": "38.1.1",
"@ckeditor/ckeditor5-list": "38.1.1",
"@ckeditor/ckeditor5-markdown-gfm": "38.1.1",
"@ckeditor/ckeditor5-media-embed": "38.1.1",
"@ckeditor/ckeditor5-mention": "38.1.1",
"@ckeditor/ckeditor5-minimap": "38.1.1",
"@ckeditor/ckeditor5-page-break": "38.1.1",
"@ckeditor/ckeditor5-paragraph": "38.1.1",
"@ckeditor/ckeditor5-paste-from-office": "38.1.1",
"@ckeditor/ckeditor5-remove-format": "38.1.1",
"@ckeditor/ckeditor5-restricted-editing": "38.1.1",
"@ckeditor/ckeditor5-select-all": "38.1.1",
"@ckeditor/ckeditor5-show-blocks": "38.1.1",
"@ckeditor/ckeditor5-source-editing": "38.1.1",
"@ckeditor/ckeditor5-special-characters": "38.1.1",
"@ckeditor/ckeditor5-style": "38.1.1",
"@ckeditor/ckeditor5-table": "38.1.1",
"@ckeditor/ckeditor5-theme-lark": "38.1.1",
"@ckeditor/ckeditor5-typing": "38.1.1",
"@ckeditor/ckeditor5-ui": "38.1.1",
"@ckeditor/ckeditor5-undo": "38.1.1",
"@ckeditor/ckeditor5-upload": "38.1.1",
"@ckeditor/ckeditor5-utils": "38.1.1",
"@ckeditor/ckeditor5-watchdog": "38.1.1",
"@ckeditor/ckeditor5-widget": "38.1.1",
"@ckeditor/ckeditor5-word-count": "38.1.1"
},
"devDependencies": {
"@ckeditor/ckeditor5-comments": "38.1.0",
"@ckeditor/ckeditor5-comments": "38.1.1",
"@ckeditor/ckeditor5-dev-bump-year": "^38.0.0",
"@ckeditor/ckeditor5-dev-ci": "^38.0.0",
"@ckeditor/ckeditor5-dev-dependency-checker": "^38.0.0",
Expand All @@ -95,21 +96,20 @@
"@ckeditor/ckeditor5-dev-translations": "^38.0.0",
"@ckeditor/ckeditor5-dev-utils": "^38.0.0",
"@ckeditor/ckeditor5-dev-web-crawler": "^38.0.0",
"@ckeditor/ckeditor5-document-outline": "38.1.0",
"@ckeditor/ckeditor5-export-pdf": "38.1.0",
"@ckeditor/ckeditor5-export-word": "38.1.0",
"@ckeditor/ckeditor5-format-painter": "38.1.0",
"@ckeditor/ckeditor5-import-word": "38.1.0",
"@ckeditor/ckeditor5-document-outline": "38.1.1",
"@ckeditor/ckeditor5-export-pdf": "38.1.1",
"@ckeditor/ckeditor5-export-word": "38.1.1",
"@ckeditor/ckeditor5-format-painter": "38.1.1",
"@ckeditor/ckeditor5-import-word": "38.1.1",
"@ckeditor/ckeditor5-inspector": "^4.0.0",
"@ckeditor/ckeditor5-mermaid": "ckeditor/ckeditor5-mermaid#v0.0.2",
"@ckeditor/ckeditor5-pagination": "38.1.0",
"@ckeditor/ckeditor5-pagination": "38.1.1",
"@ckeditor/ckeditor5-react": "^3.0.0",
"@ckeditor/ckeditor5-real-time-collaboration": "38.1.0",
"@ckeditor/ckeditor5-revision-history": "38.1.0",
"@ckeditor/ckeditor5-show-blocks": "38.1.0",
"@ckeditor/ckeditor5-slash-command": "38.1.0",
"@ckeditor/ckeditor5-template": "38.1.0",
"@ckeditor/ckeditor5-track-changes": "38.1.0",
"@ckeditor/ckeditor5-real-time-collaboration": "38.1.1",
"@ckeditor/ckeditor5-revision-history": "38.1.1",
"@ckeditor/ckeditor5-slash-command": "38.1.1",
"@ckeditor/ckeditor5-template": "38.1.1",
"@ckeditor/ckeditor5-track-changes": "38.1.1",
"@webspellchecker/wproofreader-ckeditor5": "^2.0.1",
"@wiris/mathtype-ckeditor5": "^7.24.0",
"assert": "^2.0.0",
Expand Down Expand Up @@ -138,6 +138,7 @@
"stylelint": "^13.5.0",
"stylelint-config-ckeditor5": "^4.0.0",
"svgo": "^2.2.2",
"table": "^6.8.1",
"terser-webpack-plugin": "^4.2.3",
"umberto": "^3.2.1",
"upath": "^2.0.0",
Expand Down
30 changes: 15 additions & 15 deletions packages/ckeditor5-adapter-ckfinder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-adapter-ckfinder",
"version": "38.1.0",
"version": "38.1.1",
"description": "CKFinder adapter for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,23 +12,23 @@
],
"main": "src/index.ts",
"dependencies": {
"ckeditor5": "38.1.0"
"ckeditor5": "38.1.1"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "38.1.0",
"@ckeditor/ckeditor5-core": "38.1.0",
"@ckeditor/ckeditor5-clipboard": "38.1.0",
"@ckeditor/ckeditor5-basic-styles": "38.1.1",
"@ckeditor/ckeditor5-core": "38.1.1",
"@ckeditor/ckeditor5-clipboard": "38.1.1",
"@ckeditor/ckeditor5-dev-utils": "^38.0.0",
"@ckeditor/ckeditor5-editor-classic": "38.1.0",
"@ckeditor/ckeditor5-enter": "38.1.0",
"@ckeditor/ckeditor5-heading": "38.1.0",
"@ckeditor/ckeditor5-image": "38.1.0",
"@ckeditor/ckeditor5-list": "38.1.0",
"@ckeditor/ckeditor5-paragraph": "38.1.0",
"@ckeditor/ckeditor5-theme-lark": "38.1.0",
"@ckeditor/ckeditor5-typing": "38.1.0",
"@ckeditor/ckeditor5-undo": "38.1.0",
"@ckeditor/ckeditor5-upload": "38.1.0",
"@ckeditor/ckeditor5-editor-classic": "38.1.1",
"@ckeditor/ckeditor5-enter": "38.1.1",
"@ckeditor/ckeditor5-heading": "38.1.1",
"@ckeditor/ckeditor5-image": "38.1.1",
"@ckeditor/ckeditor5-list": "38.1.1",
"@ckeditor/ckeditor5-paragraph": "38.1.1",
"@ckeditor/ckeditor5-theme-lark": "38.1.1",
"@ckeditor/ckeditor5-typing": "38.1.1",
"@ckeditor/ckeditor5-undo": "38.1.1",
"@ckeditor/ckeditor5-upload": "38.1.1",
"typescript": "^4.8.4",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
Expand Down
26 changes: 13 additions & 13 deletions packages/ckeditor5-alignment/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-alignment",
"version": "38.1.0",
"version": "38.1.1",
"description": "Text alignment feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,21 +12,21 @@
],
"main": "src/index.ts",
"dependencies": {
"ckeditor5": "38.1.0"
"ckeditor5": "38.1.1"
},
"devDependencies": {
"@ckeditor/ckeditor5-block-quote": "38.1.0",
"@ckeditor/ckeditor5-core": "38.1.0",
"@ckeditor/ckeditor5-block-quote": "38.1.1",
"@ckeditor/ckeditor5-core": "38.1.1",
"@ckeditor/ckeditor5-dev-utils": "^38.0.0",
"@ckeditor/ckeditor5-editor-classic": "38.1.0",
"@ckeditor/ckeditor5-engine": "38.1.0",
"@ckeditor/ckeditor5-enter": "38.1.0",
"@ckeditor/ckeditor5-heading": "38.1.0",
"@ckeditor/ckeditor5-image": "38.1.0",
"@ckeditor/ckeditor5-list": "38.1.0",
"@ckeditor/ckeditor5-paragraph": "38.1.0",
"@ckeditor/ckeditor5-theme-lark": "38.1.0",
"@ckeditor/ckeditor5-typing": "38.1.0",
"@ckeditor/ckeditor5-editor-classic": "38.1.1",
"@ckeditor/ckeditor5-engine": "38.1.1",
"@ckeditor/ckeditor5-enter": "38.1.1",
"@ckeditor/ckeditor5-heading": "38.1.1",
"@ckeditor/ckeditor5-image": "38.1.1",
"@ckeditor/ckeditor5-list": "38.1.1",
"@ckeditor/ckeditor5-paragraph": "38.1.1",
"@ckeditor/ckeditor5-theme-lark": "38.1.1",
"@ckeditor/ckeditor5-typing": "38.1.1",
"typescript": "^4.8.4",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
Expand Down
Loading

0 comments on commit 59c57a3

Please sign in to comment.