[MOOSE-350]: fix fselect; fix flyout theme; remove all posts option

Author: GeoffDusome

wp-content/plugins/core/src/Components/Blocks/FacetWP_Grid_Controller.php

@@ -8,7 +8,6 @@ class FacetWP_Grid_Controller extends Abstract_Block_Controller {
 
 	protected \WP_Query $query;
 	protected string $post_type;
-	protected bool $show_all_posts;
 	protected int $posts_per_page;
 	protected bool $show_pagination;
 
@@ -18,7 +17,6 @@ public function __construct( array $args = [] ) {
 		$this->block_classes .= ' facetwp-template';
 
 		$this->post_type       = $this->attributes['postType'] ?? 'post';
-		$this->show_all_posts  = $this->attributes['showAllPosts'] ?? false;
 		$this->posts_per_page  = absint( $this->attributes['postsPerPage'] ?? 12 );
 		$this->show_pagination = $this->attributes['showPagination'] ?? false;
 
@@ -56,7 +54,7 @@ private function set_query(): void {
 		$this->query = new \WP_Query( [
 			'post_type'      => $this->post_type,
 			'post_status'    => 'publish',
-			'posts_per_page' => $this->show_all_posts ? -1 : $this->posts_per_page,
+			'posts_per_page' => $this->posts_per_page,
 			'facetwp'        => true,
 		] );
 	}

wp-content/themes/core/assets/pcss/integrations/facetwp.pcss

@@ -140,6 +140,7 @@
 
 			.fs-option {
 				--checkbox-size: 24px;
+				position: relative;
 
 				/* top and bottom padding = half of the spacer-30 (helps each item have a larger click target)
 				   left padding = spacer-20 + checkbox size + spacer-10 [label displays here] */
@@ -170,6 +171,7 @@
 				}
 
 				&.selected {
+					background-color: transparent;
 
 					.fs-checkbox {
 						border-color: var(--color-black);

wp-content/themes/core/blocks/tribe/facetwp-filter-bar/js/flyout.js

@@ -89,6 +89,7 @@ const openFlyout = ( block ) => {
 
 	trigger.setAttribute( 'aria-expanded', 'true' );
 	flyout.setAttribute( 'aria-hidden', 'false' );
+	flyout.classList.add( 'is-style-white' );
 	flyout.classList.add( 'is-open' );
 	bodyLock( true );
 	closeBtn.focus();
@@ -114,6 +115,7 @@ const closeFlyout = ( block ) => {
 	trigger.setAttribute( 'aria-expanded', 'false' );
 	flyout.setAttribute( 'aria-hidden', 'true' );
 	flyout.classList.remove( 'is-open' );
+	flyout.classList.remove( 'is-style-white' );
 	bodyLock( false );
 	trigger.focus();
 	flyout.removeEventListener( 'keydown', flyoutKeydown );

wp-content/themes/core/blocks/tribe/facetwp-filter-bar/style.pcss

@@ -253,6 +253,7 @@
 	overflow: auto;
 	visibility: hidden;
 	opacity: 0;
+	color: var(--color-black);
 	transition: visibility 0.2s, opacity 0.2s;
 
 	&[aria-hidden="false"].is-open {
@@ -270,6 +271,7 @@
 		box-shadow: none;
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
+		color: var(--color-text);
 	}
 }
 

wp-content/themes/core/blocks/tribe/facetwp-grid/block.json

@@ -12,10 +12,6 @@
 			"type": "string",
 			"default": "post"
 		},
-		"showAllPosts": {
-			"type": "boolean",
-			"default": false
-		},
 		"postsPerPage": {
 			"type": "number",
 			"default": 12

wp-content/themes/core/blocks/tribe/facetwp-grid/edit.js

@@ -13,7 +13,7 @@ import metadata from './block.json';
 function Edit( { attributes, setAttributes, isSelected, postTypes } ) {
 	const blockProps = useBlockProps();
 
-	const { postType, postsPerPage, showAllPosts, showPagination } = attributes;
+	const { postType, postsPerPage, showPagination } = attributes;
 
 	const filteredPostTypes = postTypes?.filter(
 		( type ) => type.visibility.show_in_nav_menus === true
@@ -45,33 +45,18 @@ function Edit( { attributes, setAttributes, isSelected, postTypes } ) {
 								setAttributes( { postType: value } )
 							}
 						/>
-						<ToggleControl
+						<RangeControl
 							__next40pxDefaultSize
 							__nextHasNoMarginBottom
-							label={ __( 'Show All Posts', 'tribe' ) }
-							help={ __(
-								'If checked, all posts will be displayed in the grid. If unchecked, the number of posts displayed will be limited to the number set in the "Posts Per Page" setting.',
-								'tribe'
-							) }
-							checked={ showAllPosts }
+							label={ __( 'Posts Per Page', 'tribe' ) }
+							min={ 1 }
+							max={ 99 }
+							step={ 1 }
+							value={ postsPerPage }
 							onChange={ ( value ) =>
-								setAttributes( { showAllPosts: value } )
+								setAttributes( { postsPerPage: value } )
 							}
 						/>
-						{ ! showAllPosts && (
-							<RangeControl
-								__next40pxDefaultSize
-								__nextHasNoMarginBottom
-								label={ __( 'Posts Per Page', 'tribe' ) }
-								min={ 1 }
-								max={ 24 }
-								step={ 1 }
-								value={ postsPerPage }
-								onChange={ ( value ) =>
-									setAttributes( { postsPerPage: value } )
-								}
-							/>
-						) }
 						<ToggleControl
 							__next40pxDefaultSize
 							__nextHasNoMarginBottom