feat: announce filters once applied (resolves #130) (#241)

platform-coop-toolkit · Mar 31, 2020 · 46ab87a · 46ab87a
1 parent 85656ee
commit 46ab87a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/app/Controllers/App.php b/app/Controllers/App.php
@@ -68,6 +68,25 @@ public function queriedResourceTerms()
         return $terms;
     }
 
+    public function filterCount()
+    {
+        $count = 0;
+        global $wp_query;
+        if ($wp_query->tax_query) {
+            foreach ($wp_query->tax_query->queries as $value) {
+                foreach ($value['terms'] as $t) {
+                    $count++;
+                }
+            }
+        }
+        if (isset($_GET['language'])) {
+            foreach ($_GET['language'] as $lang) {
+                $count++;
+            }
+        }
+        return $count;
+    }
+
     public function availableLanguages()
     {
         if (function_exists('pll_the_languages') && function_exists('pll_current_language')) {

diff --git a/app/filters.php b/app/filters.php
@@ -13,9 +13,8 @@
         }
     }
 
-    /** Add class if sidebar is active */
-    if (display_sidebar()) {
-        $classes[] = 'sidebar-primary';
+    if (isset($_GET['filtered']) && $_GET['filtered'] === '1') {
+        $classes[] = 'filtered';
     }
 
     /** Clean up class names for custom templates */

diff --git a/resources/assets/scripts/routes/archive.js b/resources/assets/scripts/routes/archive.js
@@ -3,7 +3,7 @@
 import addNotification from '../util/addNotification';
 import Cookies from 'cookies.js';
 import Pinecone from '@platform-coop-toolkit/pinecone';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _n, sprintf } from '@wordpress/i18n';
 import { speak } from '@wordpress/a11y';
 
 export default {
@@ -13,6 +13,15 @@ export default {
     const showFilters = document.querySelector( '#show-filters' );
     const hideFilters = document.querySelector( '#hide-filters' );
 
+    if (document.body.classList.contains('filtered')) {
+      const currentFilterCount = document.body.dataset.filters;
+      if ( currentFilterCount ) {
+        setTimeout(function() {
+          speak(sprintf(_n('%s filter applied. Resource list updated.', '%s filters applied. Resource list updated.', parseInt(currentFilterCount), 'coop-library'), currentFilterCount), 'assertive');
+        }, 1000);
+      }
+    }
+
     if ( showFilters && hideFilters && filterContainer ) {
       new Pinecone.FilterList( filterContainer, showFilters, hideFilters );
     }

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -1,7 +1,11 @@
 <!doctype html>
 <html class="no-js" {!! get_language_attributes() !!}>
   @include('partials.head')
-  <body @php body_class() @endphp>
+  <body @php body_class() @endphp
+  @if($filter_count)
+  data-filters="{{ $filter_count }}"
+  @endif
+  >
     @php do_action('get_header') @endphp
     @include('partials.header')
     <div class="wrap container" role="document">

diff --git a/resources/views/partials/filters.blade.php b/resources/views/partials/filters.blade.php
@@ -1,6 +1,7 @@
 <div class="filter-wrapper">
   <button type="button" class="button button--borderless" id="show-filters">@svg('filter', 'icon--filter', ['focusable' => 'false', 'aria-hidden' => 'true']) {{ __('Filter', 'coop-library' ) }}</button>
   <form name="filters" class="filters" action="{{ (isset($_GET['s'])) ? home_url('/') : get_post_type_archive_link('lc_resource') }}">
+      <input type="hidden" name="filtered" value="1" />
       @if(isset($_GET['s']))
       <input type="hidden" name="s" value="{{ $_GET['s'] }}" />
       <input type="hidden" name="post_type" value="lc_resource" />