starred/mkdocs-material
1
0
Fork 0
mirror of https://github.com/squidfunk/mkdocs-material.git synced 2026-08-04 19:45:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary share replays

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/javascripts/components/_/index.ts
View File

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

4
src/assets/javascripts/components/header/_/index.ts
View File

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

2
src/assets/javascripts/components/header/react/index.ts
View File

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

11
src/assets/javascripts/components/main/react/index.ts
View File

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

110
src/assets/javascripts/components/navigation/_/index.ts
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({})
}
})
)
)
)
}

89
src/assets/javascripts/components/navigation/index.ts
View File

@@ -20,4 +20,91 @@
* 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({})
}
})
)
)
)
}