@mirror-physics/fractal-ui 0.2.0-next.49 → 0.2.0-next.50

package/dist/index.js

@@ -168,9 +168,9 @@ Button.displayName = "Button";
 // src/components/CodeBlock/CodeBlock.tsx
 import { useEffect, useMemo, useRef, useState as useState2 } from "react";
 import CodeMirror from "@uiw/react-codemirror";
-import { HighlightStyle, LanguageDescription, syntaxHighlighting } from "@codemirror/language";
-import { languages } from "@codemirror/language-data";
-import { EditorView } from "@codemirror/view";
+import { HighlightStyle, foldGutter, syntaxHighlighting } from "@codemirror/language";
+import { json } from "@codemirror/lang-json";
+import { EditorView, lineNumbers as lineNumberGutter } from "@codemirror/view";
 import { tags } from "@lezer/highlight";
 import { Check, Copy } from "@mirror-physics/fractal-icons";
 import { jsx, jsxs as jsxs2 } from "react/jsx-runtime";
@@ -190,7 +190,7 @@ var codeTheme = EditorView.theme({
   ".cm-line": { padding: "0 12px" },
   ".cm-cursor, .cm-dropCursor": { borderLeftColor: "var(--fg-primary)" },
   ".cm-gutters": {
-    backgroundColor: "var(--bg-surface-1)",
+    backgroundColor: "var(--bg-canvas)",
     borderRight: "1px solid var(--border-subtle)",
     color: "var(--fg-tertiary)"
   },
@@ -215,43 +215,30 @@ var codeTheme = EditorView.theme({
 var fractalHighlightStyle = HighlightStyle.define([
   { tag: tags.comment, color: "var(--fg-tertiary)", fontStyle: "italic" },
   { tag: [tags.keyword, tags.controlKeyword, tags.operatorKeyword], color: "var(--purple-default)" },
-  { tag: [tags.string, tags.special(tags.string)], color: "var(--success-default)" },
+  { tag: [tags.string, tags.special(tags.string)], color: "var(--purple-default)" },
   { tag: [tags.number, tags.bool, tags.null], color: "var(--orange-default)" },
   { tag: [tags.function(tags.variableName), tags.labelName], color: "var(--accent-default)" },
   { tag: [tags.typeName, tags.className, tags.namespace], color: "var(--pink-default)" },
-  { tag: [tags.propertyName, tags.attributeName], color: "var(--fg-primary)" },
-  { tag: [tags.operator, tags.punctuation, tags.bracket], color: "var(--fg-secondary)" },
+  { tag: [tags.propertyName, tags.attributeName], color: "var(--success-default)" },
+  { tag: [tags.operator, tags.punctuation], color: "var(--fg-secondary)" },
+  { tag: tags.bracket, color: "var(--accent-default)" },
   { tag: [tags.heading, tags.strong], color: "var(--fg-primary)", fontWeight: "600" },
   { tag: tags.emphasis, fontStyle: "italic" },
   { tag: tags.link, color: "var(--accent-default)", textDecoration: "underline" },
   { tag: tags.invalid, color: "var(--error-default)", textDecoration: "underline wavy" }
 ]);
-function findLanguage(language, fileName) {
-  const normalized = language?.trim();
-  if (normalized && !["text", "txt", "plaintext", "plain"].includes(normalized.toLowerCase())) {
-    return LanguageDescription.matchLanguageName(languages, normalized, true);
+var jsonSupport = json();
+var JSON_LANGUAGE_NAMES = /* @__PURE__ */ new Set(["json", "jsonl", "ndjson", "geojson"]);
+function resolveLanguage(language, fileName) {
+  const normalized = language?.trim().toLowerCase();
+  const extension = fileName?.split(/[?#]/, 1)[0].split(".").pop()?.toLowerCase();
+  if (normalized && JSON_LANGUAGE_NAMES.has(normalized) || extension && JSON_LANGUAGE_NAMES.has(extension)) {
+    return { label: normalized === "jsonl" || extension === "jsonl" ? "JSONL" : "JSON", support: jsonSupport };
   }
-  return fileName ? LanguageDescription.matchFilename(languages, fileName) : null;
-}
-function useLanguageSupport(language, fileName) {
-  const description = useMemo(() => findLanguage(language, fileName), [fileName, language]);
-  const [support, setSupport] = useState2(null);
-  useEffect(() => {
-    let cancelled = false;
-    setSupport(null);
-    if (!description) return () => {
-      cancelled = true;
-    };
-    void description.load().then((loaded) => {
-      if (!cancelled) setSupport(loaded);
-    }).catch(() => {
-      if (!cancelled) setSupport(null);
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [description]);
-  return { description, support };
+  if (normalized && !["text", "txt", "plaintext", "plain"].includes(normalized)) {
+    return { label: language?.trim(), support: null };
+  }
+  return { support: null };
 }
 function CodeBlock({
   value,
@@ -272,7 +259,7 @@ function CodeBlock({
   className,
   ...props
 }) {
-  const { description, support } = useLanguageSupport(language, fileName);
+  const resolvedLanguage = useMemo(() => resolveLanguage(language, fileName), [fileName, language]);
   const [copyStatus, setCopyStatus] = useState2("idle");
   const copyResetTimer = useRef(null);
   useEffect(() => () => {
@@ -281,10 +268,11 @@ function CodeBlock({
   const extensions = useMemo(() => [
     codeTheme,
     syntaxHighlighting(fractalHighlightStyle),
-    ...support ? [support] : [],
+    ...resolvedLanguage.support ? [resolvedLanguage.support] : [],
+    ...lineNumbers ? [foldGutter(), lineNumberGutter()] : [],
     ...wrap ? [EditorView.lineWrapping] : []
-  ], [support, wrap]);
-  const languageLabel = language?.trim() || description?.name;
+  ], [lineNumbers, resolvedLanguage.support, wrap]);
+  const languageLabel = resolvedLanguage.label;
   const toolbarLabel = label ?? fileName ?? languageLabel;
   const surfaceLabel = ariaLabel ?? (fileName ? `${fileName} ${editable ? "editor" : "viewer"}` : `Code ${editable ? "editor" : "viewer"}`);
   const copyCode = async () => {
@@ -340,8 +328,8 @@ function CodeBlock({
             extensions,
             theme: "none",
             basicSetup: {
-              lineNumbers,
-              foldGutter: lineNumbers,
+              lineNumbers: false,
+              foldGutter: false,
               drawSelection: editable,
               highlightActiveLine: editable,
               highlightActiveLineGutter: editable,