Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shortcut provider crash #67

Merged
merged 4 commits into from
Sep 30, 2021
Merged

Fix shortcut provider crash #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53322e3
Add ShortcutProvider
johngodley Sep 30, 2021
30591aa
Bump all packages
johngodley Sep 30, 2021
470d1ac
Bundle shortcut fix
johngodley Sep 30, 2021
5225d10
Update changelog for 2.4.3
johngodley Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
### [2.4.3] - 2021-09-30

### Fixed

- Use `ShortcutProvider` to prevent crash with Gutenberg 11.6.0

### [2.4.2] - 2021-09-27

Expand Down
4 changes: 2 additions & 2 deletions build-browser/isolated-block-editor.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions build-module/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build-module/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions build-types/components/with-registry-provider/reusable-store/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ declare var _default: {
selectors: typeof selectors;
};
export default _default;
import * as actions from "./actions";
import * as selectors from "./selectors";
//# sourceMappingURL=index.d.ts.map
2 changes: 1 addition & 1 deletion build-types/index.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions build/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

88 changes: 44 additions & 44 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,53 +34,53 @@
"author": "Automattic",
"license": "GPL-2.0-or-later",
"dependencies": {
"@wordpress/a11y": "^3.2.1",
"@wordpress/annotations": "^2.2.2",
"@wordpress/api-fetch": "^5.2.1",
"@wordpress/a11y": "^3.2.2",
"@wordpress/annotations": "^2.2.3",
"@wordpress/api-fetch": "^5.2.2",
"@wordpress/autop": "^3.2.1",
"@wordpress/base-styles": "^3.6.0",
"@wordpress/base-styles": "^4.0.0",
"@wordpress/blob": "^3.2.1",
"@wordpress/block-editor": "^7.0.1",
"@wordpress/block-library": "^5.0.1",
"@wordpress/block-editor": "^7.0.2",
"@wordpress/block-library": "^6.0.0",
"@wordpress/block-serialization-default-parser": "^4.2.1",
"@wordpress/block-serialization-spec-parser": "^4.2.0",
"@wordpress/blocks": "^11.0.1",
"@wordpress/components": "^16.0.0",
"@wordpress/compose": "^5.0.1",
"@wordpress/core-data": "^4.0.1",
"@wordpress/data": "^6.0.1",
"@wordpress/data-controls": "^2.2.2",
"@wordpress/blocks": "^11.1.0",
"@wordpress/components": "^17.0.0",
"@wordpress/compose": "^5.0.2",
"@wordpress/core-data": "^4.0.2",
"@wordpress/data": "^6.1.0",
"@wordpress/data-controls": "^2.2.3",
"@wordpress/date": "^4.2.1",
"@wordpress/deprecated": "^3.2.1",
"@wordpress/dom": "^3.2.2",
"@wordpress/dom": "^3.2.3",
"@wordpress/dom-ready": "^3.2.1",
"@wordpress/editor": "^11.0.1",
"@wordpress/element": "^4.0.0",
"@wordpress/editor": "^11.0.2",
"@wordpress/element": "^4.0.1",
"@wordpress/escape-html": "^2.2.1",
"@wordpress/format-library": "^3.0.1",
"@wordpress/format-library": "^3.0.2",
"@wordpress/hooks": "^3.2.0",
"@wordpress/html-entities": "^3.2.1",
"@wordpress/i18n": "^4.2.1",
"@wordpress/icons": "^5.0.1",
"@wordpress/interface": "^4.0.1",
"@wordpress/i18n": "^4.2.2",
"@wordpress/icons": "^5.0.2",
"@wordpress/interface": "^4.1.0",
"@wordpress/is-shallow-equal": "^4.2.0",
"@wordpress/keyboard-shortcuts": "^3.0.1",
"@wordpress/keycodes": "^3.2.1",
"@wordpress/list-reusable-blocks": "^3.0.1",
"@wordpress/media-utils": "^3.0.0",
"@wordpress/notices": "^3.2.2",
"@wordpress/plugins": "^4.0.1",
"@wordpress/primitives": "^3.0.0",
"@wordpress/keyboard-shortcuts": "^3.0.2",
"@wordpress/keycodes": "^3.2.2",
"@wordpress/list-reusable-blocks": "^3.0.2",
"@wordpress/media-utils": "^3.0.1",
"@wordpress/notices": "^3.2.3",
"@wordpress/plugins": "^4.0.2",
"@wordpress/primitives": "^3.0.1",
"@wordpress/priority-queue": "^2.2.1",
"@wordpress/react-i18n": "^3.0.0",
"@wordpress/react-i18n": "^3.0.1",
"@wordpress/redux-routine": "^4.2.1",
"@wordpress/reusable-blocks": "^3.0.1",
"@wordpress/rich-text": "^5.0.1",
"@wordpress/server-side-render": "^3.0.1",
"@wordpress/reusable-blocks": "^3.0.2",
"@wordpress/rich-text": "^5.0.2",
"@wordpress/server-side-render": "^3.0.2",
"@wordpress/shortcode": "^3.2.1",
"@wordpress/token-list": "^2.2.0",
"@wordpress/url": "^3.2.1",
"@wordpress/viewport": "^4.0.1",
"@wordpress/url": "^3.2.2",
"@wordpress/viewport": "^4.0.2",
"@wordpress/warning": "^2.2.1",
"@wordpress/wordcount": "^3.2.1",
"classnames": "^2.3.1",
Expand All @@ -94,10 +94,10 @@
"yjs": "^13.5.12"
},
"devDependencies": {
"@babel/cli": "^7.15.4",
"@babel/cli": "^7.15.7",
"@babel/core": "^7.15.5",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.4",
"@babel/preset-env": "^7.15.6",
"@babel/preset-react": "^7.14.5",
"@storybook/addon-actions": "^6.3.8",
"@storybook/addon-essentials": "^6.3.8",
Expand All @@ -106,27 +106,27 @@
"@storybook/manager-webpack5": "^6.3.8",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^6.3.8",
"@wordpress/babel-preset-default": "^6.3.1",
"@wordpress/prettier-config": "^1.1.0",
"@wordpress/scripts": "^18.0.0",
"@wordpress/babel-preset-default": "^6.3.2",
"@wordpress/prettier-config": "^1.1.1",
"@wordpress/scripts": "^18.0.1",
"babel-loader": "^8.2.2",
"babel-plugin-inline-json-import": "^0.3.2",
"css-loader": "^6.2.0",
"css-loader": "^6.3.0",
"eslint": "^7.32.0",
"eslint-config-wpcalypso": "^6.1.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-inclusive-language": "^2.1.1",
"eslint-plugin-jest": "^24.4.0",
"eslint-plugin-jest": "^24.5.0",
"eslint-plugin-jsdoc": "^36.1.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react": "^7.26.1",
"eslint-plugin-wpcalypso": "^5.0.0",
"mini-css-extract-plugin": "^2.2.2",
"mini-css-extract-plugin": "^2.3.0",
"prettier": "npm:[email protected]",
"release-it": "^14.11.5",
"release-it": "^14.11.6",
"sass-loader": "^12.1.0",
"typescript": "^4.4.2",
"webpack": "^5.52.0",
"typescript": "^4.4.3",
"webpack": "^5.55.1",
"webpack-cli": "^4.8.0"
},
"release-it": {
Expand Down
23 changes: 12 additions & 11 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { registerCoreBlocks } from '@wordpress/block-library';
import { addFilter } from '@wordpress/hooks';
import { use } from '@wordpress/data';
import '@wordpress/format-library';
import { ShortcutProvider } from '@wordpress/keyboard-shortcuts';

/**
* Internal dependencies
Expand Down Expand Up @@ -183,17 +184,17 @@ function IsolatedBlockEditor( props ) {

return (
<StrictMode>
<div className="interface-interface-skeleton__content" />

<ContentSaver onSaveBlocks={ onSaveBlocks } onSaveContent={ onSaveContent } />
<EditorSetup settings={ settings } />
<PatternMonitor />

<SlotFillProvider>
<BlockEditorContainer { ...params } settings={ settings }>
{ children }
</BlockEditorContainer>
</SlotFillProvider>
<ShortcutProvider>
<ContentSaver onSaveBlocks={ onSaveBlocks } onSaveContent={ onSaveContent } />
<EditorSetup settings={ settings } />
<PatternMonitor />

<SlotFillProvider>
<BlockEditorContainer { ...params } settings={ settings }>
{ children }
</BlockEditorContainer>
</SlotFillProvider>
</ShortcutProvider>
</StrictMode>
);
}
Expand Down
Loading