From b570366d2cb3a95f2c9cb95618ff5bae52e8b8a6 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 10:00:28 +0100 Subject: [PATCH 1/6] Enable `autoPlay` as opt-in. Documentation. --- .github/workflows/acceptance.yml | 2 +- Makefile | 2 +- README.md | 10 ++++++++++ src/components/schema.js | 14 +++++++++----- src/index.js | 1 + 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 6d120ae..454337c 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -4,7 +4,7 @@ on: [push] env: ADDON_NAME: "@kitconcept/volto-slider-block" ADDON_PATH: "volto-slider-block" - VOLTO_VERSION: "17.6.0" + VOLTO_VERSION: "17.15.3" jobs: diff --git a/Makefile b/Makefile index a553dce..997ff53 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ RESET=`tput sgr0` YELLOW=`tput setaf 3` PLONE_VERSION=6 -VOLTO_VERSION=17.7.0 +VOLTO_VERSION=17.15.3 ADDON_NAME='@kitconcept/volto-slider-block' ADDON_PATH='volto-slider-block' diff --git a/README.md b/README.md index 15c4c8a..377ac8f 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,16 @@ yarn start Go to http://localhost:3000, login, create a new page. The slider block will show up in the Volto blocks chooser. +## Configuration options + +### `enableAutoPlay` + +This enables the autoplay controls in the block's settings. + +```js +config.blocks.blocksConfig.slider.enableAutoPlay = true; +``` + ## Upgrade Guide ### `volto-slider-block` 6.0.0 diff --git a/src/components/schema.js b/src/components/schema.js index 5358c62..1165d36 100644 --- a/src/components/schema.js +++ b/src/components/schema.js @@ -126,11 +126,15 @@ export const SliderSchema = (props) => title: 'Default', fields: ['slides'], }, - { - id: 'autoplay', - title: props.intl.formatMessage(messages.Autoplay), - fields: ['autoplayEnabled', 'autoplayDelay', 'autoplayJump'], - }, + ...(config.blocks.blocksConfig.slider.enableAutoPlay + ? [ + { + id: 'autoplay', + title: props.intl.formatMessage(messages.Autoplay), + fields: ['autoplayEnabled', 'autoplayDelay', 'autoplayJump'], + }, + ] + : []), ], properties: { slides: { diff --git a/src/index.js b/src/index.js index 6f2486b..d897b0d 100644 --- a/src/index.js +++ b/src/index.js @@ -17,6 +17,7 @@ const applyConfig = (config) => { mostUsed: true, sidebarTab: 1, dataAdapter: SliderBlockDataAdapter, + enableAutoPlay: false, }; return config; }; From 53acbc53f11c70d425c92162f1ce848908222aad Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 10:06:46 +0100 Subject: [PATCH 2/6] Changelog --- news/48.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/48.feature diff --git a/news/48.feature b/news/48.feature new file mode 100644 index 0000000..1d787c7 --- /dev/null +++ b/news/48.feature @@ -0,0 +1 @@ +Enable autoPlay as opt-in. Documentation @sneridagh From 2b179082bab0269972bce14c2a8558edcee6ab75 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 10:30:02 +0100 Subject: [PATCH 3/6] Fix cypress --- acceptance/cypress/tests/block.cy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/cypress/tests/block.cy.js b/acceptance/cypress/tests/block.cy.js index dda3fc1..aab1083 100644 --- a/acceptance/cypress/tests/block.cy.js +++ b/acceptance/cypress/tests/block.cy.js @@ -34,7 +34,7 @@ context('Block Acceptance Tests', () => { // First slide cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-0"] button[aria-label="Open object browser"]', - ).click(); + ).click({ multiple: true }); cy.get('aside .breadcrumbs svg.home-icon').click(); cy.findByLabelText('Select My Page').dblclick(); @@ -46,7 +46,7 @@ context('Block Acceptance Tests', () => { ).should('be.visible'); cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-1"] button[aria-label="Open object browser"]', - ).click(); + ).click({ multiple: true }); cy.get('aside .breadcrumbs svg.home-icon').click(); cy.findByLabelText('Select My Page').dblclick(); From 9b3cefca910600a584a81a65e50b44f5fb41ff51 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 11:33:48 +0100 Subject: [PATCH 4/6] Fix test --- acceptance/cypress/tests/block.cy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/acceptance/cypress/tests/block.cy.js b/acceptance/cypress/tests/block.cy.js index aab1083..f3b5282 100644 --- a/acceptance/cypress/tests/block.cy.js +++ b/acceptance/cypress/tests/block.cy.js @@ -34,8 +34,8 @@ context('Block Acceptance Tests', () => { // First slide cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-0"] button[aria-label="Open object browser"]', - ).click({ multiple: true }); - cy.get('aside .breadcrumbs svg.home-icon').click(); + ).click(); + cy.get('aside .breadcrumbs svg.home-icon').click({force: true}); cy.findByLabelText('Select My Page').dblclick(); // Second slide @@ -46,8 +46,8 @@ context('Block Acceptance Tests', () => { ).should('be.visible'); cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-1"] button[aria-label="Open object browser"]', - ).click({ multiple: true }); - cy.get('aside .breadcrumbs svg.home-icon').click(); + ).click(); + cy.get('aside .breadcrumbs svg.home-icon').click({ multiple: true }); cy.findByLabelText('Select My Page').dblclick(); cy.get('#toolbar-save').click(); From 2143c5c9e76d1585e574c7a23aa3d2557d1d545e Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 11:54:49 +0100 Subject: [PATCH 5/6] What about now --- acceptance/cypress/tests/block.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/cypress/tests/block.cy.js b/acceptance/cypress/tests/block.cy.js index f3b5282..02342b0 100644 --- a/acceptance/cypress/tests/block.cy.js +++ b/acceptance/cypress/tests/block.cy.js @@ -87,7 +87,7 @@ context('Block Acceptance Tests', () => { cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-1"] button[aria-label="Open object browser"]', ).click(); - cy.get('aside .breadcrumbs svg.home-icon').click(); + cy.get('aside .breadcrumbs svg.home-icon').click({ multiple: true }); cy.findByLabelText('Select My Page').dblclick(); cy.get('#toolbar-save').click(); From 8f1854fc96adbced475c1a830cc026cc3afdba4b Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Thu, 7 Mar 2024 16:15:44 +0100 Subject: [PATCH 6/6] Fix again --- acceptance/cypress/tests/block.cy.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/acceptance/cypress/tests/block.cy.js b/acceptance/cypress/tests/block.cy.js index 02342b0..667f13f 100644 --- a/acceptance/cypress/tests/block.cy.js +++ b/acceptance/cypress/tests/block.cy.js @@ -35,7 +35,7 @@ context('Block Acceptance Tests', () => { cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-0"] button[aria-label="Open object browser"]', ).click(); - cy.get('aside .breadcrumbs svg.home-icon').click({force: true}); + cy.get('aside .breadcrumbs svg.home-icon').click(); cy.findByLabelText('Select My Page').dblclick(); // Second slide @@ -47,7 +47,8 @@ context('Block Acceptance Tests', () => { cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-1"] button[aria-label="Open object browser"]', ).click(); - cy.get('aside .breadcrumbs svg.home-icon').click({ multiple: true }); + cy.wait(1000); + cy.get('aside .breadcrumbs svg.home-icon').click(); cy.findByLabelText('Select My Page').dblclick(); cy.get('#toolbar-save').click(); @@ -87,7 +88,8 @@ context('Block Acceptance Tests', () => { cy.get( '.objectbrowser-field[aria-labelledby="fieldset-default-field-label-href-0-slides-1"] button[aria-label="Open object browser"]', ).click(); - cy.get('aside .breadcrumbs svg.home-icon').click({ multiple: true }); + cy.wait(1000); + cy.get('aside .breadcrumbs svg.home-icon').click(); cy.findByLabelText('Select My Page').dblclick(); cy.get('#toolbar-save').click();