From 5d6da1e52de5aa71d253fe8eabb0797781015306 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 20 Jul 2021 16:11:57 -0700 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20inline=20align?= =?UTF-8?q?tment=20support=20to=20checkbox=20and=20radio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/form/checkbox/index.hbs | 2 +- .../rose/addon/components/rose/form/radio/group/index.hbs | 2 ++ .../rose/addon/components/rose/form/radio/radio/index.hbs | 4 ++-- .../rose/addon/styles/rose/components/form/_checkbox.scss | 4 ++++ addons/rose/addon/styles/rose/components/form/_radio.scss | 6 ++++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/addons/rose/addon/components/rose/form/checkbox/index.hbs b/addons/rose/addon/components/rose/form/checkbox/index.hbs index a660c270d..e4a2c11d5 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.hbs +++ b/addons/rose/addon/components/rose/form/checkbox/index.hbs @@ -1,4 +1,4 @@ -
+
{{yield (hash radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed) )}} +
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs index eb45384c6..86edfd524 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/radio/index.hbs @@ -1,8 +1,8 @@ -
+
Date: Tue, 20 Jul 2021 16:26:13 -0700 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20undo=20unnecessary=20?= =?UTF-8?q?change?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/form/radio/group/index.hbs | 2 -- addons/rose/addon/components/rose/form/radio/radio/index.hbs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/rose/addon/components/rose/form/radio/group/index.hbs b/addons/rose/addon/components/rose/form/radio/group/index.hbs index a503c3bc9..fc34bd1cc 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/group/index.hbs @@ -1,5 +1,3 @@ -
{{yield (hash radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed) )}} -
\ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.hbs b/addons/rose/addon/components/rose/form/radio/radio/index.hbs index 86edfd524..d38bc3680 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/radio/index.hbs @@ -2,7 +2,7 @@ Date: Wed, 21 Jul 2021 10:51:33 -0700 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20attr=20in=20sto?= =?UTF-8?q?rybook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/form/checkbox/index.stories.mdx | 1 + .../addon/components/rose/form/radio/radio/index.stories.mdx | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx index 4f98fed53..fe92b59ec 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx @@ -16,6 +16,7 @@ Renders a form input checkbox. @checked={{false}} @error={{false}} @disabled={{false}} + @inline={{true}} /> ``` diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index 633a5c082..6ac5d9f15 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -16,6 +16,7 @@ Renders a form radiofield. @selectedValue="yes-agree" @disabled={{false}} @changed={{fn}} + @inline={{true}} /> ``` From 0823c1cb2d467f26601a2d94776fbc19fd3626fa Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 21 Jul 2021 12:39:24 -0700 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20stories=20for?= =?UTF-8?q?=20inline=20radio=20&=20checkbox,=20radiogrp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/form/checkbox/index.stories.mdx | 58 +++++++++++++++- .../rose/form/radio/group/index.hbs | 4 +- .../rose/form/radio/group/index.stories.mdx | 3 + .../rose/form/radio/radio/index.stories.mdx | 68 ++++++++++++++++++- .../styles/rose/components/form/_radio.scss | 15 ++-- 5 files changed, 138 insertions(+), 10 deletions(-) diff --git a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx index fe92b59ec..11405c643 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx @@ -16,7 +16,6 @@ Renders a form input checkbox. @checked={{false}} @error={{false}} @disabled={{false}} - @inline={{true}} /> ``` @@ -69,3 +68,60 @@ Renders a form input checkbox. } }} + + +```htmlbars + +``` + + + {{ + template: hbs` + + + + `, + context: { + description: text('description', 'Short description in label'), + helperText: text('helperText', 'This is an optional help text.'), + checked: boolean('checked', false), + error: boolean('error', false), + disabled: boolean('disabled', false), + } + }} + + diff --git a/addons/rose/addon/components/rose/form/radio/group/index.hbs b/addons/rose/addon/components/rose/form/radio/group/index.hbs index fc34bd1cc..de2b010b6 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.hbs +++ b/addons/rose/addon/components/rose/form/radio/group/index.hbs @@ -1,3 +1,3 @@ {{yield (hash - radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed) -)}} + radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed inline=@inline) +)}} \ No newline at end of file diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index bafffaaa4..515c7ca35 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -15,6 +15,7 @@ Renders a form radiofield group. @name={{name}} @selectedValue="disagree" @changed={{fn}} + @inline={{false}} as |radioGroup| > ``` @@ -55,3 +54,70 @@ Renders a form radiofield. } }} + + +```htmlbars + +``` + + + {{ + template: hbs` + + + + `, + context: { + error: boolean('error', false), + value: text('value', 'value and selectedValue must match to select radiofield'), + selectedValue: text( + 'selectedValue', + 'value and selectedValue must match to select radiofield' + ), + disabled: boolean('disabled', false), + icon: select( + 'icon', + { + 'none': null, + 'user-organization': 'user-organization', + 'copy-action': 'copy-action', + 'unfold-more': 'unfold-more', + 'unfold-less': 'unfold-less', + }, + null + ), + } + }} + \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/form/_radio.scss b/addons/rose/addon/styles/rose/components/form/_radio.scss index 723407017..f248d0b7a 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio.scss @@ -21,14 +21,17 @@ $radio-svg: ( ); $data-svg-prefix: 'data:image/svg+xml;utf-8,'; -.radio-group-inline { - display: flex; - .rose-form-radio { + .rose-form-radio { + &.inline { + display: inline-block; + .rose-form-radio-label { + margin-right: sizing.rems(s); + } + } + .radio-group-inline { + display: flex; margin-right: sizing.rems(s); } -} - -.rose-form-radio { @include type.type(m); position: relative; margin-bottom: sizing.rems(xs); From c43ced038030e82395b32fc947272e0c342f9db7 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 21 Jul 2021 13:01:59 -0700 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20toggle=20funct?= =?UTF-8?q?ionality?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rose/form/checkbox/index.stories.mdx | 9 +++++---- .../components/rose/form/radio/radio/index.stories.mdx | 7 ++++--- .../rose/addon/styles/rose/components/form/_radio.scss | 4 ---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx index 11405c643..39925964b 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/checkbox/index.stories.mdx @@ -77,7 +77,7 @@ Renders a form input checkbox. @checked={{false}} @error={{false}} @disabled={{false}} - @inline={{true}} + @inline={{false}} /> ``` @@ -92,7 +92,7 @@ Renders a form input checkbox. @checked={{checked}} @error={{error}} @disabled={{disabled}} - @inline={{true}} + @inline={{inline}} /> `, context: { @@ -121,6 +121,7 @@ Renders a form input checkbox. checked: boolean('checked', false), error: boolean('error', false), disabled: boolean('disabled', false), + inline: boolean('inline', false) } }} diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index feb783d31..4d6a4153e 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -78,7 +78,7 @@ Renders a form radiofield. @selectedValue={{selectedValue}} @disabled={{disabled}} @icon={{icon}} - @inline={{true}} + @inline={{inline}} /> `, context: { @@ -118,6 +118,7 @@ Renders a form radiofield. }, null ), + inline: boolean('inline', false) } }} \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/form/_radio.scss b/addons/rose/addon/styles/rose/components/form/_radio.scss index f248d0b7a..4ce25f95b 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio.scss @@ -28,10 +28,6 @@ $data-svg-prefix: 'data:image/svg+xml;utf-8,'; margin-right: sizing.rems(s); } } - .radio-group-inline { - display: flex; - margin-right: sizing.rems(s); - } @include type.type(m); position: relative; margin-bottom: sizing.rems(xs); From 0ad6d027e61f9a4f3f21fab81cb4bc55920416ea Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 21 Jul 2021 13:33:03 -0700 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20space?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/styles/rose/components/form/_radio.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/form/_radio.scss b/addons/rose/addon/styles/rose/components/form/_radio.scss index 4ce25f95b..2b547edce 100644 --- a/addons/rose/addon/styles/rose/components/form/_radio.scss +++ b/addons/rose/addon/styles/rose/components/form/_radio.scss @@ -23,11 +23,11 @@ $radio-svg: ( $data-svg-prefix: 'data:image/svg+xml;utf-8,'; .rose-form-radio { &.inline { - display: inline-block; - .rose-form-radio-label { - margin-right: sizing.rems(s); - } - } + display: inline-block; + .rose-form-radio-label { + margin-right: sizing.rems(s); + } + } @include type.type(m); position: relative; margin-bottom: sizing.rems(xs); From 2dd3e13cd3b9ea8be08e486a7c1a97fe64605229 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 21 Jul 2021 14:07:29 -0700 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20lint=20issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/components/rose/form/checkbox/index.hbs | 2 +- .../addon/styles/rose/components/form/_radio.scss | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/rose/addon/components/rose/form/checkbox/index.hbs b/addons/rose/addon/components/rose/form/checkbox/index.hbs index e4a2c11d5..d9b655458 100644 --- a/addons/rose/addon/components/rose/form/checkbox/index.hbs +++ b/addons/rose/addon/components/rose/form/checkbox/index.hbs @@ -1,4 +1,4 @@ -
+