Editor Plugin: Minor polish update (#1769)

Author: obenland

build/editor-plugin/plugin.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '35ef322601ad7ccf1214');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '59c90d6c8ab5e740f5a1');

build/editor-plugin/plugin.js

@@ -89,13 +89,12 @@ public static function register_postmeta() {
 	 */
 	public static function enqueue_editor_assets() {
 		$data = array(
-			'namespace'           => ACTIVITYPUB_REST_NAMESPACE,
-			'defaultAvatarUrl'    => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg',
-			'enabled'             => array(
+			'namespace'        => ACTIVITYPUB_REST_NAMESPACE,
+			'defaultAvatarUrl' => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg',
+			'enabled'          => array(
 				'site'  => ! is_user_type_disabled( 'blog' ),
 				'users' => ! is_user_type_disabled( 'user' ),
 			),
-			'maxImageAttachments' => \get_option( 'activitypub_max_image_attachments', ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS ),
 		);
 		wp_localize_script( 'wp-editor', '_activityPubOptions', $data );
 

includes/class-blocks.php

@@ -1,4 +1,4 @@
-import { PluginDocumentSettingPanel, PluginPreviewMenuItem } from '@wordpress/editor';
+import { PluginDocumentSettingPanel, PluginPreviewMenuItem, store as editorStore } from '@wordpress/editor';
 import { PluginDocumentSettingPanel as DocumentSettingPanel } from '@wordpress/edit-post';
 import { registerPlugin } from '@wordpress/plugins';
 import { TextControl, RadioControl, RangeControl, __experimentalText as Text, Tooltip } from '@wordpress/components';
@@ -8,35 +8,38 @@ import { useEntityProp } from '@wordpress/core-data';
 import { addQueryArgs } from '@wordpress/url';
 import { __ } from '@wordpress/i18n';
 import { SVG, Path } from '@wordpress/primitives';
-import { useOptions } from '../shared/use-options';
-
-// Defining our own because it's too new in @wordpress/icons
-// https://github.com/WordPress/gutenberg/blob/trunk/packages/icons/src/library/not-allowed.js
-const notAllowed = (
-	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-		<Path
-			fillRule="evenodd"
-			clipRule="evenodd"
-			d="M12 18.5A6.5 6.5 0 0 1 6.93 7.931l9.139 9.138A6.473 6.473 0 0 1 12 18.5Zm5.123-2.498a6.5 6.5 0 0 0-9.124-9.124l9.124 9.124ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Z"
-		/>
-	</SVG>
-);
 
 /**
  * Editor plugin for ActivityPub settings in the block editor.
  *
- * @returns {JSX.Element|null} The settings panel for ActivityPub or null for sync blocks.
+ * @returns {React.JSX.Element|null} The settings panel for ActivityPub or null for sync blocks.
  */
 const EditorPlugin = () => {
-	const postType = useSelect( ( select ) => select( 'core/editor' ).getCurrentPostType(), [] );
-	const [ meta, setMeta ] = useEntityProp( 'postType', postType || 'default', 'meta' );
+	const postType = useSelect( ( select ) => select( editorStore ).getCurrentPostType(), [] );
+	const [ meta, setMeta ] = useEntityProp( 'postType', postType, 'meta' );
 
 	// Don't show when editing sync blocks.
 	if ( 'wp_block' === postType ) {
 		return null;
 	}
 
-	const { maxImageAttachments = 4 } = useOptions();
+	/**
+	 * SVG for the not-allowed icon. Defining our own because it's too new in @wordpress/icons.
+	 *
+	 * @see https://github.com/WordPress/gutenberg/blob/trunk/packages/icons/src/library/not-allowed.js
+	 *
+	 * @var {React.JSX.Element} notAllowed The SVG for the not-allowed icon.
+	 */
+	const notAllowed = (
+		<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+			<Path
+				fillRule="evenodd"
+				clipRule="evenodd"
+				d="M12 18.5A6.5 6.5 0 0 1 6.93 7.931l9.139 9.138A6.473 6.473 0 0 1 12 18.5Zm5.123-2.498a6.5 6.5 0 0 0-9.124-9.124l9.124 9.124ZM4 12a8 8 0 1 1 16 0 8 8 0 0 1-16 0Z"
+			/>
+		</SVG>
+	);
+
 	const labelStyling = {
 		verticalAlign: 'middle',
 		gap: '4px',
@@ -48,11 +51,11 @@ const EditorPlugin = () => {
 	/**
 	 * Enhances a label with an icon and tooltip.
 	 *
-	 * @param {JSX.Element} icon    The icon to display.
-	 * @param {string}      text    The label text.
-	 * @param {string}      tooltip The tooltip text.
+	 * @param {React.JSX.Element} icon    The icon to display.
+	 * @param {string}            text    The label text.
+	 * @param {string}            tooltip The tooltip text.
 	 *
-	 * @returns {JSX.Element} The enhanced label component.
+	 * @returns {React.JSX.Element} The enhanced label component.
 	 */
 	const enhancedLabel = ( icon, text, tooltip ) => (
 		<Tooltip text={ tooltip }>
@@ -92,7 +95,7 @@ const EditorPlugin = () => {
 
 			<RangeControl
 				label={ __( 'Maximum Image Attachments', 'activitypub' ) }
-				value={ meta?.activitypub_max_image_attachments ?? maxImageAttachments }
+				value={ meta?.activitypub_max_image_attachments }
 				onChange={ ( value ) => {
 					setMeta( { ...meta, activitypub_max_image_attachments: value } );
 				} }
@@ -151,30 +154,29 @@ const EditorPlugin = () => {
 	);
 };
 
-/**
- * Opens the Fediverse preview for the current post in a new tab.
- */
-function onActivityPubPreview() {
-	const previewLink = select( 'core/editor' ).getEditedPostPreviewLink();
-	const fediversePreviewLink = addQueryArgs( previewLink, { activitypub: 'true' } );
-
-	window.open( fediversePreviewLink, '_blank' );
-}
-
 /**
  * Renders the preview menu item for Fediverse preview.
  *
- * @returns {JSX.Element} The preview menu item component.
+ * @returns {React.JSX.Element} The preview menu item component.
  */
 const EditorPreview = () => {
-	// check if post was saved
-	const post_status = useSelect( ( select ) => select( 'core/editor' ).getCurrentPost().status );
+	const post_status = useSelect( ( select ) => select( editorStore ).getCurrentPost().status, [] );
+
+	/**
+	 * Opens the Fediverse preview for the current post in a new tab.
+	 */
+	const onActivityPubPreview = () => {
+		const previewLink = select( editorStore ).getEditedPostPreviewLink();
+		const fediversePreviewLink = addQueryArgs( previewLink, { activitypub: 'true' } );
+
+		window.open( fediversePreviewLink, '_blank' );
+	};
 
 	return (
 		<>
 			{ PluginPreviewMenuItem ? (
 				<PluginPreviewMenuItem
-					onClick={ () => onActivityPubPreview() }
+					onClick={ onActivityPubPreview }
 					icon={ external }
 					disabled={ post_status === 'auto-draft' }
 				>