← All changes | includes/Editors/BlockEditor/Blocks/FAQ.php +58 -9 4.5.5 → 4.9.2 View file →

		@@ -6,8 +6,9 @@
6	6	}
7	7
8	8
9	9	use WPDeveloper\BetterDocs\Editors\BlockEditor\Block;
	10	+use WPDeveloper\BetterDocs\FrontEnd\WooProductFAQ as WooFAQRenderer;
10	11
11	12	class FAQ extends Block {
12	13	protected $editor_scripts = [
13	14	'betterdocs-faq',
		@@ -45,8 +46,9 @@
45	46	'faqSectionText' => 'Frequently Asked Questions',
46	47	'faqSectionTitleTag' => 'h2',
47	48	'faqGroupTitleTag' => 'h3',
48	49	'faqSectionTitleColor' => null,
	50	+ // JSON string of `[{value:int, label:string}]`; a bare id array (`[5]`) is also accepted since 4.9.0.
49	51	'includeFaqGroup' => '',
50	52	'excludeFaqGroup' => '',
51	53	'faqGroupTitleColor' => null,
52	54	'faqGroupTitleHoverColor' => null,
		@@ -56,13 +58,18 @@
56	58	'faqGroupTitleTypography' => null,
57	59	'faqPerPage' => 9,
58	60
59	61	'showButtonIcon' => true,
60		- 'buttonColor' => '#528ffe'
	62	+ 'buttonColor' => '#528ffe',
	63	+ 'faqTaxonomy' => 'betterdocs_faq_category'
61	64	];
62	65	}
63	66
64	67	public function render( $attributes, $content ) {
	68	+ if ( ( $this->attributes['faqTaxonomy'] ?? '' ) === 'product_assignments' ) {
	69	+ $this->render_product_assignments();
	70	+ return;
	71	+ }
65	72
66	73	add_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10, 4 );
67	74	$this->views( 'layouts/faq' );
68	75	remove_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10 );
		@@ -67,16 +74,54 @@
67	74	$this->views( 'layouts/faq' );
68	75	remove_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10 );
69	76	}
70	77
	78	+ private function render_product_assignments() {
	79	+ if ( ! class_exists( 'WooCommerce' ) || ! is_product() ) {
	80	+ return;
	81	+ }
	82	+
	83	+ // In FSE templates, top-level blocks render outside the loop, so
	84	+ // get_the_ID() can be 0 — fall back to the queried product.
	85	+ $product_id = get_the_ID();
	86	+ if ( ! $product_id ) {
	87	+ $product_id = get_queried_object_id();
	88	+ }
	89	+ if ( ! $product_id ) {
	90	+ return;
	91	+ }
	92	+
	93	+ /** @var WooFAQRenderer $renderer */
	94	+ $renderer = betterdocs()->container->get( WooFAQRenderer::class );
	95	+
	96	+ // This block is the explicit placement; don't also inject into the tab/summary.
	97	+ $renderer->suppress_auto_placement();
	98	+ $renderer->render_for_product( $product_id, $this->attributes['faqLayout'] ?? null );
	99	+ }
	100	+
	101	+ /**
	102	+ * Flatten a group-selection attribute into a comma separated list of term ids.
	103	+ *
	104	+ * The attribute is a JSON string. The editor writes
	105	+ * `[{"value":5,"label":"Install"}]`; REST clients and other programmatic
	106	+ * writers commonly write the bare form `[5]`. Both are accepted — before
	107	+ * 4.9.0 the bare form flattened to an empty string, which
	108	+ * `Query::faq_terms_query_args()` reads as "no filter", so every group
	109	+ * rendered and the block warned on every view.
	110	+ *
	111	+ * @since 4.9.0 Bare ids are accepted alongside `{ value, label }` objects;
	112	+ * ids are cast with `absint()` and de-duplicated.
	113	+ *
	114	+ * @param mixed $json JSON encoded list of term ids or `{ value, label }` objects.
	115	+ *
	116	+ * @return string Comma separated term ids, or '' when there is nothing to filter by.
	117	+ */
71	118	public function get_groups_ids( $json ) {
72		- $data = json_decode( $json, true );
73		- $ids = '';
74		- if ( $data !== null ) {
75		- $ids = implode( ',', array_column( $data, 'value' ) );
76		- }
	119	+ $data = is_string( $json ) ? json_decode( $json, true ) : $json;
	120	+ $ids = array_filter( self::normalize_id_list( $data ), 'is_numeric' );
	121	+ $ids = array_unique( array_map( 'absint', $ids ) );
77	122
78		- return $ids;
	123	+ return implode( ',', $ids );
79	124	}
80	125
81	126	public function view_params() {
82	127	$attributes = &$this->attributes;
		@@ -84,10 +129,11 @@
84	129	// Sanitize the layout attribute to prevent path traversal (LFI).
85	130	$attributes['faqLayout'] = sanitize_file_name( $attributes['faqLayout'] );
86	131	$exclude = $this->get_groups_ids( $attributes['excludeFaqGroup'] );
87	132	$include = $this->get_groups_ids( $attributes['includeFaqGroup'] );
	133	+ $taxonomy = sanitize_key( $attributes['faqTaxonomy'] ?? 'betterdocs_faq_category' );
88	134
89		- $terms_query = betterdocs()->query->faq_terms_query_args( $include, $exclude );
	135	+ $terms_query = betterdocs()->query->faq_terms_query_args( $include, $exclude, [], $taxonomy );
90	136
91	137	return wp_parse_args(
92	138	[
93	139	'enable' => true,
		@@ -114,9 +160,12 @@
114	160	'faq_group_title_typography' => $attributes['faqGroupTitleTypography'],
115	161	'faq_per_page' => $attributes['faqPerPage'],
116	162	'show_button_icon' => $attributes['showButtonIcon'],
117	163	'button_icon_position' => $attributes['faqLayout'] == 'layout-1' || $attributes['faqLayout'] == 'layout-3' || $attributes['faqLayout'] == 'layout-4' ? 'after' : 'before',
118		- 'button_color' => $attributes['buttonColor']
	164	+ 'button_color' => $attributes['buttonColor'],
	165	+ 'faq_taxonomy' => $taxonomy,
	166	+ // Per-block order; empty falls back to the global FAQ order.
	167	+ 'order' => isset( $attributes['faqOrder'] ) ? $attributes['faqOrder'] : ''
119	168	]
120	169
121	170	]
122	171	);