Bookhoard/foliate-js
1
0
Fork 0
mirror of https://github.com/john-okeefe/foliate-js.git synced 2026-09-09 11:29:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mitigate fixed-layout exception on render when there's no available source for blankWidth and blankHeight (#70)

Browse Source
This commit is contained in:
Protected
2025-05-31 04:18:01 +00:00
committed by GitHub
parent 42dea3be3d
commit 1fe4803888
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fixed-layout.js
+7 -4
View File
@@ -106,18 +106,19 @@ export class FixedLayout extends HTMLElement {
#render(side = this.#side) { #render(side = this.#side) {
if (!side) return if (!side) return
const left = this.#left ?? {} const left = this.#left ?? {}
const right = this.#center ?? this.#right const right = this.#center ?? this.#right ?? {}
const target = side === 'left' ? left : right const target = side === 'left' ? left : right
const { width, height } = this.getBoundingClientRect() const { width, height } = this.getBoundingClientRect()
const portrait = this.spread !== 'both' && this.spread !== 'portrait' const portrait = this.spread !== 'both' && this.spread !== 'portrait'
&& height > width && height > width
this.#portrait = portrait this.#portrait = portrait
const blankWidth = left.width ?? right.width const blankWidth = left.width ?? right.width ?? 0
const blankHeight = left.height ?? right.height const blankHeight = left.height ?? right.height ?? 0
const scale = typeof this.#zoom === 'number' && !isNaN(this.#zoom) const scale = typeof this.#zoom === 'number' && !isNaN(this.#zoom)
? this.#zoom ? this.#zoom
: this.#zoom === 'fit-width' ? (portrait || this.#center : (this.#zoom === 'fit-width'
? (portrait || this.#center
? width / (target.width ?? blankWidth) ? width / (target.width ?? blankWidth)
: width / ((left.width ?? blankWidth) + (right.width ?? blankWidth))) : width / ((left.width ?? blankWidth) + (right.width ?? blankWidth)))
: (portrait || this.#center : (portrait || this.#center
@@ -129,9 +130,11 @@ export class FixedLayout extends HTMLElement {
height / Math.max( height / Math.max(
left.height ?? blankHeight, left.height ?? blankHeight,
right.height ?? blankHeight))) right.height ?? blankHeight)))
) || 1;
const transform = frame => { const transform = frame => {
let { element, iframe, width, height, blank, onZoom } = frame let { element, iframe, width, height, blank, onZoom } = frame
if (!iframe) return;
if (onZoom) onZoom({ doc: frame.iframe.contentDocument, scale }) if (onZoom) onZoom({ doc: frame.iframe.contentDocument, scale })
const iframeScale = onZoom ? scale : 1 const iframeScale = onZoom ? scale : 1
Object.assign(iframe.style, { Object.assign(iframe.style, {