Merge branch 'v0.17.0' into feat-fix-aria

Author: quinnlangille

README.md

@@ -91,6 +91,7 @@ export default {
 | spacePadding                | Number  | 0       | Stage padding option adds left and right padding style (in pixels) onto VueCarousel-inner.                                                                                                                                                                                            |
 | spacePaddingMaxOffsetFactor | Number  | 0       | Specify by how much should the space padding value be multiplied of, to re-arange the final slide padding.                                                                                                                                                                            |
 | speed                       | Number  | 500     | Slide transition speed. Number of milliseconds accepted.                                                                                                                                                                                                                              |
+| tagName                     | String  | slide   | Name (tag) of slide component. Overwrite with coponent name when extending slide component.                                                                                                                                                                                           |
 | value                       | Number  |         | Support for v-model functionality. Setting this value will change the current page to the number inputted (if between 0 and pageCount).                                                                                                                                               |
 
 

src/Carousel.vue

@@ -309,6 +309,14 @@ export default {
       type: Number,
       default: 500
     },
+    /**
+     * Name (tag) of slide component
+     * Overwrite when extending slide component
+     */
+    tagName: {
+      type: String,
+      default: "slide"
+    },
     /**
      * Support for v-model functionality
      */
@@ -633,7 +641,9 @@ export default {
         (this.$slots &&
           this.$slots.default &&
           this.$slots.default.filter(
-            slot => slot.tag && slot.tag.indexOf("slide") > -1
+            slot =>
+              slot.tag &&
+              slot.tag.match(`^vue-component-\\d+-${this.tagName}$`) !== null
           ).length) ||
         0;
     },
@@ -643,7 +653,9 @@ export default {
      */
     getSlide(index) {
       const slides = this.$children.filter(
-        child => child.$vnode.tag.indexOf("slide") > -1
+        child =>
+          child.$vnode.tag.match(`^vue-component-\\d+-${this.tagName}$`) !==
+          null
       );
       return slides[index];
     },

tests/client/components/__snapshots__/carousel.spec.js.snap

@@ -175,6 +175,21 @@ exports[`Carousel should not reset autoplay when switching slide with autoplayHo
 "
 `;
 
+exports[`Carousel should only count slides matching tagName 1`] = `
+".VueCarousel-wrapper
+  .VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
+    .VueCarousel-slide(tabindex='-1')
+    .VueCarousel-slide(tabindex='-1')
+    .VueCarousel-slide(tabindex='-1')
+|  
+.VueCarousel-pagination(style='display: none;')
+  ul.VueCarousel-dot-container(role='tablist')
+    li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
+      button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
+// 
+"
+`;
+
 exports[`Carousel should register 0 slides when 0 slides are added to the slots 1`] = `
 ".VueCarousel-wrapper
   .VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')

tests/client/components/carousel.spec.js

@@ -292,6 +292,24 @@ describe('Carousel', () => {
     return utils.expectToMatchSnapshot(wrapper.vm);
   });
 
+  it('should only count slides matching tagName', () => {
+    const CustomSlide = {
+      extends: Slide,
+      name: 'CustomSlide',
+    };
+    const wrapper = mount(Carousel, {
+      propsData: {
+        tagName: 'CustomSlide'
+      },
+      slots: {
+        default: [CustomSlide, CustomSlide, Slide]
+      }
+    });
+    expect(wrapper.vm.tagName).toBe('CustomSlide');
+    expect(wrapper.vm.slideCount).toBe(2);
+    return utils.expectToMatchSnapshot(wrapper.vm);
+  });
+
   it('should set carousel height to slide height', done => {
     const wrapper = mount(Carousel, {
       propsData: {