diff --git a/addons/rose/addon/components/rose/dropdown.js b/addons/rose/addon/components/rose/dropdown.js index 8ae6f56e6..645c888be 100644 --- a/addons/rose/addon/components/rose/dropdown.js +++ b/addons/rose/addon/components/rose/dropdown.js @@ -10,6 +10,7 @@ export default Component.extend({ layout, tagName: '', + showCaret: true, // =actions diff --git a/addons/rose/addon/components/rose/dropdown.stories.mdx b/addons/rose/addon/components/rose/dropdown.stories.mdx index 9cb71ca99..7191f7479 100644 --- a/addons/rose/addon/components/rose/dropdown.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown.stories.mdx @@ -11,7 +11,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -19,7 +19,7 @@ A simple dropdown component with support for links and buttons. `, context: { - hideDropdownIndicator: boolean('hideDropdownIndicator', false), + showCaret: boolean('showCaret', true), }, }} @@ -66,10 +66,10 @@ Dropdown supports `danger` styling through `style` attribute. ``` -Dropdown indicator can be hidden using `hideDropdownIndicator` attribute. +Dropdown indicator can be hidden using `showCaret` attribute. ```html - + Menu item Button menu item diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss index c0804ea97..0194a485c 100644 --- a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss +++ b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss @@ -16,9 +16,8 @@ $chevron: "data:image/svg+xml;utf-8, diff --git a/addons/rose/tests/dummy/app/templates/index.hbs b/addons/rose/tests/dummy/app/templates/index.hbs index 840ae42fa..146a49749 100644 --- a/addons/rose/tests/dummy/app/templates/index.hbs +++ b/addons/rose/tests/dummy/app/templates/index.hbs @@ -37,7 +37,7 @@ Button - danger - + Menu item Button menu item diff --git a/addons/rose/tests/integration/components/rose/dropdown-test.js b/addons/rose/tests/integration/components/rose/dropdown-test.js index 51c34cf7d..24d4d7758 100644 --- a/addons/rose/tests/integration/components/rose/dropdown-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown-test.js @@ -10,7 +10,6 @@ module('Integration | Component | rose/dropdown', function (hooks) { await render(hbs``); assert.ok(find('.rose-dropdown')); assert.notOk(find('.rose-dropdown-right')); - assert.notOk(find('.hide-dropdown-indicator')); }); test('it renders with html attributes', async function (assert) { @@ -41,11 +40,12 @@ module('Integration | Component | rose/dropdown', function (hooks) { assert.ok(find('.rose-dropdown-right')); }); - test('it supports hiding dropdown indicator', async function (assert) { - await render(hbs` - - `); - assert.ok(find('.hide-dropdown-indicator')); + test('it supports hiding dropdown caret', async function (assert) { + await render(hbs``); + assert.ok(find('.show-caret')); + + await render(hbs``); + assert.notOk(find('.show-caret')); }); test('it renders with content', async function (assert) {