Skip to content

Commit 36e3909

Browse files
committed
Upgrade Draftail to v1.2.1. Fix wagtail#4985
This includes: - [v1.0.0](https://github.com/springload/draftail/releases/tag/v1.0.0) (identical to v0.17.2) - [v1.1.0](https://github.com/springload/draftail/releases/tag/v1.1.0) (contains fix for wagtail#4985) - [v1.2.0](https://github.com/springload/draftail/releases/tag/v1.2.0) - [v1.2.1](https://github.com/springload/draftail/releases/tag/v1.2.1) (fixes regression in v1.2.0) Here is the combined CHANGELOG for what's relevant to Wagtail: Bug fixes ~~~~~~~~~ - wagtail#4985 – Prevent crash when filtering pasted content whose last block is to be removed (e.g. unsupported image) ([wagtail#179](springload/draftail#179)). - Stop unnecessarily calling `onSave` in the editor’s `onBlur` ([wagtail#173](springload/draftail#173)). - Prevent crash in `DraftUtils.getEntitySelection`, when the provided entity key isn't valid (undefined, missing) ([wagtail#168](springload/draftail#168)). - Fix entity removal and editing not doing anything when the selection is backwards (right to left) ([wagtail#168](springload/draftail#168)). - Prevent the editor from crashing when copy-paste filtering removes all of its content (thibaudcolas/draftjs-filters@652750f) New features ~~~~~~~~~~~~ - Add support for Markdown shortcuts for inline styles, e.g. `**` for bold, `_` for italic, etc ([wagtail#134](springload/draftail#134), [wagtail#187](springload/draftail#187)). View the full list of [keyboard shortcuts](https://www.draftail.org/docs/keyboard-shortcuts). New APIs ~~~~~~~~ - Add [`onFocus`](https://www.draftail.org/docs/api#managing-focus) and [`onBlur`](https://www.draftail.org/docs/api#managing-focus) props to use callbacks on those events. This can be useful for [form validation](https://www.draftail.org/docs/next/form-validation). [wagtail#170](springload/draftail#170), [wagtail#174](springload/draftail#174), thanks to [@TheSpicyMeatball](https://github.com/TheSpicyMeatball). - Add [`plugins`](https://www.draftail.org/docs/plugins) API to support extensions of the editor using the [draft-js-plugins](https://github.com/draft-js-plugins/draft-js-plugins) architecture ([wagtail#83](springload/draftail#83), [wagtail#171](springload/draftail#171)). - Add ability to disable or customise the editor toolbar with [`topToolbar`](https://www.draftail.org/docs/customising-toolbars). - Add ability to add a toolbar below the editor with [`bottomToolbar`](https://www.draftail.org/docs/customising-toolbars). - Add data reset parameter to `DraftUtils.resetBlockWithType()`. - Enable list continuation on Enter for custom `*-list-item` blocks. All that’s required is for the block type to end with `-list-item`. None of those API additions will be usable within Wagtail (at least without hacks) until corresponding rich text features APIs are built to allow their configuration. The last 2 additions would already be usable but they would only be useful when leveraging the other APIs.
1 parent e0fc0da commit 36e3909

File tree

3 files changed

+2719
-2685
lines changed

3 files changed

+2719
-2685
lines changed

client/src/components/Draftail/__snapshots__/index.test.js.snap

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Object {
77
"autoComplete": null,
88
"autoCorrect": null,
99
"blockTypes": Array [],
10+
"bottomToolbar": null,
1011
"controls": Array [],
1112
"decorators": Array [],
1213
"enableHorizontalRule": Object {
@@ -25,8 +26,11 @@ Object {
2526
],
2627
"inlineStyles": Array [],
2728
"maxListNesting": 4,
29+
"onBlur": null,
30+
"onFocus": null,
2831
"onSave": [Function],
2932
"placeholder": "Write here…",
33+
"plugins": Array [],
3034
"rawContentState": null,
3135
"showRedoControl": Object {
3236
"description": "Redo",
@@ -39,6 +43,7 @@ Object {
3943
"stripPastedStyles": false,
4044
"textAlignment": null,
4145
"textDirectionality": null,
46+
"topToolbar": [Function],
4247
}
4348
`;
4449

0 commit comments

Comments
 (0)