Merge pull request #273 from localgovdrupal/fix/2.x/proximity-search-…

…facet-tpl

Fix(Proximity search): Facet display

localgov_directories.module

@@ -29,16 +29,29 @@ function localgov_directories_theme() {
     'facets_item_list__links__localgov_directories_facets' => [
       'base hook' => 'facets_item_list',
     ],
+    // Facets for proximity search look no different.
+    'facets_item_list__links__localgov_directories_facets_proximity_search' => [
+      'base hook' => 'facets_item_list',
+      'template'  => 'facets-item-list--links--localgov-directories-facets',
+    ],
     // Facet Checkboxes are rendered through Javascript.  So the same markup as
     // "link" Facets suffices.
     'facets_item_list__checkbox__localgov_directories_facets' => [
       'base hook' => 'facets_item_list',
       'template'  => 'facets-item-list--links--localgov-directories-facets',
     ],
+    'facets_item_list__checkbox__localgov_directories_facets_proximity_search' => [
+      'base hook' => 'facets_item_list',
+      'template'  => 'facets-item-list--links--localgov-directories-facets',
+    ],
     'facets_item_list__dropdown__localgov_directories_facets' => [
       'base hook' => 'facets_item_list',
       'template'  => 'facets-item-list--dropdown--localgov-directories-facets',
     ],
+    'facets_item_list__dropdown__localgov_directories_facets_proximity_search' => [
+      'base hook' => 'facets_item_list',
+      'template'  => 'facets-item-list--dropdown--localgov-directories-facets',
+    ],
   ];
 }
 
@@ -171,12 +184,11 @@ function localgov_directories_field_config_delete(FieldConfigInterface $field) {
  * @see facets_preprocess_facets_item_list()
  */
 function localgov_directories_preprocess_facets_item_list(array &$variables) {
-  if (!empty($variables['facet']) && ($variables['facet']->id() == 'localgov_directories_facets')) {
+  if (!empty($variables['facet']) && ($variables['facet']->id() === Directory::FACET_CONFIG_ENTITY_ID || $variables['facet']->id() === Directory::FACET_CONFIG_ENTITY_ID_FOR_PROXIMITY_SEARCH)) {
     \Drupal::service('class_resolver')
       ->getInstanceFromDefinition(DirectoryExtraFieldDisplay::class)
       ->preprocessFacetList($variables);
   }
-
 }
 
 /**