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.

Sign up for GitHub

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

Block library: Introduce block.json metadata for all client side blocks #14770

Merged
merged 2 commits into from
Apr 9, 2019
Merged

Block library: Introduce block.json metadata for all client side blocks #14770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca40d8
Block library: Introduce block.json metadata for all client side blocks
gziolo Apr 2, 2019
3de1a78
Quote: Stop using constants for attribute keys and move definition to…
gziolo Apr 2, 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
38 changes: 38 additions & 0 deletions packages/block-library/src/audio/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "core/audio",
"category": "common",
"attributes": {
"src": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "src"
},
"caption": {
"type": "string",
"source": "html",
"selector": "figcaption"
},
"id": {
"type": "number"
},
"autoplay": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "autoplay"
},
"loop": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "loop"
},
"preload": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "preload"
}
}
}
42 changes: 4 additions & 38 deletions packages/block-library/src/audio/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ import { __ } from '@wordpress/i18n';
*/
import edit from './edit';
import icon from './icon';
import metadata from './block.json';

export const name = 'core/audio';
const { name } = metadata;

export { metadata, name };

export const settings = {
title: __( 'Audio' ),
Expand All @@ -21,43 +24,6 @@ export const settings = {

icon,

category: 'common',

attributes: {
src: {
type: 'string',
source: 'attribute',
selector: 'audio',
attribute: 'src',
},
caption: {
type: 'string',
source: 'html',
selector: 'figcaption',
},
id: {
type: 'number',
},
autoplay: {
type: 'boolean',
source: 'attribute',
selector: 'audio',
attribute: 'autoplay',
},
loop: {
type: 'boolean',
source: 'attribute',
selector: 'audio',
attribute: 'loop',
},
preload: {
type: 'string',
source: 'attribute',
selector: 'audio',
attribute: 'preload',
},
},

transforms: {
from: [
{
Expand Down
35 changes: 35 additions & 0 deletions packages/block-library/src/button/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "core/button",
"category": "layout",
"attributes": {
"url": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "href"
},
"title": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "title"
},
"text": {
"type": "string",
"source": "html",
"selector": "a"
},
"backgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
}
}
}
39 changes: 3 additions & 36 deletions packages/block-library/src/button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,11 @@ import {
*/
import edit from './edit';
import icon from './icon';
import metadata from './block.json';

const blockAttributes = {
url: {
type: 'string',
source: 'attribute',
selector: 'a',
attribute: 'href',
},
title: {
type: 'string',
source: 'attribute',
selector: 'a',
attribute: 'title',
},
text: {
type: 'string',
source: 'html',
selector: 'a',
},
backgroundColor: {
type: 'string',
},
textColor: {
type: 'string',
},
customBackgroundColor: {
type: 'string',
},
customTextColor: {
type: 'string',
},
};
const { name, attributes: blockAttributes } = metadata;

export const name = 'core/button';
export { metadata, name };

const colorsMigration = ( attributes ) => {
return omit( {
Expand All @@ -68,12 +39,8 @@ export const settings = {

icon,

category: 'layout',

keywords: [ __( 'link' ) ],

attributes: blockAttributes,

supports: {
align: true,
alignWide: false,
Expand Down
10 changes: 10 additions & 0 deletions packages/block-library/src/classic/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "core/freeform",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "html"
}
}
}
14 changes: 4 additions & 10 deletions packages/block-library/src/classic/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ import { __, _x } from '@wordpress/i18n';
*/
import edit from './edit';
import icon from './icon';
import metadata from './block.json';

export const name = 'core/freeform';
const { name } = metadata;

export { metadata, name };

export const settings = {
title: _x( 'Classic', 'block title' ),
Expand All @@ -19,15 +22,6 @@ export const settings = {

icon,

category: 'formatting',

attributes: {
content: {
type: 'string',
source: 'html',
},
},

supports: {
className: false,
customClassName: false,
Expand Down
11 changes: 11 additions & 0 deletions packages/block-library/src/code/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "core/code",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "text",
"selector": "code"
}
}
}
15 changes: 4 additions & 11 deletions packages/block-library/src/code/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ import { createBlock } from '@wordpress/blocks';
*/
import edit from './edit';
import icon from './icon';
import metadata from './block.json';

export const name = 'core/code';
const { name } = metadata;

export { metadata, name };

export const settings = {
title: __( 'Code' ),
Expand All @@ -19,16 +22,6 @@ export const settings = {

icon,

category: 'formatting',

attributes: {
content: {
type: 'string',
source: 'text',
selector: 'code',
},
},

supports: {
html: false,
},
Expand Down
9 changes: 9 additions & 0 deletions packages/block-library/src/column/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "core/column",
"category": "common",
"attributes": {
"verticalAlignment": {
"type": "string"
}
}
}
17 changes: 8 additions & 9 deletions packages/block-library/src/columns/column.js → packages/block-library/src/column/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ import { InnerBlocks, BlockControls, BlockVerticalAlignmentToolbar } from '@word
import { withDispatch, withSelect } from '@wordpress/data';
import { compose } from '@wordpress/compose';

export const name = 'core/column';
/**
* Internal dependencies
*/
import metadata from './block.json';

const { name } = metadata;

export { metadata, name };

const ColumnEdit = ( { attributes, updateAlignment } ) => {
const { verticalAlignment } = attributes;
Expand Down Expand Up @@ -70,14 +77,6 @@ export const settings = {

description: __( 'A single column within a columns block.' ),

category: 'common',

attributes: {
verticalAlignment: {
type: 'string',
},
},

supports: {
inserter: false,
reusable: false,
Expand Down
13 changes: 13 additions & 0 deletions packages/block-library/src/columns/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "core/columns",
"category": "layout",
"attributes": {
"columns": {
"type": "number",
"default": 2
},
"verticalAlignment": {
"type": "string"
}
}
}
17 changes: 4 additions & 13 deletions packages/block-library/src/columns/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,17 @@ import {
import deprecated from './deprecated';
import edit from './edit';
import icon from './icon';
import metadata from './block.json';

export const name = 'core/columns';
const { name } = metadata;

export { metadata, name };

export const settings = {
title: __( 'Columns' ),

icon,

category: 'layout',

attributes: {
columns: {
type: 'number',
default: 2,
},
verticalAlignment: {
type: 'string',
},
},

description: __( 'Add a block that displays content in multiple columns, then add whatever content blocks you’d like.' ),

supports: {
Expand Down
33 changes: 33 additions & 0 deletions packages/block-library/src/cover/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name": "core/cover",
"category": "common",
"attributes": {
"url": {
"type": "string"
},
"id": {
"type": "number"
},
"hasParallax": {
"type": "boolean",
"default": false
},
"dimRatio": {
"type": "number",
"default": 50
},
"overlayColor": {
"type": "string"
},
"customOverlayColor": {
"type": "string"
},
"backgroundType": {
"type": "string",
"default": "image"
},
"focalPoint": {
"type": "object"
}
}
}
Loading