Merge pull request #1003 from rei/fix-radio-inherit

fix(form): fix SSR inheritAtttrs bug on radio/checkbox
rei · Mar 9, 2021 · ac0627b · ac0627b
2 parents d2b777b + ff2a2d7
commit ac0627b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
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": "8.0.0-beta.7",
+  "version": "8.0.0-beta.8",
   "description": "REI Cedar Component Library",
   "homepage": "https://rei.github.io/rei-cedar/",
   "license": "MIT",

diff --git a/src/components/labelWrapper/CdrLabelWrapper.jsx b/src/components/labelWrapper/CdrLabelWrapper.jsx
@@ -7,6 +7,7 @@ import propValidator from '../../utils/propValidator';
 export default {
   name: 'CdrLabelWrapper',
   mixins: [modifier, size],
+  inheritAttrs: false,
   props: {
     labelClass: String,
     contentClass: String,

diff --git a/src/components/labelWrapper/__tests__/CdrLabelWrapper.spec.js b/src/components/labelWrapper/__tests__/CdrLabelWrapper.spec.js
@@ -8,6 +8,8 @@ describe('CdrLabelWrapper', () => {
         labelClass: 'custom-label-class',
         contentClass: 'custom-content-class',
         name: 'testName',
+        class: 'foo',
+        'data-ui': 'wrapper',
         modifier: 'hide-figure',
         size: 'medium'
       },

diff --git a/src/components/labelWrapper/__tests__/__snapshots__/CdrLabelWrapper.spec.js.snap b/src/components/labelWrapper/__tests__/__snapshots__/CdrLabelWrapper.spec.js.snap
@@ -3,7 +3,6 @@
 exports[`CdrLabelWrapper matches snapshot 1`] = `
 <div
   class="cdr-label-wrapper__container"
-  name="testName"
 >
   <label
     class="cdr-label-wrapper cdr-label-wrapper--primary cdr-label-wrapper--hide-figure cdr-label-wrapper--medium custom-label-class"