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.

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

feat(storefront): BCTHEME-78 Add Play/Pause button to carousel #1944

Merged
merged 2 commits into from
Jan 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Draft
- Add Play/Pause button to carousel. [#1944](https://github.com/bigcommerce/cornerstone/pull/1944)
- Alt text not provided for ratings. [#1949](https://github.com/bigcommerce/cornerstone/pull/1949)
- Fixed announcement for product on adding to cart. [#1950](https://github.com/bigcommerce/cornerstone/pull/1950)
- Fixed non-text contrast on add to cart modal according to WCAG AA standard. [#1946](https://github.com/bigcommerce/cornerstone/pull/1946)
Expand Down
4 changes: 4 additions & 0 deletions assets/js/theme/common/carousel/utils/heroCarouselSetup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import playPause from './playPause';

const showCarouselIfSlidesAnalyzedSetup = ($carousel) => {
const analyzedSlides = [];
return ($slides) => ($slide) => {
Expand All @@ -11,6 +13,8 @@ const showCarouselIfSlidesAnalyzedSetup = ($carousel) => {
export default ($heroCarousel) => {
if ($heroCarousel.length === 0) return;

playPause($heroCarousel);

const $slidesNodes = $heroCarousel.find('.heroCarousel-slide');
const showCarouselIfSlidesAnalyzed = showCarouselIfSlidesAnalyzedSetup($heroCarousel)($slidesNodes);

Expand Down
38 changes: 38 additions & 0 deletions assets/js/theme/common/carousel/utils/playPause.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { throttle } from 'lodash';

const playAction = 'slickPlay';
const pauseAction = 'slickPause';

export default ($heroCarousel) => {
const $playPauseButton = $('.js-hero-play-pause-button');

if ($playPauseButton.length === 0) return;

const slickSettings = $heroCarousel[0].slick;
if (!slickSettings) return;

const { slideCount, options: { speed } } = slickSettings;
if (slideCount < 2) {
$playPauseButton.css('display', 'none');
return;
}

const onPlayPauseClick = () => {
const isCarouselPlaying = $playPauseButton.data('play');
const action = isCarouselPlaying ? pauseAction : playAction;
const {
play,
ariaPlay,
pause,
ariaPause,
} = $playPauseButton.data('labels');

$heroCarousel.slick(action);
$playPauseButton
.data('play', !isCarouselPlaying)
.text(action === playAction ? pause : play)
.attr('aria-label', action === playAction ? ariaPause : ariaPlay);
};

$playPauseButton.on('click', throttle(onPlayPauseClick, speed, { trailing: false }));
};
35 changes: 34 additions & 1 deletion assets/scss/components/stencil/heroCarousel/_heroCarousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
left: 25px;
}
}

.slick-dots {
bottom: spacing("third");

Expand Down Expand Up @@ -224,3 +223,37 @@
margin-top: spacing("single");
}
}

.heroCarousel-play-pause-button {
position: absolute;
left: 15px;
bottom: spacing("third");
height: 32px;
min-width: 80px;
max-width: 90px;
font-size: 14px;
line-height: 1.25;
font-weight: 700;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: $slick-play-pause-button-color;
transition: color 100ms ease-out;
z-index: zIndex("lowest");
border: 1px solid $slick-play-pause-button-borderColor;
@include carouselOpaqueBackgrounds($slick-play-pause-button-bgColor);

@include breakpoint("small") {
max-width: 150px;
font-size: 18px;
}

@include breakpoint("medium") {
left: 25px;
bottom: spacing("single");
}

&:hover {
color: $slick-play-pause-button-color-hover;
}
}
40 changes: 22 additions & 18 deletions assets/scss/settings/vendor/slick/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,28 @@
//
// -----------------------------------------------------------------------------

$slick-font-path: "./fonts/";
$slick-font-family: inherit;
$slick-loader-path: null;
$slick-arrow-color: stencilColor("carousel-arrow-color");
$slick-arrow-color-hover: stencilColor("carousel-arrow-color--hover");
$slick-arrow-bgColor: rgba(stencilColor("carousel-arrow-bgColor"), 0.9);
$slick-arrow-borderColor: stencilColor("carousel-arrow-borderColor");
$slick-dot-color: stencilColor("carousel-dot-color");
$slick-dot-color-active: stencilColor("carousel-dot-color-active");
$slick-dot-bgColor: rgba(stencilColor("carousel-dot-bgColor"), 0.9);
$slick-prev-character: "";
$slick-next-character: "";
$slick-dot-character: "";
$slick-dot-size: 60px;
$slick-opacity-default: 1;
$slick-opacity-on-hover: 0.8;
$slick-opacity-not-active: 0.6;
$slick-arrows-offset: -5px;
$slick-font-path: "./fonts/";
$slick-font-family: inherit;
$slick-loader-path: null;
$slick-arrow-color: stencilColor("carousel-arrow-color");
$slick-arrow-color-hover: stencilColor("carousel-arrow-color--hover");
$slick-arrow-bgColor: rgba(stencilColor("carousel-arrow-bgColor"), 0.9);
$slick-arrow-borderColor: stencilColor("carousel-arrow-borderColor");
$slick-play-pause-button-color: stencilColor("carousel-play-pause-button-textColor");
$slick-play-pause-button-color-hover: stencilColor("carousel-play-pause-button-textColor--hover");
$slick-play-pause-button-bgColor: rgba(stencilColor("carousel-play-pause-button-bgColor"), 0.9);
$slick-play-pause-button-borderColor: stencilColor("carousel-play-pause-button-borderColor");
$slick-dot-color: stencilColor("carousel-dot-color");
$slick-dot-color-active: stencilColor("carousel-dot-color-active");
$slick-dot-bgColor: rgba(stencilColor("carousel-dot-bgColor"), 0.9);
$slick-prev-character: "";
$slick-next-character: "";
$slick-dot-character: "";
$slick-dot-size: 60px;
$slick-opacity-default: 1;
$slick-opacity-on-hover: 0.8;
$slick-opacity-not-active: 0.6;
$slick-arrows-offset: -5px;


// Stencil Additional Settings
Expand Down
13 changes: 13 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"homepage_top_products_count": 4,
"homepage_show_carousel": true,
"homepage_show_carousel_arrows": true,
"homepage_show_carousel_play_pause_button": true,
"homepage_stretch_carousel_images": false,
"homepage_new_products_column_count": 4,
"homepage_featured_products_column_count": 4,
Expand Down Expand Up @@ -179,6 +180,10 @@
"carousel-arrow-color--hover": "#474747",
"carousel-arrow-bgColor": "#ffffff",
"carousel-arrow-borderColor": "#ffffff",
"carousel-play-pause-button-textColor": "8f8f8f",
"carousel-play-pause-button-textColor--hover": "#474747",
"carousel-play-pause-button-bgColor": "#ffffff",
"carousel-play-pause-button-borderColor": "#ffffff",
"card-title-color": "#333333",
"card-title-color-hover": "#757575",
"card-figcaption-button-background": "#ffffff",
Expand Down Expand Up @@ -474,6 +479,10 @@
"carousel-arrow-color--hover": "#474747",
"carousel-arrow-bgColor": "#ffffff",
"carousel-arrow-borderColor": "#ffffff",
"carousel-play-pause-button-textColor": "#8F8F8F",
"carousel-play-pause-button-textColor--hover": "#474747",
"carousel-play-pause-button-bgColor": "#ffffff",
"carousel-play-pause-button-borderColor": "#ffffff",
"card-title-color": "#ff957f",
"card-title-color-hover": "#fab9a3",
"card-figcaption-button-background": "#85cdcf",
Expand Down Expand Up @@ -679,6 +688,10 @@
"carousel-arrow-color--hover": "#765B42",
"carousel-arrow-bgColor": "#ffffff",
"carousel-arrow-borderColor": "#ffffff",
"carousel-play-pause-button-textColor": "#D47A21",
"carousel-play-pause-button-textColor--hover": "#765B42",
"carousel-play-pause-button-bgColor": "#ffffff",
"carousel-play-pause-button-borderColor": "#ffffff",
"card-title-color": "#bd5b00",
"card-title-color-hover": "#7f5e3f",
"card-figcaption-button-background": "#f3b679",
Expand Down
6 changes: 5 additions & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,11 @@
"carousel": {
"arrowAriaLabel": "Go to slide [NUMBER] of",
"dotAriaLabel": "Slide number",
"activeDotAriaLabel": "active"
"activeDotAriaLabel": "active",
"playPauseButtonPlay": "Play",
"playPauseButtonPause": "Pause",
"playPauseButtonAriaPlay": "Play carousel",
"playPauseButtonAriaPause": "Pause carousel"
},
"validation_messages": {
"valid_email": "You must enter a valid email.",
Expand Down
21 changes: 21 additions & 0 deletions schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,12 @@
"force_reload": true,
"id": "homepage_show_carousel_arrows"
},
{
"type": "checkbox",
"label": "i18n.ShowCarouselPlayPauseButton",
"force_reload": true,
"id": "homepage_show_carousel_play_pause_button"
},
{
"type": "checkbox",
"label": "i18n.AllowImageToStretchOn",
Expand Down Expand Up @@ -1041,6 +1047,21 @@
"label": "i18n.ArrowBorder",
"id": "carousel-arrow-borderColor"
},
{
"type": "color",
"label": "i18n.PlayPauseButtonText",
"id": "carousel-play-pause-button-textColor"
},
{
"type": "color",
"label": "i18n.PlayPauseButtonBackground",
"id": "carousel-play-pause-button-bgColor"
},
{
"type": "color",
"label": "i18n.PlayPauseButtonBorder",
"id": "carousel-play-pause-button-borderColor"
},
{
"type": "heading",
"content": "i18n.Products"
Expand Down
28 changes: 28 additions & 0 deletions schemaTranslations.json
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,13 @@
"uk": "Показати стрілки каруселі",
"zh": "显示轮播箭头"
},
"i18n.ShowCarouselPlayPauseButton": {
"default": "Show carousel Play/Pause button",
"fr": "Show carousel Play/Pause button",
"it": "Show carousel Play/Pause button",
"uk": "Show carousel Play/Pause button",
"zh": "Show carousel Play/Pause button"
},
"i18n.AllowImageToStretchOn": {
"default": "Allow image to stretch on large screens",
"fr": "Permettre à l’image de s’étirer sur de grands écrans",
Expand Down Expand Up @@ -1006,6 +1013,27 @@
"uk": "Кордон стрілки",
"zh": "箭头边框"
},
"i18n.PlayPauseButtonText": {
"default": "Play/Pause button text",
"fr": "Play/Pause button text",
"it": "Play/Pause button text",
"uk": "Play/Pause button text",
"zh": "Play/Pause button text"
},
"i18n.PlayPauseButtonBackground": {
"default": "Play/Pause button background",
"fr": "Play/Pause button background",
"it": "Play/Pause button background",
"uk": "Play/Pause button background",
"zh": "Play/Pause button background"
},
"i18n.PlayPauseButtonBorder": {
"default": "Play/Pause button border",
"fr": "Play/Pause button border",
"it": "Play/Pause button border",
"uk": "Play/Pause button border",
"zh": "Play/Pause button border"
},
"i18n.NumberOfFeaturedProducts": {
"default": "Number of featured products",
"fr": "Nombre de produits en vedette",
Expand Down
15 changes: 15 additions & 0 deletions templates/components/carousel.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,19 @@
{{#and arrows (if carousel.slides.length '>' 1)}}
<button aria-label="{{lang 'carousel.arrowAriaLabel'}} {{carousel.slides.length}}" class="js-hero-next-arrow slick-next slick-arrow"></button>
{{/and}}
{{#if play_pause_button}}
<button
type="button"
class="heroCarousel-play-pause-button js-hero-play-pause-button"
aria-label="{{lang 'carousel.playPauseButton.ariaPause'}}"
data-play="true"
data-labels='{
"play": "{{lang 'carousel.playPauseButtonPlay'}}",
"pause": "{{lang 'carousel.playPauseButtonPause'}}",
"ariaPlay": "{{lang 'carousel.playPauseButtonAriaPlay'}}",
"ariaPause": "{{lang 'carousel.playPauseButtonAriaPause'}}"
}'>
{{lang 'carousel.playPauseButtonPause'}}
</button>
{{/if}}
</section>
2 changes: 1 addition & 1 deletion templates/pages/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{{#partial "hero"}}
{{{region name="home_below_menu"}}}
{{#if carousel}}
{{> components/carousel arrows=theme_settings.homepage_show_carousel_arrows}}
{{> components/carousel arrows=theme_settings.homepage_show_carousel_arrows play_pause_button=theme_settings.homepage_show_carousel_play_pause_button}}
{{/if}}
{{{region name="home_below_carousel"}}}
{{/partial}}
Expand Down