From 8e6d1881f3cdef9dd688c45032ebec970684c3b6 Mon Sep 17 00:00:00 2001
From: colenso <colenso.castellino@yahoo.com>
Date: Tue, 30 Mar 2021 00:42:28 +0530
Subject: [PATCH 1/4] Try to get namedblocks working with a test

---
 addon/components/select-light.hbs                 | 2 +-
 addon/components/select-light.js                  | 2 --
 tests/integration/components/select-light-test.js | 5 +++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addon/components/select-light.hbs b/addon/components/select-light.hbs
index ac2857b..2a2dec5 100644
--- a/addon/components/select-light.hbs
+++ b/addon/components/select-light.hbs
@@ -15,7 +15,7 @@
         <option
           value={{get optionValue this.valueKey}}
           selected={{is-equal (get optionValue this.valueKey) @value}}>
-          {{get optionValue this.displayKey}}
+          {{yield optionValue to="option"}}
         </option>
       {{/each}}
     {{else}}
diff --git a/addon/components/select-light.js b/addon/components/select-light.js
index 74f4cb7..01c5be6 100644
--- a/addon/components/select-light.js
+++ b/addon/components/select-light.js
@@ -8,14 +8,12 @@ export default class extends Component {
     super(...arguments);
 
     this.valueKey = this.args.valueKey ?? 'value';
-    this.displayKey = this.args.displayKey ?? 'label';
     this.change = this.args.change ?? noop;
   }
 
   get hasDetailedOptions() {
     return ![ // Returns a boolean if all data is available for a { label: foo, value: bar } style list of options
       this.args.options?.[0][this.valueKey],
-      this.args.options?.[0][this.displayKey],
     ].some(isNone);
   }
 }
diff --git a/tests/integration/components/select-light-test.js b/tests/integration/components/select-light-test.js
index 7fe534e..3c97e3a 100644
--- a/tests/integration/components/select-light-test.js
+++ b/tests/integration/components/select-light-test.js
@@ -153,8 +153,9 @@ module('Integration | Component | select-light', function(hooks) {
       <SelectLight
         @options={{this.options}}
         @value={{this.value}}
-        @valueKey="val"
-        @displayKey="description" />
+        @valueKey="val">
+				<:option as |optionValue| >{{optionValue.name}}</:option>
+			</SelectLight>
     `);
 
 		assert.dom('select option').hasAttribute('value', options[0].val);

From 7152a671048ea97106f96af111c56dbbf315fbd0 Mon Sep 17 00:00:00 2001
From: colenso <colenso.castellino@yahoo.com>
Date: Tue, 30 Mar 2021 01:30:43 +0530
Subject: [PATCH 2/4] Only use named blocks when @valueKey is supplied

---
 addon/components/select-light.hbs | 6 +++++-
 addon/components/select-light.js  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/components/select-light.hbs b/addon/components/select-light.hbs
index 2a2dec5..44ffed2 100644
--- a/addon/components/select-light.hbs
+++ b/addon/components/select-light.hbs
@@ -15,7 +15,11 @@
         <option
           value={{get optionValue this.valueKey}}
           selected={{is-equal (get optionValue this.valueKey) @value}}>
-          {{yield optionValue to="option"}}
+          {{#if @valueKey}}
+            {{yield optionValue to="option"}}
+          {{else}}
+            {{get optionValue this.displayKey}}
+          {{/if}}
         </option>
       {{/each}}
     {{else}}
diff --git a/addon/components/select-light.js b/addon/components/select-light.js
index 01c5be6..56d9305 100644
--- a/addon/components/select-light.js
+++ b/addon/components/select-light.js
@@ -8,6 +8,7 @@ export default class extends Component {
     super(...arguments);
 
     this.valueKey = this.args.valueKey ?? 'value';
+    this.displayKey = this.args.displayKey ?? 'label';
     this.change = this.args.change ?? noop;
   }
 

From 81dd6143be4c59c408365a0daa1f695d062988f3 Mon Sep 17 00:00:00 2001
From: colenso <colenso.castellino@yahoo.com>
Date: Tue, 30 Mar 2021 01:30:59 +0530
Subject: [PATCH 3/4] Fix test

---
 tests/integration/components/select-light-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/components/select-light-test.js b/tests/integration/components/select-light-test.js
index 3c97e3a..a31da22 100644
--- a/tests/integration/components/select-light-test.js
+++ b/tests/integration/components/select-light-test.js
@@ -154,7 +154,7 @@ module('Integration | Component | select-light', function(hooks) {
         @options={{this.options}}
         @value={{this.value}}
         @valueKey="val">
-				<:option as |optionValue| >{{optionValue.name}}</:option>
+				<:option as |optionValue| >{{optionValue.description}}</:option>
 			</SelectLight>
     `);
 

From 482c6df104aadea5c5dfa5f931b3de5be258c8b6 Mon Sep 17 00:00:00 2001
From: colenso <colenso.castellino@yahoo.com>
Date: Tue, 30 Mar 2021 01:56:45 +0530
Subject: [PATCH 4/4] Update ember-try to 3.25 and above

---
 config/ember-try.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/ember-try.js b/config/ember-try.js
index e59f91b..8e3cea8 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -6,18 +6,10 @@ module.exports = async function () {
   return {
     scenarios: [
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-lts-3.25',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0',
-          },
-        },
-      },
-      {
-        name: 'ember-lts-3.20',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.20.5',
+            'ember-source': '~3.25.0',
           },
         },
       },