-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #77 from liip/feat/row-block-transforms
feat(): Row block transforms
- Loading branch information
Showing
24 changed files
with
2,769 additions
and
3,592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,7 @@ | ||
| { | ||
| "core": "WordPress/WordPress#5.7", | ||
| "core": "https://wordpress.org/wordpress-5.7.2.zip", | ||
| "plugins": [ "." ], | ||
| "env": { | ||
| "tests": { | ||
| "mappings": { | ||
| "wp-content/plugins/wp-bootstrap-blocks-test-plugins": "./e2e-test-plugins" | ||
| } | ||
| } | ||
| "mappings": { | ||
| "wp-content/plugins/wp-bootstrap-blocks-test-plugins": "./e2e-test-plugins" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => '3a27ed384c3dcb99453d681ff5156a5b'); | ||
| <?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-polyfill'), 'version' => 'e62e695a63e7b76aa60ea1b85c9c50ba'); |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| <?php return array('dependencies' => array('wp-polyfill'), 'version' => '17a3d0912e3f28b66ec90f712d14db46'); | ||
| <?php return array('dependencies' => array('wp-polyfill'), 'version' => 'f667eacf17d0bdd32b04f62b195ef00e'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /// <reference types="Cypress" /> | ||
| import { testBlockTransform } from '../../support/row/transform-tests'; | ||
| import { getAllBlocks } from 'cypress-wp-test-utils'; | ||
|
|
||
| context( 'Row Block Transforms', () => { | ||
| describe( 'Custom template enabled', () => { | ||
| beforeEach( () => { | ||
| cy.loginUser(); | ||
| cy.createNewPost(); | ||
| } ); | ||
|
|
||
| it( 'Should be possible to transform 2 blocks to row block', () => { | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
|
|
||
| testBlockTransform(); | ||
| cy.postContentMatchesSnapshot(); | ||
| } ); | ||
|
|
||
| it( 'Should be possible to transform 3 blocks to row block', () => { | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
|
|
||
| testBlockTransform(); | ||
| cy.postContentMatchesSnapshot(); | ||
| } ); | ||
|
|
||
| it( 'Should be possible to transform 4 blocks to row block', () => { | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
|
|
||
| testBlockTransform(); | ||
| cy.postContentMatchesSnapshot(); | ||
| } ); | ||
|
|
||
| it( 'Columns should not be smaller than 3', () => { | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
|
|
||
| testBlockTransform(); | ||
| cy.postContentMatchesSnapshot(); | ||
| } ); | ||
| } ); | ||
|
|
||
| describe( 'Custom template disabled', () => { | ||
| before( () => { | ||
| cy.loginUser(); | ||
| cy.activatePlugin( 'wp-bootstrap-blocks-test-row-filters' ); | ||
| } ); | ||
|
|
||
| after( () => { | ||
| cy.loginUser(); | ||
| cy.deactivatePlugin( 'wp-bootstrap-blocks-test-row-filters' ); | ||
| } ); | ||
|
|
||
| beforeEach( () => { | ||
| cy.loginUser(); | ||
| cy.createNewPost(); | ||
| } ); | ||
|
|
||
| it( 'Should not be possible to transform blocks if custom template is disabled', () => { | ||
| cy.insertBlock( 'Heading' ); | ||
| cy.insertBlock( 'Heading' ); | ||
|
|
||
| return getAllBlocks().then( ( blocks ) => { | ||
| const firstBlockId = blocks[ 0 ].clientId; | ||
| const lastBlockId = blocks[ blocks.length - 1 ].clientId; | ||
|
|
||
| return cy | ||
| .window() | ||
| .then( ( window ) => { | ||
| return window.wp.data | ||
| .dispatch( 'core/block-editor' ) | ||
| .multiSelect( firstBlockId, lastBlockId ); | ||
| } ) | ||
| .then( () => { | ||
| // Transform block | ||
| cy.clickBlockToolbarButton( 'Heading' ); | ||
| cy.get( | ||
| '.editor-block-list-item-wp-bootstrap-blocks-row' | ||
| ).should( 'not.exist' ); | ||
| } ); | ||
| } ); | ||
| } ); | ||
| } ); | ||
| } ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { getAllBlocks } from 'cypress-wp-test-utils'; | ||
|
|
||
| export const testBlockTransform = () => { | ||
| return getAllBlocks().then( ( blocks ) => { | ||
| const blockCount = blocks.length; | ||
| const firstBlockId = blocks[ 0 ].clientId; | ||
| const lastBlockId = blocks[ blocks.length - 1 ].clientId; | ||
| const expectedColumnSize = Math.max( Math.round( 12 / blockCount ), 3 ); | ||
|
|
||
| return cy | ||
| .window() | ||
| .then( ( window ) => { | ||
| return window.wp.data | ||
| .dispatch( 'core/block-editor' ) | ||
| .multiSelect( firstBlockId, lastBlockId ); | ||
| } ) | ||
| .then( () => { | ||
| // Transform block | ||
| cy.clickBlockToolbarButton( 'Heading' ); | ||
| cy.get( | ||
| '.editor-block-list-item-wp-bootstrap-blocks-row' | ||
| ).click(); | ||
|
|
||
| cy.get( | ||
| `[data-type="wp-bootstrap-blocks/column"][data-size-md="${ expectedColumnSize }"]` | ||
| ).should( 'have.length', blockCount ); | ||
| } ); | ||
| } ); | ||
| }; |
2 changes: 1 addition & 1 deletion
2
languages/wp-bootstrap-blocks-de_CH-dfbff627e6c248bcb3b61d7d06da9ca9.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {"translation-revision-date":"2020-10-18 22:25+0200","generator":"WP-CLI\/2.4.0","source":"build\/index.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"de_CH","plural-forms":"nplurals=2; plural=(n != 1);"},"Button":["Button"],"Bootstrap Button":["Bootstrap Button"],"Bootstrap":["Bootstrap"],"Primary":["Primary"],"Secondary":["Secondary"],"Add text...":["Text hinzuf\u00fcgen..."],"Style":["Stil"],"Link settings":["Link-Einstellungen"],"Open in new tab":["In einem neuen Tab \u00f6ffnen"],"Link rel":["Link rel"],"Change button alignment":["\u00c4ndere die Positionierung des Buttons"],"Apply":["\u00dcbernehmen"],"Column":["Column"],"Bootstrap Column":["Bootstrap Column"],"None":["Deaktiviert"],"Small":["Klein"],"Medium":["Mittel"],"Large":["Gross"],"Column size":["Anzahl Spalten"],"Xs Column count":["Xs Anzahl Spalten"],"Xs equal-width":["Xs gleiche Breite (equal-width)"],"Sm Column count":["Sm Anzahl Spalten"],"Sm equal-width":["Sm gleiche Breite (equal-width)"],"Md Column count":["Md Anzahl Spalten"],"Md equal-width":["Md gleiche Breite (equal-width)"],"Lg Column count":["Lg Anzahl Spalten"],"Lg equal-width":["Lg gleiche Breite (equal-width)"],"Xl Column count":["Xl Anzahl Spalten"],"Xl equal-width":["Xl gleiche Breite (equal-width)"],"Xxl Column count":["Xxl Anzahl Spalten"],"Xxl equal-width":["Xxl gleiche Breite (equal-width)"],"Background color":["Hintergrundfarbe"],"Center content vertically in row":["Zeileninhalt vertikal zentrieren"],"This setting only applies if there is no vertical alignment set on the parent row block.":["Diese Einstellung kann nur verwendet werden, wenn auf dem umschliessenden Row-Block keine vertikale Positionierung gesetzt ist."],"Padding (inside column)":["Padding (innerhalb der Spalte)"],"Size":["Gr\u00f6sse"],"Container":["Container"],"Bootstrap Container":["Bootstrap Container"],"Xl":["Xl"],"Lg":["Lg"],"Md":["Md"],"Sm":["Sm"],"Xxl":["Xxl"],"No breakpoint selected":["Kein Breakpoint ausgew\u00e4hlt"],"Fluid":["Fluid"],"Fluid Breakpoint":["Fluid Breakpoint"],"Fluid breakpoints only work with Bootstrap v4.4+. The container will be 100% wide until the specified breakpoint is reached, after which max-widths for each of the higher breakpoints will be applied.":["Fluid Breakpoints werden erst ab Bootstrap v4.4+ unterst\u00fctzt. Wenn die Option aktiviert ist, nimmt der Container 100% der Breite ein bis zum gew\u00e4hlten Breakpoint. Ab diesem Breakpoint gilt die jeweilige maximale Breite (max-width) des Containers."],"Margin":["Margin"],"Margin After":["Margin unterhalb vom Block"],"Row":["Row"],"Bootstrap Row":["Bootstrap Row"],"2 Columns (1:1)":["2 Spalten (1:1)"],"2 Columns (1:2)":["2 Spalten (1:2)"],"2 Columns (2:1)":["2 Spalten (2:1)"],"3 Columns (1:1:1)":["3 Spalten (1:1:1)"],"Custom":["Benutzerdefiniert"],"Bootstrap Default":["Bootstrap Standardwert"],"Bootstrap Default (None)":["Bootstrap Standardwert (Kein Abstand)"],"Align columns left":["Spalten links positionieren"],"Align columns center":["Spalten zentrieren"],"Align columns right":["Spalten rechts positionieren"],"Align columns top":["Spalten oben positionieren"],"Align columns bottom":["Spalten unten positionieren"],"Editor: Display columns stacked":["Editor: Spalten untereinander darstellen"],"Displays stacked columns in editor to enhance readability of block content. This option is only used in the editor and won't affect the output of the row.":["Stellt die Spalten untereinander dar um die Lesbarkeit der Block-Inhalte zu verbessern. Diese Option wird lediglich f\u00fcr den Editor verwendet und ver\u00e4ndert die Ausgabe des Blocks nicht."],"Change layout":["Layout \u00e4ndern"],"Row options":["Zeilen Optionen"],"No Gutters":["Keine Abst\u00e4nde zwischen Spalten (No Gutters)"],"Horizontal Gutters":["Horizontale Abst\u00e4nde zwischen Spalten"],"Vertical Gutters":["Vertikale Abst\u00e4nde zwischen Spalten"],"Change horizontal alignment of columns":["\u00c4ndere die horizontale Positionierung der Spalten"],"Change vertical alignment of columns":["\u00c4ndere die vertikale Positionierung der Spalten"]}}} | ||
| {"translation-revision-date":"2020-10-18 22:25+0200","generator":"WP-CLI\/2.5.0","source":"build\/index.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"de_CH","plural-forms":"nplurals=2; plural=(n != 1);"},"Button":["Button"],"Bootstrap Button":["Bootstrap Button"],"Bootstrap":["Bootstrap"],"Primary":["Primary"],"Secondary":["Secondary"],"Add text...":["Text hinzuf\u00fcgen..."],"Style":["Stil"],"Link settings":["Link-Einstellungen"],"Open in new tab":["In einem neuen Tab \u00f6ffnen"],"Link rel":["Link rel"],"Change button alignment":["\u00c4ndere die Positionierung des Buttons"],"Apply":["\u00dcbernehmen"],"Column":["Column"],"Bootstrap Column":["Bootstrap Column"],"None":["Deaktiviert"],"Small":["Klein"],"Medium":["Mittel"],"Large":["Gross"],"Column size":["Anzahl Spalten"],"Xs Column count":["Xs Anzahl Spalten"],"Xs equal-width":["Xs gleiche Breite (equal-width)"],"Sm Column count":["Sm Anzahl Spalten"],"Sm equal-width":["Sm gleiche Breite (equal-width)"],"Md Column count":["Md Anzahl Spalten"],"Md equal-width":["Md gleiche Breite (equal-width)"],"Lg Column count":["Lg Anzahl Spalten"],"Lg equal-width":["Lg gleiche Breite (equal-width)"],"Xl Column count":["Xl Anzahl Spalten"],"Xl equal-width":["Xl gleiche Breite (equal-width)"],"Xxl Column count":["Xxl Anzahl Spalten"],"Xxl equal-width":["Xxl gleiche Breite (equal-width)"],"Background color":["Hintergrundfarbe"],"Center content vertically in row":["Zeileninhalt vertikal zentrieren"],"This setting only applies if there is no vertical alignment set on the parent row block.":["Diese Einstellung kann nur verwendet werden, wenn auf dem umschliessenden Row-Block keine vertikale Positionierung gesetzt ist."],"Padding (inside column)":["Padding (innerhalb der Spalte)"],"Size":["Gr\u00f6sse"],"Container":["Container"],"Bootstrap Container":["Bootstrap Container"],"Xl":["Xl"],"Lg":["Lg"],"Md":["Md"],"Sm":["Sm"],"Xxl":["Xxl"],"No breakpoint selected":["Kein Breakpoint ausgew\u00e4hlt"],"Fluid":["Fluid"],"Fluid Breakpoint":["Fluid Breakpoint"],"Fluid breakpoints only work with Bootstrap v4.4+. The container will be 100% wide until the specified breakpoint is reached, after which max-widths for each of the higher breakpoints will be applied.":["Fluid Breakpoints werden erst ab Bootstrap v4.4+ unterst\u00fctzt. Wenn die Option aktiviert ist, nimmt der Container 100% der Breite ein bis zum gew\u00e4hlten Breakpoint. Ab diesem Breakpoint gilt die jeweilige maximale Breite (max-width) des Containers."],"Margin":["Margin"],"Margin After":["Margin unterhalb vom Block"],"Row":["Row"],"Bootstrap Row":["Bootstrap Row"],"2 Columns (1:1)":["2 Spalten (1:1)"],"2 Columns (1:2)":["2 Spalten (1:2)"],"2 Columns (2:1)":["2 Spalten (2:1)"],"3 Columns (1:1:1)":["3 Spalten (1:1:1)"],"Custom":["Benutzerdefiniert"],"Bootstrap Default":["Bootstrap Standardwert"],"Bootstrap Default (None)":["Bootstrap Standardwert (Kein Abstand)"],"Align columns left":["Spalten links positionieren"],"Align columns center":["Spalten zentrieren"],"Align columns right":["Spalten rechts positionieren"],"Align columns top":["Spalten oben positionieren"],"Align columns bottom":["Spalten unten positionieren"],"Editor: Display columns stacked":["Editor: Spalten untereinander darstellen"],"Displays stacked columns in editor to enhance readability of block content. This option is only used in the editor and won't affect the output of the row.":["Stellt die Spalten untereinander dar um die Lesbarkeit der Block-Inhalte zu verbessern. Diese Option wird lediglich f\u00fcr den Editor verwendet und ver\u00e4ndert die Ausgabe des Blocks nicht."],"Change layout":["Layout \u00e4ndern"],"Row options":["Zeilen Optionen"],"No Gutters":["Keine Abst\u00e4nde zwischen Spalten (No Gutters)"],"Horizontal Gutters":["Horizontale Abst\u00e4nde zwischen Spalten"],"Vertical Gutters":["Vertikale Abst\u00e4nde zwischen Spalten"],"Change horizontal alignment of columns":["\u00c4ndere die horizontale Positionierung der Spalten"],"Change vertical alignment of columns":["\u00c4ndere die vertikale Positionierung der Spalten"]}}} |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.