Add storing of vertical alignment property for column blocks
[MAILPOET-2609]
This commit is contained in:
committed by
Pavel Dohnal
parent
1c6cffc44d
commit
7cccd68d08
@ -95,6 +95,7 @@ const mapBlocks = (blocks, customFields = [], parent = null) => {
|
|||||||
position: (index + 1).toString(),
|
position: (index + 1).toString(),
|
||||||
type: 'column',
|
type: 'column',
|
||||||
params: {
|
params: {
|
||||||
|
vertical_alignment: block.attributes.verticalAlignment || null,
|
||||||
width: block.attributes.width
|
width: block.attributes.width
|
||||||
? block.attributes.width : Math.round(100 / parent.innerBlocks.length),
|
? block.attributes.width : Math.round(100 / parent.innerBlocks.length),
|
||||||
},
|
},
|
||||||
|
@ -69,6 +69,9 @@ const mapColumnBlocks = (data, customFields = []) => {
|
|||||||
if (has(data.params, 'width')) {
|
if (has(data.params, 'width')) {
|
||||||
mapped.attributes.width = parseFloat(data.params.width);
|
mapped.attributes.width = parseFloat(data.params.width);
|
||||||
}
|
}
|
||||||
|
if (has(data.params, 'vertical_alignment')) {
|
||||||
|
mapped.attributes.verticalAlignment = data.params.vertical_alignment;
|
||||||
|
}
|
||||||
return mapped;
|
return mapped;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -174,6 +174,7 @@ export const nestedColumns = {
|
|||||||
isValid: true,
|
isValid: true,
|
||||||
attributes: {
|
attributes: {
|
||||||
width: 66.66,
|
width: 66.66,
|
||||||
|
verticalAlignment: 'center',
|
||||||
},
|
},
|
||||||
innerBlocks: [
|
innerBlocks: [
|
||||||
{
|
{
|
||||||
|
@ -314,6 +314,7 @@ describe('Blocks to Form Body', () => {
|
|||||||
const column2 = columns.body[1];
|
const column2 = columns.body[1];
|
||||||
expect(column1.type).to.be.equal('column');
|
expect(column1.type).to.be.equal('column');
|
||||||
expect(column1.params.width).to.be.equal(66.66);
|
expect(column1.params.width).to.be.equal(66.66);
|
||||||
|
expect(column1.params.vertical_alignment).to.be.equal('center');
|
||||||
expect(column1.body.length).to.be.equal(2);
|
expect(column1.body.length).to.be.equal(2);
|
||||||
expect(column2.type).to.be.equal('column');
|
expect(column2.type).to.be.equal('column');
|
||||||
expect(column2.body.length).to.be.equal(1);
|
expect(column2.body.length).to.be.equal(1);
|
||||||
|
@ -323,6 +323,8 @@ describe('Form Body To Blocks', () => {
|
|||||||
// First level
|
// First level
|
||||||
const column1 = blocks[1].innerBlocks[0];
|
const column1 = blocks[1].innerBlocks[0];
|
||||||
expect(column1.name).to.be.equal('core/column');
|
expect(column1.name).to.be.equal('core/column');
|
||||||
|
expect(column1.attributes.width).to.be.equal(66.66);
|
||||||
|
expect(column1.attributes.verticalAlignment).to.be.equal('center');
|
||||||
expect(column1.innerBlocks.length).to.be.equal(2);
|
expect(column1.innerBlocks.length).to.be.equal(2);
|
||||||
const columns11 = column1.innerBlocks[0];
|
const columns11 = column1.innerBlocks[0];
|
||||||
checkBlockBasics(column1.innerBlocks[1]);
|
checkBlockBasics(column1.innerBlocks[1]);
|
||||||
@ -330,7 +332,6 @@ describe('Form Body To Blocks', () => {
|
|||||||
expect(column2.name).to.be.equal('core/column');
|
expect(column2.name).to.be.equal('core/column');
|
||||||
expect(column2.innerBlocks.length).to.be.equal(1);
|
expect(column2.innerBlocks.length).to.be.equal(1);
|
||||||
checkBlockBasics(column1.innerBlocks[0]);
|
checkBlockBasics(column1.innerBlocks[0]);
|
||||||
|
|
||||||
// Second level
|
// Second level
|
||||||
expect(columns11.innerBlocks.length).to.be.equal(2);
|
expect(columns11.innerBlocks.length).to.be.equal(2);
|
||||||
const column11 = columns11.innerBlocks[0];
|
const column11 = columns11.innerBlocks[0];
|
||||||
|
@ -184,6 +184,7 @@ export const nestedColumns = {
|
|||||||
type: 'column',
|
type: 'column',
|
||||||
params: {
|
params: {
|
||||||
width: 66.66,
|
width: 66.66,
|
||||||
|
vertical_alignment: 'center',
|
||||||
},
|
},
|
||||||
body: [
|
body: [
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user