@beyondwork/docx-react-component 1.0.93 → 1.0.94

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@beyondwork/docx-react-component",
   "publisher": "beyondwork",
-  "version": "1.0.93",
+  "version": "1.0.94",
   "description": "Embeddable React Word (docx) editor with review, comments, tracked changes, and round-trip OOXML fidelity.",
   "type": "module",
   "sideEffects": [

package/src/ui-tailwind/chrome/tw-display-mode-selector.tsx

@@ -13,14 +13,15 @@
  * names sees the right option highlighted without code changes.
  */
 
-import React, { useState } from "react";
-import * as Popover from "@radix-ui/react-popover";
+import React, { useLayoutEffect, useRef, useState, type CSSProperties } from "react";
+import { createPortal } from "react-dom";
 import { ChevronDown, Eye, EyeOff, Highlighter, Scroll } from "lucide-react";
 
 import {
   normalizeMarkupDisplay,
   type MarkupDisplay,
 } from "../../ui/headless/comment-decoration-model";
+import { preserveEditorSelectionMouseDown } from "../../ui/headless/preserve-editor-selection";
 
 export type DisplayMode = "all-markup" | "simple-markup" | "no-markup" | "original";
 
@@ -67,70 +68,136 @@ const MODES: readonly ModeEntry[] = [
 
 export function TwDisplayModeSelector(props: TwDisplayModeSelectorProps): React.ReactElement {
   const [open, setOpen] = useState(false);
+  const triggerRef = useRef<HTMLButtonElement>(null);
   const canonical = normalizeMarkupDisplay(props.value);
   const activeEntry = MODES.find((m) => m.mode === canonical) ?? MODES[0]!;
 
   return (
-    <Popover.Root open={open} onOpenChange={setOpen}>
-      <Popover.Trigger asChild>
+    <>
         <button
+          ref={triggerRef}
           type="button"
           disabled={props.disabled}
           data-testid={props["data-testid"] ?? "display-mode-selector-trigger"}
           aria-label={`Display mode: ${activeEntry.label}`}
-          className="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-[11px] font-medium text-primary hover:bg-surface focus-visible:outline-none focus-visible:bg-surface disabled:opacity-50"
+          aria-expanded={open}
+          aria-haspopup="menu"
+          onMouseDown={preserveEditorSelectionMouseDown}
+          onClick={(event) => {
+            event.preventDefault();
+            setOpen((value) => !value);
+          }}
+          className={[
+            "inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-[11px] font-medium text-primary",
+            "hover:bg-surface focus-visible:outline-none focus-visible:bg-surface disabled:opacity-50",
+            open ? "bg-canvas text-accent ring-1 ring-accent/30 shadow-sm" : "",
+          ].join(" ")}
         >
           <activeEntry.icon className="h-3.5 w-3.5 text-tertiary" />
           <span>{activeEntry.label}</span>
           <ChevronDown className="h-3.5 w-3.5 text-tertiary" />
         </button>
-      </Popover.Trigger>
-      <Popover.Portal>
-        <Popover.Content
-          className="z-50 w-[260px] rounded-lg bg-canvas p-1 shadow-lg ring-1 ring-border"
-          sideOffset={8}
-          align="end"
-          data-testid="display-mode-selector-content"
-        >
+      <DisplayModePortalMenu anchorRef={triggerRef} open={open}>
           <div className="mb-1 px-2 py-1 text-[10px] font-semibold uppercase tracking-[0.12em] text-tertiary">
             Display mode
           </div>
           {MODES.map((entry) => {
             const isActive = entry.mode === canonical;
             return (
-              <Popover.Close key={entry.mode} asChild>
-                <button
-                  type="button"
-                  role="menuitemradio"
-                  aria-checked={isActive}
-                  onClick={() => {
-                    props.onChange(entry.mode);
-                  }}
-                  className="flex w-full items-start gap-2 rounded-md px-2 py-1.5 text-left text-[11px] transition-colors hover:bg-surface focus-visible:outline-none focus-visible:bg-surface"
-                  data-testid={`display-mode-option-${entry.mode}`}
-                  data-mode={entry.mode}
-                  data-active={isActive ? "true" : undefined}
-                >
-                  <entry.icon
-                    className={[
-                      "mt-0.5 h-3.5 w-3.5 shrink-0",
-                      isActive ? "text-accent" : "text-tertiary",
-                    ].join(" ")}
-                  />
-                  <span className="flex flex-col">
-                    <span className={`font-medium ${isActive ? "text-accent" : "text-primary"}`}>
-                      {entry.label}
-                    </span>
-                    <span className="text-[10px] text-secondary">{entry.hint}</span>
+              <button
+                key={entry.mode}
+                type="button"
+                role="menuitemradio"
+                aria-checked={isActive}
+                onClick={() => {
+                  props.onChange(entry.mode);
+                  setOpen(false);
+                }}
+                className="flex w-full items-start gap-2 rounded-md px-2 py-1.5 text-left text-[11px] transition-colors hover:bg-surface focus-visible:outline-none focus-visible:bg-surface"
+                data-testid={`display-mode-option-${entry.mode}`}
+                data-mode={entry.mode}
+                data-active={isActive ? "true" : undefined}
+              >
+                <entry.icon
+                  className={[
+                    "mt-0.5 h-3.5 w-3.5 shrink-0",
+                    isActive ? "text-accent" : "text-tertiary",
+                  ].join(" ")}
+                />
+                <span className="flex flex-col">
+                  <span className={`font-medium ${isActive ? "text-accent" : "text-primary"}`}>
+                    {entry.label}
                   </span>
-                </button>
-              </Popover.Close>
+                  <span className="text-[10px] text-secondary">{entry.hint}</span>
+                </span>
+              </button>
             );
           })}
-        </Popover.Content>
-      </Popover.Portal>
-    </Popover.Root>
+      </DisplayModePortalMenu>
+    </>
+  );
+}
+
+function DisplayModePortalMenu(props: {
+  anchorRef: React.RefObject<HTMLButtonElement | null>;
+  children: React.ReactNode;
+  open: boolean;
+}): React.ReactPortal | null {
+  const style = useDisplayModePortalPosition(props.anchorRef, props.open);
+  const body = props.anchorRef.current?.ownerDocument?.body;
+  if (!props.open || !body) return null;
+  return createPortal(
+    <div
+      className="z-50 w-[260px] rounded-lg bg-canvas p-1 shadow-lg ring-1 ring-border"
+      data-testid="display-mode-selector-content"
+      style={style}
+    >
+      {props.children}
+    </div>,
+    body,
   );
 }
 
+function useDisplayModePortalPosition(
+  anchorRef: React.RefObject<HTMLButtonElement | null>,
+  open: boolean,
+): CSSProperties {
+  const [style, setStyle] = useState<CSSProperties>({
+    left: 8,
+    position: "fixed",
+    top: 8,
+    zIndex: 50,
+  });
+
+  useLayoutEffect(() => {
+    if (!open) return;
+    const anchor = anchorRef.current;
+    const ownerWindow = anchor?.ownerDocument?.defaultView;
+    if (!anchor || !ownerWindow) return;
+    const update = () => {
+      const rect = anchor.getBoundingClientRect();
+      const width = 260;
+      const left = Math.min(
+        Math.max(8, rect.right - width),
+        Math.max(8, (ownerWindow.innerWidth || width + 16) - width - 8),
+      );
+      setStyle({
+        left,
+        position: "fixed",
+        top: Math.max(8, rect.bottom + 8),
+        zIndex: 50,
+      });
+    };
+    update();
+    ownerWindow.addEventListener("resize", update);
+    ownerWindow.addEventListener("scroll", update, true);
+    return () => {
+      ownerWindow.removeEventListener("resize", update);
+      ownerWindow.removeEventListener("scroll", update, true);
+    };
+  }, [anchorRef, open]);
+
+  return style;
+}
+
 export default TwDisplayModeSelector;

package/src/ui-tailwind/toolbar/tw-role-action-region.tsx

@@ -13,8 +13,8 @@
  * traversal + claim/skip/complete.
  */
 
-import React, { useState } from "react";
-import * as Popover from "@radix-ui/react-popover";
+import React, { useLayoutEffect, useRef, useState, type CSSProperties } from "react";
+import { createPortal } from "react-dom";
 import * as Toggle from "@radix-ui/react-toggle";
 import * as Tooltip from "@radix-ui/react-tooltip";
 import {
@@ -433,38 +433,100 @@ function RoleActionOverflow({
   props,
 }: RoleActionOverflowProps): React.JSX.Element {
   const [open, setOpen] = useState(false);
+  const triggerRef = useRef<HTMLButtonElement>(null);
 
   return (
-    <Popover.Root open={open} onOpenChange={setOpen}>
-      <Popover.Trigger asChild>
+    <>
         <button
+          ref={triggerRef}
           type="button"
           aria-label="More role actions"
           aria-expanded={open}
+          aria-haspopup="menu"
           onMouseDown={preserveEditorSelectionMouseDown}
+          onClick={(event) => {
+            event.preventDefault();
+            setOpen((value) => !value);
+          }}
           title="More role actions"
-          className="inline-flex h-6 w-6 items-center justify-center rounded-md border border-border bg-canvas text-primary transition-colors hover:bg-surface outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-canvas"
+          className={`inline-flex h-6 w-6 items-center justify-center rounded-md border border-border bg-canvas text-primary transition-colors hover:bg-surface outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-canvas ${
+            open ? "text-accent ring-1 ring-accent/30 shadow-sm" : ""
+          }`}
           data-testid="role-action-overflow-trigger"
         >
           <MoreHorizontal className="h-3.5 w-3.5 text-tertiary" aria-hidden="true" />
         </button>
-      </Popover.Trigger>
-      <Popover.Portal>
-        <Popover.Content
-          className="z-50 w-[220px] rounded-lg bg-canvas p-1 shadow-lg ring-1 ring-border"
-          sideOffset={8}
-          align="start"
-          data-testid="role-action-overflow-content"
-        >
+      <RoleActionPortalMenu anchorRef={triggerRef} open={open}>
           {ids.map((id) => (
             <OverflowAction key={id} id={id} props={props} onClose={() => setOpen(false)} />
           ))}
-        </Popover.Content>
-      </Popover.Portal>
-    </Popover.Root>
+      </RoleActionPortalMenu>
+    </>
+  );
+}
+
+function RoleActionPortalMenu(props: {
+  anchorRef: React.RefObject<HTMLButtonElement | null>;
+  children: React.ReactNode;
+  open: boolean;
+}): React.ReactPortal | null {
+  const style = useRoleActionPortalPosition(props.anchorRef, props.open);
+  const body = props.anchorRef.current?.ownerDocument?.body;
+  if (!props.open || !body) return null;
+  return createPortal(
+    <div
+      className="z-50 w-[220px] rounded-lg bg-canvas p-1 shadow-lg ring-1 ring-border"
+      data-testid="role-action-overflow-content"
+      style={style}
+    >
+      {props.children}
+    </div>,
+    body,
   );
 }
 
+function useRoleActionPortalPosition(
+  anchorRef: React.RefObject<HTMLButtonElement | null>,
+  open: boolean,
+): CSSProperties {
+  const [style, setStyle] = useState<CSSProperties>({
+    left: 8,
+    position: "fixed",
+    top: 8,
+    zIndex: 50,
+  });
+
+  useLayoutEffect(() => {
+    if (!open) return;
+    const anchor = anchorRef.current;
+    const ownerWindow = anchor?.ownerDocument?.defaultView;
+    if (!anchor || !ownerWindow) return;
+    const update = () => {
+      const rect = anchor.getBoundingClientRect();
+      const width = 220;
+      const left = Math.min(
+        Math.max(8, rect.left),
+        Math.max(8, (ownerWindow.innerWidth || width + 16) - width - 8),
+      );
+      setStyle({
+        left,
+        position: "fixed",
+        top: Math.max(8, rect.bottom + 8),
+        zIndex: 50,
+      });
+    };
+    update();
+    ownerWindow.addEventListener("resize", update);
+    ownerWindow.addEventListener("scroll", update, true);
+    return () => {
+      ownerWindow.removeEventListener("resize", update);
+      ownerWindow.removeEventListener("scroll", update, true);
+    };
+  }, [anchorRef, open]);
+
+  return style;
+}
+
 function OverflowAction(arg: {
   id: ToolbarChromeItemId;
   props: TwRoleActionRegionProps;

package/src/ui-tailwind/toolbar/tw-toolbar-icon-button.tsx

@@ -27,6 +27,8 @@ export interface TwToolbarIconButtonProps {
    * vs. Windows however they like.
    */
   shortcut?: string;
+  /** Explanation surfaced when the button is disabled by selection/mode state. */
+  disabledReason?: string;
   onClick?: () => void;
 }
 
@@ -42,7 +44,9 @@ export function TwToolbarIconButton(props: TwToolbarIconButtonProps) {
           aria-label={props.label}
           aria-pressed={props.active ?? undefined}
           data-active={props.active ? "true" : undefined}
+          data-disabled-reason={props.disabled && props.disabledReason ? props.disabledReason : undefined}
           disabled={props.disabled}
+          title={props.disabled && props.disabledReason ? `Not available: ${props.disabledReason}` : undefined}
           onMouseDown={preserveEditorSelectionMouseDown}
           onClick={props.onClick}
           className={[