Release

.distignore

@@ -45,6 +45,8 @@ header-footer-grid/package.json
 header-footer-grid/package-lock.json
 header-footer-grid/rollup.config.js
 vendor/codeinwp/ti-onboarding/assets/vue
+vendor/codeinwp/themeisle-sdk/CHANGELOG.md
+vendor/composer/installed.json
 vendor/codeinwp/ti-about-page/assets/scss
 vendor/codeinwp/ti-about-page/assets/scss
 vendor/codeinwp/ti-onboarding/assets/scss

.github/workflows/playwright.yml

@@ -128,6 +128,8 @@ jobs:
             envs: "sample-data"
     #          - specs: "woo-visual-regression"
     #            envs: "woo-sample"
+          - specs: "editor"
+            envs: "sample-data"
     runs-on: ubuntu-22.04
     env:
       ZIP_URL: "https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/neve.zip"
@@ -150,5 +152,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
+          name: traces-${{ matrix.specs }}-${{ matrix.envs }}
           path: ./test-results/**
+          if-no-files-found: ignore
           retention-days: 1

CHANGELOG.md

@@ -77,7 +77,7 @@ New Features
 - Integrated installation of Login Customizer, Cookie Notice, Duplicate Page, and Custom Fonts/Scripts modules
 - New Maintenance and Coming Soon custom layouts [PRO]
 - Admin Dashboard Customizer module to personalize the WordPress admin experience (Menu, Admin Bar, Custom Pages) [Agency]
-- Included premium WP Landing Kit wordpress plugin [Agency]
+- Included premium WP Landing Kit WordPress plugin [Agency]
 
 Enhancements
 

assets/apps/metabox/src/components/MetaFieldsManager.js

@@ -126,17 +126,39 @@ class MetaFieldsManager extends Component {
 		});
 	}
 
-	addCSSToHead(css, styleID = 'neve-meta-editor-style') {
-		const head = document.head;
-		const hasStyle = document.getElementById(styleID);
-		if (hasStyle) {
-			hasStyle.innerHTML = css;
-			return false;
+	/**
+	 * Documents the editor styles need to be added to.
+	 *
+	 * Since the block editor renders inside an iframe, styles added to the
+	 * top document alone don't reach the content. Older setups without the
+	 * iframe keep working through the top document.
+	 *
+	 * @return {Document[]} Target documents.
+	 */
+	getStyleTargets() {
+		const targets = [document];
+		const canvas = document.querySelector('iframe[name="editor-canvas"]');
+		const canvasDocument = canvas && canvas.contentDocument;
+
+		if (canvasDocument && canvasDocument.head) {
+			targets.push(canvasDocument);
 		}
-		const style = document.createElement('style');
-		style.setAttribute('id', styleID);
-		style.innerHTML = css;
-		head.appendChild(style);
+
+		return targets;
+	}
+
+	addCSSToHead(css, styleID = 'neve-meta-editor-style') {
+		this.getStyleTargets().forEach((doc) => {
+			const hasStyle = doc.getElementById(styleID);
+			if (hasStyle) {
+				hasStyle.innerHTML = css;
+				return;
+			}
+			const style = doc.createElement('style');
+			style.setAttribute('id', styleID);
+			style.innerHTML = css;
+			doc.head.appendChild(style);
+		});
 	}
 
 	updateTitleVisibility() {

assets/js/src/frontend/navigation.js

@@ -1,4 +1,4 @@
-/* global NeveProperties menuCalcEvent CustomEvent */
+/* global menuCalcEvent CustomEvent */
 /* jshint esversion: 6 */
 import {
 	toggleClass,
@@ -29,39 +29,49 @@ export const initNavigation = () => {
  * Reposition drop downs in case they go off screen.
  */
 export const repositionDropdowns = () => {
-	const { isRTL } = NeveProperties;
 	const dropDowns = document.querySelectorAll(
 		'.sub-menu, .minimal .nv-nav-search'
 	);
 
-	if (dropDowns.length === 0) return;
+	if (!dropDowns.length) return;
 
 	const windowWidth = window.innerWidth;
 
+	// How far a dropdown runs past the viewport: negative past the left edge,
+	// positive past the right edge, zero when it fits.
+	const getOverflow = (bounding) => {
+		if (bounding.left < 0) {
+			return bounding.left;
+		}
+
+		return bounding.right > windowWidth ? bounding.right - windowWidth : 0;
+	};
+
 	dropDowns.forEach((dropDown) => {
-		let bounding = dropDown.getBoundingClientRect(),
-			rightDist = bounding.left;
+		const style = dropDown.style;
 
-		if (rightDist < 0) {
-			dropDown.style.right = isRTL ? '-100%' : 'auto';
-			dropDown.style.left = isRTL ? 'auto' : 0;
-		}
+		// Drop what an earlier pass applied, so the dropdown is measured where
+		// the stylesheet puts it and stale offsets do not pile up.
+		style.right = style.left = style.transform = '';
 
-		if (rightDist + bounding.width >= windowWidth) {
-			dropDown.style.right = isRTL ? 0 : '100%';
-			dropDown.style.left = 'auto';
+		let overflow = getOverflow(dropDown.getBoundingClientRect());
+
+		if (!overflow) {
+			return;
 		}
 
-		// Recalculate bounding after we've made adjustments.
-		bounding = dropDown.getBoundingClientRect();
-		rightDist = bounding.left;
+		const edge = dropDown.matches('.sub-menu .sub-menu') ? '100%' : '0px';
+
+		style.right = overflow < 0 ? 'auto' : edge;
+		style.left = overflow < 0 ? edge : 'auto';
+
+		// Wider than the space on the side it opens towards, offset it to fit.
+		overflow = getOverflow(dropDown.getBoundingClientRect());
 
-		if (rightDist < 0 || rightDist + bounding.width >= windowWidth) {
-			// Calculate how much should we offset the dropdown to make it fit.
-			dropDown.style.transform =
+		if (overflow) {
+			style.transform =
 				'translateX(' +
-				(isRTL ? '-' : '') +
-				(Math.abs(rightDist) + 20) +
+				(overflow < 0 ? 20 - overflow : -overflow - 20) +
 				'px)';
 		}
 	});

bin/envs/cli-setup.sh

@@ -21,6 +21,13 @@ init_environment(){
 	echo "Installing Neve theme from $NEVE_LOCATION"
 	wp --allow-root theme install --activate $NEVE_LOCATION
 	wp --allow-root option update fresh_site 0
+
+	# Activating Neve remaps widgets by sidebar id, and 'blog-sidebar' does not
+	# match the previous theme's, so the default widgets can be left unassigned.
+	if [ "$(wp --allow-root widget list blog-sidebar --format=count)" = "0" ]; then
+		echo "Populating blog-sidebar"
+		wp --allow-root widget add block blog-sidebar --content='<!-- wp:search /-->'
+	fi
   echo "Installing Theme API Plugin"
   wp --allow-root plugin install https://github.com/codeinwp/wp-thememods-api/archive/refs/heads/main.zip --force --activate
 }

bin/ss-pages.test.stub

@@ -4,7 +4,7 @@ describe( 'Starter Sites VR - {{site}}', () => {
     	let frontpage = "{{site}}"
 	    cy.visit(frontpage );
 		cy.captureDocument();
-        cy.get( '#nv-primary-navigation-main' ).then( $headerMenu => {
+        cy.get( '[id^="nv-primary-navigation"]' ).then( $headerMenu => {
             [ ...$headerMenu.find( '.menu-item a' ) ].forEach( $url => {
             	let url = $url.href;
             	if(url.includes("#")){
@@ -13,8 +13,11 @@ describe( 'Starter Sites VR - {{site}}', () => {
             	if(frontpage.replace(/\/*$/, "") === url.replace(/\/*$/, "")){
             		return;
 	            }
+            	if(pages.includes(url)){
+            		return;
+	            }
 
-                pages.push( $url.href );
+                pages.push( url );
             } );
         } );
     } );

e2e-tests/fixtures/customizer/hfg/footer-menu-both-devices-setup.json

@@ -0,0 +1,4 @@
+{
+	"hfg_footer_layout_v2": "{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"footer-menu\"}],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"footer-menu\"}],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}}}",
+	"nav_menu_locations[footer]": 177
+}

e2e-tests/fixtures/customizer/hfg/primary-menu-both-devices-setup.json

@@ -0,0 +1,4 @@
+{
+	"hfg_header_layout_v2": "{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"primary-menu\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"primary-menu\"},{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}",
+	"nav_menu_locations[primary]": 177
+}

e2e-tests/fixtures/customizer/hfg/submenu-viewport-setup.json

@@ -0,0 +1,7 @@
+{
+    "neve_migrated_hfg_colors": true,
+    "ti_prev_theme": "twentytwentyone",
+    "neve_ran_migrations": true,
+    "neve_container_width": "{\"mobile\":748,\"tablet\":992,\"desktop\":2000,\"suffix\":{\"mobile\":\"px\",\"tablet\":\"px\",\"desktop\":\"px\"}}",
+    "hfg_header_layout_v2": "{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"primary-menu\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}"
+}

e2e-tests/playwright.config.ts

@@ -1,11 +1,18 @@
 import { defineConfig, devices } from '@playwright/test';
 
+// Plain `|| fallback` would discard an explicit 0.
+const envInt = (name: string, fallback: number) => {
+	const parsed = parseInt(process.env[name] || '', 10);
+	return Number.isNaN(parsed) ? fallback : parsed;
+};
+
 export default defineConfig({
 	reporter: process.env.CI ? 'github' : 'list',
 	forbidOnly: !!process.env.CI,
-	workers: process.env.CI ? 6 : undefined,
-	retries: 0,
-	timeout: parseInt(process.env.TIMEOUT || '', 10) || 150_000, // Defaults to 100 seconds.
+	// Same values locally and in CI, so a race reproduces in both.
+	workers: envInt('PW_WORKERS', 2),
+	retries: envInt('PW_RETRIES', 2),
+	timeout: envInt('TIMEOUT', 150_000), // Defaults to 100 seconds.
 	fullyParallel: true,
 	projects: [
 		// Setup project
@@ -26,5 +33,7 @@ export default defineConfig({
 		headless: true,
 		ignoreHTTPSErrors: true,
 		trace: 'retain-on-failure',
+		actionTimeout: 20_000,
+		navigationTimeout: 45_000,
 	},
 });

e2e-tests/specs/accessibility/aria.spec.ts

@@ -16,9 +16,12 @@ const runMenuARIATest = (deviceType = 'mobile') => {
 		).toHaveAttribute('aria-expanded', 'true');
 
 		// Close the menu from the overlay. Check ARIA attribute for expanded state is false when menu is closed.
+		// The overlay spans the viewport and the open sidebar covers its centre, so
+		// a real click there lands on a menu link and navigates away. Dispatching
+		// hits the same handler without depending on which side the sidebar is on.
 		await page
 			.locator('.header-menu-sidebar-overlay')
-			.click({ force: true });
+			.dispatchEvent('click');
 		await expect(
 			page.getByRole('button', { name: 'Navigation Menu' })
 		).toHaveAttribute('aria-expanded', 'false');

e2e-tests/specs/admin/tpc-notice-install.spec.ts

@@ -1,11 +1,36 @@
 import { test, expect } from '@playwright/test';
-import { visitAdminPage } from '../../utils';
+import { setCustomizeSettings, visitAdminPage } from '../../utils';
+
+const TPC_PLUGIN =
+	'templates-patterns-collection/templates-patterns-collection';
+const TEST_NAME = 'tpcNotice';
 
 test.describe('Dashboard Notice', () => {
+	test.beforeAll(async ({ request, baseURL }) => {
+		const endpoint = `${baseURL}/wp-json/wp/v2/plugins/${TPC_PLUGIN}`;
+
+		await request
+			.put(endpoint, { data: { status: 'inactive' } })
+			.catch(() => null);
+		await request.delete(endpoint).catch(() => null);
+
+		// Overridden per-request via ?test_name=, not written to the options table.
+		await setCustomizeSettings(
+			TEST_NAME,
+			{
+				options: {
+					neve_notice_dismissed: 'no',
+					neve_install: Math.floor(Date.now() / 1000),
+				},
+			},
+			{ request, baseURL }
+		);
+	});
+
 	test('Starter Sites Plugin install from Dashboard Notice', async ({
 		page,
 	}) => {
-		await visitAdminPage(page, 'index.php', '');
+		await visitAdminPage(page, 'index.php', `test_name=${TEST_NAME}`);
 
 		await expect(page).toHaveURL(/wp-admin\/index.php/);
 
@@ -25,9 +50,7 @@ test.describe('Dashboard Notice', () => {
 		);
 
 		// Welcome screen
-		await expect(page.locator('h1')).toContainText(
-			'Choose a design'
-		);
+		await expect(page.locator('h1')).toContainText('Choose a design');
 
 		const categories = await page.locator('.ob-cat-wrap .cat');
 		await expect(categories).toContainText([

e2e-tests/specs/customizer/general/custom-global-colors.spec.ts

@@ -33,11 +33,37 @@ test.describe('Custom Global Color Control', () => {
 		);
 		await clearWelcome(page);
 
-		await page.locator('[aria-label="Document Overview"]').click();
-		await page.locator('.block-editor-list-view-leaf').first().click();
+		await page.waitForFunction(() =>
+			(
+				window.wp?.data?.select('core/block-editor')?.getSettings()
+					?.colors || []
+			).some((color: { slug: string }) => color.slug === 'custom-1')
+		);
+
+		// Wait for the parsed block list too, so the update below has a target.
+		await page.waitForFunction(
+			() =>
+				(
+					window.wp?.data?.select('core/block-editor')?.getBlocks() ||
+					[]
+				).length > 0
+		);
 
-		await page.getByRole('button', { name: 'Background' }).click();
-		await page.getByRole('option', { name: 'Custom 1' }).click();
+		// Clicking the palette swatch toggles, so a block left coloured by a
+		// previous run would be cleared rather than set.
+		await page.evaluate(() => {
+			const { data } = window.wp;
+			const [block] = data.select('core/block-editor').getBlocks();
+			data.dispatch('core/block-editor').updateBlockAttributes(
+				block.clientId,
+				{ backgroundColor: 'custom-1' }
+			);
+		});
+		await page.waitForFunction(
+			() =>
+				window.wp?.data?.select('core/block-editor')?.getBlocks()?.[0]
+					?.attributes?.backgroundColor === 'custom-1'
+		);
 
 		await savePost(page);
 	});