@beyondwork/docx-react-component 1.0.17 → 1.0.19

package/src/ui-tailwind/editor-surface/search-plugin.ts

@@ -15,7 +15,17 @@ import { Plugin, PluginKey } from "prosemirror-state";
 import type { EditorState, Transaction } from "prosemirror-state";
 import { Decoration, DecorationSet } from "prosemirror-view";
 
-import type { SearchOptions as PublicSearchOptions } from "../../api/public-types";
+import type {
+  SearchOptions as PublicSearchOptions,
+} from "../../api/public-types";
+import {
+  buildSearchPattern,
+  createSearchExcerpt,
+  findSearchMatches,
+  searchSecondaryStories,
+  type SecondaryStorySearchResult,
+  type SearchTextOptions,
+} from "../../core/search/search-text.ts";
 
 // ---------------------------------------------------------------------------
 // Public types
@@ -28,8 +38,7 @@ export interface SearchResult {
   index: number;
 }
 
-export interface SearchOptions extends PublicSearchOptions {
-  caseSensitive?: boolean;
+export interface SearchOptions extends PublicSearchOptions, SearchTextOptions {
   regex?: boolean;
   highlightColor?: string;
 }
@@ -133,71 +142,6 @@ export function performSearch(
   return results;
 }
 
-export function findSearchMatches(
-  text: string,
-  query: string,
-  options: SearchOptions = {},
-): SearchResult[] {
-  const pattern = buildSearchPattern(query, options);
-  if (!pattern) return [];
-
-  const results: SearchResult[] = [];
-  let match: RegExpExecArray | null;
-  pattern.lastIndex = 0;
-  while ((match = pattern.exec(text)) !== null) {
-    results.push({
-      from: match.index,
-      to: match.index + match[0].length,
-      text: match[0],
-      index: results.length,
-    });
-
-    if (match[0].length === 0) {
-      pattern.lastIndex += 1;
-    }
-  }
-
-  return results;
-}
-
-export function createSearchExcerpt(
-  text: string,
-  from: number,
-  to: number,
-  radius = 24,
-): string {
-  const safeFrom = Math.max(0, Math.min(from, text.length));
-  const safeTo = Math.max(safeFrom, Math.min(to, text.length));
-  const start = Math.max(0, safeFrom - radius);
-  const end = Math.min(text.length, safeTo + radius);
-  const prefix = start > 0 ? "…" : "";
-  const suffix = end < text.length ? "…" : "";
-  return `${prefix}${text.slice(start, end)}${suffix}`;
-}
-
-function buildSearchPattern(
-  query: string,
-  options: SearchOptions,
-): RegExp | null {
-  if (!query) {
-    return null;
-  }
-
-  const caseSensitive = options.matchCase ?? options.caseSensitive ?? false;
-  const regex = options.regex ?? false;
-  const wholeWord = options.wholeWord ?? false;
-
-  try {
-    const source = regex
-      ? query
-      : query.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const wrapped = wholeWord ? `\\b${source}\\b` : source;
-    return new RegExp(wrapped, caseSensitive ? "g" : "gi");
-  } catch {
-    return null;
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Clear helper (ProseMirror Command signature)
 // ---------------------------------------------------------------------------
@@ -215,3 +159,10 @@ export function clearSearch(
   );
   return true;
 }
+
+export {
+  createSearchExcerpt,
+  findSearchMatches,
+  searchSecondaryStories,
+};
+export type { SecondaryStorySearchResult };

package/src/ui-tailwind/editor-surface/tw-inline-token.tsx

@@ -95,6 +95,17 @@ export function TwInlineToken(props: TwInlineTokenProps) {
 
   // opaque_inline
   if (segment.kind === "opaque_inline") {
+    if (segment.presentation === "quiet-marker") {
+      return (
+        <span
+          aria-label={segment.label}
+          title={segment.detail}
+          className="inline-block h-0 w-0 overflow-hidden align-baseline"
+          data-inline-presentation="quiet-marker"
+        />
+      );
+    }
+
     return (
       <button
         type="button"