<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11072] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns: Pattern Directory: Sync with git WordPress/pattern-directory@78be0a7f3c9ed6daba62aa8b6795fe078945e47b</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/11072">11072</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/11072","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-06-28 16:57:26 +0000 (Mon, 28 Jun 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Pattern Directory: Sync with git WordPress/pattern-directory@78be0a7f3c9ed6daba62aa8b6795fe078945e47b</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsbuildindexassetphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.asset.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsbuildindexjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternssrccomponentsquerymonitorindexjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/src/components/query-monitor/index.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsbuildindexassetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.asset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.asset.php 2021-06-26 16:11:00 UTC (rev 11071)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.asset.php 2021-06-28 16:57:26 UTC (rev 11072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php return array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '08d1749aa3926c695f43341ced129089');
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php return array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '6cbaf2d77462621b3c58c07a6550bf44');
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternsbuildindexjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.js 2021-06-26 16:11:00 UTC (rev 11071)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/build/index.js 2021-06-28 16:57:26 UTC (rev 11072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12866,52 +12866,60 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> const QueryMonitor = () => {
</span><span class="cx" style="display: block; padding: 0 10px"> const {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setCurrentQuery
+ } = Object(_wordpress_data__WEBPACK_IMPORTED_MODULE_1__["useDispatch"])(_store__WEBPACK_IMPORTED_MODULE_3__["store"]);
+ const {
</ins><span class="cx" style="display: block; padding: 0 10px"> path
</span><span class="cx" style="display: block; padding: 0 10px"> } = Object(_hooks__WEBPACK_IMPORTED_MODULE_4__["useRoute"])();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const query = Object(_wordpress_data__WEBPACK_IMPORTED_MODULE_1__["useSelect"])(select => {
- let _query = Object(_wordpress_url__WEBPACK_IMPORTED_MODULE_2__["getQueryArgs"])(path);
-
- const categorySlug = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getCategoryFromPath"])(path);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let queryReady = true;
+ const query = Object(_wordpress_url__WEBPACK_IMPORTED_MODULE_2__["getQueryArgs"])(path);
+ const categorySlug = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getCategoryFromPath"])(path);
+ const categoryId = Object(_wordpress_data__WEBPACK_IMPORTED_MODULE_1__["useSelect"])(select => {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (categorySlug) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't let the query be set until we have the categories.
+ queryReady = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> const {
</span><span class="cx" style="display: block; padding: 0 10px"> getCategoryBySlug,
</span><span class="cx" style="display: block; padding: 0 10px"> hasLoadedCategories
</span><span class="cx" style="display: block; padding: 0 10px"> } = select(_store__WEBPACK_IMPORTED_MODULE_3__["store"]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!hasLoadedCategories()) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (hasLoadedCategories()) {
+ queryReady = true;
+ const categoryObj = getCategoryBySlug(categorySlug);
+ return (categoryObj === null || categoryObj === void 0 ? void 0 : categoryObj.id) || false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const category = getCategoryBySlug(categorySlug);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
+ }, [categorySlug]);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (category && category.id !== -1) {
- _query = { ..._query,
- 'pattern-categories': category.id
- };
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (categoryId) {
+ query['pattern-categories'] = categoryId;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const page = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getPageFromPath"])(path);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const author = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getValueFromPath"])(path, 'author');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (page > 1) {
- _query.page = page;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (author) {
+ query.author_name = author;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const myPatternStatus = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getValueFromPath"])(path, 'my-patterns');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const page = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getPageFromPath"])(path);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (myPatternStatus && 'page' !== myPatternStatus) {
- _query.status = myPatternStatus;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (page > 1) {
+ query.page = page;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return _query;
- }, [path]);
- const {
- setCurrentQuery
- } = Object(_wordpress_data__WEBPACK_IMPORTED_MODULE_1__["useDispatch"])(_store__WEBPACK_IMPORTED_MODULE_3__["store"]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const myPatternStatus = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getValueFromPath"])(path, 'my-patterns');
+
+ if (myPatternStatus && 'page' !== myPatternStatus) {
+ query.status = myPatternStatus;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(() => {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setCurrentQuery(query);
- }, [query]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (queryReady) {
+ setCurrentQuery(query);
+ }
+ }, [query, queryReady]);
</ins><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpatternssrccomponentsquerymonitorindexjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/src/components/query-monitor/index.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/src/components/query-monitor/index.js 2021-06-26 16:11:00 UTC (rev 11071)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/src/components/query-monitor/index.js 2021-06-28 16:57:26 UTC (rev 11072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,48 +16,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Listens for changes to the path and reconstructs the query object based on the path
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const QueryMonitor = () => {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const { setCurrentQuery } = useDispatch( patternStore );
</ins><span class="cx" style="display: block; padding: 0 10px"> const { path } = useRoute();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const query = useSelect(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let queryReady = true;
+ const query = getQueryArgs( path );
+ const categorySlug = getCategoryFromPath( path );
+
+ const categoryId = useSelect(
</ins><span class="cx" style="display: block; padding: 0 10px"> ( select ) => {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- let _query = getQueryArgs( path );
-
- const categorySlug = getCategoryFromPath( path );
</del><span class="cx" style="display: block; padding: 0 10px"> if ( categorySlug ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't let the query be set until we have the categories.
+ queryReady = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> const { getCategoryBySlug, hasLoadedCategories } = select( patternStore );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! hasLoadedCategories() ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( hasLoadedCategories() ) {
+ queryReady = true;
+ const categoryObj = getCategoryBySlug( categorySlug );
+ return categoryObj?.id || false;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- const category = getCategoryBySlug( categorySlug );
- if ( category && category.id !== -1 ) {
- _query = {
- ..._query,
- 'pattern-categories': category.id,
- };
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return false;
+ },
+ [ categorySlug ]
+ );
+ if ( categoryId ) {
+ query[ 'pattern-categories' ] = categoryId;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const page = getPageFromPath( path );
- if ( page > 1 ) {
- _query.page = page;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const author = getValueFromPath( path, 'author' );
+ if ( author ) {
+ query.author_name = author;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const myPatternStatus = getValueFromPath( path, 'my-patterns' );
- if ( myPatternStatus && 'page' !== myPatternStatus ) {
- _query.status = myPatternStatus;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const page = getPageFromPath( path );
+ if ( page > 1 ) {
+ query.page = page;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return _query;
- },
- [ path ]
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const myPatternStatus = getValueFromPath( path, 'my-patterns' );
+ if ( myPatternStatus && 'page' !== myPatternStatus ) {
+ query.status = myPatternStatus;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const { setCurrentQuery } = useDispatch( patternStore );
-
</del><span class="cx" style="display: block; padding: 0 10px"> useEffect( () => {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setCurrentQuery( query );
- }, [ query ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( queryReady ) {
+ setCurrentQuery( query );
+ }
+ }, [ query, queryReady ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span></span></pre>
</div>
</div>
</body>
</html>