@rhc-office/sdk 6.6.268 → 6.6.363

package/src/tools/SecurityToolImpl.ts

@@ -0,0 +1,48 @@
+import type { SecurityTool } from '../api/security-tool';
+import {
+  createBridgeToolAdapter,
+  type BridgeToolAdapterContext,
+  type BridgeToolDescriptor,
+} from '../viewer/BridgeToolAdapter';
+
+const SECURITY_TOOL_DESCRIPTOR: BridgeToolDescriptor = {
+  getSecuritySettings: { kind: 'query' },
+  isSecuritySettingsLocalEditable: { kind: 'query' },
+  setSecuritySettingsLocalEditable: { kind: 'query' },
+  setSecuritySettings: { kind: 'query' },
+  openSecuritySettingsDialog: { kind: 'command' },
+};
+
+export class SecurityToolImpl implements SecurityTool {
+  private readonly adapter: SecurityTool;
+
+  constructor(context: BridgeToolAdapterContext) {
+    this.adapter = createBridgeToolAdapter<SecurityTool>(
+      'security',
+      SECURITY_TOOL_DESCRIPTOR,
+      context,
+    );
+  }
+
+  getSecuritySettings: SecurityTool['getSecuritySettings'] = () => {
+    return this.adapter.getSecuritySettings();
+  };
+
+  setSecuritySettings: SecurityTool['setSecuritySettings'] = (update) => {
+    return this.adapter.setSecuritySettings(update);
+  };
+
+  isSecuritySettingsLocalEditable: SecurityTool['isSecuritySettingsLocalEditable'] = () => {
+    return this.adapter.isSecuritySettingsLocalEditable();
+  };
+
+  setSecuritySettingsLocalEditable: SecurityTool['setSecuritySettingsLocalEditable'] = (
+    editable,
+  ) => {
+    return this.adapter.setSecuritySettingsLocalEditable(editable);
+  };
+
+  openSecuritySettingsDialog: SecurityTool['openSecuritySettingsDialog'] = () => {
+    return this.adapter.openSecuritySettingsDialog();
+  };
+}

package/src/tools/UIToolImpl.ts

@@ -22,10 +22,22 @@ const createUIToolDescriptor = (context: BridgeToolAdapterContext): BridgeToolDe
   hideRibbonMenuItem: { kind: 'command' },
   showRibbonTitleBar: { kind: 'command' },
   hideRibbonTitleBar: { kind: 'command' },
+  showRibbonTabs: { kind: 'command' },
+  hideRibbonTabs: { kind: 'command' },
   selectRibbonMenu: { kind: 'command' },
+  setupRibbonMenuTab: { kind: 'command' },
+  showRibbonMenuTab: { kind: 'command' },
+  hideRibbonMenuTab: { kind: 'command' },
+  enableRibbonMenuTab: { kind: 'command' },
+  disableRibbonMenuTab: { kind: 'command' },
+  setupRibbonMenuItemState: { kind: 'command' },
+  enableRibbonMenuItem: { kind: 'command' },
+  disableRibbonMenuItem: { kind: 'command' },
   setRibbonMenuButtonStyle: { kind: 'command' },
   setWatermark: { kind: 'command' },
   setCompactMode: { kind: 'command' },
