From 6143f4ce6fc8c1276d44249c67db825e9cd09d20 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 6 Jul 2023 15:10:25 +0200 Subject: [PATCH] Use `dropdown` controller to manager actions dropdown in orders page --- app/views/spree/admin/orders/_bulk_actions.html.haml | 8 ++++---- app/webpacker/css/admin/dropdown.scss | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/views/spree/admin/orders/_bulk_actions.html.haml b/app/views/spree/admin/orders/_bulk_actions.html.haml index 7351399aa7..7616334c1f 100644 --- a/app/views/spree/admin/orders/_bulk_actions.html.haml +++ b/app/views/spree/admin/orders/_bulk_actions.html.haml @@ -3,13 +3,13 @@ %span{ "data-controller": "checked-feedback", "data-checked-feedback-translation-value": "spree.admin.orders.index.selected" } = t("spree.admin.orders.index.selected", count: 0) - %button.plain.ofn-drop-down.disabled{ "data-checked-target": "disable" } + %div.plain.ofn-drop-down.disabled{ "data-checked-target": "disable", "data-controller": "dropdown", "data-action": "click->dropdown#toggle" } %span{ class: 'icon-reorder' } ="#{t('admin.actions')}".html_safe - %span.toggle-off.icon-caret-up - %span.toggle-on.icon-caret-down + %span + %i{ "data-dropdown-target": "arrow", "data-expanded-class": "icon-caret-up", "data-collapsed-class": "icon-caret-down" } - %div.menu.dropdown-content + %div.menu{ "data-dropdown-target": "menu" } %div.menu_item %span.name{ "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "resend_confirmation" } = t('spree.admin.orders.index.resend_confirmation') diff --git a/app/webpacker/css/admin/dropdown.scss b/app/webpacker/css/admin/dropdown.scss index d3eab51beb..64c98e7ddf 100644 --- a/app/webpacker/css/admin/dropdown.scss +++ b/app/webpacker/css/admin/dropdown.scss @@ -20,14 +20,6 @@ .dropdown-content { display: inline-block; } - - .toggle-off { - display: inline-block; - } - - .toggle-on { - display: none; - } } }