Merge pull request #1095 from rei/v12-release

V12 release
rei · Apr 29, 2022 · 311523e · 311523e
2 parents c06fbeb + ac25eb7
commit 311523e
Show file tree

Hide file tree

Showing 11 changed files with 158 additions and 608 deletions.
diff --git a/build/component-variables-transfer.js b/build/component-variables-transfer.js
@@ -8,7 +8,6 @@ const SUPPORTED_COMPONENTS = [
   /* global vars */
   'options.vars.scss',
   /* component vars */
-  'CdrBanner.vars.scss',
   'CdrButton.vars.scss',
   'CdrCard.vars.scss',
   'CdrChip.vars.scss',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rei/cedar",
-  "version": "11.3.1",
+  "version": "12.0.0",
   "description": "REI Cedar Component Library",
   "homepage": "https://rei.github.io/rei-cedar/",
   "license": "MIT",
@@ -67,7 +67,7 @@
     "babel-plugin-istanbul": "^6.0.0",
     "backstopjs": "^5.3.7",
     "chalk": "^4.1.1",
-    "chromedriver": "^98.0.0",
+    "chromedriver": "^99.0.0",
     "codecov": "^3.8.2",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",

diff --git a/src/components/breadcrumb/CdrBreadcrumb.jsx b/src/components/breadcrumb/CdrBreadcrumb.jsx
@@ -93,20 +93,13 @@ export default {
           key={breadcrumb.item.id || breadcrumb.item.name.replace(/ /g, '-').toLowerCase()}
           v-show={!this.truncate || (index >= this.items.length - 2)}
         >
-          {this.$scopedSlots.link
-            ? this.$scopedSlots.link({
-              class: this.style['cdr-breadcrumb__link'],
-              href: breadcrumb.item.url,
-              content: breadcrumb.item.name,
-            })
-            : (<a
-              class={this.style['cdr-breadcrumb__link']}
-              href={breadcrumb.item.url}
-              onClick={(e) => this.$emit('navigate', breadcrumb, e)}
-            >
-              { breadcrumb.item.name }
-            </a>)
-          }
+          <a
+            class={this.style['cdr-breadcrumb__link']}
+            href={breadcrumb.item.url}
+            onClick={(e) => this.$emit('navigate', breadcrumb, e)}
+          >
+            { breadcrumb.item.name }
+          </a>
           {delimiter}
         </li>);
       });

diff --git a/src/components/breadcrumb/__tests__/CdrBreadcrumb.spec.js b/src/components/breadcrumb/__tests__/CdrBreadcrumb.spec.js
@@ -114,25 +114,6 @@ describe('CdrBreadcrumb', () => {
     expect(wrapper.vm.truncate).toBe(true);
   });
 
-  it('breadcrumb link can be overridden with link scopedSlot', () => {
-    const wrapper = shallowMount(CdrBreadcrumb, {
-      propsData: {
-        items: [
-          {
-            item: {
-              url: 'http://rei.com',
-              name: 'Scoped',
-            },
-          },
-        ],
-      },
-      scopedSlots: {
-        link: '<p slot-scope="link">{{link.href}} TEST {{link.content}} {{link.class}}</p>'
-      }
-    });
-    expect(wrapper.text()).toBe('http://rei.com TEST Scoped cdr-breadcrumb__link');
-  });
-
   it('applies focus to first breadcrumb on ellipsis click', async (done) => {
     const elem = document.createElement('div')
     if (document.body) {

diff --git a/src/components/breadcrumb/examples/Breadcrumb.vue b/src/components/breadcrumb/examples/Breadcrumb.vue
@@ -38,22 +38,6 @@
       data-backstop="breadcrumbs-default"
       @navigate="handleClick"
     />
-    <h3>
-      Scoped Slot
-    </h3>
-    <cdr-breadcrumb :items="reiExampleBreadcrumbItems">
-      <template
-        slot="link"
-        slot-scope="link"
-      >
-        <a
-          :class="link.class"
-          :href="link.href"
-        >
-          {{ link.content }}
-        </a>
-      </template>
-    </cdr-breadcrumb>
   </div>
 </template>
 

diff --git a/src/components/pagination/CdrPagination.jsx b/src/components/pagination/CdrPagination.jsx
@@ -184,20 +184,17 @@ export default {
       const LinkTag = this.linkTag;
       return this.innerValue > this.pages[0].page ? (
         <li>
-          {this.$scopedSlots.prevLink
-            ? this.$scopedSlots.prevLink(this.prevElAttrs)
-            : (<LinkTag
-              {... { attrs: this.prevElAttrs.attrs }}
-              href={LinkTag === 'a' && this.prevElAttrs.href}
-              ref={this.prevElAttrs.attrs.ref}
-              onClick={this.prevElAttrs.click}
-            >
-              <this.prevElAttrs.iconComponent
-                class={this.prevElAttrs.iconClass}
-              />
-              {this.prevElAttrs.content}
-            </LinkTag>)
-          }
+          <LinkTag
+            {... { attrs: this.prevElAttrs.attrs }}
+            href={LinkTag === 'a' && this.prevElAttrs.href}
+            ref={this.prevElAttrs.attrs.ref}
+            onClick={this.prevElAttrs.click}
+          >
+            <this.prevElAttrs.iconComponent
+              class={this.prevElAttrs.iconClass}
+            />
+            {this.prevElAttrs.content}
+          </LinkTag>
         </li>
       ) : (
         <li aria-hidden="true">
@@ -240,9 +237,7 @@ export default {
       const LinkTag = this.linkTag;
       return this.innerValue < this.pages[this.totalPageData - 1].page ? (
         <li>
-          {this.$scopedSlots.nextLink
-            ? this.$scopedSlots.nextLink(this.nextElAttrs)
-            : (<LinkTag
+          <LinkTag
               {... { attrs: this.nextElAttrs.attrs }}
               href={LinkTag === 'a' && this.nextElAttrs.href}
               ref={this.nextElAttrs.attrs.ref}
@@ -252,9 +247,7 @@ export default {
               <this.nextElAttrs.iconComponent
                 class={this.nextElAttrs.iconClass}
               />
-            </LinkTag>)
-          }
-
+            </LinkTag>
         </li>
       ) : (
         <li aria-hidden="true">
@@ -347,18 +340,8 @@ export default {
         }
       });
     },
-    select(page, e) {
-      e.preventDefault();
-      if (this.$scopedSlots.link) {
-        const ref = this.$scopedSlots.link()[0].context.$refs[`page-link-${page}-${this.componentID}`]; // eslint-disable-line max-len
-        if (ref.$el) { // it's a component (like vue-router)
-          ref.$el.click();
-        } else { // it's standard markup
-          ref.click();
-        }
-      } else {
-        this.$refs[`page-link-${page}-${this.componentID}`].click();
-      }
+    select(page) {
+      this.$refs[`page-link-${page}-${this.componentID}`].click();
     },
     guid() {
       function s4() {
@@ -387,8 +370,8 @@ export default {
       };
 
       const LinkTag = this.linkTag;
-      return (this.$scopedSlots.link ? this.$scopedSlots.link(linkData)
-        : <LinkTag
+      return (
+        <LinkTag
           {... { attrs: linkData.attrs } }
           href={LinkTag === 'a' && linkData.href}
           onClick={linkData.click}