+  setRulerVisible: { kind: 'command' },
+  toggleSidebar: { kind: 'command' },
   enterBookViewMode: {
     kind: 'callbackQuery',
     mapCallbackResult: () => [],
@@ -48,35 +60,53 @@ export class UIToolImpl implements UITool {
   }
 
   showToolbarMenu: UITool['showToolbarMenu'] = () => {
-    return this.adapter.showToolbarMenu();
+    this.warnLegacyRibbonMethod('showToolbarMenu', 'showRibbonMenu');
+    return this.showRibbonMenu();
   };
 
   hideToolbarMenu: UITool['hideToolbarMenu'] = () => {
-    return this.adapter.hideToolbarMenu();
+    this.warnLegacyRibbonMethod('hideToolbarMenu', 'hideRibbonMenu');
+    return this.hideRibbonMenu();
   };
 
   setupToolbarMenu: UITool['setupToolbarMenu'] = (opt) => {
-    return this.adapter.setupToolbarMenu(opt);
+    this.warnLegacyRibbonMethod(
+      'setupToolbarMenu',
+      'showRibbonMenu/hideRibbonMenu/setupRibbonMenuTab',
+    );
+    return this.setupRibbonMenu(opt);
   };
 
   showToolbarMenuItem: UITool['showToolbarMenuItem'] = (menuId) => {
-    return this.adapter.showToolbarMenuItem(menuId);
+    this.warnLegacyRibbonMethod('showToolbarMenuItem', 'showRibbonMenuItem');
+    return this.showRibbonMenuItem(menuId);
   };
 
   hideToolbarMenuItem: UITool['hideToolbarMenuItem'] = (menuId) => {
-    return this.adapter.hideToolbarMenuItem(menuId);
+    this.warnLegacyRibbonMethod('hideToolbarMenuItem', 'hideRibbonMenuItem');
+    return this.hideRibbonMenuItem(menuId);
   };
 
   setupRibbonMenu: UITool['setupRibbonMenu'] = (opt) => {
-    return this.adapter.setupRibbonMenu(opt);
+    this.warnLegacyRibbonMethod(
+      'setupRibbonMenu',
+      'showRibbonMenu/hideRibbonMenu/setupRibbonMenuTab',
+    );
+    if (typeof opt === 'boolean') {
+      return opt ? this.showRibbonMenu() : this.hideRibbonMenu();
+    }
+
+    return this.setupRibbonMenuTab(opt.menu, { visible: opt.visible });
   };
 
   setupRibbonMenuItem: UITool['setupRibbonMenuItem'] = (menuId, visible, config) => {
-    return this.adapter.setupRibbonMenuItem(menuId, visible, config);
+    this.warnLegacyRibbonMethod('setupRibbonMenuItem', 'setupRibbonMenuItemState');
+    return this.setupRibbonMenuItemState(menuId, { visible, config });
   };
 
   setupRibbonTitleBar: UITool['setupRibbonTitleBar'] = (visible) => {
-    return this.adapter.setupRibbonTitleBar(visible);
+    this.warnLegacyRibbonMethod('setupRibbonTitleBar', 'showRibbonTabs/hideRibbonTabs');
+    return visible ? this.showRibbonTabs() : this.hideRibbonTabs();
   };
 
   showRibbonMenu: UITool['showRibbonMenu'] = () => {
@@ -88,25 +118,69 @@ export class UIToolImpl implements UITool {
   };
 
   showRibbonMenuItem: UITool['showRibbonMenuItem'] = (menuId, config) => {
-    return this.adapter.showRibbonMenuItem(menuId, config);
+    this.warnLegacyRibbonMethod('showRibbonMenuItem', 'setupRibbonMenuItemState');
+    return this.setupRibbonMenuItemState(menuId, { visible: true, config });
   };
 
   hideRibbonMenuItem: UITool['hideRibbonMenuItem'] = (menuId, config) => {
-    return this.adapter.hideRibbonMenuItem(menuId, config);
+    this.warnLegacyRibbonMethod('hideRibbonMenuItem', 'setupRibbonMenuItemState');
+    return this.setupRibbonMenuItemState(menuId, { visible: false, config });
   };
 
   showRibbonTitleBar: UITool['showRibbonTitleBar'] = () => {
-    return this.adapter.showRibbonTitleBar();
+    this.warnLegacyRibbonMethod('showRibbonTitleBar', 'showRibbonTabs');
+    return this.showRibbonTabs();
   };
 
   hideRibbonTitleBar: UITool['hideRibbonTitleBar'] = () => {
-    return this.adapter.hideRibbonTitleBar();
+    this.warnLegacyRibbonMethod('hideRibbonTitleBar', 'hideRibbonTabs');
+    return this.hideRibbonTabs();
+  };
+
+  showRibbonTabs: UITool['showRibbonTabs'] = () => {
+    return this.adapter.showRibbonTabs();
+  };
+
+  hideRibbonTabs: UITool['hideRibbonTabs'] = () => {
+    return this.adapter.hideRibbonTabs();
   };
 
   selectRibbonMenu: UITool['selectRibbonMenu'] = (menuId) => {
     return this.adapter.selectRibbonMenu(menuId);
   };
 
+  setupRibbonMenuTab: UITool['setupRibbonMenuTab'] = (menuId, state) => {
+    return this.adapter.setupRibbonMenuTab(menuId, state);
+  };
+
+  showRibbonMenuTab: UITool['showRibbonMenuTab'] = (menuId) => {
+    return this.adapter.showRibbonMenuTab(menuId);
+  };
+
+  hideRibbonMenuTab: UITool['hideRibbonMenuTab'] = (menuId) => {
+    return this.adapter.hideRibbonMenuTab(menuId);
+  };
+
+  enableRibbonMenuTab: UITool['enableRibbonMenuTab'] = (menuId) => {
+    return this.adapter.enableRibbonMenuTab(menuId);
+  };
+
+  disableRibbonMenuTab: UITool['disableRibbonMenuTab'] = (menuId) => {
+    return this.adapter.disableRibbonMenuTab(menuId);
+  };
+
+  setupRibbonMenuItemState: UITool['setupRibbonMenuItemState'] = (menuId, state) => {
+    return this.adapter.setupRibbonMenuItemState(menuId, state);
+  };
+
+  enableRibbonMenuItem: UITool['enableRibbonMenuItem'] = (menuId, config) => {
+    return this.setupRibbonMenuItemState(menuId, { disabled: false, config });
+  };
+
+  disableRibbonMenuItem: UITool['disableRibbonMenuItem'] = (menuId, config) => {
+    return this.setupRibbonMenuItemState(menuId, { disabled: true, config });
+  };
+
   setRibbonMenuButtonStyle: UITool['setRibbonMenuButtonStyle'] = (buttonId, buttonStyle) => {
     return this.adapter.setRibbonMenuButtonStyle(buttonId, buttonStyle);
   };
@@ -119,6 +193,14 @@ export class UIToolImpl implements UITool {
     return this.adapter.setCompactMode(compact);
   };
 
+  setRulerVisible: UITool['setRulerVisible'] = (visible) => {
+    return this.adapter.setRulerVisible(visible);
+  };
+
+  toggleSidebar: UITool['toggleSidebar'] = () => {
+    return this.adapter.toggleSidebar();
+  };
+
   enterBookViewMode: UITool['enterBookViewMode'] = (callback) => {
     return this.adapter.enterBookViewMode(callback);
   };
@@ -142,4 +224,8 @@ export class UIToolImpl implements UITool {
   invalidateView: UITool['invalidateView'] = () => {
     return this.adapter.invalidateView();
   };
+
+  private warnLegacyRibbonMethod(methodName: string, replacement: string): void {
+    console.warn(`[RHC Office SDK] ui.${methodName} is deprecated. Use ui.${replacement} instead.`);
+  }
 }

package/src/tools/index.ts

@@ -4,10 +4,11 @@ export * from './DigitalSignToolImpl';
 export * from './DocumentToolImpl';
 export * from './FindToolImpl';
 export * from './NetworkingToolImpl';
+export * from './PageArrangeToolImpl';
 export * from './PageToolImpl';
 export * from './PdfFormFillerImpl';
-export * from './Phase1ToolPlaceholder';
 export * from './SDKValueObjects';
+export * from './SecurityToolImpl';
 export * from './SignServerToolImpl';
 export * from './SymbologyToolImpl';
 export * from './TemplateSignToolImpl';

package/src/viewer/AdapterProtocol.ts

@@ -8,9 +8,11 @@ export const RHC_OFFICE_READER_ID_ATTRIBUTE = 'data-rhc-office-reader-id';
 export type AdapterToolName =
   | 'document'
   | 'page'
+  | 'pageArrange'
   | 'ui'
   | 'find'
   | 'annotation'
+  | 'security'
   | 'digitalSign'
   | 'signServer'
   | 'review'
@@ -82,6 +84,8 @@ export interface AdapterStatePatch {
   documentType?: string;
   annotationMode?: string;
   annotationEnabled?: boolean;
+  annotations?: unknown[];
+  digitalSignatures?: unknown[];
   extensionState?: 'connected' | 'disconnected';
 }
 

package/src/viewer/BridgeToolAdapter.ts

@@ -15,6 +15,7 @@ export interface BridgeToolMethodDescriptor {
   callback?: (callbacks: SdkCallbackRegistry, args: unknown[]) => void;
   mapCallbackResult?: (result: unknown) => unknown[];
   kind: BridgeMethodKind;
+  returnsResult?: boolean;
   state?: (state: ReturnType<ReaderStateStore['snapshot']>, args: unknown[]) => unknown;
 }
 
@@ -100,9 +101,17 @@ export const createBridgeToolAdapter = <T extends object>(
             return undefined;
           }
 
-          void context.bridge
+          const commandRequest = context.bridge
             .request(tool, adapterMethod, normalizeParams(args))
-            .catch(context.onAsyncError);
+            .catch((error): undefined => {
+              context.onAsyncError(error);
+              return undefined;
+            });
+          if (methodDescriptor.returnsResult) {
+            return commandRequest;
+          }
+
+          void commandRequest;
           return undefined;
         };
       },

