Removed unnecessary share replays

This commit is contained in:
squidfunk 2020-08-22 18:36:37 +02:00
parent c7d770bbe3
commit e9795f382d
26 changed files with 139 additions and 167 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,12 +1,12 @@
{ {
"assets/javascripts/bundle.js": "assets/javascripts/bundle.a8472eec.min.js", "assets/javascripts/bundle.js": "assets/javascripts/bundle.d2ae5e32.min.js",
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.a8472eec.min.js.map", "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.d2ae5e32.min.js.map",
"assets/javascripts/vendor.js": "assets/javascripts/vendor.d1f5a259.min.js", "assets/javascripts/vendor.js": "assets/javascripts/vendor.9b93e5e7.min.js",
"assets/javascripts/vendor.js.map": "assets/javascripts/vendor.d1f5a259.min.js.map", "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.9b93e5e7.min.js.map",
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.fae956e7.min.js", "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.fae956e7.min.js",
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.fae956e7.min.js.map", "assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.fae956e7.min.js.map",
"assets/stylesheets/main.css": "assets/stylesheets/main.2c939256.min.css", "assets/stylesheets/main.css": "assets/stylesheets/main.c1355826.min.css",
"assets/stylesheets/main.css.map": "assets/stylesheets/main.2c939256.min.css.map", "assets/stylesheets/main.css.map": "assets/stylesheets/main.c1355826.min.css.map",
"assets/stylesheets/overrides.css": "assets/stylesheets/overrides.011ebae6.min.css", "assets/stylesheets/overrides.css": "assets/stylesheets/overrides.011ebae6.min.css",
"assets/stylesheets/overrides.css.map": "assets/stylesheets/overrides.011ebae6.min.css.map", "assets/stylesheets/overrides.css.map": "assets/stylesheets/overrides.011ebae6.min.css.map",
"assets/stylesheets/palette.css": "assets/stylesheets/palette.2c2767bb.min.css", "assets/stylesheets/palette.css": "assets/stylesheets/palette.2c2767bb.min.css",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -41,7 +41,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.2c939256.min.css' | url }}"> <link rel="stylesheet" href="{{ 'assets/stylesheets/main.c1355826.min.css' | url }}">
{% if palette.scheme or palette.primary or palette.accent %} {% if palette.scheme or palette.primary or palette.accent %}
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.2c2767bb.min.css' | url }}"> <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.2c2767bb.min.css' | url }}">
{% endif %} {% endif %}
@ -182,8 +182,8 @@
{% endblock %} {% endblock %}
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{{ 'assets/javascripts/vendor.d1f5a259.min.js' | url }}"></script> <script src="{{ 'assets/javascripts/vendor.9b93e5e7.min.js' | url }}"></script>
<script src="{{ 'assets/javascripts/bundle.a8472eec.min.js' | url }}"></script> <script src="{{ 'assets/javascripts/bundle.d2ae5e32.min.js' | url }}"></script>
{%- set translations = {} -%} {%- set translations = {} -%}
{%- for key in [ {%- for key in [
"clipboard.copy", "clipboard.copy",

View File

@ -137,7 +137,7 @@ export function setupComponents(
}), }),
/* Convert to hot observable */ /* Convert to hot observable */
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
} }

View File

@ -25,7 +25,6 @@ import {
distinctUntilChanged, distinctUntilChanged,
filter, filter,
map, map,
shareReplay,
startWith, startWith,
switchMap, switchMap,
withLatestFrom withLatestFrom
@ -116,8 +115,7 @@ export function mountHeader(
/* Combine into single observable */ /* Combine into single observable */
return combineLatest([header$, type$]) return combineLatest([header$, type$])
.pipe( .pipe(
map(([header, type]): Header => ({ type, ...header })), map(([header, type]): Header => ({ type, ...header }))
shareReplay(1)
) )
}) })
) )

View File

@ -96,7 +96,7 @@ export function watchHeader(
}) })
} }
}), }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
} }

View File

@ -34,7 +34,6 @@ import {
map, map,
observeOn, observeOn,
pluck, pluck,
shareReplay,
switchMap, switchMap,
tap tap
} from "rxjs/operators" } from "rxjs/operators"
@ -84,8 +83,7 @@ export function watchMain(
const adjust$ = header$ const adjust$ = header$
.pipe( .pipe(
pluck("height"), pluck("height"),
distinctUntilChanged(), distinctUntilChanged()
shareReplay(1)
) )
/* Compute the main area's top and bottom borders */ /* Compute the main area's top and bottom borders */
@ -96,11 +94,10 @@ export function watchMain(
map(({ height }) => ({ map(({ height }) => ({
top: el.offsetTop, top: el.offsetTop,
bottom: el.offsetTop + height bottom: el.offsetTop + height
})) })),
distinctUntilKeyChanged("bottom")
) )
), )
distinctUntilKeyChanged("bottom"),
shareReplay(1)
) )
/* Compute the main area's offset, visible height and if we scrolled past */ /* Compute the main area's offset, visible height and if we scrolled past */

