← All changes | extensions/blocks/map/map.php +99 -10 13.5.2 → 16.3-a.1 View file →

		@@ -15,8 +15,12 @@
15	15	use Jetpack;
16	16	use Jetpack_Gutenberg;
17	17	use Jetpack_Mapbox_Helper;
18	18
	19	+if ( ! defined( 'ABSPATH' ) ) {
	20	+ exit( 0 );
	21	+}
	22	+
19	23	if ( ! class_exists( 'Jetpack_Mapbox_Helper' ) ) {
20	24	require_once JETPACK__PLUGIN_DIR . '_inc/lib/class-jetpack-mapbox-helper.php';
21	25	}
22	26
		@@ -47,9 +51,10 @@
47	51
48	52	$event_name = 'map_block_mapbox_wpcom_key_load';
49	53	if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
50	54	require_lib( 'tracks/client' );
51		- tracks_record_event( wp_get_current_user(), $event_name );
	55	+ // Tracking::record_user_event() prefixes the source itself; tracks_record_event() does not.
	56	+ tracks_record_event( wp_get_current_user(), 'jetpack_' . $event_name );
52	57	} elseif ( ( new Host() )->is_woa_site() && Jetpack::is_connection_ready() ) {
53	58	$tracking = new Tracking();
54	59	$tracking->record_user_event( $event_name );
55	60	}
		@@ -57,9 +62,9 @@
