← All changes | jetpack_vendor/automattic/jetpack-search/src/initializers/class-initializer.php +106 -6 13.0.2 → 16.3-beta View file →

		@@ -7,8 +7,9 @@
7	7
8	8	namespace Automattic\Jetpack\Search;
9	9
10	10	use Automattic\Jetpack\Connection\Manager as Connection_Manager;
	11	+use Automattic\Jetpack\Status\Host;
11	12	use WP_Error;
12	13	/**
13	14	* Base class for the initializer pattern.
14	15	*/
		@@ -14,8 +15,24 @@
14	15	*/
15	16	class Initializer {
16	17
17	18	/**
	19	+ * Whether a block-driven experience owns the search results this request
	20	+ * — Embedded, or the experimental blocks Overlay. Set to `true` in
	21	+ * `init_search_blocks()` only when the `jetpack_search_blocks_enabled`
	22	+ * gate is on AND the saved experience is one of those (the Overlay arm
	23	+ * additionally requires `jetpack_search_overlay_block_template_enabled`).
	24	+ * In those experiences both Classic and Instant Search are suppressed, so
	25	+ * `init_search()` returns falsy by design; `init()` reads this flag to
	26	+ * treat that as a no-op rather than a real failure. Anchoring on the
	27	+ * actually-wired-up state (not a filter read) prevents the abort carve-out
	28	+ * from being bypassed on a site that doesn't have Search Blocks registered.
	29	+ *
	30	+ * @var bool
	31	+ */
	32	+ private static $block_search_active = false;
	33	+
	34	+ /**
18	35	* Initialize the search package.
19	36	*
20	37	* The method is called from the `Config` class.
21	38	*/
		@@ -53,8 +70,15 @@
53	70	do_action( 'jetpack_search_abort', 'inactive', null );
54	71	return;
55	72	}
56	73
	74	+ // Register the Search 3.0 Interactivity API blocks. Connection +
	75	+ // plan are already guaranteed by the abort above; this call only
	76	+ // layers the Phase 1 feature flag on top, mirroring how
	77	+ // `init_search()` layers `is_instant_search_enabled` on top of
	78	+ // the same upstream gate.
	79	+ static::init_search_blocks();
	80	+
