From ee97bd2d1592d4469204030cb1d6e97c98980b26 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Wed, 31 Oct 2018 11:49:10 +0100 Subject: [PATCH 1/4] Remove the code that does block the merging of different types blocks --- src/block-management/block-manager.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js index 717e556b61..c874159a06 100644 --- a/src/block-management/block-manager.js +++ b/src/block-management/block-manager.js @@ -185,12 +185,6 @@ export default class BlockManager extends React.Component return; } - // TODO: there is a problem with block transformation - // let's stop here until we fix the problems with block transformation routine - if ( blockA.name !== blockB.name ) { - return; - } - // We can only merge blocks with similar types // thus, we transform the block to merge first const blocksWithTheSameType = blockA.name === blockB.name ? From 39789d8dd2eb496dd538b035b989e9a2567a7c08 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Wed, 31 Oct 2018 12:23:22 +0100 Subject: [PATCH 2/4] Update GB hash --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 9d465966ae..7d2cc6f1d7 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 9d465966aec3c55fb316b079486d9a1cce934af7 +Subproject commit 7d2cc6f1d795c8a99fb32ee40e7699ae8babe08a From 6c974dfcae9ad1ab111637bc6a95edcb9c519218 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Wed, 31 Oct 2018 12:51:59 +0100 Subject: [PATCH 3/4] Add `turbo-combine-reducers` dep and fix tests and build errors --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b59b67b754..6825759611 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "regenerator-runtime": "^0.12.1", "remote-redux-devtools": "^0.5.12", "rungen": "^0.3.2", - "sprintf-js": "^1.1.1" + "sprintf-js": "^1.1.1", + "turbo-combine-reducers": "^1.0.2" }, "scripts": { "start": "yarn react-native start", From ae16a90b4a78f6ef6bde29dab0ab4a4b5cf39517 Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Thu, 1 Nov 2018 19:19:42 +0100 Subject: [PATCH 4/4] Remove ref to turbo-combine-reducers Update GB hash --- gutenberg | 2 +- package.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gutenberg b/gutenberg index 7d2cc6f1d7..5d3c7a1393 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7d2cc6f1d795c8a99fb32ee40e7699ae8babe08a +Subproject commit 5d3c7a139381e3a34469c88cf0aa0d66dd708fef diff --git a/package.json b/package.json index 8aa78c9157..fdcab83d8e 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,7 @@ "regenerator-runtime": "^0.12.1", "remote-redux-devtools": "^0.5.12", "rungen": "^0.3.2", - "sprintf-js": "^1.1.1", - "turbo-combine-reducers": "^1.0.2" + "sprintf-js": "^1.1.1" }, "scripts": { "start": "yarn react-native start",