@casualoffice/sheets 0.12.0 → 0.14.0

package/src/embed/EmbedTransport.ts

@@ -235,13 +235,13 @@ export class EmbedTransport {
         await this.handlers.onHostHello?.(env.data as HostHelloData);
         this.sendReady();
         return;
-      case 'casual.command.setReadOnly':
+      case 'casual.command.set.readonly':
         await this.handlers.onCommandSetReadOnly?.(env.data as CommandSetReadOnlyData);
         return;
-      case 'casual.command.setTheme':
+      case 'casual.command.set.theme':
         await this.handlers.onCommandSetTheme?.(env.data as CommandSetThemeData);
         return;
-      case 'casual.command.setLocale':
+      case 'casual.command.set.locale':
         await this.handlers.onCommandSetLocale?.(env.data as CommandSetLocaleData);
         return;
       case 'casual.command.set.viewmode':

package/src/embed-runtime/index.tsx

@@ -32,6 +32,7 @@ interface EmbedUrlConfig {
   app: CasualApp;
   docId: string;
   viewMode: 'preview' | 'editor';
+  theme: 'light' | 'dark' | 'system';
 }
 
 function parseUrlConfig(search: string): EmbedUrlConfig {
@@ -40,7 +41,22 @@ function parseUrlConfig(search: string): EmbedUrlConfig {
   const docId = params.get('docId') ?? '';
   const viewModeParam = params.get('viewMode');
   const viewMode: 'preview' | 'editor' = viewModeParam === 'editor' ? 'editor' : 'preview';
-  return { app, docId, viewMode };
+  // The host passes its theme so the embedded editor matches light/dark.
+  // Default `system` follows the OS/host colour-scheme; the host can also
+  // push live changes over `casual.command.set.theme`.
+  const themeParam = params.get('theme');
+  const theme: 'light' | 'dark' | 'system' =
+    themeParam === 'dark' ? 'dark' : themeParam === 'light' ? 'light' : 'system';
+  return { app, docId, viewMode, theme };
+}
+
+/** Resolve `system` against the iframe's media query; `light`/`dark` pass through. */
+function resolveAppearance(theme: 'light' | 'dark' | 'system'): 'light' | 'dark' {
+  if (theme === 'light' || theme === 'dark') return theme;
+  if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+  }
+  return 'light';
 }
 
 export interface MountEmbeddedOptions {
@@ -112,7 +128,12 @@ export function mountEmbedded(opts: MountEmbeddedOptions): void {
 
   const reactRoot = createRoot(opts.root);
   reactRoot.render(
-    <EmbeddedSheets transport={transport} docId={config.docId} initialViewMode={config.viewMode} />,
+    <EmbeddedSheets
+      transport={transport}
+      docId={config.docId}
+      initialViewMode={config.viewMode}
+      initialTheme={config.theme}
+    />,
   );
 }
 
@@ -123,31 +144,53 @@ function EmbeddedSheets({
   transport,
   docId,
   initialViewMode,
+  initialTheme,
 }: {
   transport: EmbedTransport;
   docId: string;
   initialViewMode: 'preview' | 'editor';
+  initialTheme: 'light' | 'dark' | 'system';
 }) {
   const [data, setData] = useState<IWorkbookData | null>(null);
   const [errorMsg, setErrorMsg] = useState<string | null>(null);
 
+  // Theme: track the host's choice (light/dark/system) and resolve `system`
+  // live against the iframe's prefers-color-scheme. The host pushes changes
+  // over `casual.command.set.theme`; passed to <CasualSheets appearance>,
+  // which flips Univer's `univer-dark` class + ThemeService so the canvas,
+  // headers, gridlines and chrome all match.
+  const [theme, setTheme] = useState<'light' | 'dark' | 'system'>(initialTheme);
+  const [appearance, setAppearance] = useState<'light' | 'dark'>(() =>
+    resolveAppearance(initialTheme),
+  );
+  useEffect(() => {
+    setAppearance(resolveAppearance(theme));
+    if (theme !== 'system' || typeof window === 'undefined' || !window.matchMedia) return;
+    const mq = window.matchMedia('(prefers-color-scheme: dark)');
+    const onChange = () => setAppearance(mq.matches ? 'dark' : 'light');
+    mq.addEventListener('change', onChange);
+    return () => mq.removeEventListener('change', onChange);
+  }, [theme]);
+
   const [viewMode, setViewMode] = useState<'preview' | 'editor'>(initialViewMode);
-  // Editor mode flips `header: true` so Univer's formula bar (A1 cell
-  // ref, fx button) and menubar render at the top of the iframe —
-  // visually distinct from preview's canvas-only surface. `toolbar` and
-  // `footer` stay off: Univer's ribbon and sheet-tabs slot resolve
-  // services (IRPCChannelService, sheet-drawing) at construction that
-  // the SDK doesn't bundle a worker for, and turning them on lights up
-  // `[redi]: Cannot find "Kb" registered by any injector` and the
-  // canvas never paints. Cells stay editable in editor mode via direct
-  // keyboard input on the focused cell.
-  const ui =
-    viewMode === 'editor'
-      ? { header: true, toolbar: false, footer: false, contextMenu: true }
-      : { header: false, toolbar: false, footer: false, contextMenu: true };
+  // Editor mode renders the SDK's OWN React chrome (`chrome="full"`): the
+  // menu bar (Edit/Insert/Format/Data/View), the rich formatting toolbar,
+  // the formula bar, sheet tabs and status bar — the full native editor, so
+  // hosts embed a complete spreadsheet and only frame/brand it (they do NOT
+  // hand-roll a toolbar). We use the SDK chrome, NOT Univer's built-in `ui`
+  // toolbar/footer: Univer's ribbon + sheet-tabs slots resolve services
+  // (IRPCChannelService, sheet-drawing) the single-file embed doesn't bundle,
+  // which throws `[redi]: Cannot find … registered by any injector`. The SDK
+  // chrome is plain React over the facade, so it has no such dependency.
+  //
+  // Preview = `chrome="none"`: bare canvas, made read-only by the veto in
+  // onReady. Univer's own chrome stays off in both modes.
+  const chrome: 'full' | 'none' = viewMode === 'editor' ? 'full' : 'none';
+  const ui = { header: false, toolbar: false, footer: false, contextMenu: true };
 
   useEffect(() => {
     transport.on({
+      onCommandSetTheme: ({ theme: next }) => setTheme(next),
       onCommandSetViewMode: ({ viewMode: next }) => setViewMode(next),
     });
   }, [transport]);
@@ -225,6 +268,8 @@ function EmbeddedSheets({
     <CasualSheets
       key={viewMode}
       initialData={data}
+      chrome={chrome}
+      appearance={appearance}
       ui={ui}
       // Seed the en-US string bundle. Without `locales`, Univer's
       // LocaleService throws "Locale not initialized" and the workbench
@@ -233,12 +278,17 @@ function EmbeddedSheets({
       // this from the host's `locales` prop; the iframe has no host to
       // pass one, so the self-contained runtime bundles a minimal set.
       locales={EMBED_LOCALES}
-      // The embed runtime is bundled as ONE self-contained file (tsup
-      // `noExternal: /.*/`). Lazy plugins would emit per-feature dynamic
-      // chunks into dist/embed/, breaking that single-file deployment, so the
-      // iframe ships the minimal editor. Hosts that need feature plugins use
-      // the React `<CasualSheets>` component directly (lazyPlugins defaults on).
-      lazyPlugins={false}
+      // Enable the FULL feature set (tables, sort, filter, conditional
+      // formatting, data validation, drawing, hyperlinks, notes, comments,
+      // find/replace) so the embed matches the real app. The tsup embed
+      // config is `splitting: false` + `noExternal: /.*/`, so the lazy
+      // loader's dynamic `import()`s are INLINED into the single
+      // embed-runtime.js rather than emitted as separate chunks — the
+      // single-file deployment is preserved. With lazyPlugins on, the loader
+      // also eager-loads any feature whose data is already in the snapshot
+      // (so opening a file with tables/CF never silently drops it) and
+      // idle-loads the rest, so the toolbar/menu feature actions resolve.
+      lazyPlugins={true}
       // Phase 2 save/exit contract — the iframe surface of the same
       // `onSave` / `onExit` hooks the React component exposes. The editor
       // never persists; it hands the snapshot to the host over postMessage