From 9befaaa4523cba40ed4647eff5cc3ffd1cb279c0 Mon Sep 17 00:00:00 2001 From: Darren Ethier Date: Sun, 24 Mar 2019 15:12:05 -0400 Subject: [PATCH 1/3] =?UTF-8?q?ensure=20there=E2=80=99s=20accounting=20for?= =?UTF-8?q?=20object=20being=20undefined.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/block-library/src/columns/edit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js index af5431807645d4..e415f79f3552cf 100644 --- a/packages/block-library/src/columns/edit.js +++ b/packages/block-library/src/columns/edit.js @@ -82,15 +82,18 @@ export const ColumnsEdit = function( { attributes, setAttributes, className, upd ); }; +const DEFAULT_EMPTY_ARRAY = []; + export default compose( /** * Selects the child column Blocks for this parent Column */ withSelect( ( select, { clientId } ) => { const { getBlocksByClientId } = select( 'core/editor' ); + const blocks = getBlocksByClientId( clientId )[ 0 ]; return { - childColumns: getBlocksByClientId( clientId )[ 0 ].innerBlocks, + childColumns: blocks ? blocks.innerBlocks : DEFAULT_EMPTY_ARRAY, }; } ), withDispatch( ( dispatch, { clientId, childColumns } ) => { From ea01d273319b8ef0987a7fad4fd82c08c73d4416 Mon Sep 17 00:00:00 2001 From: Darren Ethier Date: Sun, 24 Mar 2019 15:17:10 -0400 Subject: [PATCH 2/3] add changelog entry --- packages/block-library/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md index 34ac5b9d4807d9..30a19230105eaa 100644 --- a/packages/block-library/CHANGELOG.md +++ b/packages/block-library/CHANGELOG.md @@ -2,6 +2,10 @@ - Add vertical alignment controls to `columns` Block ([#13899](https://github.com/WordPress/gutenberg/pull/13899/)). +### Bug Fixes + +- fix uncaught error in `columns` block due to accessing a property on an object that might be undefined [#14605](https://github.com/WordPress/gutenberg/pull/14605) + ## 2.3.0 (2019-03-06) ### New Feature From 8fb701f4b51263dad2b990b9319f777317718f3d Mon Sep 17 00:00:00 2001 From: Darren Ethier Date: Sun, 24 Mar 2019 15:20:04 -0400 Subject: [PATCH 3/3] improve variable name --- packages/block-library/src/columns/edit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/block-library/src/columns/edit.js b/packages/block-library/src/columns/edit.js index e415f79f3552cf..206b313427cf99 100644 --- a/packages/block-library/src/columns/edit.js +++ b/packages/block-library/src/columns/edit.js @@ -90,10 +90,10 @@ export default compose( */ withSelect( ( select, { clientId } ) => { const { getBlocksByClientId } = select( 'core/editor' ); - const blocks = getBlocksByClientId( clientId )[ 0 ]; + const block = getBlocksByClientId( clientId )[ 0 ]; return { - childColumns: blocks ? blocks.innerBlocks : DEFAULT_EMPTY_ARRAY, + childColumns: block ? block.innerBlocks : DEFAULT_EMPTY_ARRAY, }; } ), withDispatch( ( dispatch, { clientId, childColumns } ) => {