From edcbe11ec52e92c99305bc06c0b2ee379e78b6f3 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 13 May 2019 14:20:33 -0400 Subject: [PATCH 01/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 295a381838..f4435d421c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 295a381838c03ace2d239a6cbb426b1285c1cc69 +Subproject commit f4435d421c40349e3f774912f90799f475065a05 From b16976381746b9b13387fd2ce0413bb431e74931 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 13 May 2019 17:41:25 -0400 Subject: [PATCH 02/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index f4435d421c..97e6800d23 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit f4435d421c40349e3f774912f90799f475065a05 +Subproject commit 97e6800d23a73c583a19965bea98483b417cdd73 From 4c77940092f8a1628546e4be6e6f532a1a7906b0 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 13 May 2019 17:56:45 -0400 Subject: [PATCH 03/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 97e6800d23..af2fb2f4a5 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 97e6800d23a73c583a19965bea98483b417cdd73 +Subproject commit af2fb2f4a5fe0c0d40257fa75a7962667539357d From 8f3a39d2f469c3a252cb5b32b2c2fcb4456fb263 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 14 May 2019 18:19:34 -0400 Subject: [PATCH 04/21] Updated gutenberg submodule --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index af2fb2f4a5..580be02967 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit af2fb2f4a5fe0c0d40257fa75a7962667539357d +Subproject commit 580be02967123b526f2cc34f246f44f68f4958cb From cfe4a190f53328d341dde736aad11bf2bbf6cbb4 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 15 May 2019 17:38:01 -0400 Subject: [PATCH 05/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c216b48679..9a1acd2ed5 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c216b48679e1ef8136612e206f4f96d87c31e1cf +Subproject commit 9a1acd2ed5b128fce6749a31ce8920f790514e33 From ff095868bdee25943700654eba937a5b62fa34ec Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 16 May 2019 10:08:12 -0400 Subject: [PATCH 06/21] Updated gutenberg submodule --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 9a1acd2ed5..1ec2db0708 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 9a1acd2ed5b128fce6749a31ce8920f790514e33 +Subproject commit 1ec2db0708b4991a1a1b1c5915dbc11ae4f03907 From c288131ebc1d935f51724efaf632a8fdee2ed8ae Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 16 May 2019 15:26:39 -0400 Subject: [PATCH 07/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 1ec2db0708..25aa9ca157 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 1ec2db0708b4991a1a1b1c5915dbc11ae4f03907 +Subproject commit 25aa9ca157db261b467890c5036f694eb2d39ae2 From 593c5468074df35eadcc84e975c3dbb6add3c389 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 16 May 2019 18:42:15 -0400 Subject: [PATCH 08/21] Use Icon component instead of local method for re-creating SVG --- gutenberg | 2 +- src/block-management/block-picker.js | 12 ++---------- src/block-management/block-picker.scss | 3 +++ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gutenberg b/gutenberg index 25aa9ca157..27eda920ac 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 25aa9ca157db261b467890c5036f694eb2d39ae2 +Subproject commit 27eda920ac2791c51dfd4fe13b63c0e90a20335c diff --git a/src/block-management/block-picker.js b/src/block-management/block-picker.js index a3f16efd0e..3c612b6b22 100644 --- a/src/block-management/block-picker.js +++ b/src/block-management/block-picker.js @@ -12,7 +12,7 @@ import { FlatList, Text, TouchableHighlight, View } from 'react-native'; /** * WordPress dependencies */ -import { SVG } from '@wordpress/components'; +import { Icon } from '@wordpress/components'; import { BottomSheet } from '@wordpress/block-editor'; import { Component } from '@wordpress/element'; import { getBlockTypes, getUnregisteredTypeHandlerName } from '@wordpress/blocks'; @@ -64,7 +64,7 @@ export default class BlockPicker extends Component { - { this.iconWithUpdatedFillColor( styles.modalIcon.fill, item.icon ) } + { item.title } @@ -76,14 +76,6 @@ export default class BlockPicker extends Component { ); } - iconWithUpdatedFillColor( color: string, icon: SVG ) { - return ( - - { icon.src.props.children } - - ); - } - calculateNumberOfColumns() { const bottomSheetWidth = BottomSheet.getWidth(); const { paddingLeft: itemPaddingLeft, paddingRight: itemPaddingRight } = styles.modalItem; diff --git a/src/block-management/block-picker.scss b/src/block-management/block-picker.scss index b11aa74918..1f39a54eee 100644 --- a/src/block-management/block-picker.scss +++ b/src/block-management/block-picker.scss @@ -42,6 +42,9 @@ height: 32px; justify-content: center; align-items: center; +} + +.icon { fill: $gray-dark; } From 1428652670d5ef78b2c9deb0eb5a45b2c2c7bd9e Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 16 May 2019 19:24:59 -0400 Subject: [PATCH 09/21] Updated gutenberg submodule ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 27eda920ac..429292598c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 27eda920ac2791c51dfd4fe13b63c0e90a20335c +Subproject commit 429292598c32aecbc5ee11a67e6a576d20440453 From c465425e24a3d18112f12e9a530405dad80c332f Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Fri, 17 May 2019 13:35:46 +0300 Subject: [PATCH 10/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 429292598c..21a42c498e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 429292598c32aecbc5ee11a67e6a576d20440453 +Subproject commit 21a42c498eabd9954b7809bd53a8887086d482ba From c2fbca9da6f33e88e4adcb352bddf7b83ee5eadd Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Fri, 17 May 2019 14:29:12 +0300 Subject: [PATCH 11/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 21a42c498e..542ae59e24 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 21a42c498eabd9954b7809bd53a8887086d482ba +Subproject commit 542ae59e24ebd16d33c94702ca7bc82a020ecfa6 From 188429fca7ede4a2b204c618433fe370bdf27c87 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Fri, 17 May 2019 14:40:39 +0300 Subject: [PATCH 12/21] Add style mocks for unit-tests --- __mocks__/styleMock.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js index 3fd7196880..51ac1cd022 100644 --- a/__mocks__/styleMock.js +++ b/__mocks__/styleMock.js @@ -58,4 +58,10 @@ module.exports = { modalIcon: { fill: 'gray', }, + icon: { + fill: 'gray', + }, + iconRetry: { + fill: 'gray', + }, }; From 13d0bd1827d0fa4abfc20be507979e180503591c Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Sat, 18 May 2019 00:03:41 +0300 Subject: [PATCH 13/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 542ae59e24..40655169be 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 542ae59e24ebd16d33c94702ca7bc82a020ecfa6 +Subproject commit 40655169be88be7590a5eb48dcdd0a24f5feafde From a24756b1b68e260679f29db95f5399b3b905757e Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Sat, 18 May 2019 00:03:52 +0300 Subject: [PATCH 14/21] Add new mock style --- __mocks__/styleMock.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js index 51ac1cd022..2d77874313 100644 --- a/__mocks__/styleMock.js +++ b/__mocks__/styleMock.js @@ -64,4 +64,7 @@ module.exports = { iconRetry: { fill: 'gray', }, + iconUploading: { + fill: 'gray', + }, }; From 7f0a31717084ea05dd5f512a57bed98f027e080a Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Mon, 20 May 2019 17:12:10 +0300 Subject: [PATCH 15/21] Reverse icon fix --- src/block-management/block-picker.js | 12 ++++++++++-- src/block-management/block-picker.scss | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/block-management/block-picker.js b/src/block-management/block-picker.js index 3c612b6b22..a3f16efd0e 100644 --- a/src/block-management/block-picker.js +++ b/src/block-management/block-picker.js @@ -12,7 +12,7 @@ import { FlatList, Text, TouchableHighlight, View } from 'react-native'; /** * WordPress dependencies */ -import { Icon } from '@wordpress/components'; +import { SVG } from '@wordpress/components'; import { BottomSheet } from '@wordpress/block-editor'; import { Component } from '@wordpress/element'; import { getBlockTypes, getUnregisteredTypeHandlerName } from '@wordpress/blocks'; @@ -64,7 +64,7 @@ export default class BlockPicker extends Component { - + { this.iconWithUpdatedFillColor( styles.modalIcon.fill, item.icon ) } { item.title } @@ -76,6 +76,14 @@ export default class BlockPicker extends Component { ); } + iconWithUpdatedFillColor( color: string, icon: SVG ) { + return ( + + { icon.src.props.children } + + ); + } + calculateNumberOfColumns() { const bottomSheetWidth = BottomSheet.getWidth(); const { paddingLeft: itemPaddingLeft, paddingRight: itemPaddingRight } = styles.modalItem; diff --git a/src/block-management/block-picker.scss b/src/block-management/block-picker.scss index 1f39a54eee..b11aa74918 100644 --- a/src/block-management/block-picker.scss +++ b/src/block-management/block-picker.scss @@ -42,9 +42,6 @@ height: 32px; justify-content: center; align-items: center; -} - -.icon { fill: $gray-dark; } From 66338199c0c7a16b113621e7fb018a6ed394ed60 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Mon, 20 May 2019 17:12:38 +0300 Subject: [PATCH 16/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 40655169be..c4a0bd5c0c 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 40655169be88be7590a5eb48dcdd0a24f5feafde +Subproject commit c4a0bd5c0c5732d564ab7d9ca51536d158a6f931 From 623f1cf3a11cb0fa1c491f5956270fb70633acc8 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Mon, 20 May 2019 17:27:21 +0300 Subject: [PATCH 17/21] Handle function type during creating icons --- src/block-management/block-picker.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/block-management/block-picker.js b/src/block-management/block-picker.js index d13770dc08..032dd41456 100644 --- a/src/block-management/block-picker.js +++ b/src/block-management/block-picker.js @@ -14,7 +14,7 @@ import { FlatList, Text, TouchableHighlight, View } from 'react-native'; */ import { SVG, Dashicon } from '@wordpress/components'; import { BottomSheet } from '@wordpress/block-editor'; -import { Component } from '@wordpress/element'; +import { Component, createElement } from '@wordpress/element'; import { getBlockTypes, getUnregisteredTypeHandlerName } from '@wordpress/blocks'; /** @@ -87,6 +87,11 @@ export default class BlockPicker extends Component { { icon.src.props.children } ); + } else if ( 'function' === typeof icon.src ) { + if ( icon.src.prototype instanceof Component ) { + return createElement( icon.src, { fill: color, size: styles.modalIcon.width } ); + } + return icon.src( { fill: color, size: styles.modalIcon.width } ); } } From c7a7fb8f281cf74fdc3e408a0a6c59a4ea01b244 Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Mon, 20 May 2019 18:14:22 +0300 Subject: [PATCH 18/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c4a0bd5c0c..30e98b04b1 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c4a0bd5c0c5732d564ab7d9ca51536d158a6f931 +Subproject commit 30e98b04b1ae48406170ea994f315b3f39c0b8ba From 3cd6143b5ca926dd0cae3c1b14893e4d2c3e409e Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 21 May 2019 10:37:46 +0300 Subject: [PATCH 19/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 30e98b04b1..deaa780c1d 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 30e98b04b1ae48406170ea994f315b3f39c0b8ba +Subproject commit deaa780c1d053f0831c56c9b9e12d4fe0b5c5dd9 From 3df6e836310593f0fdb611fae9830739d00caf2e Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 21 May 2019 10:51:05 +0300 Subject: [PATCH 20/21] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index deaa780c1d..32037e868a 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit deaa780c1d053f0831c56c9b9e12d4fe0b5c5dd9 +Subproject commit 32037e868a840407f870d76a164470f4c03c96c7 From a316a42edb9afd8596281ec69e78f516984a95be Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Tue, 21 May 2019 11:13:22 +0300 Subject: [PATCH 21/21] Update gutenberg ref to master --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 32037e868a..0773762250 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 32037e868a840407f870d76a164470f4c03c96c7 +Subproject commit 0773762250afaec366e58d4e9e19c52efa92519a