rn-shiki 0.0.37-26 → 0.0.37-28

package/lib/commonjs/components/syntax/SyntaxHighlighter.js

@@ -16,28 +16,54 @@ const monospaceFont = _reactNative.Platform.select({
   android: 'monospace',
   default: 'monospace'
 });
-const styles = _reactNative.StyleSheet.create({
+// Helper function to extract theme registration from Shiki theme input
+function getThemeRegistration(theme) {
+  if ('default' in theme) {
+    return theme.default;
+  }
+  return theme;
+}
+const baseStyles = _reactNative.StyleSheet.create({
   scrollView: {
     flex: 1,
     minHeight: 20
   },
   lineContainer: {
     flexDirection: 'row',
-    flexWrap: 'wrap'
+    flexWrap: 'wrap',
+    paddingHorizontal: 16,
+    paddingVertical: 8
+  },
+  token: {
+    fontFamily: monospaceFont,
+    fontSize: 14
+  },
+  container: {
+    flex: 1
   }
 });
 const SyntaxHighlighter = ({
   text,
   language,
   languageId,
-  theme
+  theme,
+  fontSize = 14
 }) => {
-  console.log('theme:', theme);
   const stylesheet = (0, _react.useMemo)(() => {
-    const styles = (0, _styleTransformer.getRNStylesFromShikiStyle)(theme);
-    console.log('Generated stylesheet:', styles);
-    return styles;
-  }, [theme]);
+    const themeRegistration = getThemeRegistration(theme);
+    const styles = (0, _styleTransformer.getRNStylesFromShikiStyle)(themeRegistration);
+    return _reactNative.StyleSheet.create({
+      ...styles,
+      editor: {
+        backgroundColor: themeRegistration.colors?.['editor.background'] || '#1e1e1e'
+      },
+      token: {
+        ...baseStyles.token,
+        fontSize,
+        color: themeRegistration.colors?.['editor.foreground'] || '#d4d4d4'
+      }
+    });
+  }, [theme, fontSize]);
   const {
     tokens
   } = (0, _useSyntaxHighlighter.useSyntaxHighlighter)({
@@ -47,40 +73,46 @@ const SyntaxHighlighter = ({
     theme
   });
   const renderToken = (token, index, lineIndex) => {
-    // Ensure to collect all styles associated with the token's scopes
+    const styles = [stylesheet.token];
+
+    // Add token-specific styles from stylesheet based on scope
     const tokenScopes = Array.isArray(token.scope) ? token.scope : [token.scope];
-    const tokenStylesArray = tokenScopes.map(scope => stylesheet[scope] || {});
-    const combinedStyles = _reactNative.StyleSheet.flatten([...tokenStylesArray, {
-      fontFamily: monospaceFont,
-      ...(token.color && {
-        color: token.color
-      }),
-      ...(token.fontStyle === 'italic' && stylesheet.italic),
-      ...(token.fontWeight === 'bold' && stylesheet.bold)
-    }]);
-    console.log(`Rendering token: ${token.content}, styles:`, combinedStyles);
+    tokenScopes.forEach(scope => {
+      if (stylesheet[scope]) {
+        styles.push(stylesheet[scope]);
+      }
+    });
+
+    // Add token-specific styles from the token itself
+    const tokenStyles = {};
+    if (token.color) {
+      tokenStyles.color = token.color;
+    }
+    if (token.fontStyle === 'italic') {
+      tokenStyles.fontStyle = 'italic';
+    }
+    if (token.fontWeight === 'bold') {
+      tokenStyles.fontWeight = 'bold';
+    }
+    if (Object.keys(tokenStyles).length > 0) {
+      styles.push(tokenStyles);
+    }
+    const finalStyle = _reactNative.StyleSheet.flatten(styles);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-      style: combinedStyles,
+      style: finalStyle,
       children: token.content.replace(/ /g, '\u00A0')
     }, `${lineIndex}-${index}`);
   };
-
-  // In the renderLine and renderToken flow
-  const renderLine = (line, lineIndex) => {
-    console.log(`Rendering line ${lineIndex}:`, line);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      style: styles.lineContainer,
-      children: line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))
-    }, lineIndex);
-  };
+  const renderLine = (line, lineIndex) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+    style: baseStyles.lineContainer,
+    children: line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))
+  }, lineIndex);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ScrollView, {
     horizontal: true,
     showsHorizontalScrollIndicator: _reactNative.Platform.OS !== 'web',
-    style: styles.scrollView,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      onStartShouldSetResponder: () => true,
-      children: tokens.map((line, index) => renderLine(line, index))
-    })
+    style: [baseStyles.scrollView, stylesheet.editor],
+    contentContainerStyle: baseStyles.container,
+    children: tokens.map((line, index) => renderLine(line, index))
   });
 };
 var _default = exports.default = SyntaxHighlighter;

