From 106dee00409beae9ff99c0782a9ef995e8f7bfa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 23 May 2023 17:57:03 +0200 Subject: [PATCH] Remove redundant HTML map classes The `map` class is applied to the map element by LeafletJS; using it in the container led to hacks like adding an `inline` class to fix the fact that the container was using the `height` rule of the `.map` elements. Even though we don't add styles for them, I'm adding the `budgets-map` and `budget-investments-map` HTML classes so these elements can still be easily selected with CSS and JavaScript. --- app/components/budgets/investments/map_component.html.erb | 2 +- app/components/budgets/investments/map_component.rb | 1 + app/components/budgets/map_component.html.erb | 2 +- spec/components/budgets/map_component_spec.rb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/components/budgets/investments/map_component.html.erb b/app/components/budgets/investments/map_component.html.erb index 2324476b8..d8961a740 100644 --- a/app/components/budgets/investments/map_component.html.erb +++ b/app/components/budgets/investments/map_component.html.erb @@ -1,3 +1,3 @@ -
+
<%= render_map(map_location, investments_coordinates: coordinates) %>
diff --git a/app/components/budgets/investments/map_component.rb b/app/components/budgets/investments/map_component.rb index 7c88ac828..c843c38a4 100644 --- a/app/components/budgets/investments/map_component.rb +++ b/app/components/budgets/investments/map_component.rb @@ -1,5 +1,6 @@ class Budgets::Investments::MapComponent < ApplicationComponent attr_reader :heading, :investments + delegate :render_map, to: :helpers def initialize(investments, heading:) @investments = investments diff --git a/app/components/budgets/map_component.html.erb b/app/components/budgets/map_component.html.erb index fa2284472..fb89cd1f0 100644 --- a/app/components/budgets/map_component.html.erb +++ b/app/components/budgets/map_component.html.erb @@ -1,4 +1,4 @@ -
+

<%= t("budgets.index.map") %>

<%= render_map(nil, investments_coordinates: coordinates) %>
diff --git a/spec/components/budgets/map_component_spec.rb b/spec/components/budgets/map_component_spec.rb index 7d9d3ffb8..60996af24 100644 --- a/spec/components/budgets/map_component_spec.rb +++ b/spec/components/budgets/map_component_spec.rb @@ -10,7 +10,7 @@ describe Budgets::MapComponent do render_inline Budgets::MapComponent.new(budget) - expect(page.first("div.map")).to have_content "located geographically" + expect(page.find(".budgets-map")).to have_content "located geographically" end it "is not rendered during the informing phase" do