View File

@ -1,110 +0,0 @@
/*
* Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
import { Observable, OperatorFunction, of, pipe } from "rxjs"
import { map, switchMap } from "rxjs/operators"
import { Viewport } from "browser"
import { Header } from "../../header"
import { Main } from "../../main"
import {
Sidebar,
applySidebar,
watchSidebar
} from "../../shared"
/* ----------------------------------------------------------------------------
* Types
* ------------------------------------------------------------------------- */
/**
* Navigation for [screen -]
*/
interface NavigationBelowScreen {} // tslint:disable-line
/**
* Navigation for [screen +]
*/
interface NavigationAboveScreen {
sidebar: Sidebar /* Sidebar */
}
/* ------------------------------------------------------------------------- */
/**
* Navigation
*/
export type Navigation =
| NavigationBelowScreen
| NavigationAboveScreen
/* ----------------------------------------------------------------------------
* Helper types
* ------------------------------------------------------------------------- */
/**
* Mount options
*/
interface MountOptions {
header$: Observable<Header> /* Header observable */
main$: Observable<Main> /* Main area observable */
viewport$: Observable<Viewport> /* Viewport observable */
screen$: Observable<boolean> /* Screen media observable */
}
/* ----------------------------------------------------------------------------
* Functions
* ------------------------------------------------------------------------- */
/**
* Mount navigation from source observable
*
* @param options - Options
*
* @return Operator function
*/
export function mountNavigation(
{ header$, main$, viewport$, screen$ }: MountOptions
): OperatorFunction<HTMLElement, Navigation> {
return pipe(
switchMap(el => screen$
.pipe(
switchMap(screen => {
/* [screen +]: Mount navigation in sidebar */
if (screen) {
return watchSidebar(el, { main$, viewport$ })
.pipe(
applySidebar(el, { header$ }),
map(sidebar => ({ sidebar }))
)
/* [screen -]: Mount navigation in drawer */
} else {
return of({})
}
})
)
)
)
}

View File

@ -20,4 +20,91 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
export * from "./_" import { Observable, OperatorFunction, of, pipe } from "rxjs"
import { map, switchMap } from "rxjs/operators"
import { Viewport } from "browser"
import { Header } from "../header"
import { Main } from "../main"
import {
Sidebar,
applySidebar,
watchSidebar
} from "../shared"
/* ----------------------------------------------------------------------------
* Types
* ------------------------------------------------------------------------- */
/**
* Navigation for [screen -]
*/
interface NavigationBelowScreen {} // tslint:disable-line
/**
* Navigation for [screen +]
*/
interface NavigationAboveScreen {
sidebar: Sidebar /* Sidebar */
}
/* ------------------------------------------------------------------------- */
/**
* Navigation
*/
export type Navigation =
| NavigationBelowScreen
| NavigationAboveScreen
/* ----------------------------------------------------------------------------
* Helper types
* ------------------------------------------------------------------------- */
/**
* Mount options
*/
interface MountOptions {
header$: Observable<Header> /* Header observable */
main$: Observable<Main> /* Main area observable */
viewport$: Observable<Viewport> /* Viewport observable */
screen$: Observable<boolean> /* Screen media observable */
}
/* ----------------------------------------------------------------------------
* Functions
* ------------------------------------------------------------------------- */
/**
* Mount navigation from source observable
*
* @param options - Options
*
* @return Operator function
*/
export function mountNavigation(
{ header$, main$, viewport$, screen$ }: MountOptions
): OperatorFunction<HTMLElement, Navigation> {
return pipe(
switchMap(el => screen$
.pipe(
switchMap(screen => {
/* [screen +]: Mount navigation in sidebar */
if (screen) {
return watchSidebar(el, { main$, viewport$ })
.pipe(
applySidebar(el, { header$ }),
map(sidebar => ({ sidebar }))
)
/* [screen -]: Mount navigation in drawer */
} else {
return of({})
}
})
)
)
)
}

View File