package/lib/commonjs/components/syntax/SyntaxHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useSyntaxHighlighter","_styleTransformer","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","monospaceFont","Platform","select","ios","android","styles","StyleSheet","create","scrollView","flex","minHeight","lineContainer","flexDirection","flexWrap","SyntaxHighlighter","text","language","languageId","theme","console","log","stylesheet","useMemo","getRNStylesFromShikiStyle","tokens","useSyntaxHighlighter","renderToken","token","index","lineIndex","tokenScopes","Array","isArray","scope","tokenStylesArray","map","combinedStyles","flatten","fontFamily","color","fontStyle","italic","fontWeight","bold","content","jsx","Text","style","children","replace","renderLine","line","View","tokenIndex","ScrollView","horizontal","showsHorizontalScrollIndicator","OS","onStartShouldSetResponder","_default","exports"],"sourceRoot":"../../../../src","sources":["components/syntax/SyntaxHighlighter.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useSyntaxHighlighter","_styleTransformer","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","monospaceFont","Platform","select","ios","android","getThemeRegistration","theme","baseStyles","StyleSheet","create","scrollView","flex","minHeight","lineContainer","flexDirection","flexWrap","paddingHorizontal","paddingVertical","token","fontFamily","fontSize","container","SyntaxHighlighter","text","language","languageId","stylesheet","useMemo","themeRegistration","styles","getRNStylesFromShikiStyle","editor","backgroundColor","colors","color","tokens","useSyntaxHighlighter","renderToken","index","lineIndex","tokenScopes","Array","isArray","scope","forEach","push","tokenStyles","fontStyle","fontWeight","keys","length","finalStyle","flatten","jsx","Text","style","children","content","replace","renderLine","line","View","map","tokenIndex","ScrollView","horizontal","showsHorizontalScrollIndicator","OS","contentContainerStyle","_default","exports"],"sourceRoot":"../../../../src","sources":["components/syntax/SyntaxHighlighter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/syntax/highlighter.js

