Avoid ppi<10 causing UI to break (#1240)

internetarchive · Sep 15, 2023 · fa43ed5 · fa43ed5
1 parent 7361245
commit fa43ed5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/BookReader/BookModel.js b/src/BookReader/BookModel.js
@@ -352,8 +352,9 @@ export class PageModel {
    * @param {PageIndex} index
    */
   constructor(book, index) {
-    // TODO: Get default from config
-    this.ppi = book._getDataProp(index, 'ppi', book.ppi);
+    // Values less than 10 cause the UI to not work correctly
+    const pagePPI = book._getDataProp(index, 'ppi', book.ppi);
+    this.ppi = Math.max(pagePPI < 10 ? book.ppi : pagePPI, 10);
     this.book = book;
     this.index = index;
     this.width = book.getPageWidth(index);

diff --git a/tests/jest/BookReader/BookModel.test.js b/tests/jest/BookReader/BookModel.test.js
@@ -24,8 +24,8 @@ const SAMPLE_DATA = [
 
 describe('getMedianPageSizeInches', () => {
   test('handles single page data', () => {
-    const bm = new BookModel({ data: SAMPLE_DATA.slice(0, 1), options: {ppi: 1} });
-    expect(bm.getMedianPageSizeInches()).toEqual({ width: 123, height: 123 });
+    const bm = new BookModel({ data: SAMPLE_DATA.slice(0, 1), options: {ppi: 10} });
+    expect(bm.getMedianPageSizeInches()).toEqual({ width: 12.3, height: 12.3 });
   });
 
   test('handles odd pages data', () => {
@@ -39,8 +39,8 @@ describe('getMedianPageSizeInches', () => {
     Object.assign(data[0][0], sizes[0]);
     Object.assign(data[1][0], sizes[1]);
     Object.assign(data[1][1], sizes[2]);
-    const bm = new BookModel({ data, options: {ppi: 1} });
-    expect(bm.getMedianPageSizeInches()).toEqual({ width: 200, height: 2200 });
+    const bm = new BookModel({ data, options: {ppi: 10} });
+    expect(bm.getMedianPageSizeInches()).toEqual({ width: 20, height: 220 });
   });
 
 
@@ -56,8 +56,8 @@ describe('getMedianPageSizeInches', () => {
     Object.assign(data[1][0], sizes[1]);
     Object.assign(data[1][1], sizes[2]);
     Object.assign(data[2][0], sizes[3]);
-    const bm = new BookModel({ data, options: {ppi: 1} });
-    expect(bm.getMedianPageSizeInches()).toEqual({ width: 300, height: 2300 });
+    const bm = new BookModel({ data, options: {ppi: 10} });
+    expect(bm.getMedianPageSizeInches()).toEqual({ width: 30, height: 230 });
   });
 
   test('does not lexicographic sort for median', () => {
@@ -71,8 +71,8 @@ describe('getMedianPageSizeInches', () => {
     Object.assign(data[0][0], sizes[0]);
     Object.assign(data[1][0], sizes[1]);
     Object.assign(data[1][1], sizes[2]);
-    const bm = new BookModel({ data, options: {ppi: 1} });
-    expect(bm.getMedianPageSizeInches()).toEqual({ width: 30, height: 30 });
+    const bm = new BookModel({ data, options: {ppi: 10} });
+    expect(bm.getMedianPageSizeInches()).toEqual({ width: 3, height: 3 });
   });
 
   test('caches result', () => {