From d30bf89db30c5145a8b8369fd736375f63ba5af1 Mon Sep 17 00:00:00 2001
From: Ava Wroten <jo@wroten.me>
Date: Thu, 5 Mar 2020 10:21:52 -0600
Subject: [PATCH] Refactored how actions were passed

---
 ember-ui/app/components/meal-item.hbs                 |  1 +
 ember-ui/app/components/meal-list.hbs                 | 11 ++++++-----
 ember-ui/app/components/sortable-group-accessible.hbs | 10 +++++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ember-ui/app/components/meal-item.hbs b/ember-ui/app/components/meal-item.hbs
index a91982e..afe7383 100644
--- a/ember-ui/app/components/meal-item.hbs
+++ b/ember-ui/app/components/meal-item.hbs
@@ -1,4 +1,5 @@
 <LinkTo
+  {{on 'focus' @handleFocus}}
   {{on 'blur' @handleBlur}}
   @route="meal"
   @model={{@meal}}
diff --git a/ember-ui/app/components/meal-list.hbs b/ember-ui/app/components/meal-list.hbs
index 5a09016..318c72d 100644
--- a/ember-ui/app/components/meal-list.hbs
+++ b/ember-ui/app/components/meal-list.hbs
@@ -1,6 +1,6 @@
 <SortableGroupAccessible
   @models={{this.sortedItems}}
-  as |groupHasFocus selectedIndex orderItemDown orderItemUp handleBlur|>
+  as |groupHasFocus selectedIndex groupActions|>
   <SortableGroup
     @onChange={{action this.reorderMeals}}
     as |group|>
@@ -9,16 +9,17 @@
         @groupHasFocus={{groupHasFocus}}
         @currentIndex={{index}}
         @selectedIndex={{selectedIndex}}
-        @orderItemDown={{orderItemDown}}
-        @orderItemUp={{orderItemUp}}
-        @handleBlur={{handleBlur}}>
+        @orderItemDown={{groupActions.orderItemDown}}
+        @orderItemUp={{groupActions.orderItemUp}}
+        @handleBlur={{groupActions.handleBlur}}>
         <SortableItem
           @model={{meal}}
           @group={{group}}
           data-test-id="meal-item">
           <MealItem
             @meal={{meal}}
-            @handleBlur={{handleBlur}}
+            @handleFocus={{groupActions.handleFocus}}
+            @handleBlur={{groupActions.handleBlur}}
           />
         </SortableItem>
       </SortableItemAccessible>
diff --git a/ember-ui/app/components/sortable-group-accessible.hbs b/ember-ui/app/components/sortable-group-accessible.hbs
index be39ac4..0c1b74f 100644
--- a/ember-ui/app/components/sortable-group-accessible.hbs
+++ b/ember-ui/app/components/sortable-group-accessible.hbs
@@ -8,5 +8,13 @@
   {{key-down this.preventDefault key='ArrowDown'}}
   tabindex="0"
   class="shadow-md bg-gray-200 outline-none border border-gray-400 focus:border-teal-400 focus:shadow-lg">
-  {{yield this.groupHasFocus this.selectedIndex (action 'orderItemDown') (action 'orderItemUp') (action 'handleBlur')}}
+  {{yield
+    this.groupHasFocus
+    this.selectedIndex
+    (hash
+      orderItemDown=(action 'orderItemDown')
+      orderItemUp=(action 'orderItemUp')
+      handleFocus=(action 'handleFocus')
+      handleBlur=(action 'handleBlur')
+    )}}
 </div>