-
Notifications
You must be signed in to change notification settings - Fork 18
Add FacetWP services #372
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Add FacetWP services #372
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d0b78be
Add FacetWP services
ecorica 448ce7a
Add text domain and update translation
ecorica 8ac1dc1
FacetWP Service : add customization to facet pager links // remove cu…
MarieComet 6c4caf3
FacetWP Service : remove load_assets filter // Simplify labels
MarieComet ac3253d
FacetWP Service : Add aria label to per page select // Allow to exclu…
MarieComet ffb033c
apply FacetWP Service review fixes
MarieComet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,175 @@ | ||
<?php | ||
|
||
namespace BEA\Theme\Framework\Services; | ||
|
||
use BEA\Theme\Framework\Service; | ||
use BEA\Theme\Framework\Service_Container; | ||
|
||
class Facet_WP implements Service { | ||
public function register( Service_Container $container ): void { | ||
} | ||
|
||
public function boot( Service_Container $container ): void { | ||
add_filter( 'facetwp_load_assets', '__return_true' ); | ||
add_filter( 'facetwp_load_a11y', '__return_true' ); | ||
add_filter( 'facetwp_facets', [ $this, 'register_facets' ], 40 ); | ||
add_filter( 'facetwp_pager_html', [ $this, 'accessible_facetwp_pager_html' ], 10, 2 ); | ||
add_filter( 'facetwp_facet_html', [ $this, 'accessible_facetwp_labels' ], 10, 2 ); | ||
} | ||
|
||
/** | ||
* Get service name | ||
* | ||
* @return string | ||
*/ | ||
public function get_service_name(): string { | ||
return 'facetwp'; | ||
} | ||
|
||
/** | ||
* Register facets from config file. | ||
* | ||
* @param array $facets | ||
* | ||
* @return array | ||
* @author Egidio CORICA | ||
*/ | ||
public function register_facets( array $facets ): array { | ||
|
||
$filename = get_theme_file_path( 'assets/facetwp/config.json' ); | ||
if ( ! is_readable( $filename ) ) { | ||
return $facets; | ||
} | ||
|
||
$facet_content = file_get_contents( $filename ); // phpcs:ignore | ||
if ( empty( $facet_content ) ) { | ||
return $facets; | ||
} | ||
|
||
$facet_content = \json_decode( $facet_content, true ); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Attention, on a deux appels à |
||
if ( | ||
JSON_ERROR_NONE !== \json_last_error() | ||
|| ! is_array( $facet_content ) | ||
|| empty( $facet_content['facets'] ) | ||
) { | ||
return $facets; | ||
} | ||
MarieComet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
return wp_parse_args( $facet_content['facets'], $facets ); | ||
} | ||
|
||
/** | ||
* Add custom and accessible FacetWP pagination. | ||
* | ||
* @param $output | ||
* @param $params | ||
* | ||
* @return string | ||
* | ||
* @author Egidio CORICA | ||
* | ||
*/ | ||
firestar300 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
public function accessible_facetwp_pager_html( $output, $params ): string { | ||
$defaults = [ | ||
'page' => 1, | ||
'per_page' => 10, | ||
'total_rows' => 1, | ||
]; | ||
$params = array_merge( $defaults, $params ); | ||
$output = ''; | ||
$page = (int) $params['page']; | ||
$total_pages = (int) $params['total_pages']; | ||
|
||
// Only show pagination when > 1 page | ||
if ( 1 < $total_pages ) { | ||
|
||
$text_page = esc_html__( 'Page', 'fwp-front' ); | ||
$text_of = esc_html__( 'of', 'fwp-front' ); | ||
$step = 10; | ||
|
||
$output .= '<span class="facetwp-pager-label sr-only">' . "$text_page $page $text_of $total_pages</span>"; | ||
|
||
if ( $page > 1 ) { | ||
$output .= '<a href="#" class="facetwp-page previouspostslink" data-page="' . ( $page - 1 ) . '">' . __( 'Previous', 'framework-textdomain' ) . '</a>'; | ||
} else { | ||
$output .= '<span class="facetwp-page previouspostslink" aria-hidden="true" tabindex="-1" style="visibility: hidden"></span>'; | ||
} | ||
|
||
if ( 3 < $page ) { | ||
$output .= '<a href="#" class="facetwp-page first-page" data-page="1"> | ||
<span class="sr-only">Première page</span> | ||
<span aria-hidden="true">1</span> | ||
</a>'; | ||
} | ||
if ( 1 < ( $page - $step ) ) { | ||
$output .= '<span class="facetwp-page-more" aria-hidden="true">...</span>'; | ||
} | ||
|
||
for ( $i = 2; $i > 0; $i -- ) { | ||
if ( 0 < ( $page - $i ) ) { | ||
$output .= '<a href="#" class="facetwp-page" data-page="' . ( $page - $i ) . '"><span class="sr-only">' . __( 'Page', 'framework-textdomain' ) . '</span> ' . ( $page - $i ) . '</a>'; | ||
} | ||
} | ||
|
||
// Current page | ||
$output .= '<a href="#" class="facetwp-page active" aria-current="true" data-page="' . $page . '"><span class="sr-only">' . __( 'Current page', 'framework-textdomain' ) . '</span> ' . $page . '</a>'; | ||
MarieComet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
for ( $i = 1; $i <= 2; $i ++ ) { | ||
if ( $total_pages >= ( $page + $i ) ) { | ||
$output .= '<a href="#" class="facetwp-page" data-page="' . ( $page + $i ) . '"><span class="sr-only">' . __( 'Page', 'framework-textdomain' ) . '</span> ' . ( $page + $i ) . '</a>'; | ||
} | ||
} | ||
|
||
if ( $total_pages > ( $page + $step ) ) { | ||
$output .= '<span class="facetwp-page-more" aria-hidden="true">...</span>'; | ||
} | ||
|
||
if ( $total_pages > ( $page + 2 ) ) { | ||
$output .= '<a href="#" class="facetwp-page last-page" data-page="' . $total_pages . '"> | ||
<span class="sr-only">' . __( 'Last page', 'framework-textdomain' ) . '</span> | ||
<span aria-hidden="true">' . $total_pages . '</span> | ||
</a>'; | ||
} | ||
|
||
if ( $page < $total_pages && $total_pages > 1 ) { | ||
$output .= '<a href="#" class="facetwp-page nextpostslink" data-page="' . ( $page + 1 ) . '">' . __( 'Next', 'framework-textdomain' ) . '</a>'; | ||
} else { | ||
$output .= '<span class="facetwp-page nextpostslink" aria-hidden="true" style="visibility: hidden;" tabindex="-1"></span>'; | ||
} | ||
} | ||
|
||
return $output; | ||
} | ||
|
||
/** | ||
* Fix Labels for supported facets. | ||
* Put in show_label_not_empty the facets that only need to be visible in they have results. | ||
* | ||
* @param string $html | ||
* @param array $args | ||
* | ||
* @return string | ||
*/ | ||
public function accessible_facetwp_labels( string $html, array $args ): string { | ||
$show_label_not_empty = [ | ||
'checkboxes', | ||
'radio', | ||
]; | ||
|
||
if ( ( true === in_array( $args['facet']['type'], $show_label_not_empty, true ) && ! empty( $args['values'] ) ) || false === in_array( $args['facet']['type'], $show_label_not_empty, true ) ) { | ||
$label = $args['facet']['label']; | ||
if ( function_exists( 'facetwp_i18n' ) ) { | ||
$label = facetwp_i18n( $label ); | ||
} | ||
|
||
$html = sprintf( '<label class="facetwp-label" for="%s">%s</label>%s', esc_attr( $args['facet']['name'] ), esc_html( $label ), $html ); | ||
|
||
// Add id attribute to per_page select | ||
if ( 'per_page' === $args['facet']['name'] ) { | ||
$html = str_replace( '<select class="facetwp-per-page-select">', '<select class="facetwp-per-page-select" id="per_page">', $html ); | ||
} | ||
} | ||
|
||
return $html; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.