Restructured viewport helpers

material/base.html

@@ -213,7 +213,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.82d444e5.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.6baa0517.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

material/overrides/main.html

@@ -16,5 +16,5 @@
 {% endblock %}
 {% block scripts %}
   {{ super() }}
-  <script src="{{ 'overrides/assets/javascripts/bundle.876eeeea.min.js' | url }}"></script>
+  <script src="{{ 'overrides/assets/javascripts/bundle.de54bb68.min.js' | url }}"></script>
 {% endblock %}

src/assets/javascripts/browser/viewport/_/index.ts

@@ -23,14 +23,10 @@
 import {
   Observable,
   combineLatest,
-  distinctUntilKeyChanged,
   map,
   shareReplay
 } from "rxjs"
 
-import { Header } from "~/components"
-
-import { getElementOffset } from "../../element"
 import {
   ViewportOffset,
   watchViewportOffset
@@ -52,18 +48,6 @@ export interface Viewport {
   size: ViewportSize                   /* Viewport size */
 }
 
-/* ----------------------------------------------------------------------------
- * Helper types
- * ------------------------------------------------------------------------- */
-
-/**
- * Watch at options
- */
-interface WatchAtOptions {
-  viewport$: Observable<Viewport>      /* Viewport observable */
-  header$: Observable<Header>          /* Header observable */
-}
-
 /* ----------------------------------------------------------------------------
  * Functions
  * ------------------------------------------------------------------------- */
@@ -83,38 +67,3 @@ export function watchViewport(): Observable<Viewport> {
       shareReplay(1)
     )
 }
-
-/**
- * Watch viewport relative to element
- *
- * @param el - Element
- * @param options - Options
- *
- * @returns Viewport observable
- */
-export function watchViewportAt(
-  el: HTMLElement, { viewport$, header$ }: WatchAtOptions
-): Observable<Viewport> {
-  const size$ = viewport$
-    .pipe(
-      distinctUntilKeyChanged("size")
-    )
-
-  /* Compute element offset */
-  const offset$ = combineLatest([size$, header$])
-    .pipe(
-      map(() => getElementOffset(el))
-    )
-
-  /* Compute relative viewport, return hot observable */
-  return combineLatest([header$, viewport$, offset$])
-    .pipe(
-      map(([{ height }, { offset, size }, { x, y }]) => ({
-        offset: {
-          x: offset.x - x,
-          y: offset.y - y + height
-        },
-        size
-      }))
-    )
-}

src/assets/javascripts/browser/viewport/at/index.ts

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016-2021 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,
+  combineLatest,
+  distinctUntilKeyChanged,
+  map
+} from "rxjs"
+
+import { Header } from "~/components"
+
+import { getElementOffset } from "../../element"
+import { Viewport } from "../_"
+
+/* ----------------------------------------------------------------------------
+ * Helper types
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Watch options
+ */
+interface WatchOptions {
+  viewport$: Observable<Viewport>      /* Viewport observable */
+  header$: Observable<Header>          /* Header observable */
+}
+
+/* ----------------------------------------------------------------------------
+ * Functions
+ * ------------------------------------------------------------------------- */
+
+/**
+ * Watch viewport relative to element
+ *
+ * @param el - Element
+ * @param options - Options
+ *
+ * @returns Viewport observable
+ */
+export function watchViewportAt(
+  el: HTMLElement, { viewport$, header$ }: WatchOptions
+): Observable<Viewport> {
+  const size$ = viewport$
+    .pipe(
+      distinctUntilKeyChanged("size")
+    )
+
+  /* Compute element offset */
+  const offset$ = combineLatest([size$, header$])
+    .pipe(
+      map(() => getElementOffset(el))
+    )
+
+  /* Compute relative viewport, return hot observable */
+  return combineLatest([header$, viewport$, offset$])
+    .pipe(
+      map(([{ height }, { offset, size }, { x, y }]) => ({
+        offset: {
+          x: offset.x - x,
+          y: offset.y - y + height
+        },
+        size
+      }))
+    )
+}

src/assets/javascripts/browser/viewport/index.ts

@@ -21,5 +21,6 @@
  */
 
 export * from "./_"
+export * from "./at"
 export * from "./offset"
 export * from "./size"