@prose-reader/core 1.127.0 → 1.128.0

package/dist/navigation/tests/SpineItemsManagerMock.d.ts

@@ -9,7 +9,10 @@ export type Item = {
 };
 export declare class SpineItemsManagerMock {
     items: Item[];
-    layout$: Subject<unknown>;
+    layout$: Subject<{
+        width: number;
+        height: number;
+    }>;
     items$: BehaviorSubject<Item[]>;
     load(items: {
         left: number;

package/dist/reader.d.ts

@@ -108,12 +108,7 @@ export declare const createReader: (inputSettings: CreateReaderOptions) => {
     };
     settings: SettingsInterface<NonNullable<CoreInputSettings>, NonNullable<import('./settings/types').CoreOutputSettings | undefined>>;
     element$: import('rxjs').Observable<HTMLElement>;
-    layout$: import('rxjs').Observable<{
-        hasChanged: boolean;
-        spineItemsAbsolutePositions: import('./spine/SpineLayout').LayoutPosition[];
-        spineItemsPagesAbsolutePositions: import('./spine/SpineLayout').LayoutPosition[][];
-        pages: import('./spine/SpineLayout').PageLayoutInformation[];
-    }>;
+    layout$: import('rxjs').Observable<import('./spine/SpineLayout').LayoutInfo>;
     viewportState$: import('rxjs').Observable<"free" | "busy">;
     viewportFree$: import('rxjs').Observable<"free">;
     state$: import('rxjs').Observable<"idle" | "ready">;

package/dist/settings/types.d.ts

@@ -1,5 +1,5 @@
 import { Manifest } from '@prose-reader/shared';
-import { DocumentRenderer, DocumentRendererParams } from '../spineItem/DocumentRenderer';
+import { DocumentRenderer, DocumentRendererParams } from '../spineItem/renderer/DocumentRenderer';
 import { Observable } from 'rxjs';
 export type CoreInputSettings = {
     forceSinglePageMode: boolean;

package/dist/spine/SpineLayout.d.ts

@@ -20,18 +20,20 @@ export type PageLayoutInformation = {
     itemIndex: number;
     absolutePosition: LayoutPosition;
 };
+export type LayoutInfo = {
+    hasChanged: boolean;
+    spineItemsAbsolutePositions: LayoutPosition[];
+    spineItemsPagesAbsolutePositions: LayoutPosition[][];
+    pages: PageLayoutInformation[];
+};
 export declare class SpineLayout extends DestroyableClass {
     protected spineItemsManager: SpineItemsManager;
     protected context: Context;
     protected settings: ReaderSettingsManager;
     protected itemLayoutInformation: LayoutPosition[];
-    protected layoutSubject: Subject<boolean>;
-    layout$: Observable<{
-        hasChanged: boolean;
-        spineItemsAbsolutePositions: LayoutPosition[];
-        spineItemsPagesAbsolutePositions: LayoutPosition[][];
-        pages: PageLayoutInformation[];
-    }>;
+    protected layoutSubject: Subject<unknown>;
+    readonly layout$: Observable<LayoutInfo>;
+    readonly info$: Observable<LayoutInfo>;
     constructor(spineItemsManager: SpineItemsManager, context: Context, settings: ReaderSettingsManager);
     layout(): void;
     getAbsolutePositionOf(spineItemOrIndex: SpineItem | number | string | undefined): {

package/dist/spine/layout/layoutItem.d.ts

@@ -0,0 +1,20 @@
+import { Observable } from 'rxjs';
+import { SpineItem } from '../..';
+import { Context } from '../../context/Context';
+import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
+import { SpineItemsManager } from '../SpineItemsManager';
+import { LayoutPosition } from '../SpineLayout';
+export declare const layoutItem: ({ horizontalOffset, verticalOffset, context, spineItemsManager, isGloballyPrePaginated, settings, index, item, newItemLayoutInformation, }: {
+    horizontalOffset: number;
+    verticalOffset: number;
+    context: Context;
+    spineItemsManager: SpineItemsManager;
+    isGloballyPrePaginated: boolean;
+    settings: ReaderSettingsManager;
+    item: SpineItem;
+    index: number;
+    newItemLayoutInformation: LayoutPosition[];
+}) => Observable<{
+    horizontalOffset: number;
+    verticalOffset: number;
+}>;

package/dist/spineItem/SpineItem.d.ts

@@ -1,25 +1,27 @@
 import { Context } from '../context/Context';
-import { Manifest } from '..';
-import { Observable, Subject } from 'rxjs';
+import { DestroyableClass, Manifest } from '..';
+import { Observable, ObservedValueOf } from 'rxjs';
 import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
 import { HookManager } from '../hooks/HookManager';
-import { DocumentRenderer } from './DocumentRenderer';
+import { DocumentRenderer } from './renderer/DocumentRenderer';
 import { ResourceHandler } from './ResourceHandler';
-export declare class SpineItem {
+export declare class SpineItem extends DestroyableClass {
     item: Manifest[`spineItems`][number];
     parentElement: HTMLElement;
     context: Context;
     settings: ReaderSettingsManager;
     hookManager: HookManager;
     index: number;
-    destroySubject$: Subject<void>;
-    containerElement: HTMLElement;
-    contentLayout$: Observable<{
-        isFirstLayout: boolean;
-        isReady: boolean;
-    }>;
+    private layoutTriggerSubject;
+    readonly containerElement: HTMLElement;
+    needsLayout$: Observable<unknown>;
     renderer: DocumentRenderer;
     resourcesHandler: ResourceHandler;
+    layout$: Observable<{
+        width: number;
+        height: number;
+    }>;
+    readonly isReady$: Observable<boolean>;
     constructor(item: Manifest[`spineItems`][number], parentElement: HTMLElement, context: Context, settings: ReaderSettingsManager, hookManager: HookManager, index: number);
     adjustPositionOfElement: ({ right, left, top, }: {
         right?: number;
@@ -27,14 +29,10 @@ export declare class SpineItem {
         top?: number;
     }) => void;
     getBoundingRectOfElementFromSelector: (selector: string) => DOMRect | undefined;
-    layout: ({ blankPagePosition, minimumWidth, spreadPosition, }: {
-        blankPagePosition: `before` | `after` | `none`;
-        minimumWidth: number;
-        spreadPosition: `left` | `right` | `none`;
-    }) => {
+    layout: (params: ObservedValueOf<typeof this.layoutTriggerSubject>) => Observable<{
         width: number;
         height: number;
-    };
+    }>;
     load: () => void;
     unload: () => void;
     getElementDimensions: () => {
@@ -52,10 +50,6 @@ export declare class SpineItem {
     get element(): HTMLElement;
     get readingDirection(): "rtl" | "ltr" | undefined;
     isUsingVerticalWriting: () => boolean;
-    get isReady(): boolean;
-    get ready$(): Observable<"ready">;
     get loaded$(): Observable<"loaded">;
     get unloaded$(): Observable<"idle">;
-    get isReady$(): Observable<boolean>;
-    upsertCSS(id: string, style: string, prepend?: boolean): void;
 }

package/dist/spineItem/renderer/DefaultRenderer.d.ts

@@ -0,0 +1,8 @@
+import { Observable } from 'rxjs';
+import { DocumentRenderer } from './DocumentRenderer';
+export declare class DefaultRenderer extends DocumentRenderer {
+    onUnload(): Observable<unknown>;
+    onCreateDocument(): Observable<unknown>;
+    onLoadDocument(): Observable<unknown>;
+    onLayout(): Observable<undefined>;
+}

package/dist/spineItem/{DocumentRenderer.d.ts → renderer/DocumentRenderer.d.ts}

@@ -1,9 +1,10 @@
 import { Manifest } from '@prose-reader/shared';
-import { Context } from '../context/Context';
-import { HookManager } from '../hooks/HookManager';
-import { ReaderSettingsManager } from '../settings/ReaderSettingsManager';
+import { Context } from '../../context/Context';
+import { HookManager } from '../../hooks/HookManager';
+import { ReaderSettingsManager } from '../../settings/ReaderSettingsManager';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { ResourceHandler } from './ResourceHandler';
+import { ResourceHandler } from '../ResourceHandler';
+import { DestroyableClass } from '../../utils/DestroyableClass';
 type Layer = {
     element: HTMLElement;
 };
@@ -15,7 +16,13 @@ export type DocumentRendererParams = {
     containerElement: HTMLElement;
     resourcesHandler: ResourceHandler;
 };
-export declare abstract class DocumentRenderer {
+type LayoutParams = {
+    minPageSpread: number;
+    blankPagePosition: `before` | `after` | `none`;
+    spreadPosition: `none` | `left` | `right`;
+    minimumWidth: number;
+};
+export declare abstract class DocumentRenderer extends DestroyableClass {
     private triggerSubject;
     protected context: Context;
     protected settings: ReaderSettingsManager;
@@ -23,7 +30,7 @@ export declare abstract class DocumentRenderer {
     protected item: Manifest[`spineItems`][number];
     protected containerElement: HTMLElement;
     protected resourcesHandler: ResourceHandler;
-    protected stateSubject: BehaviorSubject<"idle" | "loading" | "loaded" | "unloading" | "ready">;
+    protected stateSubject: BehaviorSubject<"idle" | "loading" | "loaded" | "unloading">;
     protected unload$: Observable<undefined>;
     protected load$: Observable<undefined>;
     layers: Layer[];
@@ -35,29 +42,19 @@ export declare abstract class DocumentRenderer {
         containerElement: HTMLElement;
         resourcesHandler: ResourceHandler;
     });
-    protected destroy$: Observable<"destroy">;
-    get state$(): BehaviorSubject<"idle" | "loading" | "loaded" | "unloading" | "ready">;
+    get state$(): BehaviorSubject<"idle" | "loading" | "loaded" | "unloading">;
+    get isLoaded$(): Observable<boolean>;
     load(): void;
     unload(): void;
     destroy(): void;
     abstract onUnload(): Observable<unknown>;
     abstract onCreateDocument(): Observable<unknown>;
     abstract onLoadDocument(): Observable<unknown>;
-    abstract layout(params: {
-        minPageSpread: number;
-        blankPagePosition: `before` | `after` | `none`;
-        spreadPosition: `none` | `left` | `right`;
-    }): {
+    abstract onLayout(params: LayoutParams): Observable<{
         width: number;
         height: number;
-    } | undefined;
+    } | undefined>;
     get writingMode(): `vertical-rl` | `horizontal-tb` | undefined;
     get readingDirection(): `rtl` | `ltr` | undefined;
 }
-export declare class DefaultRenderer extends DocumentRenderer {
-    onUnload(): Observable<unknown>;
-    onCreateDocument(): Observable<unknown>;
-    onLoadDocument(): Observable<unknown>;
-    layout(): undefined;
-}
 export {};

package/dist/utils/rxjs.d.ts

@@ -4,3 +4,4 @@ export declare const mapKeysTo: <R extends {
 }, K extends keyof R>(keys: K[]) => OperatorFunction<R, Pick<R, K>>;
 export declare function observeResize(element: HTMLElement): Observable<ResizeObserverEntry[]>;
 export declare const waitForSwitch: <O>(waitForStream: Observable<O>) => <N>(stream: Observable<N>) => Observable<N>;
+export declare const deferNextResult: <T>(stream: Observable<T>) => () => Observable<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prose-reader/core",
-  "version": "1.127.0",
+  "version": "1.128.0",
   "type": "module",
   "main": "./dist/index.umd.cjs",
   "module": "./dist/index.js",
@@ -25,10 +25,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@prose-reader/shared": "^1.127.0"
+    "@prose-reader/shared": "^1.128.0"
   },
   "peerDependencies": {
     "rxjs": "*"
   },
-  "gitHead": "3853ad2ffb4f4b4ae690cc35e9cee025e0fc5a97"
+  "gitHead": "019a6db06a80e8bb22e99e247144dd9b7ae74ac6"
 }