Skip to content

Commit

Permalink
Merge pull request #141 from wordpress-mobile/feature/image-block
Browse files Browse the repository at this point in the history
Most basic image block
  • Loading branch information
daniloercoli authored Sep 13, 2018
2 parents aec516b + ebc2876 commit e6d6ed9
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 73 files
+1 −1 composer.json
+9 −6 docs/block-api.md
+1 −1 docs/design.md
+3 −1 docs/extensibility/extending-blocks.md
+6 −0 docs/manifest.json
+4 −1 docs/readme.md
+1 −1 edit-post/components/header/index.js
+10 −3 edit-post/components/keyboard-shortcut-help-modal/config.js
+2 −2 edit-post/components/keyboard-shortcut-help-modal/index.js
+7 −2 edit-post/components/keyboard-shortcut-help-modal/test/__snapshots__/index.js.snap
+7 −6 edit-post/components/sidebar/settings-header/index.js
+13 −0 edit-post/components/sidebar/settings-header/style.scss
+1 −1 edit-post/components/sidebar/sidebar-header/index.js
+1 −1 edit-post/components/visual-editor/block-inspector-button.js
+2 −1 edit-post/keyboard-shortcuts.js
+2 −2 package-lock.json
+1 −1 packages/block-library/src/archives/edit.js
+4 −4 packages/block-library/src/block/edit-panel/style.scss
+1 −1 packages/block-library/src/block/edit.js
+3 −3 packages/block-library/src/block/indicator/style.scss
+14 −6 packages/block-library/src/gallery/editor.scss
+18 −2 packages/block-library/src/gallery/style.scss
+11 −0 packages/block-library/src/image/edit.native.js
+2 −0 packages/block-library/src/index.native.js
+1 −1 packages/block-library/src/latest-comments/edit.js
+9 −8 packages/block-library/src/quote/index.js
+1 −1 packages/block-serialization-default-parser/README.md
+1 −1 packages/block-serialization-default-parser/parser.php
+4 −3 packages/block-serialization-spec-parser/README.md
+7 −1 packages/blocks/CHANGELOG.md
+0 −1 packages/blocks/src/api/index.js
+0 −33 packages/blocks/src/api/registration.js
+1 −0 packages/components/package.json
+3 −3 packages/components/src/menu-item/index.js
+0 −10 packages/components/src/menu-item/shortcut.js
+7 −3 packages/components/src/menu-item/test/__snapshots__/index.js.snap
+0 −4 packages/components/src/popover/index.js
+4 −3 packages/components/src/server-side-render/index.js
+22 −7 packages/components/src/server-side-render/test/index.js
+30 −0 packages/components/src/shortcut/index.js
+41 −0 packages/components/src/shortcut/test/index.js
+7 −6 packages/components/src/slot-fill/slot.js
+2 −1 packages/components/src/tooltip/index.js
+1 −1 packages/components/src/tooltip/test/index.js
+10 −0 packages/editor/CHANGELOG.md
+43 −0 packages/editor/src/components/block-compare/README.md
+28 −0 packages/editor/src/components/block-compare/block-view.js
+88 −0 packages/editor/src/components/block-compare/index.js
+77 −0 packages/editor/src/components/block-compare/style.scss
+38 −0 packages/editor/src/components/block-compare/test/__snapshots__/block-view.js.snap
+18 −0 packages/editor/src/components/block-compare/test/block-view.js
+15 −5 packages/editor/src/components/block-list/block-html.js
+82 −34 packages/editor/src/components/block-list/block-invalid-warning.js
+3 −3 packages/editor/src/components/block-list/block.js
+21 −8 packages/editor/src/components/block-list/style.scss
+110 −0 packages/editor/src/components/block-list/test/block-html.js
+0 −2 packages/editor/src/components/colors/index.js
+0 −32 packages/editor/src/components/colors/utils.js
+2 −11 packages/editor/src/components/colors/with-colors.js
+1 −0 packages/editor/src/components/index.js
+6 −29 packages/editor/src/components/rich-text/index.js
+6 −0 packages/editor/src/components/rich-text/index.native.js
+0 −14 packages/editor/src/components/rich-text/test/index.js
+3 −0 packages/editor/src/components/server-side-render/README.md
+18 −0 packages/editor/src/components/server-side-render/index.js
+1 −0 packages/editor/src/style.scss
+4 −0 packages/element/CHANGELOG.md
+1 −0 packages/element/src/index.js
+1 −5 packages/element/src/test/utils.js
+0 −0 packages/element/src/utils.js
+38 −7 packages/keycodes/src/index.js
+51 −0 packages/keycodes/src/test/index.js
+5 −1 test/e2e/specs/reusable-blocks.test.js
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
},
"dependencies": {
"@wordpress/autop": "^1.0.6",
"@wordpress/blob": "^2.0.0",
"@wordpress/compose": "^1.0.1",
"@wordpress/deprecated": "^1.0.0-alpha.2",
"@wordpress/element": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion rn-cli.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
// On the other hand, GB packages that are loaded from the source tree directly
// are automagically resolved by Metro so, there is no list of them anywhere.
return blacklist( [
/gutenberg\/packages\/(autop|compose|deprecated|hooks|i18n|is-shallow-equal)\/.*/,
/gutenberg\/packages\/(autop|compose|deprecated|hooks|i18n|is-shallow-equal|blob)\/.*/,
] );
},
getTransformModulePath() {
Expand Down
4 changes: 4 additions & 0 deletions src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ registerBlockType( UnsupportedBlock.name, UnsupportedBlock.settings );
setUnknownTypeHandlerName( UnsupportedBlock.name );

const initialHtml = `
<!-- wp:image -->
<figure class="wp-block-image"><img alt=""/></figure>
<!-- /wp:image -->
<!-- wp:title -->
Hello World
<!-- /wp:title -->
Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,12 @@
pirates "^4.0.0"
source-map-support "^0.4.2"

"@babel/runtime@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
dependencies:
regenerator-runtime "^0.12.0"

"@babel/runtime@^7.0.0-beta.52":
version "7.0.0-beta.54"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.54.tgz#39ebb42723fe7ca4b3e1b00e967e80138d47cadf"
Expand Down Expand Up @@ -536,6 +542,12 @@
babel-plugin-transform-runtime "^6.23.0"
babel-preset-env "^1.6.1"

"@wordpress/blob@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@wordpress/blob/-/blob-2.0.0.tgz#b310674a93f7484c0b4492e6698aba55a1e04f48"
dependencies:
"@babel/runtime" "^7.0.0"

"@wordpress/block-serialization-spec-parser@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@wordpress/block-serialization-spec-parser/-/block-serialization-spec-parser-1.0.0.tgz#a51a9276421629d4be398dfcc9bab52e303c3403"
Expand Down

0 comments on commit e6d6ed9

Please sign in to comment.