@ -200,13 +200,13 @@ export function initialize(config: unknown) {
const header$ = useComponent("header") const header$ = useComponent("header")
.pipe( .pipe(
mountHeader({ document$, viewport$ }), mountHeader({ document$, viewport$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
const main$ = useComponent("main") const main$ = useComponent("main")
.pipe( .pipe(
mountMain({ header$, viewport$ }), mountMain({ header$, viewport$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -214,25 +214,25 @@ export function initialize(config: unknown) {
const navigation$ = useComponent("navigation") const navigation$ = useComponent("navigation")
.pipe( .pipe(
mountNavigation({ header$, main$, viewport$, screen$ }), mountNavigation({ header$, main$, viewport$, screen$ }),
shareReplay(1) // shareReplay because there might be late subscribers shareReplay({ bufferSize: 1, refCount: true }) // shareReplay because there might be late subscribers
) )
const toc$ = useComponent("toc") const toc$ = useComponent("toc")
.pipe( .pipe(
mountTableOfContents({ header$, main$, viewport$, tablet$ }), mountTableOfContents({ header$, main$, viewport$, tablet$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
const tabs$ = useComponent("tabs") const tabs$ = useComponent("tabs")
.pipe( .pipe(
mountTabs({ header$, viewport$, screen$ }), mountTabs({ header$, viewport$, screen$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
const hero$ = useComponent("hero") const hero$ = useComponent("hero")
.pipe( .pipe(
mountHero({ header$, viewport$ }), mountHero({ header$, viewport$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -277,21 +277,21 @@ export function initialize(config: unknown) {
const query$ = useComponent("search-query") const query$ = useComponent("search-query")
.pipe( .pipe(
mountSearchQuery(worker, { transform: config.search.transform }), mountSearchQuery(worker, { transform: config.search.transform }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* Mount search reset */ /* Mount search reset */
const reset$ = useComponent("search-reset") const reset$ = useComponent("search-reset")
.pipe( .pipe(
mountSearchReset(), mountSearchReset(),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* Mount search result */ /* Mount search result */
const result$ = useComponent("search-result") const result$ = useComponent("search-result")
.pipe( .pipe(
mountSearchResult(worker, { query$ }), mountSearchResult(worker, { query$ }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
return useComponent("search") return useComponent("search")
@ -304,7 +304,7 @@ export function initialize(config: unknown) {
.subscribe(el => el.hidden = true) // TODO: Hack .subscribe(el => el.hidden = true) // TODO: Hack
return NEVER return NEVER
}), }),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */

View File

@ -25,7 +25,7 @@ import { Observable, Subject, asyncScheduler } from "rxjs"
import { import {
map, map,
observeOn, observeOn,
shareReplay, share,
withLatestFrom withLatestFrom
} from "rxjs/operators" } from "rxjs/operators"
@ -120,7 +120,7 @@ export function setupSearchWorker(
} }
return message return message
}), }),
shareReplay(1) share()
) )
/* Set up search index */ /* Set up search index */

View File

@ -70,7 +70,7 @@ export function patchScrollfix(
const els$ = document$ const els$ = document$
.pipe( .pipe(
map(() => getElements("[data-md-scrollfix]")), map(() => getElements("[data-md-scrollfix]")),
shareReplay(1) shareReplay({ bufferSize: 1, refCount: true })
) )
/* Remove marker attribute, so we'll only add the fix once */ /* Remove marker attribute, so we'll only add the fix once */

View File

@ -21,9 +21,9 @@
*/ */
import { Repo, User } from "github-types" import { Repo, User } from "github-types"
import { Observable, of } from "rxjs" import { Observable } from "rxjs"
import { ajax } from "rxjs/ajax" import { ajax } from "rxjs/ajax"
import { filter, pluck, switchMap } from "rxjs/operators" import { filter, map, pluck } from "rxjs/operators"
import { round } from "utilities" import { round } from "utilities"
@ -53,22 +53,22 @@ export function fetchSourceFactsFromGitHub(
.pipe( .pipe(
filter(({ status }) => status === 200), filter(({ status }) => status === 200),
pluck("response"), pluck("response"),
switchMap(data => { map(data => {
/* GitHub repository */ /* GitHub repository */
if (typeof repo !== "undefined") { if (typeof repo !== "undefined") {
const { stargazers_count, forks_count }: Repo = data const { stargazers_count, forks_count }: Repo = data
return of([ return [
`${round(stargazers_count || 0)} Stars`, `${round(stargazers_count || 0)} Stars`,
`${round(forks_count || 0)} Forks` `${round(forks_count || 0)} Forks`
]) ]
/* GitHub user/organization */ /* GitHub user/organization */
} else { } else {
const { public_repos }: User = data const { public_repos }: User = data
return of([ return [
`${round(public_repos || 0)} Repositories` `${round(public_repos || 0)} Repositories`
]) ]
} }
}) })
) )

View File

@ -109,5 +109,5 @@ button {
// Reset input styles // Reset input styles
input { input {
border: 0; border: 0;
outline: 0; outline: none;
} }

View File

@ -81,7 +81,7 @@
// Focused tab label // Focused tab label
&:focus + label { &:focus + label {
outline: auto; outline-style: auto;
} }
} }

View File

@ -545,7 +545,7 @@ $md-toggle__search--checked:
// Link inside item // Link inside item
&__link { &__link {
display: block; display: block;
outline: 0; outline: none;
transition: background 250ms; transition: background 250ms;
scroll-snap-align: start; scroll-snap-align: start;