57	62
58	63	/**
59	64	* Function to determine which map provider to choose
60	65	*
61		- * @param array $html The block's HTML - needed for the class name.
	66	+ * @param string $html The block's HTML - needed for the class name.
62	67	*
63	68	* @return string The name of the map provider.
64	69	*/
65	70	function get_map_provider( $html ) {
		@@ -122,13 +127,92 @@
122	127
123	128	Jetpack_Gutenberg::load_assets_as_required( __DIR__ );
124	129
125	130	$map_provider = get_map_provider( $content );
126		- if ( $map_provider === 'mapkit' ) {
127		- return preg_replace( '/<div /', '<div data-map-provider="mapkit" data-api-key="' . esc_attr( $access_token['key'] ) . '" data-blog-id="' . \Jetpack_Options::get_option( 'id' ) . '" ', $content, 1 );
	131	+
	132	+ return rebuild_map_block_div( $attr, $content, $map_provider, $access_token );
	133	+}
	134	+
	135	+/**
	136	+ * Rebuild the map block div to move large JSON data from HTML attributes
	137	+ * into an inline JS payload, keeping the DOM lightweight.
	138	+ *
	139	+ * @param array $attr Array containing the map block attributes.
	140	+ * @param string $content String containing the map block content.
	141	+ * @param string $map_provider The map provider (mapbox or mapkit).
	142	+ * @param array $access_token The Mapbox/MapKit access token data.
	143	+ *
	144	+ * @return string
	145	+ */
	146	+function rebuild_map_block_div( $attr, $content, $map_provider, $access_token ) {
	147	+ static $did_inline = false;
	148	+
	149	+ $block_id = wp_unique_id( 'jp-map-' );
	150	+
	151	+ // Extract map-style from the saved HTML since it's no longer a block attribute
	152	+ // (was deprecated and converted to CSS class names like is-style-terrain).
	153	+ $map_style = 'default';
	154	+ if ( preg_match( '/data-map-style="([^"]*)"/', $content, $matches ) ) {
	155	+ $map_style = $matches[1];
128	156	}
129	157
130		- return preg_replace( '/<div /', '<div data-map-provider="mapbox" data-api-key="' . esc_attr( $access_token['key'] ) . '" ', $content, 1 );
	158	+ $classes = array( 'wp-block-jetpack-map' );
	159	+ if ( ! empty( $attr['align'] ) ) {
	160	+ $classes[] = 'align' . $attr['align'];
	161	+ }
	162	+ if ( ! empty( $attr['className'] ) ) {
	163	+ $classes[] = $attr['className'];
	164	+ }
	165	+
	166	+ // Keep the tag small: no giant JSON in attributes.
	167	+ $data_attrs = array(
	168	+ 'class' => implode( ' ', $classes ),
	169	+ 'data-map-id' => $block_id,
	170	+ 'data-map-provider' => $map_provider,
	171	+ 'data-api-key' => $access_token['key'],
	172	+ 'data-map-style' => $map_style,
	173	+ );
	174	+
	175	+ if ( 'mapkit' === $map_provider ) {
	176	+ $data_attrs['data-blog-id'] = \Jetpack_Options::get_option( 'id' );
	177	+ }
	178	+
	179	+ // Put everything else in the JS payload (including points).
	180	+ $payload = array(
	181	+ 'points' => $attr['points'] ?? null,
	182	+ 'zoom' => $attr['zoom'] ?? null,
	183	+ 'mapCenter' => $attr['mapCenter'] ?? null,
	184	+ 'markerColor' => $attr['markerColor'] ?? null,
	185	+ 'scrollToZoom' => $attr['scrollToZoom'] ?? null,
	186	+ 'mapDetails' => $attr['mapDetails'] ?? null,
	187	+ 'mapHeight' => $attr['mapHeight'] ?? null,
	188	+ 'showFullscreenButton' => $attr['showFullscreenButton'] ?? null,
	189	+ 'mapStyle' => $map_style,
	190	+ );
	191	+
	192	+ $handle = 'jetpack-block-map';
	193	+
	194	+ // Seed global once.
	195	+ if ( ! $did_inline ) {
	196	+ wp_add_inline_script( $handle, 'window.JetpackMapBlockData = window.JetpackMapBlockData || {};', 'before' );
	197	+ $did_inline = true;
	198	+ }
	199	+
	200	+ // Add this block's payload keyed by ID.
	201	+ wp_add_inline_script(
	202	+ $handle,
	203	+ 'window.JetpackMapBlockData[' . wp_json_encode( $block_id, JSON_HEX_TAG | JSON_HEX_AMP ) . '] = ' . wp_json_encode( $payload, JSON_HEX_TAG | JSON_HEX_AMP ) . ';',
	204	+ 'before'
	205	+ );
	206	+
	207	+ $div_open = '<div';
	208	+ foreach ( $data_attrs as $key => $value ) {
	209	+ $div_open .= ' ' . $key . '="' . esc_attr( $value ) . '"';
	210	+ }
	211	+ $div_open .= '>';
	212	+
	213	+ $result = preg_replace( '/<div[^>]*>/', $div_open, $content, 1 );
	214	+ return $result ?? $content;
131	215	}
132	216
133	217	/**
134	218	* Render a page containing only a single Map block.
		@@ -153,8 +237,13 @@
153	237	$post_html = new \DOMDocument();
154	238	/** This filter is already documented in core/wp-includes/post-template.php */
155	239	$content = apply_filters( 'the_content', $post->post_content );
156	240
	241	+ // Return early if empty to prevent DOMDocument::loadHTML fatal.
	242	+ if ( empty( $content ) ) {
	243	+ return;
	244	+ }
	245	+
157	246	/* Suppress warnings */
158	247	libxml_use_internal_errors( true );
159	248	@$post_html->loadHTML( $content ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
160	249	libxml_use_internal_errors( false );
		@@ -188,9 +277,9 @@
188	277	$head_content,
189	278	preg_replace( '/(?<=<div\s)/', 'data-api-key="' . esc_attr( $access_token['key'] ) . '" ', $block_markup, 1 )
190	279	);
191	280	echo $page_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
192		- exit;
	281	+ exit( 0 );
193	282	}
194	283	add_action( 'wp', __NAMESPACE__ . '\render_single_block_page' );
195	284
196	285	/**
		@@ -223,14 +312,14 @@
223	312	},
224	313	$points
225	314	);
226	315
227		- $map_block = '<!-- wp:jetpack/map ' . wp_json_encode( $map_block_data ) . ' -->' . PHP_EOL;
	316	+ $map_block = '<!-- wp:jetpack/map ' . wp_json_encode( $map_block_data, JSON_UNESCAPED_SLASHES | JSON_HEX_TAG | JSON_HEX_AMP ) . ' -->' . PHP_EOL;
228	317	$map_block .= sprintf(
229	318	'<div class="wp-block-jetpack-map" data-map-style="default" data-map-details="true" data-points="%1$s" data-zoom="%2$d" data-map-center="%3$s" data-marker-color="red" data-show-fullscreen-button="true">',
230		- esc_html( wp_json_encode( $map_block_data['points'] ) ),
231		- (int) $map_block_data['zoom'],
232		- esc_html( wp_json_encode( $map_block_data['mapCenter'] ) )
	319	+ esc_attr( wp_json_encode( $map_block_data['points'], JSON_HEX_AMP | JSON_UNESCAPED_SLASHES ) ),
	320	+ $map_block_data['zoom'],
	321	+ esc_attr( wp_json_encode( $map_block_data['mapCenter'], JSON_HEX_AMP | JSON_UNESCAPED_SLASHES ) )
233	322	);
234	323	$map_block .= '<ul>' . implode( "\n", $list_items ) . '</ul>';
235	324	$map_block .= '</div>' . PHP_EOL;
236	325	$map_block .= '<!-- /wp:jetpack/map -->';