Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

## Screenshot

![feedreader home screen](docs/assets/feedreader-home.png)
![feedreader home screen](docs/assets/feedreader-home.png?v=2)

---

Expand Down
4 changes: 2 additions & 2 deletions core/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ export function renderIndexPage(data: PageData): string {
<link rel="shortcut icon" href="/favicon.svg?v=8" type="image/svg+xml" />
<link rel="apple-touch-icon" href="/apple-touch-icon.png?v=8" />
<script src="/static/theme-init.js?v=1"></script>
<link rel="stylesheet" href="/static/style.css?v=120" />
<script src="/static/app.js?v=100" defer></script>
<link rel="stylesheet" href="/static/style.css?v=122" />
<script src="/static/app.js?v=101" defer></script>
</head>
<body data-app-version="${escapeHtml(data.appVersion)}">
<header class="shell page-header">
Expand Down
Binary file modified docs/assets/feedreader-home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions web-static/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const SHELL_CACHE = "reader-shell-v130";
const SHELL_CACHE = "reader-shell-v132";
const ITEMS_CACHE = "reader-items-v24";
const CORE_ASSETS = [
"/",
"/static/style.css?v=120",
"/static/app.js?v=100",
"/static/style.css?v=122",
"/static/app.js?v=101",
"/static/theme-init.js?v=1",
"/static/source-icons/hackernews.svg",
"/static/source-icons/github.svg",
Expand Down
25 changes: 20 additions & 5 deletions web-static/static/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@
let previewAutoLoadingMore = false;
let previewChromeHidden = false;
let previewLastScrollTop = 0;
let previewScrollDirection = 0;
let previewScrollTravel = 0;
let previewScrollFrame = 0;
let searchTimer = null;
let ignoreNextEmptySearchInput = false;
Expand Down Expand Up @@ -1530,6 +1532,8 @@

const resetPreviewChrome = () => {
previewLastScrollTop = previewScroll?.scrollTop ?? 0;
previewScrollDirection = 0;
previewScrollTravel = 0;
setPreviewChromeHidden(false);
};

Expand All @@ -1540,18 +1544,29 @@
}
const scrollTop = previewScroll.scrollTop;
const delta = scrollTop - previewLastScrollTop;
if (Math.abs(delta) < 4) return;
if (delta === 0) return;
previewLastScrollTop = scrollTop;

if (scrollTop <= 4) {
const direction = delta > 0 ? 1 : -1;
if (direction !== previewScrollDirection) {
previewScrollDirection = direction;
previewScrollTravel = 0;
}
previewScrollTravel += Math.abs(delta);
// Ignore finger jitter: require a deliberate directional movement before
// the chrome slides, otherwise it can flicker in and out.
if (previewScrollTravel < 12) return;
previewScrollTravel = 0;

if (scrollTop <= 8) {
setPreviewChromeHidden(false);
return;
}

const hideThreshold = (previewHeader?.offsetHeight ?? 64) + 12;
if (delta > 0 && scrollTop > hideThreshold) {
const hideThreshold = (previewHeader?.offsetHeight ?? 64) + 24;
if (direction > 0 && scrollTop > hideThreshold) {
setPreviewChromeHidden(true);
} else if (delta < 0) {
} else if (direction < 0) {
setPreviewChromeHidden(false);
}
};
Expand Down
9 changes: 7 additions & 2 deletions web-static/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ body.is-dialog-open {
gap: 0.5rem;
padding: var(--preview-panel-padding);
padding-bottom: calc(var(--preview-panel-padding) + 0.25rem);
transition: transform 320ms cubic-bezier(0.32, 0.72, 0, 1);
transition: transform 380ms cubic-bezier(0.22, 1, 0.36, 1);
}

/* Glass header: the scroll content passes beneath this layer, so the header's
Expand Down Expand Up @@ -1404,6 +1404,7 @@ body.is-dialog-open {
.preview-panel-scroll {
flex: 1 1 auto;
min-height: 0;
overflow-x: hidden;
overflow-y: auto;
overscroll-behavior: contain;
-webkit-overflow-scrolling: touch;
Expand Down Expand Up @@ -1447,6 +1448,7 @@ body.is-dialog-open {
display: flex;
flex-direction: column;
gap: 0.62rem;
overflow-wrap: anywhere;
}

.preview-panel-figure {
Expand Down Expand Up @@ -1482,7 +1484,7 @@ body.is-dialog-open {
gap: 0.5rem;
padding: calc(var(--preview-panel-padding) + 0.25rem)
var(--preview-panel-padding) var(--preview-panel-padding);
transition: transform 320ms cubic-bezier(0.32, 0.72, 0, 1);
transition: transform 380ms cubic-bezier(0.22, 1, 0.36, 1);
}

/* Mirror of the header glass: content scrolls beneath the footer, and the
Expand Down Expand Up @@ -1547,6 +1549,7 @@ body.is-dialog-open {
.preview-panel.is-preview-chrome-hidden .preview-panel-header,
.preview-panel.is-preview-chrome-hidden .preview-panel-footer {
pointer-events: none;
transition: transform 280ms cubic-bezier(0.4, 0, 1, 1);
}

/* Clear the 2rem gradient extension too, so no glass strip is left behind. */
Expand Down Expand Up @@ -1611,6 +1614,8 @@ body.is-dialog-open {

.preview-panel-content > * {
margin: 0;
min-width: 0;
max-width: 100%;
}

.preview-panel-content p,
Expand Down
Loading