57	81	$blog_id = Helper::get_wpcom_site_id();
58	82	if ( ! $blog_id ) {
59	83	/** This filter is documented in search/src/initalizers/class-initalizer.php */
60	84	do_action( 'jetpack_search_abort', 'no_blog_id', null );
		@@ -66,10 +90,19 @@
66	90	do_action( 'jetpack_search_abort', 'module_inactive', null );
67	91	return;
68	92	}
69	93
70		- // Initialize search package.
71		- if ( ! static::init_search( $blog_id ) ) {
	94	+ // Initialize search package. The block-driven experiences (Embedded /
	95	+ // blocks Overlay) intentionally skip both instant and classic init
	96	+ // (Search_Blocks owns the UI), so a falsy return there is by design —
	97	+ // not an abort. Anything else falsy is a real failure. Anchor on the
	98	+ // actually-wired-up flag (set in `init_search_blocks()` only when the
	99	+ // blocks gate passed) rather than a filter read, so flipping a filter
	100	+ // without the blocks gate can never bypass the abort.
	101	+ $initialized = static::init_search( $blog_id )
	102	+ || self::$block_search_active;
	103	+
	104	+ if ( ! $initialized ) {
72	105	/** This filter is documented in search/src/initalizers/class-initalizer.php */
73	106	do_action( 'jetpack_search_abort', 'jetpack_search_init_search', null );
74	107	return;
75	108	}
		@@ -85,9 +118,11 @@
85	118	/**
86	119	* Extra tweaks to make Jetpack Search play well with others.
87	120	*/
88	121	public static function include_compatibility_files() {
89		- if ( class_exists( 'Jetpack' ) ) {
	122	+ // WordPress.com Simple defines its own unrelated `Jetpack` class, so the class name
	123	+ // alone does not mean the Jetpack plugin, and this shim would fatal there.
	124	+ if ( class_exists( 'Jetpack' ) && ! ( new Host() )->is_wpcom_simple() ) {
90	125	require_once Package::get_installed_path() . 'compatibility/jetpack.php';
91	126	}
92	127	require_once Package::get_installed_path() . 'compatibility/search-0.15.2.php';
93	128	require_once Package::get_installed_path() . 'compatibility/search-0.17.0.php';
		@@ -98,14 +133,78 @@
98	133	* Init functionality required for connection.
99	134	*/
100	135	protected static function init_before_connection() {
101	136	// Set up Search API endpoints.
102		- add_action( 'rest_api_init', array( new REST_Controller(), 'register_rest_routes' ) );
	137	+ add_action( 'rest_api_init', array( REST_Controller::class, 'register' ) );
103	138	// The dashboard has to be initialized before connection.
104	139	( new Dashboard() )->init_hooks();
	140	+ ( new AI_Answers() )->init();
105	141	}
106	142
107	143	/**
	144	+ * Register the Search 3.0 Interactivity API blocks on this request,
	145	+ * gated by the Phase 1 feature flag.
	146	+ *
	147	+ * Called from `init()` after the upstream connection + Search-plan
	148	+ * abort, so on entry the site is guaranteed to be connected and on a
	149	+ * plan that supports Search (paid plans or the free
	150	+ * `jetpack_search_free` product). The remaining gate is the
	151	+ * feature-flag opt-in.
	152	+ *
	153	+ * Sits before the blog_id and module-active checks because admins
	154	+ * should be able to configure Search blocks in the editor regardless
	155	+ * of which runtime experience is enabled — matching how Instant
	156	+ * Search layers its own opt-in on top of the same connection + plan
	157	+ * gate further down in `init_search()`.
	158	+ */
	159	+ protected static function init_search_blocks() {
	160	+ /**
	161	+ * Filter whether the Jetpack Search 3.0 Interactivity API blocks are enabled.
	162	+ *
	163	+ * Necessary but not sufficient on its own — registration also
	164	+ * requires the site to be connected and on a plan that supports
	165	+ * Search (paid plans or the free `jetpack_search_free` product).
	166	+ *
	167	+ * @param bool $enabled Default true.
	168	+ */
	169	+ if ( ! apply_filters( 'jetpack_search_blocks_enabled', true ) ) {
	170	+ return;
	171	+ }
	172	+
	173	+ Search_Blocks::init();
	174	+
	175	+ // When the Search blocks own the front-end results (Embedded / blocks
	176	+ // Overlay), Classic Search would otherwise run a server-side
	177	+ // Elasticsearch query plus a WP_Query to hydrate the posts on every
	178	+ // search request — work the blocks immediately discard. Suppress it so
	179	+ // it never runs, the same way Instant Search replaces Classic;
	180	+ // `Search_Blocks::filter__posts_pre_query` then short-circuits the
	181	+ // remaining core database search. With both handlers gone `init_search()`
	182	+ // returns false by design, so this flag tells `init()` not to treat that
	183	+ // as an abort.
	184	+ //
	185	+ // Front-end only, matching the `posts_pre_query` registration guard:
	186	+ // leaving Classic Search to initialize normally in wp-admin keeps the
	187	+ // change scoped to the search page and avoids dropping admin-side hooks.
	188	+ if ( ! is_admin() && Search_Blocks::owns_search_results() ) {
	189	+ add_filter( 'jetpack_search_classic_search_enabled', '__return_false' );
	190	+ self::$block_search_active = true;
	191	+ }
	192	+
	193	+ // Experimental block-template overlay (available by default, opt-in
	194	+ // via the Experience Selector; see
	195	+ // `Search_Blocks::is_block_template_overlay_enabled()`): bypass the
	196	+ // preact `SearchApp` so it doesn't race the block overlay for
	197	+ // `?s=`, popstate, and theme search-trigger selectors. Suppressing
	198	+ // at the init filter is cleaner than dequeuing post-enqueue. Gated on
	199	+ // the overlay path specifically — Embedded never enables Instant Search,
	200	+ // so there is nothing to suppress there.
	201	+ if ( Search_Blocks::is_block_template_overlay_enabled() ) {
	202	+ add_filter( 'jetpack_search_init_instant_search', '__return_false' );
	203	+ }
	204	+ }
	205	+
	206	+ /**
108	207	* Init the search package.
109	208	*
110	209	* @param int $blog_id WPCOM blog ID.
111	210	*/
		@@ -121,9 +220,9 @@
121	220	}
122	221	/**
123	222	* Filter whether classic search should be enabled. By this stage, search module would be enabled already.
124	223	*
125		- * @since Jetpack $$next_version$$
	224	+ * @since 0.39.6
126	225	* @param boolean initial value whether classic search is enabled.
127	226	* @param boolean filtered result whether classic search is enabled.
128	227	*/
129	228	if ( apply_filters( 'jetpack_search_classic_search_enabled', ! $is_instant_search_enabled ) ) {
		@@ -184,9 +283,10 @@
184	283	*/
185	284	if ( ! apply_filters( 'jetpack_search_init_classic_search', true ) ) {
186	285	return;
187	286	}
188		- Classic_Search::initialize( $blog_id );
	287	+ Inline_Search::get_instance_maybe_fallback_to_classic( $blog_id );
	288	+
189	289	return true;
190	290	}
191	291
192	292	/**