react-native-nitro-markdown 0.7.0 → 0.7.1

package/lib/typescript/module/use-markdown-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-markdown-stream.d.ts","sourceRoot":"","sources":["../../../src/use-markdown-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAO1D,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEvE,wBAAgB,kBAAkB;;;;;;6BAiCY,MAAM;kBAMjB,MAAM;oBAIJ,MAAM,MAAM,MAAM,QAAQ,MAAM;EAcpE;AAED,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;;0BAgBzC,MAAM;;;;;;6BA1CoB,MAAM;kBAMjB,MAAM;oBAIJ,MAAM,MAAM,MAAM,QAAQ,MAAM;EAqDpE"}
+{"version":3,"file":"use-markdown-stream.d.ts","sourceRoot":"","sources":["../../../src/use-markdown-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAO1D,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEvE,wBAAgB,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM;;;;;;6BA2CT,MAAM;kBAMjB,MAAM;oBAIJ,MAAM,MAAM,MAAM,QAAQ,MAAM;EA0BpE;AAED,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9E,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,eAAe,GAAG,yBAAyB,GACjD,KAAK,IAAI,yBAAyB,CAEpC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,GAAG,yBAAyB,GACnD,eAAe,CAMjB;AAED,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;;;0BAgBzC,MAAM;;;;;;6BAxEoB,MAAM;kBAMjB,MAAM;oBAIJ,MAAM,MAAM,MAAM,QAAQ,MAAM;EAmFpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-markdown",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "High-performance Markdown parser for React Native using Nitro Modules and md4c",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -57,6 +57,7 @@
     "clean": "rimraf lib nitrogen/generated",
     "codegen": "nitrogen --logLevel=\"debug\"",
     "lint": "bunx eslint src --max-warnings=0 --ignore-pattern 'src/**/__tests__/**' --ignore-pattern 'src/**/*.nitro.ts'",
+    "lint:fix": "bunx eslint src --fix --ignore-pattern 'src/**/__tests__/**' --ignore-pattern 'src/**/*.nitro.ts'",
     "typecheck": "tsc --noEmit",
     "test": "jest",
     "test:coverage": "jest --coverage",

package/src/MarkdownSession.ts

@@ -3,6 +3,13 @@ import type { MarkdownSession as MarkdownSessionSpec } from "./specs/MarkdownSes
 
 export type MarkdownSession = MarkdownSessionSpec;
 
-export function createMarkdownSession(): MarkdownSession {
-  return NitroModules.createHybridObject<MarkdownSession>("MarkdownSession");
+export function createMarkdownSession(initialText?: string): MarkdownSession {
+  const session =
+    NitroModules.createHybridObject<MarkdownSession>("MarkdownSession");
+
+  if (initialText !== undefined) {
+    session.reset(initialText);
+  }
+
+  return session;
 }

package/src/index.ts

@@ -77,6 +77,7 @@ export { MathInline, MathBlock } from "./renderers/math";
 export { createMarkdownSession } from "./MarkdownSession";
 export type { MarkdownSession } from "./MarkdownSession";
 export { useMarkdownSession, useStream } from "./use-markdown-stream";
+export type { MarkdownSessionController } from "./use-markdown-stream";
 
 export type {
   HighlightedToken,

package/src/markdown-stream.tsx

@@ -9,6 +9,10 @@ import {
 import type { MarkdownNode } from "./headless";
 import { Markdown, type MarkdownProps } from "./markdown";
 import type { MarkdownSession } from "./specs/MarkdownSession.nitro";
+import {
+  resolveMarkdownSession,
+  type MarkdownSessionController,
+} from "./use-markdown-stream";
 import { getNextStreamAst, parseMarkdownAst } from "./utils/incremental-ast";
 
 const normalizeOffset = (value: number): number | null => {
@@ -71,7 +75,7 @@ export type MarkdownStreamProps = {
   /**
    * The active MarkdownSession to stream content from.
    */
-  session: MarkdownSession;
+  session: MarkdownSession | MarkdownSessionController;
   /**
    * Throttle UI updates when updateStrategy is "interval".
    * Ignored when updateStrategy is "raf".
@@ -110,6 +114,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
   plugins,
   ...props
 }) => {
+  const activeSession = resolveMarkdownSession(session);
   const parseText = useCallback(
     (text: string): MarkdownNode => parseMarkdownAst(text, options),
     [options],
@@ -118,7 +123,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
     type: "document",
     children: [],
   });
-  const initialText = session.getAllText();
+  const initialText = activeSession.getAllText();
   const hasBeforeParsePlugins =
     plugins?.some((plugin) => typeof plugin.beforeParse === "function") ??
     false;
@@ -148,7 +153,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
   }, []);
 
   useEffect(() => {
-    const initialText = session.getAllText();
+    const initialText = activeSession.getAllText();
     const initialState = {
       text: initialText,
       ast: hasBeforeParsePlugins ? createEmptyAst() : parseText(initialText),
@@ -159,7 +164,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
     forceFullSyncRef.current = false;
     renderStateRef.current = initialState;
     setRenderState(initialState);
-  }, [hasBeforeParsePlugins, parseText, session]);
+  }, [activeSession, hasBeforeParsePlugins, parseText]);
 
   useEffect(() => {
     const flushUpdate = () => {
@@ -184,7 +189,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
         pendingFrom,
         pendingTo,
         previousText: previousState.text,
-        session,
+        session: activeSession,
       });
       if (latest === previousState.text) return;
 
@@ -230,7 +235,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
     let unsubscribe: (() => void) | null = null;
 
     try {
-      unsubscribe = session.addListener((from, to) => {
+      unsubscribe = activeSession.addListener((from, to) => {
         const nextFrom = normalizeOffset(from);
         const nextTo = normalizeOffset(to);
 
@@ -276,7 +281,7 @@ export const MarkdownStream: FC<MarkdownStreamProps> = ({
     hasBeforeParsePlugins,
     options,
     plugins,
-    session,
+    activeSession,
     updateIntervalMs,
     updateStrategy,
     useTransitionUpdates,

package/src/use-markdown-stream.ts

@@ -1,4 +1,4 @@
-import { useRef, useCallback, useState, useEffect } from "react";
+import { useRef, useCallback, useState, useEffect, useMemo } from "react";
 import { createMarkdownSession } from "./MarkdownSession";
 import {
   createTimestampTimeline,
@@ -8,10 +8,11 @@ import {
 
 export type MarkdownSession = ReturnType<typeof createMarkdownSession>;
 
-export function useMarkdownSession() {
+export function useMarkdownSession(initialText?: string) {
   const sessionRef = useRef<MarkdownSession | null>(null);
+  const initialTextRef = useRef(initialText);
   if (sessionRef.current === null) {
-    sessionRef.current = createMarkdownSession();
+    sessionRef.current = createMarkdownSession(initialText);
   }
 
   const [isStreaming, setIsStreaming] = useState(false);
@@ -31,6 +32,15 @@ export function useMarkdownSession() {
     };
   }, []);
 
+  useEffect(() => {
+    if (initialText === undefined || initialTextRef.current === initialText) {
+      return;
+    }
+
+    initialTextRef.current = initialText;
+    sessionRef.current!.reset(initialText);
+  }, [initialText]);
+
   const stop = useCallback(() => {
     setIsStreaming(false);
   }, []);
@@ -55,16 +65,46 @@ export function useMarkdownSession() {
     return sessionRef.current!.replace(from, to, text);
   }, []);
 
-  return {
-    getSession,
-    isStreaming,
-    setIsStreaming,
-    stop,
-    clear,
-    setHighlight,
-    reset,
-    replace,
-  };
+  return useMemo(
+    () => ({
+      getSession,
+      isStreaming,
+      setIsStreaming,
+      stop,
+      clear,
+      setHighlight,
+      reset,
+      replace,
+    }),
+    [
+      clear,
+      getSession,
+      isStreaming,
+      replace,
+      reset,
+      setHighlight,
+      setIsStreaming,
+      stop,
+    ],
+  );
+}
+
+export type MarkdownSessionController = ReturnType<typeof useMarkdownSession>;
+
+export function isMarkdownSessionController(
+  value: MarkdownSession | MarkdownSessionController,
+): value is MarkdownSessionController {
+  return typeof Reflect.get(value, "getSession") === "function";
+}
+
+export function resolveMarkdownSession(
+  session: MarkdownSession | MarkdownSessionController,
+): MarkdownSession {
+  if (isMarkdownSessionController(session)) {
+    return session.getSession();
+  }
+
+  return session;
 }
 
 export function useStream(timestamps?: Record<number, number>) {