Skip to content

Commit

Permalink
Merge branch 'trunk' into enhancement/paragraph-top-heading-shortcut
Browse files Browse the repository at this point in the history
  • Loading branch information
t-hamano committed Feb 16, 2023
2 parents b960296 + 11525f7 commit c093e75
Show file tree
Hide file tree
Showing 244 changed files with 1,648 additions and 919 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ module.exports = {
rules: {
'@wordpress/no-global-active-element': 'off',
'@wordpress/no-global-get-selection': 'off',
'playwright/no-page-pause': 'error',
'no-restricted-syntax': [
'error',
{
Expand Down
358 changes: 358 additions & 0 deletions changelog.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
* Requires at least: 6.0
* Requires PHP: 5.6
* Version: 15.1.0
* Version: 15.2.0-rc.1
* Author: Gutenberg Team
* Text Domain: gutenberg
*
Expand Down
23 changes: 14 additions & 9 deletions lib/load.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,20 @@ function gutenberg_is_experiment_enabled( $name ) {
require __DIR__ . '/experimental/kses.php';

// Fonts API.
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider.php';
require __DIR__ . '/experimental/fonts-api/deprecations/webfonts-deprecations.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts-provider.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-utils.php';
require __DIR__ . '/experimental/fonts-api/register-fonts-from-theme-json.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider-local.php';
require __DIR__ . '/experimental/fonts-api/fonts-api.php';
if ( ! class_exists( 'WP_Fonts' ) ) {
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider.php';
require __DIR__ . '/experimental/fonts-api/deprecations/webfonts-deprecations.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts-utils.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts-provider.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts-provider-local.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-webfonts.php';
require __DIR__ . '/experimental/fonts-api/deprecations/class-wp-web-fonts.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-utils.php';
require __DIR__ . '/experimental/fonts-api/register-fonts-from-theme-json.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts.php';
require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider-local.php';
require __DIR__ . '/experimental/fonts-api/fonts-api.php';
}

// Plugin specific code.
require __DIR__ . '/class-wp-theme-json-gutenberg.php';
Expand Down
9 changes: 8 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gutenberg",
"version": "15.1.0",
"version": "15.2.0-rc.1",
"private": true,
"description": "A new WordPress editor experience.",
"author": "The WordPress Contributors",
Expand Down
2 changes: 2 additions & 0 deletions packages/a11y/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 3.27.0 (2023-02-15)

## 3.26.0 (2023-02-01)

## 3.25.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/a11y",
"version": "3.26.0",
"version": "3.27.0",
"description": "Accessibility (a11y) utilities for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/annotations/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 2.27.0 (2023-02-15)

## 2.26.0 (2023-02-01)

## 2.25.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/annotations/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/annotations",
"version": "2.26.0",
"version": "2.27.0",
"description": "Annotate content in the Gutenberg editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/api-fetch/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 6.24.0 (2023-02-15)

## 6.23.0 (2023-02-01)

## 6.22.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/api-fetch/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/api-fetch",
"version": "6.23.0",
"version": "6.24.0",
"description": "Utility to make WordPress REST API requests.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/autop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 3.27.0 (2023-02-15)

## 3.26.0 (2023-02-01)

## 3.25.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/autop/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/autop",
"version": "3.26.0",
"version": "3.27.0",
"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 4.10.0 (2023-02-15)

## 4.9.0 (2023-02-01)

## 4.8.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-import-jsx-pragma/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/babel-plugin-import-jsx-pragma",
"version": "4.9.0",
"version": "4.10.0",
"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/babel-plugin-makepot/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 5.11.0 (2023-02-15)

## 5.10.0 (2023-02-01)

## 5.9.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-makepot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/babel-plugin-makepot",
"version": "5.10.0",
"version": "5.11.0",
"description": "WordPress Babel internationalization (i18n) plugin.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/babel-preset-default/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 7.11.0 (2023-02-15)

## 7.10.0 (2023-02-01)

## 7.9.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-default/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/babel-preset-default",
"version": "7.10.0",
"version": "7.11.0",
"description": "Default Babel preset for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/base-styles/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 4.18.0 (2023-02-15)

## 4.17.0 (2023-02-01)

## 4.16.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/base-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/base-styles",
"version": "4.17.0",
"version": "4.18.0",
"description": "Base SCSS utilities and variables for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/blob/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 3.27.0 (2023-02-15)

## 3.26.0 (2023-02-01)

## 3.25.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/blob/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/blob",
"version": "3.26.0",
"version": "3.27.0",
"description": "Blob utilities for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions packages/block-directory/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

## 4.4.0 (2023-02-15)

## 4.3.0 (2023-02-01)

## 4.2.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/block-directory/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/block-directory",
"version": "4.3.0",
"version": "4.4.0",
"description": "Extend editor with block directory features to search, download and install blocks.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
6 changes: 6 additions & 0 deletions packages/block-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

## 11.4.0 (2023-02-15)

### Bug Fix

- `LinkControl`: fix scrollbar displayed on toggle link settings ([#47986](https://github.com/WordPress/gutenberg/pull/47986)).

## 11.3.0 (2023-02-01)

## 11.2.0 (2023-01-11)
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wordpress/block-editor",
"version": "11.3.0",
"version": "11.4.0",
"description": "Generic block editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default function BlockTypesList( {
name,
sections,
onSelect,
label,
listProps,
initialNumToRender = 3,
} ) {
Expand Down Expand Up @@ -154,6 +155,7 @@ export default function BlockTypesList( {
<SectionList
onLayout={ onLayout }
testID={ `InserterUI-${ name }` }
accessibilityLabel={ label }
keyboardShouldPersistTaps="always"
sections={ sections }
initialNumToRender={ initialNumToRender }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { useMemo } from '@wordpress/element';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -66,6 +67,7 @@ function BlockTypesTab( { onSelect, rootClientId, listProps } ) {
sections={ sections }
onSelect={ handleSelect }
listProps={ listProps }
label={ __( 'Blocks menu' ) }
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { useSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -31,6 +32,7 @@ function ReusableBlocksTab( { onSelect, rootClientId, listProps } ) {
sections={ sections }
onSelect={ onSelect }
listProps={ listProps }
label={ __( 'Reusable blocks' ) }
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { useSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -54,6 +55,7 @@ function InserterSearchResults( {
sections={ [ createInserterSection( { key: 'search', items } ) ] }
onSelect={ handleSelect }
listProps={ listProps }
label={ __( 'Blocks' ) }
/>
);
}
Expand Down
8 changes: 7 additions & 1 deletion packages/block-editor/src/components/link-control/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,13 @@ $preview-image-height: 140px;
justify-content: space-between;
margin: 0;
padding: $grid-unit-20;
padding-top: 0;

// To hide the horizontal scrollbar on toggle.
// Margin and padding are needed to prevent cutoff of the toggle button focus outline.
// See: https://github.com/WordPress/gutenberg/pull/47986
margin-top: calc(var(--wp-admin-border-width-focus) * -1);
padding-top: var(--wp-admin-border-width-focus);
overflow: hidden;
}

.block-editor-link-control__unlink {
Expand Down
12 changes: 12 additions & 0 deletions packages/block-editor/src/components/list-view/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { sprintf, __ } from '@wordpress/i18n';
* Internal dependencies
*/
import ListViewLeaf from './leaf';
import useListViewScrollIntoView from './use-list-view-scroll-into-view';
import {
BlockMoverUpButton,
BlockMoverDownButton,
Expand Down Expand Up @@ -57,6 +58,7 @@ function ListViewBlock( {
isSyncedBranch,
} ) {
const cellRef = useRef( null );
const rowRef = useRef( null );
const [ isHovered, setIsHovered ] = useState( false );
const { clientId } = block;

Expand Down Expand Up @@ -220,6 +222,15 @@ function ListViewBlock( {
? selectedClientIds
: [ clientId ];

// Pass in a ref to the row, so that it can be scrolled
// into view when selected. For long lists, the placeholder for the
// selected block is also observed, within ListViewLeafPlaceholder.
useListViewScrollIntoView( {
isSelected,
rowItemRef: rowRef,
selectedClientIds,
} );

return (
<ListViewLeaf
className={ classes }
Expand All @@ -235,6 +246,7 @@ function ListViewBlock( {
data-block={ clientId }
isExpanded={ canExpand ? isExpanded : undefined }
aria-selected={ !! isSelected || forceSelectionContentLock }
ref={ rowRef }
>
<TreeGridCell
className="block-editor-list-view-block__contents-cell"
Expand Down
Loading

0 comments on commit c093e75

Please sign in to comment.