package/src/viewer/DocumentSDK.ts

@@ -1,12 +1,14 @@
 import type { AnnotationTool } from '../api/annotation-tool';
 import type { CryptoTool } from '../api/crypto-tool';
 import type { ReaderReadyCallback, ReaderUnloadCallback } from '../api/callbacks';
-import type { IDocumentSDK, IReaderEmbedOptions } from '../api/document-sdk';
+import type { IDocumentSDK, ReaderThemeMode } from '../api/document-sdk';
 import type { DocumentTool } from '../api/document-tool';
 import type { FindTool } from '../api/find-tool';
 import type { NetworkingTool } from '../api/networking-tool';
+import type { PageArrangeTool } from '../api/page-arrange-tool';
 import type { PageTool } from '../api/page-tool';
 import type { PdfFormFiller } from '../api/pdf-formfiller';
+import type { SecurityTool } from '../api/security-tool';
 import type { SignServerTool } from '../api/sign-server';
 import type { DigitalSignTool } from '../api/sign-tool';
 import type { SymbologyTool } from '../api/symbology-tool';
@@ -18,9 +20,11 @@ import { DigitalSignToolImpl } from '../tools/DigitalSignToolImpl';
 import { DocumentToolImpl } from '../tools/DocumentToolImpl';
 import { FindToolImpl } from '../tools/FindToolImpl';
 import { NetworkingToolImpl } from '../tools/NetworkingToolImpl';
