From c13f802c6301b6767854d73dfbeafd76bb72b984 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Thu, 26 Sep 2024 11:20:41 +0300 Subject: [PATCH 01/14] refactor: separate grind of alerts card from ad --- packages/js/src/dashboard/routes/alert-center.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 55905184667..ddc1698c862 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -25,9 +25,11 @@ export const AlertCenter = () => { -
- - +
+
+ + +
{ ! isPremium && Date: Thu, 26 Sep 2024 15:52:05 +0300 Subject: [PATCH 02/14] restore dynamic height of cards --- packages/js/src/dashboard/routes/alert-center.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index ddc1698c862..37eaf79b368 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -26,7 +26,7 @@ export const AlertCenter = () => {
-
+
From 604d0da780d415f19746b486eb61186783e9b011 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Thu, 26 Sep 2024 17:44:56 +0300 Subject: [PATCH 03/14] create sticky effect with js --- .../components/sidebar-recommendations.js | 51 ++++++++++++++++--- .../js/src/dashboard/routes/alert-center.js | 15 +++++- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index 94bea5e95bb..40138f3358c 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -1,9 +1,11 @@ -import { AcademyUpsellCard, PremiumUpsellCard, RecommendationsSidebar } from "../../shared-admin/components"; +import { useEffect, useState, useCallback } from "@wordpress/element"; +import PropTypes from "prop-types"; +import { AcademyUpsellCard, PremiumUpsellCard } from "../../shared-admin/components"; import { useSelectDashboard } from "../hooks"; /** * @returns {JSX.Element} The sidebar recommendations. */ -const SidebarRecommendations = () => { +const SidebarRecommendations = ( { position } ) => { const isPremium = useSelectDashboard( "selectPreference", [], "isPremium" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/jj" ); @@ -13,12 +15,49 @@ const SidebarRecommendations = () => { return null; } + const [ sidebarPosition, setSidebarPosition ] = useState( {} ); + const [ scrollY, setScrollY ] = useState( 0 ); + + const updatePosition = useCallback( () => { + setScrollY( window.scrollY ); + }, [ setScrollY ] ); + + useEffect( () => { + if ( ! position?.top ) { + return; + } + + if ( position.top > scrollY ) { + setSidebarPosition( { top: position.top - scrollY } ); + } else { + setSidebarPosition( { top: "64px" } ); + } + }, [ scrollY ] ); + + useEffect( () => { + setScrollY( window.scrollY ); + window.addEventListener( "scroll", updatePosition ); + window.addEventListener( "resize", updatePosition ); + return () => { + window.removeEventListener( "scroll", updatePosition ); + window.removeEventListener( "resize", updatePosition ); + }; + }, [] ); + return ( - - - - +
+
+ + +
+
); }; +SidebarRecommendations.propTypes = { + position: PropTypes.shape( { + top: PropTypes.number, + } ), +}; + export default SidebarRecommendations; diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 37eaf79b368..3275222a485 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -1,4 +1,5 @@ import { __ } from "@wordpress/i18n"; +import { useRef, useEffect, useState } from "@wordpress/element"; import { Paper, Title } from "@yoast/ui-library"; import { PremiumUpsellList } from "../../shared-admin/components/premium-upsell-list"; import { Notifications, Problems } from "../components"; @@ -13,8 +14,18 @@ export const AlertCenter = () => { const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" ); const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); + const paperRef = useRef( null ); + const [ position, setPosition ] = useState( { top: 0 } ); + + useEffect( () => { + if ( paperRef.current ) { + const rect = paperRef.current.getBoundingClientRect(); + setPosition( { top: rect.top + window.scrollY } ); + } + }, [] ); + return <> -
+
@@ -36,7 +47,7 @@ export const AlertCenter = () => { promotions={ promotions } /> }
- +
; }; From a163d07cdfed3f930ac29e768300b712632aa5f3 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Tue, 1 Oct 2024 16:35:58 +0300 Subject: [PATCH 04/14] Revert "create sticky effect with js" This reverts commit 604d0da780d415f19746b486eb61186783e9b011. --- .../components/sidebar-recommendations.js | 51 +++---------------- .../js/src/dashboard/routes/alert-center.js | 15 +----- 2 files changed, 8 insertions(+), 58 deletions(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index 40138f3358c..94bea5e95bb 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -1,11 +1,9 @@ -import { useEffect, useState, useCallback } from "@wordpress/element"; -import PropTypes from "prop-types"; -import { AcademyUpsellCard, PremiumUpsellCard } from "../../shared-admin/components"; +import { AcademyUpsellCard, PremiumUpsellCard, RecommendationsSidebar } from "../../shared-admin/components"; import { useSelectDashboard } from "../hooks"; /** * @returns {JSX.Element} The sidebar recommendations. */ -const SidebarRecommendations = ( { position } ) => { +const SidebarRecommendations = () => { const isPremium = useSelectDashboard( "selectPreference", [], "isPremium" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/jj" ); @@ -15,49 +13,12 @@ const SidebarRecommendations = ( { position } ) => { return null; } - const [ sidebarPosition, setSidebarPosition ] = useState( {} ); - const [ scrollY, setScrollY ] = useState( 0 ); - - const updatePosition = useCallback( () => { - setScrollY( window.scrollY ); - }, [ setScrollY ] ); - - useEffect( () => { - if ( ! position?.top ) { - return; - } - - if ( position.top > scrollY ) { - setSidebarPosition( { top: position.top - scrollY } ); - } else { - setSidebarPosition( { top: "64px" } ); - } - }, [ scrollY ] ); - - useEffect( () => { - setScrollY( window.scrollY ); - window.addEventListener( "scroll", updatePosition ); - window.addEventListener( "resize", updatePosition ); - return () => { - window.removeEventListener( "scroll", updatePosition ); - window.removeEventListener( "resize", updatePosition ); - }; - }, [] ); - return ( -
-
- - -
-
+ + + + ); }; -SidebarRecommendations.propTypes = { - position: PropTypes.shape( { - top: PropTypes.number, - } ), -}; - export default SidebarRecommendations; diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 3275222a485..37eaf79b368 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -1,5 +1,4 @@ import { __ } from "@wordpress/i18n"; -import { useRef, useEffect, useState } from "@wordpress/element"; import { Paper, Title } from "@yoast/ui-library"; import { PremiumUpsellList } from "../../shared-admin/components/premium-upsell-list"; import { Notifications, Problems } from "../components"; @@ -14,18 +13,8 @@ export const AlertCenter = () => { const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" ); const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); - const paperRef = useRef( null ); - const [ position, setPosition ] = useState( { top: 0 } ); - - useEffect( () => { - if ( paperRef.current ) { - const rect = paperRef.current.getBoundingClientRect(); - setPosition( { top: rect.top + window.scrollY } ); - } - }, [] ); - return <> -
+
@@ -47,7 +36,7 @@ export const AlertCenter = () => { promotions={ promotions } /> }
- +
; }; From 76ace9c623c88481223949eea33edeca40d1ceac Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Tue, 1 Oct 2024 16:39:40 +0300 Subject: [PATCH 05/14] implement usage of sticky class --- .../components/sidebar-recommendations.js | 14 +++++++++----- packages/js/src/dashboard/routes/alert-center.js | 12 +++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index 94bea5e95bb..e40836cc991 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -1,4 +1,4 @@ -import { AcademyUpsellCard, PremiumUpsellCard, RecommendationsSidebar } from "../../shared-admin/components"; +import { AcademyUpsellCard, PremiumUpsellCard } from "../../shared-admin/components"; import { useSelectDashboard } from "../hooks"; /** * @returns {JSX.Element} The sidebar recommendations. @@ -14,10 +14,14 @@ const SidebarRecommendations = () => { } return ( - - - - +
+
+
+ + +
+
+
); }; diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 37eaf79b368..7954b07daf7 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -4,7 +4,7 @@ import { PremiumUpsellList } from "../../shared-admin/components/premium-upsell- import { Notifications, Problems } from "../components"; import SidebarRecommendations from "../components/sidebar-recommendations"; import { useSelectDashboard } from "../hooks"; -import classNames from "classnames"; + /** * @returns {JSX.Element} The dashboard content placeholder. */ @@ -13,8 +13,9 @@ export const AlertCenter = () => { const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" ); const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); - return <> -
+ return
+ { /* Alert center */ } +
@@ -36,7 +37,8 @@ export const AlertCenter = () => { promotions={ promotions } /> }
-
- ; + { /* Sidebar Recommendations */ } + +
; }; From ce30430900b9ae33f810a50fb8ab8beee8ff7163 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Tue, 1 Oct 2024 16:50:22 +0300 Subject: [PATCH 06/14] adds class for mobile view --- packages/js/src/dashboard/routes/alert-center.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 7954b07daf7..f002f5b3eaa 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -13,7 +13,7 @@ export const AlertCenter = () => { const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" ); const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); - return
+ return
{ /* Alert center */ }
From eff364c25926d250546b82f73c3df42a3390e13f Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Wed, 2 Oct 2024 10:12:38 +0300 Subject: [PATCH 07/14] remove full width from sidebar --- packages/js/src/dashboard/components/sidebar-recommendations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index e40836cc991..d87cf2e17c0 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -14,7 +14,7 @@ const SidebarRecommendations = () => { } return ( -
+
From f66359e4b0ba6f3753f8206526904637e245c651 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Wed, 2 Oct 2024 13:36:18 +0300 Subject: [PATCH 08/14] fix width on large screens and bor --- .../js/src/dashboard/components/sidebar-recommendations.js | 2 +- packages/js/src/dashboard/routes/alert-center.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index d87cf2e17c0..e088646b56a 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -14,7 +14,7 @@ const SidebarRecommendations = () => { } return ( -
+
diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index f002f5b3eaa..afe06f3f338 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -15,9 +15,9 @@ export const AlertCenter = () => { const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); return
{ /* Alert center */ } -
+
-
+
{ __( "Alert center", "wordpress-seo" ) }

From 94f358cc454d1f311ab7ac13610fd7c3a89ce24c Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Mon, 7 Oct 2024 09:52:12 +0300 Subject: [PATCH 09/14] fix recommandation sidebar width --- .../js/src/dashboard/components/sidebar-recommendations.js | 2 +- packages/js/src/dashboard/routes/alert-center.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/js/src/dashboard/components/sidebar-recommendations.js b/packages/js/src/dashboard/components/sidebar-recommendations.js index e088646b56a..da6b12bb35a 100644 --- a/packages/js/src/dashboard/components/sidebar-recommendations.js +++ b/packages/js/src/dashboard/components/sidebar-recommendations.js @@ -14,7 +14,7 @@ const SidebarRecommendations = () => { } return ( -

+
diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index afe06f3f338..5d1a5625209 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -13,9 +13,9 @@ export const AlertCenter = () => { const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" ); const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" ); const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] ); - return
+ return
{ /* Alert center */ } -
+
From 4c18b4edb299b738b72d3e9805dcb3e795a91209 Mon Sep 17 00:00:00 2001 From: Vraja Das Date: Tue, 8 Oct 2024 12:07:27 +0300 Subject: [PATCH 10/14] fix width for cards --- packages/js/src/dashboard/routes/alert-center.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/js/src/dashboard/routes/alert-center.js b/packages/js/src/dashboard/routes/alert-center.js index 5d1a5625209..025f9995f01 100644 --- a/packages/js/src/dashboard/routes/alert-center.js +++ b/packages/js/src/dashboard/routes/alert-center.js @@ -26,7 +26,7 @@ export const AlertCenter = () => {
-
+
From 6f76e151a6cae2f837b293afd8d9b8613c4bfd40 Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 09:33:59 +0000 Subject: [PATCH 11/14] Bump version to 23.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f121e6b592e..ceb759b0ecc 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "webpack-bundle-analyzer": "^4.9.1" }, "yoast": { - "pluginVersion": "23.6-RC6" + "pluginVersion": "23.6" }, "version": "0.0.0" } From 4c5f9780cef7c22b7f9bfbace943d71badc638ed Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 09:39:01 +0000 Subject: [PATCH 12/14] Bump version to 23.6 on free --- readme.txt | 2 +- wp-seo-main.php | 2 +- wp-seo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.txt b/readme.txt index ae5092a0c8d..57977aa83c9 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ License: GPLv3 License URI: http://www.gnu.org/licenses/gpl.html Tags: SEO, XML sitemap, Content analysis, Readability, Schema Tested up to: 6.6 -Stable tag: 23.5 +Stable tag: 23.6 Requires PHP: 7.2.5 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using the Yoast SEO plugin. diff --git a/wp-seo-main.php b/wp-seo-main.php index ea407184e87..6a26a79adae 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -15,7 +15,7 @@ * {@internal Nobody should be able to overrule the real version number as this can cause * serious issues with the options, so no if ( ! defined() ).}} */ -define( 'WPSEO_VERSION', '23.6-RC6' ); +define( 'WPSEO_VERSION', '23.6' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index 518d288085e..07927273c3a 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 23.6-RC6 + * Version: 23.6 * Plugin URI: https://yoa.st/1uj * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. * Author: Team Yoast From 94aee382412e5402b1f3d26048a8f0c0b2c7a3ef Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 11:03:27 +0000 Subject: [PATCH 13/14] Add changelog --- readme.txt | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/readme.txt b/readme.txt index 57977aa83c9..9dba477cfff 100644 --- a/readme.txt +++ b/readme.txt @@ -274,6 +274,24 @@ Your question has most likely been answered on our help center: [yoast.com/help/ == Changelog == += 23.7 = + +Release date: 2024-10-22 + +#### Enhancements + +* Removes the _keyphrase in slug_ assessment for static home pages. + +#### Bugfixes + +* Fixes a bug where a database error would occur when there were no public taxonomies available for indexing. +* Fixes a bug where another plugin running the `exit()` function inside the `plugin_loaded` hook would result in a fatal error. Props to @menno-ll. + +#### Other + +* Removes translation strings that are not meant for the Yoast SEO Free version from the plugin. +* Resets the notice for search engines discouraged when changing Search engine visibility to visible. + = 23.6 = Release date: 2024-10-08 @@ -296,20 +314,5 @@ Yoast SEO 23.6 brings more enhancements and bugfixes. [Find more information abo * Sets the minimum supported WordPress version to 6.5. -= 23.5 = - -Release date: 2024-09-24 - -Yoast SEO 23.5 brings more enhancements and bugfixes. [Find more information about our software releases and updates here](https://yoa.st/release-24-9-24). - -#### Enhancements - -* Improves analysis score feedback labels in the publish sections. -* Improves our integration with cache plugins by preventing flushing their cache when not needed. - -#### Bugfixes - -* Fixes a bug where Arabic keyphrases containing certain function words were not correctly matched. - = Earlier versions = For the changelog of earlier versions, please refer to [the changelog on yoast.com](https://yoa.st/yoast-seo-changelog). From 1873158cfcb20b2de7e907152dea96a59fa3cbb5 Mon Sep 17 00:00:00 2001 From: YoastBot Date: Tue, 8 Oct 2024 11:03:33 +0000 Subject: [PATCH 14/14] Bump version to 23.7-RC1 --- package.json | 2 +- wp-seo-main.php | 2 +- wp-seo.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ceb759b0ecc..4d16df7576f 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "webpack-bundle-analyzer": "^4.9.1" }, "yoast": { - "pluginVersion": "23.6" + "pluginVersion": "23.7-RC1" }, "version": "0.0.0" } diff --git a/wp-seo-main.php b/wp-seo-main.php index d262554792b..b35c44ddf24 100644 --- a/wp-seo-main.php +++ b/wp-seo-main.php @@ -15,7 +15,7 @@ * {@internal Nobody should be able to overrule the real version number as this can cause * serious issues with the options, so no if ( ! defined() ).}} */ -define( 'WPSEO_VERSION', '23.6' ); +define( 'WPSEO_VERSION', '23.7-RC1' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index 07927273c3a..90e1a88b67f 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 23.6 + * Version: 23.7-RC1 * Plugin URI: https://yoa.st/1uj * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more. * Author: Team Yoast