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 c2f71d82f..7191f7479 100644 --- a/addons/rose/addon/components/rose/dropdown.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown.stories.mdx @@ -1,5 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { hbs } from 'ember-cli-htmlbars'; +import { boolean } from '@storybook/addon-knobs'; @@ -10,13 +11,16 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item Button menu item `, + context: { + showCaret: boolean('showCaret', true), + }, }} @@ -34,7 +38,7 @@ A simple dropdown component with support for links and buttons. -```htmlbars +```html Menu item Menu item @@ -44,7 +48,7 @@ A simple dropdown component with support for links and buttons. Dropdown content can be aligned to right edge of the component instead of the default left edge, which is the default setting. The following example floats the component to right edge of the page inorder to provide enough space to display right aligned dropdown content. -```htmlbars +```html Menu item Menu item @@ -55,9 +59,18 @@ Dropdown content can be aligned to right edge of the component instead of the de Dropdown supports `danger` styling through `style` attribute. -```htmlbars +```html Link - danger Button - danger ``` + +Dropdown indicator can be hidden using `showCaret` attribute. + +```html + + Menu item + Button menu item + +``` \ No newline at end of file diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss index 34b2753b0..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 529b6c7c5..146a49749 100644 --- a/addons/rose/tests/dummy/app/templates/index.hbs +++ b/addons/rose/tests/dummy/app/templates/index.hbs @@ -36,3 +36,8 @@ Button menu item 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 0c0c22695..24d4d7758 100644 --- a/addons/rose/tests/integration/components/rose/dropdown-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown-test.js @@ -40,6 +40,14 @@ module('Integration | Component | rose/dropdown', function (hooks) { assert.ok(find('.rose-dropdown-right')); }); + 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) { await render(hbs`