@@ -17,7 +17,7 @@ async function initializeHighlighter(langs, themes) {
     return await (0, _core.createHighlighterCore)({
       langs,
       themes,
-      engine
+      engine // Pass the configured engine
     });
   } catch (err) {
     console.error('Error initializing highlighter:', err);

package/lib/commonjs/syntax/highlighter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_engineJavascript","engine","createJavaScriptRegexEngine","forgiving","simulation","cache","Map","initializeHighlighter","langs","themes","createHighlighterCore","err","console","error","createHighlighter","length","Error","highlighter","processTokens","tokens","map","token","content","color","fontStyle","toString"],"sourceRoot":"../../../src","sources":["syntax/highlighter.ts"],"mappings":";;;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAEA,MAAME,MAAM,GAAG,IAAAC,6CAA2B,EAAC;EACzCC,SAAS,EAAE,IAAI;EACfC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAE,IAAIC,GAAG,CAAC;AACjB,CAAC,CAAC;AAEF,eAAeC,qBAAqBA,CAACC,KAAsB,EAAEC,MAAoB,EAAE;EACjF,IAAI;IACF,OAAO,MAAM,IAAAC,2BAAqB,EAAC;MACjCF,KAAK;MACLC,MAAM;MACNR;IACF,CAAC,CAAC;EACJ,CAAC,CACD,OAAOU,GAAG,EAAE;IACVC,OAAO,CAACC,KAAK,CAAC,iCAAiC,EAAEF,GAAG,CAAC;IACrD,MAAMA,GAAG;EACX;AACF;AAEO,eAAeG,iBAAiBA,CAAC;EAAEN,KAAK;EAAEC;AAAyD,CAAC,EAAE;EAC3G,IAAI,CAACD,KAAK,EAAEO,MAAM,EAAE;IAClB,MAAM,IAAIC,KAAK,CAAC,uDAAuD,CAAC;EAC1E;EAEA,IAAI;IACF,MAAMC,WAAW,GAAG,MAAMV,qBAAqB,CAACC,KAAK,EAAEC,MAAM,CAAC;IAC9D,OAAOQ,WAAW;EACpB,CAAC,CACD,OAAOJ,KAAK,EAAE;IACZD,OAAO,CAACC,KAAK,CAAC,+BAA+B,EAAEA,KAAK,CAAC;IACrD,MAAMA,KAAK;EACb;AACF;AAEO,SAASK,aAAaA,CAACC,MAAqB,EAAe;EAChE,OAAOA,MAAM,CAACC,GAAG,CAACC,KAAK,KAAK;IAC1BC,OAAO,EAAED,KAAK,CAACC,OAAO;IACtBC,KAAK,EAAEF,KAAK,CAACE,KAAK,IAAI,SAAS;IAC/BC,SAAS,EAAEH,KAAK,CAACG,SAAS,EAAEC,QAAQ,CAAC;EACvC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["_core","require","_engineJavascript","engine","createJavaScriptRegexEngine","forgiving","simulation","cache","Map","initializeHighlighter","langs","themes","createHighlighterCore","err","console","error","createHighlighter","length","Error","highlighter","processTokens","tokens","map","token","content","color","fontStyle","toString"],"sourceRoot":"../../../src","sources":["syntax/highlighter.ts"],"mappings":";;;;;;;AAEA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAD,OAAA;AAEA,MAAME,MAAM,GAAG,IAAAC,6CAA2B,EAAC;EACzCC,SAAS,EAAE,IAAI;EACfC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAE,IAAIC,GAAG,CAAC;AACjB,CAAC,CAAC;AAEF,eAAeC,qBAAqBA,CAACC,KAAsB,EAAEC,MAAoB,EAAE;EACjF,IAAI;IACF,OAAO,MAAM,IAAAC,2BAAqB,EAAC;MACjCF,KAAK;MACLC,MAAM;MACNR,MAAM,CAAE;IACV,CAAC,CAAC;EACJ,CAAC,CACD,OAAOU,GAAG,EAAE;IACVC,OAAO,CAACC,KAAK,CAAC,iCAAiC,EAAEF,GAAG,CAAC;IACrD,MAAMA,GAAG;EACX;AACF;AAEO,eAAeG,iBAAiBA,CAAC;EAAEN,KAAK;EAAEC;AAAyD,CAAC,EAAE;EAC3G,IAAI,CAACD,KAAK,EAAEO,MAAM,EAAE;IAClB,MAAM,IAAIC,KAAK,CAAC,uDAAuD,CAAC;EAC1E;EAEA,IAAI;IACF,MAAMC,WAAW,GAAG,MAAMV,qBAAqB,CAACC,KAAK,EAAEC,MAAM,CAAC;IAC9D,OAAOQ,WAAW;EACpB,CAAC,CACD,OAAOJ,KAAK,EAAE;IACZD,OAAO,CAACC,KAAK,CAAC,+BAA+B,EAAEA,KAAK,CAAC;IACrD,MAAMA,KAAK;EACb;AACF;AAEO,SAASK,aAAaA,CAACC,MAAqB,EAAe;EAChE,OAAOA,MAAM,CAACC,GAAG,CAACC,KAAK,KAAK;IAC1BC,OAAO,EAAED,KAAK,CAACC,OAAO;IACtBC,KAAK,EAAEF,KAAK,CAACE,KAAK,IAAI,SAAS;IAC/BC,SAAS,EAAEH,KAAK,CAACG,SAAS,EAAEC,QAAQ,CAAC;EACvC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}

package/lib/commonjs/utils/style-transformer.js

@@ -5,24 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertTokenColorsToReactStyle = convertTokenColorsToReactStyle;
 exports.getRNStylesFromShikiStyle = getRNStylesFromShikiStyle;
-var _cssToReactNative = _interopRequireDefault(require("css-to-react-native"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// Helper function to convert hex color to RGB
 function hexToRgb(hex) {
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  // Remove # if present
+  hex = hex.replace(/^#/, '');
+
+  // Handle both 3 and 6 digit hex
+  if (hex.length === 3) {
+    hex = `${hex[0]}${hex[0]}${hex[1]}${hex[1]}${hex[2]}${hex[2]}`;
+  }
+  const result = /^([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   return result ? {
     r: Number.parseInt(result[1], 16),
     g: Number.parseInt(result[2], 16),
     b: Number.parseInt(result[3], 16)
   } : null;
 }
-
-// Helper function to normalize color values
 function normalizeColor(color) {
   if (!color) return 'transparent';
 
-  // Type guard to ensure color is string before we call string methods
-  if (typeof color === 'string' && color.startsWith('#')) {
+  // Handle hex colors
+  if (color.startsWith('#')) {
     const rgb = hexToRgb(color);
     if (rgb) {
       return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`;
@@ -31,67 +33,71 @@ function normalizeColor(color) {
   return color;
 }
 function convertTokenColorsToReactStyle(tokenColors) {
+  if (!tokenColors) return {};
   const styleMap = {};
-
-  // Add default styles
-  styleMap.default = {
-    color: '#e1e4e8',
-    backgroundColor: 'transparent'
-  };
   tokenColors.forEach(token => {
-    if (!token.settings || !token.scope) return;
-    const scopes = Array.isArray(token.scope) ? token.scope : [token.scope];
-    const styleEntries = [];
+    if (!token.settings) return;
 
-    // Only add styles if they exist
+    // Handle global theme settings
+    if (!token.scope) {
+      styleMap.default = {
+        color: normalizeColor(token.settings.foreground),
+        backgroundColor: normalizeColor(token.settings.background)
+      };
+      return;
+    }
+    const scopes = Array.isArray(token.scope) ? token.scope : [token.scope];
+    const style = {};
     if (token.settings.foreground) {
-      styleEntries.push(['color', normalizeColor(token.settings.foreground)]);
+      style.color = normalizeColor(token.settings.foreground);
     }
     if (token.settings.background) {
-      styleEntries.push(['backgroundColor', normalizeColor(token.settings.background)]);
+      style.backgroundColor = normalizeColor(token.settings.background);
     }
     if (token.settings.fontStyle) {
       if (token.settings.fontStyle.includes('italic')) {
-        styleEntries.push(['fontStyle', 'italic']);
+        style.fontStyle = 'italic';
       }
       if (token.settings.fontStyle.includes('bold')) {
-        styleEntries.push(['fontWeight', 'bold']);
+        style.fontWeight = 'bold';
       }
     }
-    if (styleEntries.length > 0) {
-      const transformedStyle = (0, _cssToReactNative.default)(styleEntries);
-      scopes.forEach(scope => {
-        if (typeof scope === 'string') {
-          styleMap[scope] = {
-            ...(styleMap[scope] || {}),
-            ...transformedStyle
-          };
-        }
-      });
-    }
+    scopes.forEach(scope => {
+      styleMap[scope] = {
+        ...(styleMap[scope] || {}),
+        ...style
+      };
+    });
   });
   return styleMap;
 }
 function getRNStylesFromShikiStyle(theme) {
-  if (!theme || !theme.tokenColors) {
-    console.error('Provided theme does not contain \'tokenColors\'.');
-    return {};
-  }
+  if (!theme) return {};
   try {
-    // Convert theme colors to React Native styles
-    const styles = convertTokenColorsToReactStyle(theme.tokenColors);
+    const styles = {
+      editor: {
+        backgroundColor: normalizeColor(theme.colors?.['editor.background'])
+      },
+      base: {
+        color: normalizeColor(theme.colors?.['editor.foreground'])
+      }
+    };
 
-    // Add theme-specific base styles if they exist
-    if (theme.colors) {
-      styles.base = {
-        color: normalizeColor(theme.colors['editor.foreground']),
-        backgroundColor: normalizeColor(theme.colors['editor.background'])
-      };
+    // Process token colors
+    if (theme.tokenColors) {
+      const tokenStyles = convertTokenColorsToReactStyle(theme.tokenColors);
+      Object.assign(styles, tokenStyles);
     }
     return styles;
   } catch {
-    console.error('Error converting theme styles');
-    return {};
+    return {
+      editor: {
+        backgroundColor: '#1e1e1e'
+      },
+      base: {
+        color: '#d4d4d4'
+      }
+    };
   }
 }
 //# sourceMappingURL=style-transformer.js.map

package/lib/commonjs/utils/style-transformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_cssToReactNative","_interopRequireDefault","require","e","__esModule","default","hexToRgb","hex","result","exec","r","Number","parseInt","g","b","normalizeColor","color","startsWith","rgb","convertTokenColorsToReactStyle","tokenColors","styleMap","backgroundColor","forEach","token","settings","scope","scopes","Array","isArray","styleEntries","foreground","push","background","fontStyle","includes","length","transformedStyle","transform","getRNStylesFromShikiStyle","theme","console","error","styles","colors","base"],"sourceRoot":"../../../src","sources":["utils/style-transformer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["hexToRgb","hex","replace","length","result","exec","r","Number","parseInt","g","b","normalizeColor","color","startsWith","rgb","convertTokenColorsToReactStyle","tokenColors","styleMap","forEach","token","settings","scope","default","foreground","backgroundColor","background","scopes","Array","isArray","style","fontStyle","includes","fontWeight","getRNStylesFromShikiStyle","theme","styles","editor","colors","base","tokenStyles","Object","assign"],"sourceRoot":"../../../src","sources":["utils/style-transformer.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/syntax/SyntaxHighlighter.js

@@ -10,28 +10,54 @@ const monospaceFont = Platform.select({
   android: 'monospace',
   default: 'monospace'
 });
-const styles = StyleSheet.create({
+// Helper function to extract theme registration from Shiki theme input
+function getThemeRegistration(theme) {
+  if ('default' in theme) {
+    return theme.default;
+  }
+  return theme;
+}
+const baseStyles = StyleSheet.create({
   scrollView: {
     flex: 1,
     minHeight: 20
   },
   lineContainer: {
     flexDirection: 'row',
-    flexWrap: 'wrap'
+    flexWrap: 'wrap',
+    paddingHorizontal: 16,
+    paddingVertical: 8
+  },
+  token: {
+    fontFamily: monospaceFont,
+    fontSize: 14
+  },
+  container: {
+    flex: 1
   }
 });
 const SyntaxHighlighter = ({
   text,
   language,
   languageId,
-  theme
+  theme,
+  fontSize = 14
 }) => {
-  console.log('theme:', theme);
   const stylesheet = useMemo(() => {
-    const styles = getRNStylesFromShikiStyle(theme);
-    console.log('Generated stylesheet:', styles);
-    return styles;
-  }, [theme]);
+    const themeRegistration = getThemeRegistration(theme);
+    const styles = getRNStylesFromShikiStyle(themeRegistration);
+    return StyleSheet.create({
+      ...styles,
+      editor: {
+        backgroundColor: themeRegistration.colors?.['editor.background'] || '#1e1e1e'
+      },
+      token: {
+        ...baseStyles.token,
+        fontSize,
+        color: themeRegistration.colors?.['editor.foreground'] || '#d4d4d4'
+      }
+    });
+  }, [theme, fontSize]);
   const {
     tokens
   } = useSyntaxHighlighter({
@@ -41,40 +67,46 @@ const SyntaxHighlighter = ({
     theme
   });
   const renderToken = (token, index, lineIndex) => {
-    // Ensure to collect all styles associated with the token's scopes
+    const styles = [stylesheet.token];
+
+    // Add token-specific styles from stylesheet based on scope
     const tokenScopes = Array.isArray(token.scope) ? token.scope : [token.scope];
-    const tokenStylesArray = tokenScopes.map(scope => stylesheet[scope] || {});
-    const combinedStyles = StyleSheet.flatten([...tokenStylesArray, {
-      fontFamily: monospaceFont,
-      ...(token.color && {
-        color: token.color
-      }),
-      ...(token.fontStyle === 'italic' && stylesheet.italic),
-      ...(token.fontWeight === 'bold' && stylesheet.bold)
-    }]);
-    console.log(`Rendering token: ${token.content}, styles:`, combinedStyles);
+    tokenScopes.forEach(scope => {
+      if (stylesheet[scope]) {
+        styles.push(stylesheet[scope]);
+      }
+    });
+
+    // Add token-specific styles from the token itself
+    const tokenStyles = {};
+    if (token.color) {
+      tokenStyles.color = token.color;
+    }
+    if (token.fontStyle === 'italic') {
+      tokenStyles.fontStyle = 'italic';
+    }
+    if (token.fontWeight === 'bold') {
+      tokenStyles.fontWeight = 'bold';
+    }
+    if (Object.keys(tokenStyles).length > 0) {
+      styles.push(tokenStyles);
+    }
+    const finalStyle = StyleSheet.flatten(styles);
     return /*#__PURE__*/_jsx(Text, {
-      style: combinedStyles,
+      style: finalStyle,
       children: token.content.replace(/ /g, '\u00A0')
     }, `${lineIndex}-${index}`);
   };
-
-  // In the renderLine and renderToken flow
-  const renderLine = (line, lineIndex) => {
-    console.log(`Rendering line ${lineIndex}:`, line);
-    return /*#__PURE__*/_jsx(View, {
-      style: styles.lineContainer,
-      children: line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))
-    }, lineIndex);
-  };
+  const renderLine = (line, lineIndex) => /*#__PURE__*/_jsx(View, {
+    style: baseStyles.lineContainer,
+    children: line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))
+  }, lineIndex);
   return /*#__PURE__*/_jsx(ScrollView, {
     horizontal: true,
     showsHorizontalScrollIndicator: Platform.OS !== 'web',
-    style: styles.scrollView,
-    children: /*#__PURE__*/_jsx(View, {
-      onStartShouldSetResponder: () => true,
-      children: tokens.map((line, index) => renderLine(line, index))
-    })
+    style: [baseStyles.scrollView, stylesheet.editor],
+    contentContainerStyle: baseStyles.container,
+    children: tokens.map((line, index) => renderLine(line, index))
   });
 };
 export default SyntaxHighlighter;

package/lib/module/components/syntax/SyntaxHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","Platform","ScrollView","StyleSheet","Text","View","useSyntaxHighlighter","getRNStylesFromShikiStyle","jsx","_jsx","monospaceFont","select","ios","android","default","styles","create","scrollView","flex","minHeight","lineContainer","flexDirection","flexWrap","SyntaxHighlighter","text","language","languageId","theme","console","log","stylesheet","tokens","renderToken","token","index","lineIndex","tokenScopes","Array","isArray","scope","tokenStylesArray","map","combinedStyles","flatten","fontFamily","color","fontStyle","italic","fontWeight","bold","content","style","children","replace","renderLine","line","tokenIndex","horizontal","showsHorizontalScrollIndicator","OS","onStartShouldSetResponder"],"sourceRoot":"../../../../src","sources":["components/syntax/SyntaxHighlighter.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","Platform","ScrollView","StyleSheet","Text","View","useSyntaxHighlighter","getRNStylesFromShikiStyle","jsx","_jsx","monospaceFont","select","ios","android","default","getThemeRegistration","theme","baseStyles","create","scrollView","flex","minHeight","lineContainer","flexDirection","flexWrap","paddingHorizontal","paddingVertical","token","fontFamily","fontSize","container","SyntaxHighlighter","text","language","languageId","stylesheet","themeRegistration","styles","editor","backgroundColor","colors","color","tokens","renderToken","index","lineIndex","tokenScopes","Array","isArray","scope","forEach","push","tokenStyles","fontStyle","fontWeight","Object","keys","length","finalStyle","flatten","style","children","content","replace","renderLine","line","map","tokenIndex","horizontal","showsHorizontalScrollIndicator","OS","contentContainerStyle"],"sourceRoot":"../../../../src","sources":["components/syntax/SyntaxHighlighter.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/syntax/highlighter.js

@@ -12,7 +12,7 @@ async function initializeHighlighter(langs, themes) {
     return await createHighlighterCore({
       langs,
       themes,
-      engine
+      engine // Pass the configured engine
     });
   } catch (err) {
     console.error('Error initializing highlighter:', err);

package/lib/module/syntax/highlighter.js.map

@@ -1 +1 @@
-{"version":3,"names":["createHighlighterCore","createJavaScriptRegexEngine","engine","forgiving","simulation","cache","Map","initializeHighlighter","langs","themes","err","console","error","createHighlighter","length","Error","highlighter","processTokens","tokens","map","token","content","color","fontStyle","toString"],"sourceRoot":"../../../src","sources":["syntax/highlighter.ts"],"mappings":";;AAEA,SAASA,qBAAqB,QAAQ,qBAAqB;AAC3D,SAASC,2BAA2B,QAAQ,kCAAkC;AAE9E,MAAMC,MAAM,GAAGD,2BAA2B,CAAC;EACzCE,SAAS,EAAE,IAAI;EACfC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAE,IAAIC,GAAG,CAAC;AACjB,CAAC,CAAC;AAEF,eAAeC,qBAAqBA,CAACC,KAAsB,EAAEC,MAAoB,EAAE;EACjF,IAAI;IACF,OAAO,MAAMT,qBAAqB,CAAC;MACjCQ,KAAK;MACLC,MAAM;MACNP;IACF,CAAC,CAAC;EACJ,CAAC,CACD,OAAOQ,GAAG,EAAE;IACVC,OAAO,CAACC,KAAK,CAAC,iCAAiC,EAAEF,GAAG,CAAC;IACrD,MAAMA,GAAG;EACX;AACF;AAEA,OAAO,eAAeG,iBAAiBA,CAAC;EAAEL,KAAK;EAAEC;AAAyD,CAAC,EAAE;EAC3G,IAAI,CAACD,KAAK,EAAEM,MAAM,EAAE;IAClB,MAAM,IAAIC,KAAK,CAAC,uDAAuD,CAAC;EAC1E;EAEA,IAAI;IACF,MAAMC,WAAW,GAAG,MAAMT,qBAAqB,CAACC,KAAK,EAAEC,MAAM,CAAC;IAC9D,OAAOO,WAAW;EACpB,CAAC,CACD,OAAOJ,KAAK,EAAE;IACZD,OAAO,CAACC,KAAK,CAAC,+BAA+B,EAAEA,KAAK,CAAC;IACrD,MAAMA,KAAK;EACb;AACF;AAEA,OAAO,SAASK,aAAaA,CAACC,MAAqB,EAAe;EAChE,OAAOA,MAAM,CAACC,GAAG,CAACC,KAAK,KAAK;IAC1BC,OAAO,EAAED,KAAK,CAACC,OAAO;IACtBC,KAAK,EAAEF,KAAK,CAACE,KAAK,IAAI,SAAS;IAC/BC,SAAS,EAAEH,KAAK,CAACG,SAAS,EAAEC,QAAQ,CAAC;EACvC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["createHighlighterCore","createJavaScriptRegexEngine","engine","forgiving","simulation","cache","Map","initializeHighlighter","langs","themes","err","console","error","createHighlighter","length","Error","highlighter","processTokens","tokens","map","token","content","color","fontStyle","toString"],"sourceRoot":"../../../src","sources":["syntax/highlighter.ts"],"mappings":";;AAEA,SAASA,qBAAqB,QAAQ,qBAAqB;AAC3D,SAASC,2BAA2B,QAAQ,kCAAkC;AAE9E,MAAMC,MAAM,GAAGD,2BAA2B,CAAC;EACzCE,SAAS,EAAE,IAAI;EACfC,UAAU,EAAE,IAAI;EAChBC,KAAK,EAAE,IAAIC,GAAG,CAAC;AACjB,CAAC,CAAC;AAEF,eAAeC,qBAAqBA,CAACC,KAAsB,EAAEC,MAAoB,EAAE;EACjF,IAAI;IACF,OAAO,MAAMT,qBAAqB,CAAC;MACjCQ,KAAK;MACLC,MAAM;MACNP,MAAM,CAAE;IACV,CAAC,CAAC;EACJ,CAAC,CACD,OAAOQ,GAAG,EAAE;IACVC,OAAO,CAACC,KAAK,CAAC,iCAAiC,EAAEF,GAAG,CAAC;IACrD,MAAMA,GAAG;EACX;AACF;AAEA,OAAO,eAAeG,iBAAiBA,CAAC;EAAEL,KAAK;EAAEC;AAAyD,CAAC,EAAE;EAC3G,IAAI,CAACD,KAAK,EAAEM,MAAM,EAAE;IAClB,MAAM,IAAIC,KAAK,CAAC,uDAAuD,CAAC;EAC1E;EAEA,IAAI;IACF,MAAMC,WAAW,GAAG,MAAMT,qBAAqB,CAACC,KAAK,EAAEC,MAAM,CAAC;IAC9D,OAAOO,WAAW;EACpB,CAAC,CACD,OAAOJ,KAAK,EAAE;IACZD,OAAO,CAACC,KAAK,CAAC,+BAA+B,EAAEA,KAAK,CAAC;IACrD,MAAMA,KAAK;EACb;AACF;AAEA,OAAO,SAASK,aAAaA,CAACC,MAAqB,EAAe;EAChE,OAAOA,MAAM,CAACC,GAAG,CAACC,KAAK,KAAK;IAC1BC,OAAO,EAAED,KAAK,CAACC,OAAO;IACtBC,KAAK,EAAEF,KAAK,CAACE,KAAK,IAAI,SAAS;IAC/BC,SAAS,EAAEH,KAAK,CAACG,SAAS,EAAEC,QAAQ,CAAC;EACvC,CAAC,CAAC,CAAC;AACL","ignoreList":[]}

package/lib/module/utils/style-transformer.js

@@ -1,22 +1,25 @@
 "use strict";
 
-import transform from 'css-to-react-native';
-// Helper function to convert hex color to RGB
 function hexToRgb(hex) {
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  // Remove # if present
+  hex = hex.replace(/^#/, '');
+
+  // Handle both 3 and 6 digit hex
+  if (hex.length === 3) {
+    hex = `${hex[0]}${hex[0]}${hex[1]}${hex[1]}${hex[2]}${hex[2]}`;
+  }
+  const result = /^([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
   return result ? {
     r: Number.parseInt(result[1], 16),
     g: Number.parseInt(result[2], 16),
     b: Number.parseInt(result[3], 16)
   } : null;
 }
-
-// Helper function to normalize color values
 function normalizeColor(color) {
   if (!color) return 'transparent';
 
-  // Type guard to ensure color is string before we call string methods
-  if (typeof color === 'string' && color.startsWith('#')) {
+  // Handle hex colors
+  if (color.startsWith('#')) {
     const rgb = hexToRgb(color);
     if (rgb) {
       return `rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`;
@@ -25,67 +28,71 @@ function normalizeColor(color) {
   return color;
 }
 export function convertTokenColorsToReactStyle(tokenColors) {
+  if (!tokenColors) return {};
   const styleMap = {};
-
-  // Add default styles
-  styleMap.default = {
-    color: '#e1e4e8',
-    backgroundColor: 'transparent'
-  };
   tokenColors.forEach(token => {
-    if (!token.settings || !token.scope) return;
-    const scopes = Array.isArray(token.scope) ? token.scope : [token.scope];
-    const styleEntries = [];
+    if (!token.settings) return;
 
-    // Only add styles if they exist
+    // Handle global theme settings
+    if (!token.scope) {
+      styleMap.default = {
+        color: normalizeColor(token.settings.foreground),
+        backgroundColor: normalizeColor(token.settings.background)
+      };
+      return;
+    }
+    const scopes = Array.isArray(token.scope) ? token.scope : [token.scope];
+    const style = {};
     if (token.settings.foreground) {
-      styleEntries.push(['color', normalizeColor(token.settings.foreground)]);
+      style.color = normalizeColor(token.settings.foreground);
     }
     if (token.settings.background) {
-      styleEntries.push(['backgroundColor', normalizeColor(token.settings.background)]);
+      style.backgroundColor = normalizeColor(token.settings.background);
     }
     if (token.settings.fontStyle) {
       if (token.settings.fontStyle.includes('italic')) {
-        styleEntries.push(['fontStyle', 'italic']);
+        style.fontStyle = 'italic';
       }
       if (token.settings.fontStyle.includes('bold')) {
-        styleEntries.push(['fontWeight', 'bold']);
+        style.fontWeight = 'bold';
       }
     }
-    if (styleEntries.length > 0) {
-      const transformedStyle = transform(styleEntries);
-      scopes.forEach(scope => {
-        if (typeof scope === 'string') {
-          styleMap[scope] = {
-            ...(styleMap[scope] || {}),
-            ...transformedStyle
-          };
-        }
-      });
-    }
+    scopes.forEach(scope => {
+      styleMap[scope] = {
+        ...(styleMap[scope] || {}),
+        ...style
+      };
+    });
   });
   return styleMap;
 }
 export function getRNStylesFromShikiStyle(theme) {
-  if (!theme || !theme.tokenColors) {
-    console.error('Provided theme does not contain \'tokenColors\'.');
-    return {};
-  }
+  if (!theme) return {};
   try {
-    // Convert theme colors to React Native styles
-    const styles = convertTokenColorsToReactStyle(theme.tokenColors);
+    const styles = {
+      editor: {
+        backgroundColor: normalizeColor(theme.colors?.['editor.background'])
+      },
+      base: {
+        color: normalizeColor(theme.colors?.['editor.foreground'])
+      }
+    };
 
-    // Add theme-specific base styles if they exist
-    if (theme.colors) {
-      styles.base = {
-        color: normalizeColor(theme.colors['editor.foreground']),
-        backgroundColor: normalizeColor(theme.colors['editor.background'])
-      };
+    // Process token colors
+    if (theme.tokenColors) {
+      const tokenStyles = convertTokenColorsToReactStyle(theme.tokenColors);
+      Object.assign(styles, tokenStyles);
     }
     return styles;
   } catch {
-    console.error('Error converting theme styles');
-    return {};
+    return {
+      editor: {
+        backgroundColor: '#1e1e1e'
+      },
+      base: {
+        color: '#d4d4d4'
+      }
+    };
   }
 }
 //# sourceMappingURL=style-transformer.js.map

package/lib/module/utils/style-transformer.js.map

@@ -1 +1 @@
-{"version":3,"names":["transform","hexToRgb","hex","result","exec","r","Number","parseInt","g","b","normalizeColor","color","startsWith","rgb","convertTokenColorsToReactStyle","tokenColors","styleMap","default","backgroundColor","forEach","token","settings","scope","scopes","Array","isArray","styleEntries","foreground","push","background","fontStyle","includes","length","transformedStyle","getRNStylesFromShikiStyle","theme","console","error","styles","colors","base"],"sourceRoot":"../../../src","sources":["utils/style-transformer.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["hexToRgb","hex","replace","length","result","exec","r","Number","parseInt","g","b","normalizeColor","color","startsWith","rgb","convertTokenColorsToReactStyle","tokenColors","styleMap","forEach","token","settings","scope","default","foreground","backgroundColor","background","scopes","Array","isArray","style","fontStyle","includes","fontWeight","getRNStylesFromShikiStyle","theme","styles","editor","colors","base","tokenStyles","Object","assign"],"sourceRoot":"../../../src","sources":["utils/style-transformer.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/components/syntax/SyntaxHighlighter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SyntaxHighlighter.d.ts","sourceRoot":"","sources":["../../../../src/components/syntax/SyntaxHighlighter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,KAAkB,MAAM,OAAO,CAAA;AAsBtC,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAqDvD,CAAA;AAED,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"SyntaxHighlighter.d.ts","sourceRoot":"","sources":["../../../../src/components/syntax/SyntaxHighlighter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AAC7D,OAAO,KAAkB,MAAM,OAAO,CAAA;AAoDtC,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAuEvD,CAAA;AAED,eAAe,iBAAiB,CAAA"}

package/lib/typescript/utils/style-transformer.d.ts

@@ -1,8 +1,9 @@
 import type { TextStyle } from 'react-native';
+import type { ThemeRegistration } from 'shiki';
 export interface HighlighterStyleSheet {
     [key: string]: TextStyle;
 }
 export type ReactStyle = Record<string, TextStyle>;
-export declare function convertTokenColorsToReactStyle(tokenColors: any[]): ReactStyle;
-export declare function getRNStylesFromShikiStyle(theme: any): HighlighterStyleSheet;
+export declare function convertTokenColorsToReactStyle(tokenColors: ThemeRegistration['tokenColors']): ReactStyle;
+export declare function getRNStylesFromShikiStyle(theme: ThemeRegistration): HighlighterStyleSheet;
 //# sourceMappingURL=style-transformer.d.ts.map

package/lib/typescript/utils/style-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/style-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG7C,MAAM,WAAW,qBAAqB;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AA6BlD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,UAAU,CA4C7E;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,GAAG,GAAG,qBAAqB,CAwB3E"}
+{"version":3,"file":"style-transformer.d.ts","sourceRoot":"","sources":["../../../src/utils/style-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAE9C,MAAM,WAAW,qBAAqB;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAoClD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,iBAAiB,CAAC,aAAa,CAAC,GAAG,UAAU,CA2CxG;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,GAAG,qBAAqB,CA4BzF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rn-shiki",
   "type": "module",
-  "version": "0.0.37-26",
+  "version": "0.0.37-28",
   "description": "Shiki syntax highlighter for React Native.",
   "author": "Ryan Skinner <hello@ryanskinner.com>",
   "license": "MIT",

package/src/components/syntax/SyntaxHighlighter.tsx

@@ -1,4 +1,5 @@
 import type { ColorValue, StyleProp, TextStyle } from 'react-native'
+import type { ThemeInput, ThemeRegistration } from 'shiki'
 import type { SyntaxHighlighterProps } from 'src/types/shiki'
 import React, { useMemo } from 'react'
 import { Platform, ScrollView, StyleSheet, Text, View } from 'react-native'
@@ -24,14 +25,12 @@ interface Styles {
 
 type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'
 
-interface ThemeColors {
-  'editor.background'?: string
-  'editor.foreground'?: string
-}
-
-interface Theme {
-  colors?: ThemeColors
-  tokenColors?: any[]
+// Helper function to extract theme registration from Shiki theme input
+function getThemeRegistration(theme: ThemeInput): ThemeRegistration {
+  if ('default' in theme) {
+    return theme.default
+  }
+  return theme as ThemeRegistration
 }
 
 const baseStyles = StyleSheet.create({
@@ -54,24 +53,19 @@ const baseStyles = StyleSheet.create({
   },
 })
 
-const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({
-  text,
-  language,
-  languageId,
-  theme,
-  fontSize = 14,
-}) => {
+const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, languageId, theme, fontSize = 14 }) => {
   const stylesheet = useMemo(() => {
-    const styles = getRNStylesFromShikiStyle(theme as Theme)
+    const themeRegistration = getThemeRegistration(theme)
+    const styles = getRNStylesFromShikiStyle(themeRegistration)
     return StyleSheet.create<Styles>({
       ...styles,
       editor: {
-        backgroundColor: (theme as Theme).colors?.['editor.background'] || '#1e1e1e',
+        backgroundColor: themeRegistration.colors?.['editor.background'] || '#1e1e1e',
       },
       token: {
         ...baseStyles.token,
         fontSize,
-        color: (theme as Theme).colors?.['editor.foreground'] || '#d4d4d4',
+        color: themeRegistration.colors?.['editor.foreground'] || '#d4d4d4',
       },
     })
   }, [theme, fontSize])
@@ -126,12 +120,7 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({
   )
 
   return (
-    <ScrollView
-      horizontal
-      showsHorizontalScrollIndicator={Platform.OS !== 'web'}
-      style={[baseStyles.scrollView, stylesheet.editor]}
-      contentContainerStyle={baseStyles.container}
-    >
+    <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={[baseStyles.scrollView, stylesheet.editor]} contentContainerStyle={baseStyles.container}>
       {tokens.map((line, index) => renderLine(line, index))}
     </ScrollView>
   )

package/src/syntax/highlighter.ts

@@ -14,7 +14,7 @@ async function initializeHighlighter(langs: LanguageInput[], themes: ThemeInput[
     return await createHighlighterCore({
       langs,
       themes,
-      engine,
+      engine, // Pass the configured engine
     })
   }
   catch (err) {

package/src/utils/style-transformer.ts

@@ -1,4 +1,5 @@
 import type { TextStyle } from 'react-native'
+import type { ThemeRegistration } from 'shiki'
 
 export interface HighlighterStyleSheet {
   [key: string]: TextStyle
@@ -6,7 +7,6 @@ export interface HighlighterStyleSheet {
 
 export type ReactStyle = Record<string, TextStyle>
 
-// Helper function to convert hex color to RGB
 function hexToRgb(hex: string): { r: number, g: number, b: number } | null {
   // Remove # if present
   hex = hex.replace(/^#/, '')
@@ -27,9 +27,8 @@ function hexToRgb(hex: string): { r: number, g: number, b: number } | null {
 }
 
 function normalizeColor(color: string | undefined): string {
-  if (!color) {
+  if (!color)
     return 'transparent'
-  }
 
   // Handle hex colors
   if (color.startsWith('#')) {
@@ -39,23 +38,14 @@ function normalizeColor(color: string | undefined): string {
     }
   }
 
-  // Handle rgb/rgba
-  if (color.startsWith('rgb')) {
-    return color
-  }
-
-  // Handle named colors
   return color
 }
 
-export function convertTokenColorsToReactStyle(tokenColors: any[]): ReactStyle {
-  const styleMap: ReactStyle = {}
+export function convertTokenColorsToReactStyle(tokenColors: ThemeRegistration['tokenColors']): ReactStyle {
+  if (!tokenColors)
+    return {}
 
-  // Add default styles
-  styleMap.default = {
-    color: '#e1e4e8',
-    backgroundColor: 'transparent',
-  }
+  const styleMap: ReactStyle = {}
 
   tokenColors.forEach((token) => {
     if (!token.settings)
@@ -63,11 +53,9 @@ export function convertTokenColorsToReactStyle(tokenColors: any[]): ReactStyle {
 
     // Handle global theme settings
     if (!token.scope) {
-      if (token.settings.foreground) {
-        styleMap.default!.color = normalizeColor(token.settings.foreground)
-      }
-      if (token.settings.background) {
-        styleMap.default!.backgroundColor = normalizeColor(token.settings.background)
+      styleMap.default = {
+        color: normalizeColor(token.settings.foreground),
+        backgroundColor: normalizeColor(token.settings.background),
       }
       return
     }
@@ -90,7 +78,7 @@ export function convertTokenColorsToReactStyle(tokenColors: any[]): ReactStyle {
       }
     }
 
-    scopes.forEach((scope: string) => {
+    scopes.forEach((scope) => {
       styleMap[scope] = { ...(styleMap[scope] || {}), ...style }
     })
   })
@@ -98,38 +86,24 @@ export function convertTokenColorsToReactStyle(tokenColors: any[]): ReactStyle {
   return styleMap
 }
 
-interface ThemeColors {
-  'editor.background'?: string
-  'editor.foreground'?: string
-  [key: string]: string | undefined
-}
-
-interface Theme {
-  colors?: ThemeColors
-  tokenColors?: any[]
-}
-
-export function getRNStylesFromShikiStyle(theme: Theme): HighlighterStyleSheet {
-  if (!theme) {
+export function getRNStylesFromShikiStyle(theme: ThemeRegistration): HighlighterStyleSheet {
+  if (!theme)
     return {}
-  }
 
   try {
-    const styles: HighlighterStyleSheet = {}
-
-    // Convert token colors
-    if (theme.tokenColors) {
-      Object.assign(styles, convertTokenColorsToReactStyle(theme.tokenColors))
+    const styles: HighlighterStyleSheet = {
+      editor: {
+        backgroundColor: normalizeColor(theme.colors?.['editor.background']),
+      },
+      base: {
+        color: normalizeColor(theme.colors?.['editor.foreground']),
+      },
     }
 
-    // Add theme-specific editor styles
-    if (theme.colors) {
-      styles.editor = {
-        backgroundColor: normalizeColor(theme.colors['editor.background']),
-      }
-      styles.base = {
-        color: normalizeColor(theme.colors['editor.foreground']),
-      }
+    // Process token colors
+    if (theme.tokenColors) {
+      const tokenStyles = convertTokenColorsToReactStyle(theme.tokenColors)
+      Object.assign(styles, tokenStyles)
     }
 
     return styles