From 5567e5436ff4b83edcb25584049936b9d0f96669 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 7 May 2020 17:44:18 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20ember-radio-butto?= =?UTF-8?q?n=20as=20radiofield?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use ember-radio-button to wrap a radiofield. Introduce radiofield group --- .../rose/addon/components/rose/form/radio.js | 20 ------ .../addon/components/rose/form/radio/group.js | 25 ++++++- .../addon/components/rose/form/radio/radio.js | 26 +++---- .../styles/rose/components/form/_radio.scss | 67 +++++++++++++------ .../templates/components/rose/form/radio.hbs | 16 ----- .../components/rose/form/radio/radio.hbs | 3 +- addons/rose/app/components/rose/form/radio.js | 1 - .../app/components/rose/form/radio/group.js | 2 +- .../app/components/rose/form/radio/radio.js | 2 +- addons/rose/app/templates/index.hbs | 62 ++++++++--------- .../rose/stories/form/radio/group.stories.js | 41 ++++++++++++ .../stories/form/{ => radio}/radio.stories.js | 19 +++--- .../components/rose/form/radio-test.js | 49 -------------- .../components/rose/form/radio/group-test.js | 58 +++++++++++----- .../components/rose/form/radio/radio-test.js | 61 +++++++++++++---- 15 files changed, 260 insertions(+), 192 deletions(-) delete mode 100644 addons/rose/addon/components/rose/form/radio.js delete mode 100644 addons/rose/addon/templates/components/rose/form/radio.hbs delete mode 100644 addons/rose/app/components/rose/form/radio.js create mode 100644 addons/rose/stories/form/radio/group.stories.js rename addons/rose/stories/form/{ => radio}/radio.stories.js (55%) delete mode 100644 addons/rose/tests/integration/components/rose/form/radio-test.js diff --git a/addons/rose/addon/components/rose/form/radio.js b/addons/rose/addon/components/rose/form/radio.js deleted file mode 100644 index 882c4eea2..000000000 --- a/addons/rose/addon/components/rose/form/radio.js +++ /dev/null @@ -1,20 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/form/radio'; - -/** - * A HTML `` element. - * - * @example - * - */ -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/components/rose/form/radio/group.js b/addons/rose/addon/components/rose/form/radio/group.js index 5375e3cbf..9ad393cd2 100644 --- a/addons/rose/addon/components/rose/form/radio/group.js +++ b/addons/rose/addon/components/rose/form/radio/group.js @@ -1,8 +1,31 @@ import Component from '@ember/component'; import layout from '../../../../templates/components/rose/form/radio/group'; +/** + * A `` element. + * + * @example + * + * + * + * + * + */ + export default Component.extend({ layout, - tagName: '' + tagName: '', }); diff --git a/addons/rose/addon/components/rose/form/radio/radio.js b/addons/rose/addon/components/rose/form/radio/radio.js index 853f3a58b..6d0083cc2 100644 --- a/addons/rose/addon/components/rose/form/radio/radio.js +++ b/addons/rose/addon/components/rose/form/radio/radio.js @@ -2,18 +2,20 @@ import Component from '@ember/component'; import layout from '../../../../templates/components/rose/form/radio/radio'; /** - * A HTML `` element. - * - * @example - * - */ + * A `` element. + * `value` and `variable` must be equal to select + * radiofield. + * + * @example + * + */ export default Component.extend({ layout, tagName: '', diff --git a/addons/rose/addon/styles/rose/components/form/_radio.scss b/addons/rose/addon/styles/rose/components/form/_radio.scss index e86b33d1c..822505cf8 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio.scss @@ -2,21 +2,22 @@ @use '../../utilities/type'; $radio-svg: ( - 'default': "", - - 'hover': "", - - 'focus': "", - - 'checked': "", - - 'disabled': "", - - 'disabled-checked': "", - - 'error': "", - - 'error-checked': "", + 'default': + "", + 'hover': + "", + 'focus': + "", + 'checked': + "", + 'disabled': + "", + 'disabled-checked': + "", + 'error': + "", + 'error-checked': + "", ); $data-svg-prefix: 'data:image/svg+xml;utf-8,'; @@ -33,6 +34,7 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &::before { position: absolute; + top: sizing.rems(xs); left: 0; display: block; width: sizing.rems(m); @@ -68,7 +70,10 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &:hover { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'hover')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'hover' + )); } } } @@ -76,7 +81,10 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &:focus { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'focus')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'focus' + )); } } } @@ -84,7 +92,10 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &:checked { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'checked')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'checked' + )); } } } @@ -93,14 +104,20 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &:disabled { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'disabled')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'disabled' + )); } } &:checked { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'disabled-checked')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'disabled-checked' + )); } } } @@ -114,14 +131,20 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; &:not(:disabled):not(:focus) { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'error')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'error' + )); } } &:checked { ~ .rose-form-radio-label { &::after { - background-image: url($data-svg-prefix + map-get($radio-svg, 'error-checked')); + background-image: url($data-svg-prefix + map-get( + $radio-svg, + 'error-checked' + )); } } } diff --git a/addons/rose/addon/templates/components/rose/form/radio.hbs b/addons/rose/addon/templates/components/rose/form/radio.hbs deleted file mode 100644 index f01831c6d..000000000 --- a/addons/rose/addon/templates/components/rose/form/radio.hbs +++ /dev/null @@ -1,16 +0,0 @@ -
- - - - - - {{yield}} - -
diff --git a/addons/rose/addon/templates/components/rose/form/radio/radio.hbs b/addons/rose/addon/templates/components/rose/form/radio/radio.hbs index 84b155d26..09e492f7d 100644 --- a/addons/rose/addon/templates/components/rose/form/radio/radio.hbs +++ b/addons/rose/addon/templates/components/rose/form/radio/radio.hbs @@ -7,7 +7,8 @@ type="radio" @name={{@name}} @value={{@value}} - @groupValue={{@variable}} /> + @groupValue={{@variable}} + @disabled={{@disabled}}/>