From d1ba88f302b7508d52fd56e90b49836809f54c3b Mon Sep 17 00:00:00 2001 From: Abbey Hart Date: Thu, 19 Dec 2019 11:45:44 -0600 Subject: [PATCH 1/2] fix(checkbox-skeleton): apply skeleton class to checkbox --- .../components/src/components/checkbox/_checkbox.scss | 11 +++++++++++ .../src/components/Checkbox/Checkbox.Skeleton.js | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/components/src/components/checkbox/_checkbox.scss b/packages/components/src/components/checkbox/_checkbox.scss index df09d8a15e55..9317ad68368e 100644 --- a/packages/components/src/components/checkbox/_checkbox.scss +++ b/packages/components/src/components/checkbox/_checkbox.scss @@ -185,6 +185,17 @@ .#{$prefix}--checkbox-label[data-contained-checkbox-state='mixed'][data-contained-checkbox-disabled='true']::before { background-color: $disabled-02; } + + //----------------------------------------------- + // Skeleton + //----------------------------------------------- + + .#{$prefix}--checkbox-label-text.#{$prefix}--skeleton { + @include skeleton; + width: rem(100px); + height: $spacing-05; + margin: auto 0; + } } @include exports('checkbox') { diff --git a/packages/react/src/components/Checkbox/Checkbox.Skeleton.js b/packages/react/src/components/Checkbox/Checkbox.Skeleton.js index 9097ab5de778..6e7bf8bf071d 100644 --- a/packages/react/src/components/Checkbox/Checkbox.Skeleton.js +++ b/packages/react/src/components/Checkbox/Checkbox.Skeleton.js @@ -17,10 +17,11 @@ const CheckboxSkeleton = ({ className, ...rest }) => ( className={cx( `${prefix}--form-item`, `${prefix}--checkbox-wrapper`, + `${prefix}--checkbox-label`, className )} {...rest}> - + ); From fe8ff002435340623aaa48131fed3f432e16a926 Mon Sep 17 00:00:00 2001 From: Abbey Hart Date: Thu, 19 Dec 2019 12:56:36 -0600 Subject: [PATCH 2/2] test(checkbox): update checkbox skeleton test --- packages/react/src/components/Checkbox/Checkbox-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/components/Checkbox/Checkbox-test.js b/packages/react/src/components/Checkbox/Checkbox-test.js index 3e741af84da3..abdd198c4e9c 100644 --- a/packages/react/src/components/Checkbox/Checkbox-test.js +++ b/packages/react/src/components/Checkbox/Checkbox-test.js @@ -163,7 +163,7 @@ describe('CheckboxSkeleton', () => { }); it('has the expected classes', () => { - expect(label.hasClass(`${prefix}--checkbox-label`)).toEqual(true); + expect(label.hasClass(`${prefix}--checkbox-label-text`)).toEqual(true); expect(label.hasClass(`${prefix}--skeleton`)).toEqual(true); }); });