← All changes | includes/Editors/BlockEditor/Blocks/SearchForm.php +4 -27 4.8.2 → 3.8.9 View file →

		@@ -35,11 +35,9 @@
35	35	'placeholderText' => __( 'Search', 'betterdocs' ),
36	36	'searchLayout' => 'layout-1',
37	37	'searchHeading' => '',
38	38	'searchSubHeading' => '',
39		- 'searchHeadingTag' => 'h2',
40		- 'searchSubHeadingTag' => 'h3',
41		- 'searchButtonLayout2' => true, //for search modal — search button enabled by default
	39	+ 'searchButtonLayout2' => false, //for search modal
42	40	'categorySearchLayout2' => false, //for search modal
43	41	'popularSearchLayout2' => false, //for search modal,
44	42	'initialFAQNumber' => 5, //for search modal,
45	43	'initialDocsNumber' => 5, //for search modal,
		@@ -50,9 +48,8 @@
50	48	}
51	49
52	50	public function render( $attributes, $content ) {
53	51	$settings = $this->attributes;
54		-
55	52	if ( isset( $settings['searchLayout'] ) && $settings['searchLayout'] == 'layout-1' ) {
56	53	$this->views( 'widgets/search-form' );
57	54	} else {
58	55	$popular_search = isset( $settings['popularSearchLayout2'] ) ? $settings['popularSearchLayout2'] : false;
		@@ -64,18 +61,10 @@
64	61	$doc_ids = isset( $settings['searchModalQueryDocIds'] ) ? $settings['searchModalQueryDocIds'] : '';
65	62	$faq_categories_ids = isset( $settings['searchModalQueriesFaqGroupIds'] ) ? $settings['searchModalQueriesFaqGroupIds'] : '';
66	63	$searchHeading = isset( $settings['searchHeading'] ) ? $settings['searchHeading'] : '';
67	64	$subHeading = isset( $settings['searchSubHeading'] ) ? $settings['searchSubHeading'] : '';
68		- $search_modal_layout = isset( $settings['searchModalLayout'] ) ? $settings['searchModalLayout'] : 'layout-1';
69		- $search_modal_search_type = betterdocs()->settings->get('search_modal_search_type');
70		- $headingTag = isset( $settings['searchHeadingTag'] ) ? $settings['searchHeadingTag'] : 'h2';
71		- $subHeadingTag = isset( $settings['searchSubHeadingTag'] ) ? $settings['searchSubHeadingTag'] : 'h3';
72		- $search_modal_search_type = betterdocs()->settings->get('search_modal_search_type');
73		-
74		- // Add AI Search Suggestions parameter
75		- $enable_ai_suggestions = isset( $settings['enable_ai_powered_search'] ) ? $settings['enable_ai_powered_search'] : false;
76	65	echo '<div class="' . esc_attr( $settings['blockId'] ) . '">';
77		- echo do_shortcode( '[betterdocs_search_modal enable_docs_search="'.($search_modal_search_type == 'all' || $search_modal_search_type == 'docs' ? true : false).'" enable_faq_search="'.($search_modal_search_type == 'all' || $search_modal_search_type == 'faq' ? true : false).'" faq_categories_ids="' . esc_attr( $faq_categories_ids ). '" doc_ids="' . esc_attr( $doc_ids ) . '" doc_categories_ids="' . esc_attr( $doc_categories_ids ) . '" number_of_docs="' . esc_attr( $number_of_docs ) . '" number_of_faqs="' . esc_attr( $number_of_faqs ) . '" search_button_text="Search" search_button="' . esc_attr( $search_button ) . '" popular_search="' . esc_attr( $popular_search ) . '" category_search="' . esc_attr( $category_search ) . '" layout="' . esc_attr( $search_modal_layout ) . '" heading="' . esc_attr( $searchHeading ) . '" subheading="' . esc_attr( $subHeading ) . '" heading_tag="' . esc_attr( $headingTag ) . '" subheading_tag="' . esc_attr( $subHeadingTag ) . '" placeholder="' . esc_attr( $settings['placeholderText'] ) . '" enable_ai_powered_search="' . esc_attr( $enable_ai_suggestions ) . '"]' );
	66	+ echo do_shortcode( '[betterdocs_search_modal faq_categories_ids="' . $faq_categories_ids . '" doc_ids="' . $doc_ids . '" doc_categories_ids="' . $doc_categories_ids . '" number_of_docs="' . $number_of_docs . '" number_of_faqs="' . $number_of_faqs . '" search_button_text="Search" search_button="' . $search_button . '" popular_search="' . $popular_search . '" category_search="' . $category_search . '" layout="layout-1" heading="' . $searchHeading . '" subheading="' . $subHeading . '" heading_tag="h2" subheading_tag="h2" placeholder="' . $settings['placeholderText'] . '"]' );
78	67	echo '</div>';
79	68	}
80	69	}
81	70
		@@ -84,26 +73,14 @@
84	73
85	74	$_shortcode_attributes = apply_filters(
86	75	'betterdocs_elementor_search_form_params',
87	76	[
88		- 'placeholder' => esc_html( $settings['placeholderText'] ),
89		- 'heading' => isset( $settings['searchHeading'] ) ? esc_html( $settings['searchHeading'] ) : '',
90		- 'subheading' => isset( $settings['searchSubHeading'] ) ? esc_html( $settings['searchSubHeading'] ) : '',
91		- 'heading_tag' => isset( $settings['searchHeadingTag'] ) ? esc_attr( $settings['searchHeadingTag'] ) : 'h2',
92		- 'subheading_tag' => isset( $settings['searchSubHeadingTag'] ) ? esc_attr( $settings['searchSubHeadingTag'] ) : 'h3'
	77	+ 'placeholder' => esc_html( $settings['placeholderText'] )
93	78	],
94	79	$this->attributes
95	80	);
96	81
97		- $wrapper_classes = [];
98		- if ( isset( $settings['blockId'] ) && ! empty( $settings['blockId'] ) ) {
99		- $wrapper_classes[] = $settings['blockId'];
100		- }
101		-
102	82	return [
103		- 'shortcode_attr' => $_shortcode_attributes,
104		- 'wrapper_attr' => [
105		- 'class' => $wrapper_classes
106		- ]
	83	+ 'shortcode_attr' => $_shortcode_attributes
107	84	];
108	85	}
109	86	}