Merge pull request #30 from andreyzb/main

 fix: Bugfixes - DS-640, DS-656, DS-657, DS-658

modules/openy_map_lb/assets/src/js/map.js

@@ -329,12 +329,12 @@
         this.distance_limit_el.on('change', $.proxy(this.apply_distance_limit, this));
         this.amenities_filter_el.find('input[type=checkbox]').on('change', $.proxy(this.update_amenities_filters, this));
 
-        $('.amenities-group', this.amenities_filter_el).each(function (group) {
-          $('ul', group).on('show.bs.collapse', function () {
-            $('header i', group).removeClass('fa-plus').addClass('fa-times');
+        $('.amenities-group', this.amenities_filter_el).each(function (idx, group){
+          $('ul', this).on('show.bs.collapse', () => {
+            $('header i', this).removeClass('fa-plus').addClass('fa-times');
           });
-          $('ul', group).on('hide.bs.collapse', function () {
-            $('header i', group).removeClass('fa-times').addClass('fa-plus');
+          $('ul', this).on('hide.bs.collapse', () => {
+            $('header i', this).removeClass('fa-times').addClass('fa-plus');
           });
         });
       },
@@ -933,12 +933,12 @@
         this.distance_limit_el.on('change', $.proxy(this.apply_distance_limit, this));
         this.amenities_filter_el.find('input[type=checkbox]').on('change', $.proxy(this.update_amenities_filters, this));
 
-        $('.amenities-group', this.amenities_filter_el).each(function (group){
-          $('ul', group).on('show.bs.collapse', function (){
-            $('header i', group).removeClass('fa-plus').addClass('fa-times');
+        $('.amenities-group', this.amenities_filter_el).each(function (idx, group){
+          $('ul', this).on('show.bs.collapse', () => {
+            $('header i', this).removeClass('fa-plus').addClass('fa-times');
           });
-          $('ul', group).on('hide.bs.collapse', function (){
-            $('header i', group).removeClass('fa-times').addClass('fa-plus');
+          $('ul', this).on('hide.bs.collapse', () => {
+            $('header i', this).removeClass('fa-times').addClass('fa-plus');
           });
         });
       },

modules/openy_map_lb/assets/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "map.js",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Open Y LB map library",
   "main": "map.js",
   "scripts": {

modules/openy_map_lb/assets/src/scss/openy-map-lb.scss

@@ -124,15 +124,18 @@
         padding-left: 30px;
       }
       .group-header {
+        font-family: var(--ylb-font-family-verdana);
+        font-size: 15px;
         text-transform: uppercase;
-        font-size: 16px;
         line-height: 26px;
         margin-bottom: 21px;
       }
       ul {
         margin-bottom: 20px;
       }
       header {
+        font-family: var(--ylb-font-family-verdana);
+        font-size: 15px;
         position: relative;
         @include media-breakpoint-up(md){
           margin-bottom: 20px;
@@ -211,6 +214,10 @@
       border-radius: 20px;
       text-transform: none;
       padding: 1px 15px;
+      margin-bottom: 15px;
+      @include media-breakpoint-down(sm){
+        margin-bottom: 30px;
+      }
       input {
         display: none;
       }

modules/openy_map_lb/openy_map_lb.info.yml

@@ -2,7 +2,7 @@ name: Y Layout Builder - Open Y Map
 type: module
 description: Renders a map with locations. Provides Layout Builder block for Locations page.
 core_version_requirement: ^8.8 || ^9 || ^10
-version: 1.0.1
+version: 1.0.2
 package: 'YMCA Website Services'
 dependencies:
   - openy_map:openy_map

modules/openy_map_lb/openy_map_lb.libraries.yml

@@ -1,5 +1,5 @@
 openy_map:
-  version: 1.0.1
+  version: 1.0.2
   js:
     assets/js/map.js: { preprocess: true }
   css:

modules/openy_map_lb/openy_map_lb.module

@@ -3,6 +3,9 @@
  * @file
  * Module file.
  */
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\node\NodeInterface;
 
 /**
@@ -51,6 +54,17 @@ function openy_map_lb_preprocess_block__lb_openy_map(&$variables) {
   $variables['content'] = $render;
 }
 
+/**
+ * Implements hook_ENTITY_TYPE_view_alter().
+ */
+function openy_map_lb_node_view_alter( array &$build, EntityInterface $entity, EntityViewDisplayInterface $display ) {
+  $activeTypes = \Drupal::configFactory()->get('openy_map.settings')->get('active_types');
+  $activeTypes = !empty($activeTypes) ? array_keys(array_filter($activeTypes)) : [];
+  if ($build['#view_mode'] == 'teaser' && $entity->hasField('field_location_coordinates') && in_array($entity->bundle(), $activeTypes)) {
+    $build['#cache']['contexts'][] = 'url.path.parent';
+  }
+}
+
 /**
  * Implements hook_theme_suggestions_HOOK_alter().
  */
@@ -62,12 +76,12 @@ function openy_map_lb_theme_suggestions_node_alter(array &$suggestions, array $v
   // Check for active types.
   $activeTypes = \Drupal::configFactory()->get('openy_map.settings')->get('active_types');
   $activeTypes = !empty($activeTypes) ? array_keys(array_filter($activeTypes)) : [];
+  if (is_null($has_layout)) {
+    $current_page = Drupal::routeMatch()->getParameter('node');
+    $has_layout = ($current_page instanceof NodeInterface) && $current_page->hasField('layout_builder__layout');
+  }
   // Add universal template for all location content type teasers.
   if ($view_mode == 'teaser' && $node->hasField('field_location_coordinates') && in_array($node->bundle(), $activeTypes)) {
-    if (is_null($has_layout)) {
-      $current_page = Drupal::routeMatch()->getParameter('node');
-      $has_layout = ($current_page instanceof NodeInterface) && $current_page->hasField('layout_builder__layout');
-    }
     if ($has_layout) {
       $suggestions[] = 'node__location_type__lb_teaser';
     }