+import { PageArrangeToolImpl } from '../tools/PageArrangeToolImpl';
 import { PageToolImpl } from '../tools/PageToolImpl';
 import { PdfFormFillerImpl } from '../tools/PdfFormFillerImpl';
 import { DigitalSignOptions, KVField } from '../tools/SDKValueObjects';
+import { SecurityToolImpl } from '../tools/SecurityToolImpl';
 import { SignServerToolImpl } from '../tools/SignServerToolImpl';
 import { SymbologyToolImpl } from '../tools/SymbologyToolImpl';
 import { TemplateSignToolImpl } from '../tools/TemplateSignToolImpl';
@@ -45,12 +49,30 @@ type ReaderEventListener = Parameters<IDocumentSDK['setReaderEventListener']>[0]
 type ReaderEventPayload = Parameters<NonNullable<ReaderEventListener>>[1];
 
 interface DocumentSDKRuntimeOptions {
-  adapterReadyTimeoutMs?: number;
-  adapterRequestTimeoutMs?: number;
+  readyTimeoutMs?: number;
+  requestTimeoutMs?: number;
+}
+
+type ReaderHostRuntimeKind = 'server' | 'browser-static' | 'mobile-webview' | 'desktop-shell';
+
+interface ReaderHostRuntimeConfig {
+  hostKind?: ReaderHostRuntimeKind | (string & {});
+  server?: {
+    baseUrl?: string;
+    paths?: Record<string, string | undefined>;
+  };
 }
 
 type NativeReaderEventName = 'documentLoaded' | 'documentStateChange' | 'documentError';
 type ReaderThemeCleanup = () => void;
