Merge branch 'master' into docs/restructure-docs

CHANGELOG

@@ -1,3 +1,16 @@
+mkdocs-material-7.3.2+insiders-3.1.2 (2021-10-06)
+
+  * Fixed incorrect path separators for social cards on Windows
+
+mkdocs-material-7.3.2 (2021-10-06)
+
+  * Deprecated prebuilding of search index
+  * Improved graceful handling of broken search for file://
+  * Added minimum Jinja version to list of requirements
+  * Fixed #3071: section index pages render empty directories
+  * Fixed margin issues when using navigation tabs (7.3.1 regression)
+  * Fixed search placeholder sometimes being shown too early
+
 mkdocs-material-7.3.1 (2021-10-02)
 
   * Added new experimental content tabs implementation

docs/changelog.md

@@ -6,6 +6,15 @@ template: overrides/main.html
 
 ## Material for MkDocs
 
+### 7.3.2 <small>_ October 6, 2021</small>
+
+- Deprecated prebuilding of search index
+- Improved graceful handling of broken search for `file://`
+- Added minimum Jinja version to list of requirements
+- Fixed #3071: section index pages render empty directories
+- Fixed margin issues when using navigation tabs (7.3.1 regression)
+- Fixed search placeholder sometimes being shown too early
+
 ### 7.3.1 <small>_ October 2, 2021</small>
 
 - Added new experimental content tabs implementation

docs/insiders/changelog.md

@@ -6,6 +6,10 @@ template: overrides/main.html
 
 ## Material for MkDocs Insiders
 
+### 3.1.2 <small>_ October 6, 2021</small>
+
+- Fixed incorrect path separators for social cards on Windows
+
 ### 3.1.1 <small>_ September 26, 2021</small>
 
 - Fixed ordering bug in search exclusion logic

material/base.html

@@ -27,7 +27,7 @@
         <link rel="canonical" href="{{ page.canonical_url }}">
       {% endif %}
       <link rel="icon" href="{{ config.theme.favicon | url }}">
-      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-7.3.1">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-7.3.2">
     {% endblock %}
     {% block htmltitle %}
       {% if page and page.meta and page.meta.title %}
@@ -225,7 +225,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.39a44d95.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.bc35569b.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "7.3.1",
+  "version": "7.3.2",
   "description": "A Material Design theme for MkDocs",
   "keywords": [
     "mkdocs",

requirements.txt

@@ -19,8 +19,9 @@
 # IN THE SOFTWARE.
 
 # Direct dependencies
-mkdocs>=1.2.2
+jinja2>=2.11.1
-Pygments>=2.4
 markdown>=3.2
-pymdown-extensions>=9.0
+mkdocs>=1.2.2
 mkdocs-material-extensions>=1.0
+pygments>=2.4
+pymdown-extensions>=9.0

src/assets/javascripts/components/search/_/index.ts

@@ -107,12 +107,8 @@ export function mountSearch(
     tx$
       .pipe(
         filter(isSearchQueryMessage),
-        sample(rx$
+        sample(rx$.pipe(filter(isSearchReadyMessage))),
-          .pipe(
+        take(1)
-            filter(isSearchReadyMessage),
-            take(1)
-          )
-        )
       )
         .subscribe(tx$.next.bind(tx$))
 

src/assets/javascripts/components/search/result/index.ts

@@ -33,6 +33,7 @@ import {
   finalize,
   map,
   observeOn,
+  skipUntil,
   switchMap,
   take,
   tap,
@@ -102,20 +103,18 @@ export function mountSearchResult(
   const list = getElementOrThrow(":scope > :last-child", el)
 
   /* Update search result metadata when ready */
-  rx$
+  const ready$ = rx$
     .pipe(
       filter(isSearchReadyMessage),
       take(1)
     )
-      .subscribe(() => {
-        resetSearchResultMeta(meta)
-      })
 
   /* Update search result metadata */
   internal$
     .pipe(
       observeOn(animationFrameScheduler),
-      withLatestFrom(query$)
+      withLatestFrom(query$),
+      skipUntil(ready$)
     )
       .subscribe(([{ items }, { value }]) => {
         if (value)

src/assets/javascripts/integrations/search/worker/_/index.ts

@@ -127,10 +127,10 @@ export function setupSearchWorker(
   /* Set up search index */
   from(index)
     .pipe(
-      map<SearchIndex, SearchSetupMessage>(data => ({
+      map(data => ({
         type: SearchMessageType.SETUP,
         data: setupSearchIndex(data)
-      }))
+      } as SearchSetupMessage))
     )
       .subscribe(tx$.next.bind(tx$))