[pull] trunk from WordPress:trunk

bin/api-docs/gen-components-docs/markdown/props.mjs

@@ -48,4 +48,3 @@ export function generateMarkdownPropsJson( props, { headingLevel = 2 } = {} ) {
 
 	return [ { [ `h${ headingLevel }` ]: 'Props' }, ...propsJson ];
 }
-

packages/block-editor/src/components/block-card/stories/index.story.js

@@ -0,0 +1,79 @@
+/**
+ * WordPress dependencies
+ */
+import { box, button, cog, paragraph } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import BlockCard from '../';
+
+const meta = {
+	title: 'BlockEditor/BlockCard',
+	component: BlockCard,
+	parameters: {
+		docs: {
+			description: {
+				component:
+					'The `BlockCard` component allows to display a "card" which contains the title of a block, its icon and its description.',
+			},
+			canvas: { sourceState: 'shown' },
+		},
+	},
+	argTypes: {
+		title: {
+			control: 'text',
+			description: 'The title of the block.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+		description: {
+			control: 'text',
+			description: 'A description of the block functionality.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+		icon: {
+			control: 'select',
+			options: [ 'paragraph', 'cog', 'box', 'button' ],
+			mapping: {
+				paragraph,
+				cog,
+				box,
+				button,
+			},
+			description:
+				'The icon of the block. This can be any of [WordPress Dashicons](https://developer.wordpress.org/resource/dashicons/), or a custom `svg` element.',
+			table: {
+				type: { summary: 'string | object' },
+			},
+		},
+		name: {
+			control: 'text',
+			description: 'Optional custom name for the block.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+		className: {
+			control: 'text',
+			description: 'Additional CSS class names.',
+			table: {
+				type: { summary: 'string' },
+			},
+		},
+	},
+};
+
+export default meta;
+
+export const Default = {
+	args: {
+		title: 'Paragraph',
+		icon: paragraph,
+		description: 'This is a paragraph block description.',
+		name: 'Paragraph Block',
+	},
+};

packages/block-editor/src/components/date-format-picker/index.js

@@ -40,7 +40,11 @@ export default function DateFormatPicker( {
 	onChange,
 } ) {
 	return (
-		<fieldset className="block-editor-date-format-picker">
+		<VStack
+			as="fieldset"
+			spacing={ 4 }
+			className="block-editor-date-format-picker"
+		>
 			<VisuallyHidden as="legend">{ __( 'Date format' ) }</VisuallyHidden>
 			<ToggleControl
 				__nextHasNoMarginBottom
@@ -57,7 +61,7 @@ export default function DateFormatPicker( {
 			{ format && (
 				<NonDefaultControls format={ format } onChange={ onChange } />
 			) }
-		</fieldset>
+		</VStack>
 	);
 }
 

packages/block-editor/src/components/date-format-picker/style.scss

@@ -1,5 +1,7 @@
 .block-editor-date-format-picker {
-	margin-bottom: $grid-unit-20;
+	margin: 0 0 $grid-unit-20;
+	padding: 0;
+	border: none;
 }
 
 .block-editor-date-format-picker__custom-format-select-control__custom-option {

packages/components/src/badge/stories/index.story.tsx

@@ -11,6 +11,7 @@ import Badge from '..';
 const meta = {
 	component: Badge,
 	title: 'Components/Containers/Badge',
+	id: 'components-badge',
 	tags: [ 'status-private' ],
 } satisfies Meta< typeof Badge >;
 

packages/create-block/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Enhancement
+
+-   Add support for custom `textdomain` property for the scaffolded block ([#57197](https://github.com/WordPress/gutenberg/pull/57197)).
+
 ## 4.57.0 (2024-12-11)
 
 ### Internal

packages/create-block/lib/index.js

@@ -159,6 +159,7 @@ program
 							'description',
 							'dashicon',
 							'category',
+							'textdomain',
 						],
 						variant
 					).filter( filterOptionsProvided );

packages/create-block/lib/prompts.js

@@ -79,6 +79,20 @@ const category = {
 	choices: [ 'text', 'media', 'design', 'widgets', 'theme', 'embed' ],
 };
 
+const textdomain = {
+	type: 'input',
+	name: 'textdomain',
+	message:
+		'The text domain used to internationalize text in the block (by default it will be same as slug):',
+	validate( input ) {
+		if ( input.length && ! /^[a-z][a-z0-9\-]*$/.test( input ) ) {
+			return 'Invalid text domain specified. Text domain can contain only lowercase alphanumeric characters or dashes, and start with a letter.';
+		}
+
+		return true;
+	},
+};
+
 // Plugin header fields.
 const pluginURI = {
 	type: 'input',
@@ -141,6 +155,7 @@ module.exports = {
 	description,
 	dashicon,
 	category,
+	textdomain,
 	pluginURI,
 	version,
 	author,

packages/create-block/lib/scaffold.js

@@ -26,6 +26,7 @@ module.exports = async (
 		description,
 		dashicon,
 		category,
+		textdomain,
 		attributes,
 		supports,
 		author,
@@ -95,7 +96,7 @@ module.exports = async (
 		customPackageJSON,
 		customBlockJSON,
 		example,
-		textdomain: slug,
+		textdomain: textdomain || slug,
 		rootDirectory,
 	} );