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.

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

Video block ui/ux enhancements #979

Merged
merged 26 commits into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
edcbe11
Updated gutenberg submodule ref
marecar3 May 13, 2019
b169763
Updated gutenberg submodule ref
marecar3 May 13, 2019
4c77940
Updated gutenberg submodule ref
marecar3 May 13, 2019
8f3a39d
Updated gutenberg submodule
marecar3 May 14, 2019
b12d5ad
Merge branch 'develop' into fix/video-block-ui-ux-enhancements
marecar3 May 15, 2019
cfe4a19
Updated gutenberg submodule ref
marecar3 May 15, 2019
ff09586
Updated gutenberg submodule
marecar3 May 16, 2019
f7ec757
Merge branch 'develop' into fix/video-block-ui-ux-enhancements
marecar3 May 16, 2019
c288131
Updated gutenberg submodule ref
marecar3 May 16, 2019
593c546
Use Icon component instead of local method for re-creating SVG
marecar3 May 16, 2019
1428652
Updated gutenberg submodule ref
marecar3 May 16, 2019
c465425
Update gutenberg ref
pinarol May 17, 2019
c2fbca9
Update gutenberg ref
pinarol May 17, 2019
7a42780
Merge branch 'develop' into fix/video-block-ui-ux-enhancements
pinarol May 17, 2019
188429f
Add style mocks for unit-tests
pinarol May 17, 2019
13d0bd1
Update gutenberg ref
pinarol May 17, 2019
a24756b
Add new mock style
pinarol May 17, 2019
7f0a317
Reverse icon fix
pinarol May 20, 2019
6633819
Update gutenberg ref
pinarol May 20, 2019
3949741
Merge branch 'develop' into fix/video-block-ui-ux-enhancements
pinarol May 20, 2019
623f1cf
Handle function type during creating icons
pinarol May 20, 2019
c7a7fb8
Update gutenberg ref
pinarol May 20, 2019
f8dbed1
Merge branch 'develop' into fix/video-block-ui-ux-enhancements
pinarol May 20, 2019
3cd6143
Update gutenberg ref
pinarol May 21, 2019
3df6e83
Update gutenberg ref
pinarol May 21, 2019
a316a42
Update gutenberg ref to master
pinarol May 21, 2019
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
9 changes: 9 additions & 0 deletions __mocks__/styleMock.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,13 @@ module.exports = {
modalIcon: {
fill: 'gray',
},
icon: {
fill: 'gray',
},
iconRetry: {
fill: 'gray',
},
iconUploading: {
fill: 'gray',
},
};
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 30 files
+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
7 changes: 6 additions & 1 deletion src/block-management/block-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down Expand Up @@ -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 } );
}
}

Expand Down