react-codemirror-runmode 2.0.0 → 2.0.1

package/README.md

@@ -20,7 +20,7 @@ import ReactDOM from 'react-dom/client'
 const code = 'const x = 123'
 
 ReactDOM.createRoot(document.getElementById('app')!).render(
-  <Highlighter lang="js" highlightStyle={oneDarkHighlightStyle}>
+  <Highlighter lang="js" theme={oneDarkHighlightStyle}>
     {code}
   </Highlighter>
 )
@@ -37,7 +37,7 @@ You can apply custom themes using CodeMirror's theme system. This component uses
 Props:
 
 - `lang`: `string` - The name of the language
-- `highlightStyle`: [`HighlightStyle`](https://codemirror.net/docs/ref#language.HighlightStyle) - The highlight style
+- `theme`: [`Highlighter`](https://lezer.codemirror.net/docs/ref/#highlight.Highlighter) - The highlight style
 - `children`: `string` - The code to highlight
 
 ### `highlightCode<Output>(languageName, input, highlightStyle, callback): Promise<Output[]>`
@@ -46,7 +46,7 @@ Parameters:
 
 - `languageName`: `string` - The name of the language
 - `input`: `string` - The code to highlight
-- `highlightStyle`: [`HighlightStyle`](https://codemirror.net/docs/ref#language.HighlightStyle) - The highlight style
+- `highlighter`: [`Highlighter`](https://lezer.codemirror.net/docs/ref/#highlight.Highlighter) - The highlight style
 - `callback`: `(text: string, style: string | null, from: number, to: number) => Output)` - A callback function that converts the parsed tokens
 
 ### `getCodeParser(languageName, defaultLanguage?): Promise<Parser | null>`

package/dist/highlight.d.ts

@@ -1,4 +1,5 @@
 import { Parser } from '@lezer/common';
-import { HighlightStyle, Language } from '@codemirror/language';
+import { Language } from '@codemirror/language';
+import { Highlighter } from '@lezer/highlight';
 export declare function getCodeParser(languageName: string, defaultLanguage?: Language): Promise<Parser | null>;
-export declare function highlightCode<Output>(languageName: string, input: string, highlightStyle: HighlightStyle, callback: (text: string, style: string | null, from: number, to: number) => Output): Promise<Output[]>;
+export declare function highlightCode<Output>(languageName: string, input: string, highlighter: Highlighter, callback: (text: string, style: string | null, from: number, to: number) => Output): Promise<Output[]>;

package/dist/highlight.js

@@ -14,13 +14,13 @@ export async function getCodeParser(languageName, defaultLanguage) {
     }
     return defaultLanguage ? defaultLanguage.parser : null;
 }
-export async function highlightCode(languageName, input, highlightStyle, callback) {
+export async function highlightCode(languageName, input, highlighter, callback) {
     const parser = await getCodeParser(languageName);
     if (parser) {
         const tree = parser.parse(input);
         const output = [];
         let pos = 0;
-        highlightTree(tree, highlightStyle, (from, to, classes) => {
+        highlightTree(tree, highlighter, (from, to, classes) => {
             if (from > pos)
                 output.push(callback(input.slice(pos, from), null, pos, from));
             output.push(callback(input.slice(from, to), classes, from, to));

package/dist/react-highlighter.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import type { HighlightStyle } from '@codemirror/language';
+import type { Highlighter as LezerHighlighter } from '@lezer/highlight';
 export type HighlighterProps = {
     lang: string;
     children: string;
-    highlightStyle: HighlightStyle;
+    theme: LezerHighlighter;
 };
 export declare const Highlighter: React.NamedExoticComponent<HighlighterProps>;

package/dist/react-highlighter.js

@@ -2,12 +2,12 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo, useEffect, useState } from 'react';
 import { highlightCode } from './highlight';
 export const Highlighter = memo((props) => {
-    const { lang, children: code, highlightStyle } = props;
+    const { lang, children: code, theme } = props;
     const [highlightedCode, setHighlightedCode] = useState(null);
     useEffect(() => {
-        highlightCode(lang, code, highlightStyle, (text, style, from) => {
+        highlightCode(lang, code, theme, (text, style, from) => {
             return (_jsx("span", { className: style || '', children: text }, from));
         }).then(setHighlightedCode);
-    }, [lang, code, highlightStyle]);
+    }, [lang, code, theme]);
     return _jsx(_Fragment, { children: highlightedCode || code });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-codemirror-runmode",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Syntax highlighting for react, utilizing CodeMirror's parser",
   "type": "module",
   "main": "dist/index.js",

package/src/highlight.ts

@@ -1,10 +1,6 @@
 import { Parser } from '@lezer/common'
-import {
-  HighlightStyle,
-  Language,
-  LanguageDescription
-} from '@codemirror/language'
-import { highlightTree } from '@lezer/highlight'
+import { Language, LanguageDescription } from '@codemirror/language'
+import { Highlighter, highlightTree } from '@lezer/highlight'
 import { languages } from '@codemirror/language-data'
 
 export async function getCodeParser(
@@ -28,7 +24,7 @@ export async function getCodeParser(
 export async function highlightCode<Output>(
   languageName: string,
   input: string,
-  highlightStyle: HighlightStyle,
+  highlighter: Highlighter,
   callback: (
     text: string,
     style: string | null,
@@ -41,7 +37,7 @@ export async function highlightCode<Output>(
     const tree = parser.parse(input)
     const output: Array<Output> = []
     let pos = 0
-    highlightTree(tree, highlightStyle, (from, to, classes) => {
+    highlightTree(tree, highlighter, (from, to, classes) => {
       if (from > pos)
         output.push(callback(input.slice(pos, from), null, pos, from))
       output.push(callback(input.slice(from, to), classes, from, to))

package/src/react-highlighter.tsx

@@ -1,15 +1,15 @@
 import React, { memo, useEffect, useState } from 'react'
 import { highlightCode } from './highlight'
-import type { HighlightStyle } from '@codemirror/language'
+import type { Highlighter as LezerHighlighter } from '@lezer/highlight'
 
 export type HighlighterProps = {
   lang: string
   children: string
-  highlightStyle: HighlightStyle
+  theme: LezerHighlighter
 }
 
 export const Highlighter = memo<HighlighterProps>((props: HighlighterProps) => {
-  const { lang, children: code, highlightStyle } = props
+  const { lang, children: code, theme } = props
   const [highlightedCode, setHighlightedCode] = useState<
     React.ReactNode[] | null
   >(null)
@@ -18,7 +18,7 @@ export const Highlighter = memo<HighlighterProps>((props: HighlighterProps) => {
     highlightCode(
       lang,
       code,
-      highlightStyle,
+      theme,
       (text: string, style: string | null, from: number) => {
         return (
           <span key={from} className={style || ''}>
@@ -27,7 +27,7 @@ export const Highlighter = memo<HighlighterProps>((props: HighlighterProps) => {
         )
       }
     ).then(setHighlightedCode)
-  }, [lang, code, highlightStyle])
+  }, [lang, code, theme])
 
   return <>{highlightedCode || code}</>
 })

package/test/index.spec.tsx

@@ -70,7 +70,7 @@ describe('React Highlighter', () => {
     const code = 'const x = 123'
     render(
       <code className="mde-preview">
-        <Highlighter lang="js" highlightStyle={oneDarkHighlightStyle}>
+        <Highlighter lang="js" theme={oneDarkHighlightStyle}>
           {code}
         </Highlighter>
       </code>