From aa282e8f644ae8fdb4d860c06458542b499aac3b Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 24 Sep 2020 10:06:33 -0400 Subject: [PATCH 01/24] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20convert=20drop?= =?UTF-8?q?down=20components=20to=20nested=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/components/rose/dropdown/button.js | 10 -------- .../rose/dropdown/button/index.hbs} | 0 .../rose/dropdown/index.hbs} | 0 .../rose/{dropdown.js => dropdown/index.js} | 25 ++++++++++--------- .../index.stories.mdx} | 0 .../addon/components/rose/dropdown/link.js | 10 -------- .../rose/dropdown/link/index.hbs} | 0 7 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 addons/rose/addon/components/rose/dropdown/button.js rename addons/rose/addon/{templates/components/rose/dropdown/button.hbs => components/rose/dropdown/button/index.hbs} (100%) rename addons/rose/addon/{templates/components/rose/dropdown.hbs => components/rose/dropdown/index.hbs} (100%) rename addons/rose/addon/components/rose/{dropdown.js => dropdown/index.js} (64%) rename addons/rose/addon/components/rose/{dropdown.stories.mdx => dropdown/index.stories.mdx} (100%) delete mode 100644 addons/rose/addon/components/rose/dropdown/link.js rename addons/rose/addon/{templates/components/rose/dropdown/link.hbs => components/rose/dropdown/link/index.hbs} (100%) diff --git a/addons/rose/addon/components/rose/dropdown/button.js b/addons/rose/addon/components/rose/dropdown/button.js deleted file mode 100644 index 6f776e15d..000000000 --- a/addons/rose/addon/components/rose/dropdown/button.js +++ /dev/null @@ -1,10 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/dropdown/button'; - -/** - * A dropdown button component based on simplified rose/button - */ -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/dropdown/button.hbs b/addons/rose/addon/components/rose/dropdown/button/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/dropdown/button.hbs rename to addons/rose/addon/components/rose/dropdown/button/index.hbs diff --git a/addons/rose/addon/templates/components/rose/dropdown.hbs b/addons/rose/addon/components/rose/dropdown/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/dropdown.hbs rename to addons/rose/addon/components/rose/dropdown/index.hbs diff --git a/addons/rose/addon/components/rose/dropdown.js b/addons/rose/addon/components/rose/dropdown/index.js similarity index 64% rename from addons/rose/addon/components/rose/dropdown.js rename to addons/rose/addon/components/rose/dropdown/index.js index 645c888be..916c50c3f 100644 --- a/addons/rose/addon/components/rose/dropdown.js +++ b/addons/rose/addon/components/rose/dropdown/index.js @@ -1,16 +1,17 @@ -import Component from '@ember/component'; -import layout from '../../templates/components/rose/dropdown'; -import { action } from '@ember/object'; +import Component from '@glimmer/component'; +import { computed, action } from '@ember/object'; + +export default class RoseDropdownComponent extends Component { -/** - * A dropdown component composed of HTML disclosure elements: details and summary - */ -export default Component.extend({ // =attributes - layout, - tagName: '', - showCaret: true, + /** + * @type {boolean} + */ + @computed('args.showCaret') + get showCaret() { + return this.args.showCaret ?? true; + } // =actions @@ -26,5 +27,5 @@ export default Component.extend({ close(element) { if (element.open) element.open = false; if (element.parentElement.open) element.parentElement.open = false; - }, -}); + } +} diff --git a/addons/rose/addon/components/rose/dropdown.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/dropdown.stories.mdx rename to addons/rose/addon/components/rose/dropdown/index.stories.mdx diff --git a/addons/rose/addon/components/rose/dropdown/link.js b/addons/rose/addon/components/rose/dropdown/link.js deleted file mode 100644 index c6609fe05..000000000 --- a/addons/rose/addon/components/rose/dropdown/link.js +++ /dev/null @@ -1,10 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../../templates/components/rose/dropdown/link'; - -/** - * A dropdown link wrapper for LinkTo component. - */ -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/dropdown/link.hbs b/addons/rose/addon/components/rose/dropdown/link/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/dropdown/link.hbs rename to addons/rose/addon/components/rose/dropdown/link/index.hbs From 0c8668a91b8123cfca139990f585ada85449ac9f Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 24 Sep 2020 10:50:40 -0400 Subject: [PATCH 02/24] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20convert=20badg?= =?UTF-8?q?e=20component=20to=20nested=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/badge.js | 7 ------- .../rose/badge.hbs => components/rose/badge/index.hbs} | 0 .../rose/{badge.stories.mdx => badge/index.stories.mdx} | 0 3 files changed, 7 deletions(-) delete mode 100644 addons/rose/addon/components/rose/badge.js rename addons/rose/addon/{templates/components/rose/badge.hbs => components/rose/badge/index.hbs} (100%) rename addons/rose/addon/components/rose/{badge.stories.mdx => badge/index.stories.mdx} (100%) diff --git a/addons/rose/addon/components/rose/badge.js b/addons/rose/addon/components/rose/badge.js deleted file mode 100644 index 8a5cbcec5..000000000 --- a/addons/rose/addon/components/rose/badge.js +++ /dev/null @@ -1,7 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../templates/components/rose/badge'; - -export default Component.extend({ - layout, - tagName: '', -}); diff --git a/addons/rose/addon/templates/components/rose/badge.hbs b/addons/rose/addon/components/rose/badge/index.hbs similarity index 100% rename from addons/rose/addon/templates/components/rose/badge.hbs rename to addons/rose/addon/components/rose/badge/index.hbs diff --git a/addons/rose/addon/components/rose/badge.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx similarity index 100% rename from addons/rose/addon/components/rose/badge.stories.mdx rename to addons/rose/addon/components/rose/badge/index.stories.mdx From 000c18f89f2195173beac6882bfc1800b1ac2b18 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 24 Sep 2020 10:56:25 -0400 Subject: [PATCH 03/24] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20convert=20butt?= =?UTF-8?q?on=20component=20to=20nested=20structure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/components/rose/button.js | 15 --------------- .../rose/button/index.hbs} | 0 .../index.stories.mdx} | 0 3 files changed, 15 deletions(-) delete mode 100644 addons/rose/addon/components/rose/button.js rename addons/rose/addon/{templates/components/rose/button.hbs => components/rose/button/index.hbs} (100%) rename addons/rose/addon/components/rose/{button.stories.mdx => button/index.stories.mdx} (100%) diff --git a/addons/rose/addon/components/rose/button.js b/addons/rose/addon/components/rose/button.js deleted file mode 100644 index 02b50d397..000000000 --- a/addons/rose/addon/components/rose/button.js +++ /dev/null @@ -1,15 +0,0 @@ -import Component from '@ember/component'; -import layout from '../../templates/components/rose/button'; - -/** - * A simple HTML `