HTML;
diff --git a/packages/block-library/src/image/view.js b/packages/block-library/src/image/view.js
index 30d1259637e3d9..331c0e79c731fc 100644
--- a/packages/block-library/src/image/view.js
+++ b/packages/block-library/src/image/view.js
@@ -135,7 +135,7 @@ store(
false
);
},
- hideLightbox: async ( { context, event } ) => {
+ hideLightbox: async ( { context } ) => {
context.core.image.hideAnimationEnabled = true;
if ( context.core.image.lightboxEnabled ) {
// We want to wait until the close animation is completed
@@ -149,19 +149,15 @@ store(
'scroll',
scrollCallback
);
+ // If we don't delay before changing the focus,
+ // the focus ring will appear on Firefox before
+ // the image has finished animating, which looks broken.
+ context.core.image.lightboxTriggerRef.focus( {
+ preventScroll: true,
+ } );
}, 450 );
context.core.image.lightboxEnabled = false;
-
- // We want to avoid drawing attention to the button
- // after the lightbox closes for mouse and touch users.
- // Note that the `event.pointerType` property returns
- // as an empty string if a keyboard fired the event.
- if ( event.pointerType === '' ) {
- context.core.image.lastFocusedElement.focus( {
- preventScroll: true,
- } );
- }
}
},
handleKeydown: ( { context, actions, event } ) => {
@@ -266,6 +262,10 @@ store(
image: {
initOriginImage: ( { context, ref } ) => {
context.core.image.imageRef = ref;
+ context.core.image.lightboxTriggerRef =
+ ref.parentElement.querySelector(
+ '.lightbox-trigger'
+ );
if ( ref.complete ) {
context.core.image.imageLoaded = true;
context.core.image.imageCurrentSrc = ref.currentSrc;
@@ -282,14 +282,8 @@ store(
focusableElements.length - 1
];
- // We want to avoid drawing unnecessary attention to the close
- // button for mouse and touch users. Note that even if opening
- // the lightbox via keyboard, the event fired is of type
- // `pointerEvent`, so we need to rely on the `event.pointerType`
- // property, which returns an empty string for keyboard events.
- if ( context.core.image.pointerType === '' ) {
- ref.querySelector( '.close-button' ).focus();
- }
+ // Move focus to the dialog when opening it.
+ ref.focus();
}
},
setButtonStyles: ( { context, ref } ) => {
diff --git a/packages/block-library/src/missing/edit.native.js b/packages/block-library/src/missing/edit.native.js
index 8aa4738aeea85d..a6164f590ca21d 100644
--- a/packages/block-library/src/missing/edit.native.js
+++ b/packages/block-library/src/missing/edit.native.js
@@ -14,7 +14,7 @@ import {
import { Icon } from '@wordpress/components';
import { compose, withPreferredColorScheme } from '@wordpress/compose';
import { coreBlocks } from '@wordpress/block-library';
-import { normalizeIconObject } from '@wordpress/blocks';
+import { normalizeIconObject, rawHandler, serialize } from '@wordpress/blocks';
import { Component } from '@wordpress/element';
import { __, _x, sprintf } from '@wordpress/i18n';
import { help, plugins } from '@wordpress/icons';
@@ -24,6 +24,7 @@ import {
UnsupportedBlockDetails,
store as blockEditorStore,
} from '@wordpress/block-editor';
+import { store as noticesStore } from '@wordpress/notices';
/**
* Internal dependencies
@@ -34,6 +35,8 @@ import styles from './style.scss';
const UBE_INCOMPATIBLE_BLOCKS = [ 'core/block' ];
const I18N_BLOCK_SCHEMA_TITLE = 'block title';
+const EMPTY_ARRAY = [];
+
export class UnsupportedBlockEdit extends Component {
constructor( props ) {
super( props );
@@ -119,16 +122,39 @@ export class UnsupportedBlockEdit extends Component {
}
renderSheet( blockTitle, blockName ) {
- const { clientId } = this.props;
+ const { block, clientId, createSuccessNotice, replaceBlocks } =
+ this.props;
const { showHelp } = this.state;
+
/* translators: Missing block alert title. %s: The localized block name */
const titleFormat = __( "'%s' is not fully-supported" );
const title = sprintf( titleFormat, blockTitle );
- const description = applyFilters(
+ let description = applyFilters(
'native.missing_block_detail',
__( 'We are working hard to add more blocks with each release.' ),
blockName
);
+ let customActions = EMPTY_ARRAY;
+
+ // For Classic blocks, we offer the alternative to convert the content to blocks.
+ if ( blockName === 'core/freeform' ) {
+ description +=
+ ' ' +
+ __( 'Alternatively, you can convert the content to blocks.' );
+ /* translators: displayed right after the classic block is converted to blocks. %s: The localized classic block name */
+ const successNotice = __( "'%s' block converted to blocks" );
+ customActions = [
+ {
+ label: __( 'Convert to blocks' ),
+ onPress: () => {
+ createSuccessNotice(
+ sprintf( successNotice, blockTitle )
+ );
+ replaceBlocks( block );
+ },
+ },
+ ];
+ }
return (
);
}
@@ -202,8 +229,9 @@ export class UnsupportedBlockEdit extends Component {
}
export default compose( [
- withSelect( ( select, { attributes } ) => {
- const { capabilities } = select( blockEditorStore ).getSettings();
+ withSelect( ( select, { attributes, clientId } ) => {
+ const { getBlock, getSettings } = select( blockEditorStore );
+ const { capabilities } = getSettings();
return {
isUnsupportedBlockEditorSupported:
capabilities?.unsupportedBlockEditor === true,
@@ -211,14 +239,23 @@ export default compose( [
capabilities?.canEnableUnsupportedBlockEditor === true,
isEditableInUnsupportedBlockEditor:
! UBE_INCOMPATIBLE_BLOCKS.includes( attributes.originalName ),
+ block: getBlock( clientId ),
};
} ),
withDispatch( ( dispatch, ownProps ) => {
- const { selectBlock } = dispatch( blockEditorStore );
+ const { selectBlock, replaceBlocks } = dispatch( blockEditorStore );
+ const { createSuccessNotice } = dispatch( noticesStore );
return {
selectBlock() {
selectBlock( ownProps.clientId );
},
+ replaceBlocks( block ) {
+ replaceBlocks(
+ ownProps.clientId,
+ rawHandler( { HTML: serialize( block ) } )
+ );
+ },
+ createSuccessNotice,
};
} ),
withPreferredColorScheme,
diff --git a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
index 2322881ab0d710..52c9c4966646fa 100644
--- a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
+++ b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
@@ -30,6 +30,10 @@
* @package {{namespace}}
*/
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly.
+}
+
/**
* Registers the block using the metadata loaded from the `block.json` file.
* Behind the scenes, it registers also all assets so they can be enqueued
diff --git a/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache b/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
index 2322881ab0d710..52c9c4966646fa 100644
--- a/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
+++ b/packages/create-block-tutorial-template/plugin-templates/$slug.php.mustache
@@ -30,6 +30,10 @@
* @package {{namespace}}
*/
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly.
+}
+
/**
* Registers the block using the metadata loaded from the `block.json` file.
* Behind the scenes, it registers also all assets so they can be enqueued
diff --git a/packages/create-block/lib/templates/es5/$slug.php.mustache b/packages/create-block/lib/templates/es5/$slug.php.mustache
index a04553af1e7d8b..0f64471e434a7f 100644
--- a/packages/create-block/lib/templates/es5/$slug.php.mustache
+++ b/packages/create-block/lib/templates/es5/$slug.php.mustache
@@ -30,6 +30,10 @@
* @package {{namespace}}
*/
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly.
+}
+
/**
* Registers all block assets so that they can be enqueued through the block editor
* in the corresponding context.
diff --git a/packages/create-block/lib/templates/plugin/$slug.php.mustache b/packages/create-block/lib/templates/plugin/$slug.php.mustache
index 2ed0354314cc47..90f293f1472f4e 100644
--- a/packages/create-block/lib/templates/plugin/$slug.php.mustache
+++ b/packages/create-block/lib/templates/plugin/$slug.php.mustache
@@ -30,6 +30,10 @@
* @package {{namespace}}
*/
+if ( ! defined( 'ABSPATH' ) ) {
+ exit; // Exit if accessed directly.
+}
+
/**
* Registers the block using the metadata loaded from the `block.json` file.
* Behind the scenes, it registers also all assets so they can be enqueued
diff --git a/packages/edit-site/src/components/dataviews/README.md b/packages/edit-site/src/components/dataviews/README.md
index 9128c71e64874d..460235c8df3df4 100644
--- a/packages/edit-site/src/components/dataviews/README.md
+++ b/packages/edit-site/src/components/dataviews/README.md
@@ -1,16 +1,44 @@
# DataView
-This file aims to document the main APIs related to the DataView component.
+This file documents the DataViews UI component, which provides an API to render datasets using different view types (table, grid, etc.).
+
+```js
+
+```
+
+## Data
+
+The dataset to work with, represented as a one-dimensional array.
+
+Example:
+
+```js
+[
+ { id: 1, title: "Title", ... },
+ { ... }
+]
+```
## View
-The view is responsible for configuring how the dataset is visible to the user. For example:
+The view object configures how the dataset is visible to the user.
+
+Example:
```js
{
type: 'list',
- page: 1,
perPage: 5,
+ page: 1,
sort: {
field: 'date',
direction: 'desc',
@@ -26,44 +54,77 @@ The view is responsible for configuring how the dataset is visible to the user.
}
```
-- `type`: one of `list` or `grid`.
-- `page`: the current page.
-- `perPage`: number of records per page.
-- `sort.field`: field used for sorting.
-- `sort.direction`: one of `asc` or `desc`.
-- `filters`: the filters applied to the dataset.
+- `type`: view type, one of `list` or `grid`.
+- `perPage`: number of records to show per page.
+- `page`: the page that is visible.
+- `sort.field`: field used for sorting the dataset.
+- `sort.direction`: the direction to use for sorting, one of `asc` or `desc`.
+- `filters`: the filters applied to the dataset. See filters section.
- `visibleFilters`: the `id` of the filters that are visible in the UI.
- `hiddenFields`: the `id` of the fields that are hidden in the UI.
- `layout`: ...
-The view configuration is used to retrieve the corresponding entity that holds the dataset:
+Note that it's the consumer's responsibility to provide the data and make sure the dataset corresponds to the view's config (sort, pagination, filters, etc.).
+
+Example:
```js
-const {
- records: pages,
- isLoading: isLoadingPages,
- totalItems,
- totalPages
-} = useEntityRecords( 'postType', 'page', {
- per_page: view.perPage,
- page: view.page,
- order: view.sort?.direction,
- orderby: view.sort?.field
- ...view.filters
-} );
+function MyCustomPageList() {
+ const [ view, setView ] = useState( {
+ type: 'list',
+ page: 1,
+ "...": "..."
+ } );
+
+ const queryArgs = useMemo(
+ () => ( {
+ per_page: view.perPage,
+ page: view.page,
+ order: view.sort?.direction,
+ orderby: view.sort?.field
+ ...view.filters
+ } ),
+ [ view ]
+ );
+
+ const {
+ records
+ } = useEntityRecords( 'postType', 'page', queryArgs );
+
+ return (
+
+ );
+}
```
## Fields
-The fields describe the dataset. For example:
+The fields describe the visible items for each record in the dataset.
+
+Example:
```js
[
+ {
+ id: 'date',
+ header: __( 'Date' ),
+ getValue: ( { item } ) => item.date,
+ render: ( { item } ) => {
+ return (
+
+ );
+ }
+ },
{
id: 'author',
header: __( 'Author' ),
getValue: ( { item } ) => item.author,
- render: ( {item} ) => {
+ render: ( { item } ) => {
return (
{ item.author }
);
@@ -73,37 +134,71 @@ The fields describe the dataset. For example:
{ value: 2, label: 'User' }
]
filters: [
- 'enumeration',
+ 'enumeration'
{ id: 'author_search', type: 'search', name: __( 'Search by author' ) }
],
- },
+ }
]
```
- `id`: identifier for the field. Unique.
-- `header`: the field name for the UI.
+- `header`: the field's name to be shown in the UI.
- `getValue`: function that returns the value of the field.
- `render`: function that renders the field.
-- `elements`: a set of valid values for the field.
-- `filters`: what filters are available for the user to use. A filter contains the following properties:
- - `id`: unique identifier for the filter. Matches the entity query param. If not provided, the field's `id` is used.
- - `name`: nice looking name for the filter. If not provided, the field's `header` is used.
- - `type`: the type of filter. One of `search` or `enumeration`.
- - `resetLabel`: the label for the reset option of the filter. If none provided, `All` is used.
- - `resetValue`: the value for the reset option of the filter. If none provedid, `''` is used.
+- `elements`: the set of valid values for the field's value.
+- `filters`: what filters are available for the user to use. See filters section.
+
+## Filters
-## DataViews
+Filters describe the conditions a record should match to be listed as part of the dataset.
-The UI component responsible for rendering the dataset.
+Filters can be provided globally, as a property of the `DataViews` component, or per field, should they be considered part of a fields' description.
```js
+const field = [
+ {
+ id: 'author',
+ filters: [
+ 'enumeration'
+ { id: 'author_search', type: 'search', name: __( 'Search by author' ) }
+ ],
+ }
+];
+
```
+
+A filter is an object that may contain the following properties:
+
+- `id`: unique identifier for the filter. Matches the entity query param. Field filters may omit it, in which case the field's `id` will be used.
+- `name`: nice looking name for the filter. Field filters may omit it, in which case the field's `header` will be used.
+- `type`: the type of filter. One of `search` or `enumeration`.
+- `elements`: for filters of type `enumeration`, the list of options to show. A one-dimensional array of object with value/label keys, as in `[ { value: 1, label: "Value name" } ]`.
+ - `value`: what's serialized into the view's filters.
+ - `label`: nice-looking name for users.
+- `resetValue`: for filters of type `enumeration`, this is the value for the reset option. If none is provided, `''` will be used.
+- `resetLabel`: for filters of type `enumeration`, this is the label for the reset option. If none is provided, `All` will be used.
+
+As a convenience, field's filter can provide abbreviated versions for the filter. All of following examples result in the same filter:
+
+```js
+const field = [
+ {
+ id: 'author',
+ header: __( 'Author' ),
+ elements: authors,
+ filters: [
+ 'enumeration',
+ { type: 'enumeration' },
+ { id: 'author', type: 'enumeration' },
+ { id: 'author', type: 'enumeration', name: __( 'Author' ) },
+ { id: 'author', type: 'enumeration', name: __( 'Author' ), elements: authors },
+ ],
+ }
+];
+```
diff --git a/packages/edit-site/src/components/dataviews/sidebar-content.js b/packages/edit-site/src/components/dataviews/sidebar-content.js
index c10565b38de37f..5015e73bc4a635 100644
--- a/packages/edit-site/src/components/dataviews/sidebar-content.js
+++ b/packages/edit-site/src/components/dataviews/sidebar-content.js
@@ -1,3 +1,4 @@
export default function DataViewsSidebarContent() {
- return
Add views ui here
;
+ // TODO: add views UI.
+ return null;
}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
index 61de80838f6372..08ff1a95d6e41a 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -244,7 +244,7 @@ function FontCollection( { id } ) {
! fonts.length && (
{ __(
- 'No fonts found. Try with a different seach term'
+ 'No fonts found. Try with a different search term'
) }
) }
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 2e1a6b8683c7fa..a7f3180b2172ab 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,10 @@
## Unreleased
+### Bug Fix
+
+- Update the title when using enhanced pagination. ([#55446](https://github.com/WordPress/gutenberg/pull/55446))
+
## 2.5.0 (2023-10-18)
## 2.4.0 (2023-10-05)
diff --git a/packages/interactivity/src/router.js b/packages/interactivity/src/router.js
index ee9755126994e3..68d1bc677addf3 100644
--- a/packages/interactivity/src/router.js
+++ b/packages/interactivity/src/router.js
@@ -55,8 +55,8 @@ const regionsToVdom = ( dom ) => {
const id = region.getAttribute( attrName );
regions[ id ] = toVdom( region );
} );
-
- return { regions };
+ const title = dom.querySelector( 'title' )?.innerText;
+ return { regions, title };
};
// Prefetch a page. We store the promise to avoid triggering a second fetch for
@@ -76,6 +76,9 @@ const renderRegions = ( page ) => {
const fragment = getRegionRootFragment( region );
render( page.regions[ id ], fragment );
} );
+ if ( page.title ) {
+ document.title = page.title;
+ }
};
// Variable to store the current navigation.
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 9e69c51a6b73ba..9077664ca60be2 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,8 @@ For each user feature we should also add a importance categorization label to i
-->
## Unreleased
+- [*] Synced Patterns: Fix visibility of heading section when used with block based themes in dark mode [#55399]
+- [*] Classic block: Add option to convert to blocks [#55461]
## 1.106.0
- [*] Exit Preformatted and Verse blocks by triple pressing the Return key [#53354]
diff --git a/packages/scripts/README.md b/packages/scripts/README.md
index 8e80d806b17e7d..89ae3f1fff05c5 100644
--- a/packages/scripts/README.md
+++ b/packages/scripts/README.md
@@ -491,7 +491,7 @@ Should there be any situation where you want to provide your own Jest config, yo
- there is a file called `jest-unit.config.js`, `jest-unit.config.json`, `jest.config.js`, or `jest.config.json` in the top-level directory of your package (at the same level than your `package.json`).
- a `jest` object can be provided in the `package.json` file with the test configuration.
-### `test-plyawright`
+### `test-playwright`
Launches the Playwright End-To-End (E2E) test runner. Similar to Puppeteer, it provides a high-level API to control a headless browser.
diff --git a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
index fc0dc4b30d664e..44507ad34813e8 100644
--- a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
+++ b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
@@ -47,6 +47,7 @@ export default class InteractivityUtils {
content: ``,
status: 'publish' as 'publish',
date_gmt: '2023-01-01T00:00:00',
+ title: alias,
};
const { link } = await this.requestUtils.createPost( payload );
diff --git a/test/e2e/specs/interactivity/router-regions.spec.ts b/test/e2e/specs/interactivity/router-regions.spec.ts
index cbe66b7bd1b217..f1ea308d6c2563 100644
--- a/test/e2e/specs/interactivity/router-regions.spec.ts
+++ b/test/e2e/specs/interactivity/router-regions.spec.ts
@@ -97,4 +97,18 @@ test.describe( 'Router regions', () => {
await page.getByTestId( 'back' ).click();
await expect( nestedRegionSsr ).toHaveText( 'content from page 1' );
} );
+
+ test( 'Page title is updated 2', async ( { page } ) => {
+ await expect( page ).toHaveTitle(
+ 'router regions – page 1 – gutenberg'
+ );
+ await page.getByTestId( 'next' ).click();
+ await expect( page ).toHaveTitle(
+ 'router regions – page 2 – gutenberg'
+ );
+ await page.getByTestId( 'back' ).click();
+ await expect( page ).toHaveTitle(
+ 'router regions – page 1 – gutenberg'
+ );
+ } );
} );
diff --git a/test/performance/fixtures/perf-utils.ts b/test/performance/fixtures/perf-utils.ts
index a61af86684e6bb..dcd9579364e10b 100644
--- a/test/performance/fixtures/perf-utils.ts
+++ b/test/performance/fixtures/perf-utils.ts
@@ -33,26 +33,19 @@ export class PerfUtils {
* @return Locator for the editor canvas element.
*/
async getCanvas() {
- return await Promise.any( [
- ( async () => {
- const legacyCanvasLocator = this.page.locator(
- '.wp-block-post-content'
- );
- await legacyCanvasLocator.waitFor( {
- timeout: 120_000,
- } );
- return legacyCanvasLocator;
- } )(),
- ( async () => {
- const iframedCanvasLocator = this.page.frameLocator(
- '[name=editor-canvas]'
- );
- await iframedCanvasLocator
- .locator( 'body' )
- .waitFor( { timeout: 120_000 } );
- return iframedCanvasLocator;
- } )(),
- ] );
+ const canvasLocator = this.page.locator(
+ '.wp-block-post-content, iframe[name=editor-canvas]'
+ );
+
+ const isFramed = await canvasLocator.evaluate(
+ ( node ) => node.tagName === 'IFRAME'
+ );
+
+ if ( isFramed ) {
+ return canvasLocator.frameLocator( ':scope' );
+ }
+
+ return canvasLocator;
}
/**
@@ -61,9 +54,7 @@ export class PerfUtils {
* @return URL of the saved draft.
*/
async saveDraft() {
- await this.page
- .getByRole( 'button', { name: 'Save draft' } )
- .click( { timeout: 60_000 } );
+ await this.page.getByRole( 'button', { name: 'Save draft' } ).click();
await expect(
this.page.getByRole( 'button', { name: 'Saved' } )
).toBeDisabled();
@@ -75,6 +66,8 @@ export class PerfUtils {
* Disables the editor autosave function.
*/
async disableAutosave() {
+ await this.page.waitForFunction( () => window?.wp?.data );
+
await this.page.evaluate( () => {
return window.wp.data
.dispatch( 'core/editor' )
@@ -83,12 +76,6 @@ export class PerfUtils {
localAutosaveInterval: 100000000000,
} );
} );
-
- const { autosaveInterval } = await this.page.evaluate( () => {
- return window.wp.data.select( 'core/editor' ).getEditorSettings();
- } );
-
- expect( autosaveInterval ).toBe( 100000000000 );
}
/**
@@ -139,6 +126,10 @@ export class PerfUtils {
throw new Error( `File not found: ${ filepath }` );
}
+ await this.page.waitForFunction(
+ () => window?.wp?.blocks && window?.wp?.data
+ );
+
return await this.page.evaluate( ( html: string ) => {
const { parse } = window.wp.blocks;
const { dispatch } = window.wp.data;
@@ -159,6 +150,10 @@ export class PerfUtils {
* Generates and loads a 1000 empty paragraphs into the editor canvas.
*/
async load1000Paragraphs() {
+ await this.page.waitForFunction(
+ () => window?.wp?.blocks && window?.wp?.data
+ );
+
await this.page.evaluate( () => {
const { createBlock } = window.wp.blocks;
const { dispatch } = window.wp.data;
diff --git a/test/performance/playwright.config.ts b/test/performance/playwright.config.ts
index a8208342ac2d81..ed221b1dc7bfbe 100644
--- a/test/performance/playwright.config.ts
+++ b/test/performance/playwright.config.ts
@@ -27,6 +27,7 @@ const config = defineConfig( {
),
use: {
...baseConfig.use,
+ actionTimeout: 120_000, // 2 minutes.
video: 'off',
},
} );
diff --git a/test/performance/specs/post-editor.spec.js b/test/performance/specs/post-editor.spec.js
index 7f590330465278..da20e3c3e667b5 100644
--- a/test/performance/specs/post-editor.spec.js
+++ b/test/performance/specs/post-editor.spec.js
@@ -70,9 +70,7 @@ test.describe( 'Post Editor Performance', () => {
const canvas = await perfUtils.getCanvas();
// Wait for the first block.
- await canvas.locator( '.wp-block' ).first().waitFor( {
- timeout: 120_000,
- } );
+ await canvas.locator( '.wp-block' ).first().waitFor();
// Get the durations.
const loadingDurations = await metrics.getLoadingDurations();
diff --git a/test/performance/specs/site-editor.spec.js b/test/performance/specs/site-editor.spec.js
index f2f211dd52e6e0..28a1cbb0ecde29 100644
--- a/test/performance/specs/site-editor.spec.js
+++ b/test/performance/specs/site-editor.spec.js
@@ -86,9 +86,7 @@ test.describe( 'Site Editor Performance', () => {
const canvas = await perfUtils.getCanvas();
// Wait for the first block.
- await canvas.locator( '.wp-block' ).first().waitFor( {
- timeout: 120_000,
- } );
+ await canvas.locator( '.wp-block' ).first().waitFor();
// Get the durations.
const loadingDurations = await metrics.getLoadingDurations();
@@ -142,7 +140,7 @@ test.describe( 'Site Editor Performance', () => {
// Spinner was used instead of the progress bar in an earlier version of the site editor.
'.edit-site-canvas-loader, .edit-site-canvas-spinner'
)
- .waitFor( { state: 'hidden', timeout: 120_000 } );
+ .waitFor( { state: 'hidden' } );
const canvas = await perfUtils.getCanvas();