Video block ui/ux enhancements (#979)

* Updated gutenberg submodule ref * Updated gutenberg submodule ref * Updated gutenberg submodule ref * Updated gutenberg submodule * Updated gutenberg submodule ref * Updated gutenberg submodule * Updated gutenberg submodule ref * Use Icon component instead of local method for re-creating SVG * Updated gutenberg submodule ref * Update gutenberg ref * Update gutenberg ref * Add style mocks for unit-tests * Update gutenberg ref * Add new mock style * Reverse icon fix * Update gutenberg ref * Handle function type during creating icons * Update gutenberg ref * Update gutenberg ref * Update gutenberg ref * Update gutenberg ref to master
wordpress-mobile · May 21, 2019 · 95add06 · 95add06
1 parent 52feb26
commit 95add06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js
@@ -58,4 +58,13 @@ module.exports = {
 	modalIcon: {
 		fill: 'gray',
 	},
+	icon: {
+		fill: 'gray',
+	},
+	iconRetry: {
+		fill: 'gray',
+	},
+	iconUploading: {
+		fill: 'gray',
+	},
 };
diff --git a/gutenberg b/gutenberg
diff --git 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<PropsType> {
 					{ icon.src.props.children }
 				</SVG>
 			);
+		} 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 } );
 		}
 	}
+1 −1		README.md
+1 −1		gutenberg.php
+0 −1		package-lock.json
+2 −2		packages/block-editor/src/components/inner-blocks/README.md
+9 −14		packages/block-editor/src/components/media-placeholder/index.native.js
+10 −2		packages/block-editor/src/components/media-placeholder/styles.native.scss
+31 −7		packages/block-library/src/image/edit.native.js
+10 −0		packages/block-library/src/image/icon-retry.js
+5 −1		packages/block-library/src/image/icon.js
+2 −4		packages/block-library/src/image/media-upload-progress.native.js
+21 −1		packages/block-library/src/image/styles.native.scss
+1 −3		packages/block-library/src/shortcode/editor.scss
+30 −10		packages/block-library/src/video/edit.native.js
+10 −0		packages/block-library/src/video/icon-retry.js
+5 −1		packages/block-library/src/video/icon.js
+35 −2		packages/block-library/src/video/style.native.scss
+4 −2		packages/block-library/src/video/video-player.android.js
+2 −2		packages/block-library/src/video/video-player.ios.js
+1 −1		packages/blocks/README.md
+1 −1		packages/blocks/src/api/registration.js
+1 −0		packages/components/CHANGELOG.md
+4 −1		packages/components/src/date-time/time.js
+1 −2		packages/components/src/slot-fill/context.js
+37 −45		packages/components/src/slot-fill/fill.js
+1 −1		packages/components/src/slot-fill/slot.js
+6 −3		packages/components/src/spinner/index.native.js
+4 −0		packages/components/src/spinner/style.native.scss
+5 −1		packages/custom-templated-path-webpack-plugin/CHANGELOG.md
+0 −0		packages/custom-templated-path-webpack-plugin/index.js
+1 −5		packages/custom-templated-path-webpack-plugin/package.json