+const READER_RUNTIME_GLOBAL_KEY = '__RHC_OFFICE_READER_RUNTIME__' as const;
+const READER_RUNTIME_PROPERTY_KEY = '__rhcOfficeReaderRuntimeConfig' as const;
+type ReaderRuntimeBrowserGlobal = typeof globalThis & {
+  __RHC_OFFICE_READER_RUNTIME__?: ReaderHostRuntimeConfig;
+};
+type ReaderRuntimeElement = HTMLElement & {
+  [READER_RUNTIME_PROPERTY_KEY]?: ReaderHostRuntimeConfig;
+};
 type CompatibleMediaQueryList = MediaQueryList & {
   addListener?: (listener: (event: MediaQueryListEvent) => void) => void;
   removeListener?: (listener: (event: MediaQueryListEvent) => void) => void;
@@ -151,36 +173,25 @@ const removeMediaQueryListener = (
   }
 };
 
-const applyReaderElementLayout = (
-  readerElement: HTMLElement,
-  configuration: NormalizedReaderEmbedOptions,
-): void => {
-  if (configuration.style) {
-    readerElement.style.cssText = configuration.style;
-  }
-
+const applyReaderElementLayout = (readerElement: HTMLElement): void => {
   if (!readerElement.style.display) {
     readerElement.style.display = 'block';
   }
 
   if (!readerElement.style.width) {
-    readerElement.style.width = configuration.width ?? '100%';
-  } else if (configuration.width) {
-    readerElement.style.width = configuration.width;
+    readerElement.style.width = '100%';
   }
 
   if (!readerElement.style.height) {
-    readerElement.style.height = configuration.height ?? '100%';
-  } else if (configuration.height) {
-    readerElement.style.height = configuration.height;
+    readerElement.style.height = '100%';
   }
 };
 
 const bindReaderElementTheme = (
   readerElement: HTMLElement,
-  configuration: NormalizedReaderEmbedOptions,
+  theme: ReaderThemeMode | undefined,
 ): ReaderThemeCleanup | null => {
-  const configuredTheme = configuration.theme;
+  const configuredTheme = theme;
   if (!configuredTheme) {
     readerElement.removeAttribute('theme');
     return null;
@@ -230,6 +241,7 @@ export class DocumentSDK implements IDocumentSDK {
   private readonly documentTool = new DocumentToolImpl(this.bridgeToolContext);
   private readonly uiTool = new UIToolImpl(this.bridgeToolContext);
   private readonly pageTool = new PageToolImpl(this.bridgeToolContext);
+  private readonly pageArrangeTool = new PageArrangeToolImpl(this.bridgeToolContext);
   private readonly findTool = new FindToolImpl(this.bridgeToolContext);
   private readonly signServerTool = new SignServerToolImpl(this.bridgeToolContext);
   private readonly digitalSignTool = new DigitalSignToolImpl(this.bridgeToolContext);
@@ -239,6 +251,7 @@ export class DocumentSDK implements IDocumentSDK {
   private readonly pdfFormFiller = new PdfFormFillerImpl(this.bridgeToolContext);
   private readonly networkingTool = new NetworkingToolImpl(this.bridgeToolContext);
   private readonly cryptoTool = new CryptoToolImpl(this.bridgeToolContext);
+  private readonly securityTool = new SecurityToolImpl(this.bridgeToolContext);
 
   private readonly readyCallbacks: ReaderReadyCallback[] = [];
   private readonly unloadCallbacks: ReaderUnloadCallback[] = [];
@@ -253,16 +266,19 @@ export class DocumentSDK implements IDocumentSDK {
   private readerElement: HTMLElement | null = null;
   private readerId: string | null = null;
   private normalizedConfiguration: NormalizedReaderEmbedOptions | null = null;
+  private runtimeRestoreState: {
+    hadPreviousRuntime: boolean;
+    previousRuntime?: ReaderHostRuntimeConfig;
+  } | null = null;
   private sessionUser?: Parameters<IDocumentSDK['setSessionUser']>[0];
   private sessionData?: string;
-  private license?: { license: string; feature: string };
   private readonly nativeEventCleanupCallbacks: Array<() => void> = [];
   private themeCleanup: ReaderThemeCleanup | null = null;
 
   constructor(options?: DocumentSDKRuntimeOptions) {
     this.bridge.configureTimeouts({
-      readyTimeoutMs: options?.adapterReadyTimeoutMs,
-      requestTimeoutMs: options?.adapterRequestTimeoutMs,
+      readyTimeoutMs: options?.readyTimeoutMs,
+      requestTimeoutMs: options?.requestTimeoutMs,
     });
   }
 
@@ -270,12 +286,29 @@ export class DocumentSDK implements IDocumentSDK {
     this.debugEnabled = debug;
   };
 
-  readonly changeLanguage: IDocumentSDK['changeLanguage'] = (): void => {
-    // Phase 1: reserved for future reader language bridging.
+  readonly changeLanguage: IDocumentSDK['changeLanguage'] = (lang): void => {
+    if (!this.readerElement) {
+      return;
+    }
+
+    this.readerElement.setAttribute('language', lang);
   };
 
-  readonly setLicense: IDocumentSDK['setLicense'] = (license, feature): void => {
-    this.license = { license, feature };
+  readonly setThemeMode: IDocumentSDK['setThemeMode'] = (theme): void => {
+    this.themeCleanup?.();
+    this.themeCleanup = null;
+    this.normalizedConfiguration = this.normalizedConfiguration
+      ? {
+          ...this.normalizedConfiguration,
+          theme,
+        }
+      : null;
+
+    if (!this.readerElement) {
+      return;
+    }
+
+    this.themeCleanup = bindReaderElementTheme(this.readerElement, theme);
   };
 
   readonly setSessionUser: IDocumentSDK['setSessionUser'] = (userNameOrInfo): void => {
@@ -345,6 +378,7 @@ export class DocumentSDK implements IDocumentSDK {
     this.mountToken += 1;
     this.cleanupNativeEventForwarders();
     this.cleanupThemeBinding();
+    this.restoreReaderRuntimeConfig();
 
     if (this.readerElement?.parentNode) {
       this.readerElement.parentNode.removeChild(this.readerElement);
@@ -380,6 +414,10 @@ export class DocumentSDK implements IDocumentSDK {
     return this.pageTool;
   };
 
+  readonly getPageArrangeTool: IDocumentSDK['getPageArrangeTool'] = (): PageArrangeTool => {
+    return this.pageArrangeTool;
+  };
+
   readonly getFindTool: IDocumentSDK['getFindTool'] = (): FindTool => {
     return this.findTool;
   };
@@ -416,6 +454,10 @@ export class DocumentSDK implements IDocumentSDK {
     return this.cryptoTool;
   };
 
+  readonly getSecurityTool: IDocumentSDK['getSecurityTool'] = (): SecurityTool => {
+    return this.securityTool;
+  };
+
   readonly createDigitalSignOptions: IDocumentSDK['createDigitalSignOptions'] = () => {
     return new DigitalSignOptions();
   };
@@ -440,8 +482,13 @@ export class DocumentSDK implements IDocumentSDK {
       readerElement.setAttribute(RHC_OFFICE_READER_ID_ATTRIBUTE, readerId);
       this.readerId = readerId;
       this.bridge.setReaderId(readerId);
-      applyReaderElementLayout(readerElement, configuration);
-      this.themeCleanup = bindReaderElementTheme(readerElement, configuration);
+      applyReaderElementLayout(readerElement);
+      this.applyReaderRuntimeConfig(readerElement, configuration);
+      const shouldUseCompactMode =
+        configuration.compactViewer === true && configuration.keepPCMenu !== true;
+      readerElement.toggleAttribute('data-sdk-compact-mode', shouldUseCompactMode);
+      readerElement.setAttribute('language', configuration.language ?? 'zh_CN');
+      this.themeCleanup = bindReaderElementTheme(readerElement, configuration.theme);
       this.bindNativeReaderEvents(readerElement);
 
       hostContainer.replaceChildren(readerElement);
@@ -451,8 +498,13 @@ export class DocumentSDK implements IDocumentSDK {
         return;
       }
 
-      if (configuration.scrollIntoView && typeof hostContainer.scrollIntoView === 'function') {
-        hostContainer.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+      const adapterReady = await this.bridge.waitForReady();
+      if (this.mountToken !== mountToken) {
+        return;
+      }
+
+      if (!adapterReady) {
+        throw new Error('Editor adapter is not available.');
       }
 
       this.isReady = true;
@@ -468,6 +520,44 @@ export class DocumentSDK implements IDocumentSDK {
     }
   };
 
+  private applyReaderRuntimeConfig(
+    readerElement: HTMLElement,
+    configuration: NormalizedReaderEmbedOptions,
+  ): void {
+    this.restoreReaderRuntimeConfig();
+    const readerHost: ReaderHostRuntimeConfig = {
+      hostKind: 'server',
+      server: {
+        baseUrl: configuration.appUrl,
+      },
+    };
+
+    const runtimeElement = readerElement as ReaderRuntimeElement;
+    runtimeElement[READER_RUNTIME_PROPERTY_KEY] = readerHost;
+
+    const browserGlobal = globalThis as ReaderRuntimeBrowserGlobal;
+    const previousRuntime = browserGlobal[READER_RUNTIME_GLOBAL_KEY];
+    this.runtimeRestoreState = {
+      hadPreviousRuntime: previousRuntime !== undefined,
+      ...(previousRuntime !== undefined ? { previousRuntime } : {}),
+    };
+    browserGlobal[READER_RUNTIME_GLOBAL_KEY] = readerHost;
+  }
+
+  private restoreReaderRuntimeConfig(): void {
+    if (!this.runtimeRestoreState) {
+      return;
+    }
+
+    const browserGlobal = globalThis as ReaderRuntimeBrowserGlobal;
+    if (this.runtimeRestoreState.hadPreviousRuntime) {
+      browserGlobal[READER_RUNTIME_GLOBAL_KEY] = this.runtimeRestoreState.previousRuntime;
+    } else {
+      Reflect.deleteProperty(browserGlobal, READER_RUNTIME_GLOBAL_KEY);
+    }
+    this.runtimeRestoreState = null;
+  }
+
   private readonly bindNativeReaderEvents = (readerElement: HTMLElement): void => {
     this.cleanupNativeEventForwarders();
 

package/src/viewer/ReaderBridgeClient.ts

@@ -141,6 +141,15 @@ export class ReaderBridgeClient {
     return getAdapterGlobal()?.getCapabilities(this.readerId) ?? null;
   }
 
+  async waitForReady(options?: { timeoutMs?: number }): Promise<boolean> {
+    if (!this.readerId) {
+      return false;
+    }
+
+    const adapter = await this.waitForAdapter(this.readerId, options?.timeoutMs);
+    return Boolean(adapter);
+  }
+
   private async waitForAdapter(
     readerId: string,
     timeoutMs = this.readyTimeoutMs,

package/src/viewer/ReaderConfiguration.ts

@@ -4,7 +4,6 @@ export type SupportedReaderTheme = 'light' | 'dark' | 'high-contrast' | 'auto';
 
 export interface NormalizedReaderEmbedOptions extends IReaderEmbedOptions {
   appUrl: string;
-  scrollIntoView: boolean;
   theme?: SupportedReaderTheme;
 }
 
@@ -53,7 +52,6 @@ export const normalizeReaderEmbedOptions = (
   return {
     ...configuration,
     appUrl: normalizedAppUrl,
-    scrollIntoView: configuration.scrollIntoView ?? true,
     theme: normalizeTheme(configuration.theme),
   };
 };

package/src/viewer/ReaderStateStore.ts

@@ -3,6 +3,8 @@ import type { AdapterStatePatch } from './AdapterProtocol';
 export interface ReaderStateSnapshot {
   annotationEnabled: boolean;
   annotationMode?: string;
+  annotations?: unknown[];
+  digitalSignatures?: unknown[];
   documentModified: boolean;
   documentOpened: boolean;
   documentType?: string;
@@ -37,6 +39,10 @@ export class ReaderStateStore {
     this.state = {
       ...this.state,
       ...patch,
+      annotations: patch.annotations ? [...patch.annotations] : this.state.annotations,
+      digitalSignatures: patch.digitalSignatures
+        ? [...patch.digitalSignatures]
+        : this.state.digitalSignatures,
     };
   }
 
@@ -48,6 +54,12 @@ export class ReaderStateStore {
   }
 
   snapshot(): ReaderStateSnapshot {
-    return { ...this.state };
+    return {
+      ...this.state,
+      annotations: this.state.annotations ? [...this.state.annotations] : undefined,
+      digitalSignatures: this.state.digitalSignatures
+        ? [...this.state.digitalSignatures]
+        : undefined,
+    };
   }
 }