rn-shiki 0.0.37-21 → 0.0.37-22

package/package.json

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

package/src/components/syntax/SyntaxHighlighter.tsx

@@ -1,3 +1,4 @@
+import type { ColorValue, StyleProp, TextStyle, ViewStyle } from 'react-native'
 import type { SyntaxHighlighterProps } from 'src/types/shiki'
 import type { ReactStyle } from '../../utils/style-transformer'
 import React, { useMemo } from 'react'
@@ -11,7 +12,14 @@ const monospaceFont = Platform.select({
   default: 'monospace',
 })
 
-const styles = StyleSheet.create({
+interface Styles {
+  scrollView: ViewStyle
+  lineContainer: ViewStyle
+  token: TextStyle
+  container: ViewStyle
+}
+
+const baseStyles = StyleSheet.create<Styles>({
   scrollView: {
     flex: 1,
     minHeight: 20,
@@ -20,14 +28,27 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     flexWrap: 'wrap',
   },
+  token: {
+    fontFamily: monospaceFont,
+  },
+  container: {
+    flex: 1,
+  },
 })
 
+type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'
+
+interface TokenStyle extends Omit<TextStyle, 'color' | 'fontWeight'> {
+  color?: ColorValue
+  fontStyle?: 'normal' | 'italic'
+  fontWeight?: FontWeight
+  fontFamily?: string
+}
+
 const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, languageId, theme }) => {
-  console.log('theme:', theme)
   const stylesheet = useMemo(() => {
     const styles = getRNStylesFromShikiStyle(theme as ReactStyle)
-    console.log('Generated stylesheet:', styles)
-    return styles
+    return StyleSheet.create(styles)
   }, [theme])
 
   const { tokens } = useSyntaxHighlighter({
@@ -38,20 +59,35 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
   })
 
   const renderToken = (token: any, index: number, lineIndex: number) => {
-    // Ensure to collect all styles associated with the token's scopes
+    const styles: StyleProp<TokenStyle>[] = [baseStyles.token]
+
+    if (stylesheet.base) {
+      styles.push(stylesheet.base as unknown as TokenStyle)
+    }
+
     const tokenScopes = Array.isArray(token.scope) ? token.scope : [token.scope]
-    const tokenStylesArray = tokenScopes.map((scope: string) => 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: string) => {
+      if (stylesheet[scope]) {
+        styles.push(stylesheet[scope] as unknown as TokenStyle)
+      }
+    })
+
+    const tokenStyles: TokenStyle = {}
+    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 combinedStyles = StyleSheet.flatten(styles)
 
     return (
       <Text key={`${lineIndex}-${index}`} style={combinedStyles}>
@@ -60,19 +96,17 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
     )
   }
 
-  // In the renderLine and renderToken flow
-  const renderLine = (line: any[], lineIndex: number) => {
-    console.log(`Rendering line ${lineIndex}:`, line)
-    return (
-      <View key={lineIndex} style={styles.lineContainer}>
-        {line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))}
-      </View>
-    )
-  }
+  const renderLine = (line: any[], lineIndex: number) => (
+    <View key={lineIndex} style={baseStyles.lineContainer}>
+      {line.map((token, tokenIndex) => renderToken(token, tokenIndex, lineIndex))}
+    </View>
+  )
 
   return (
-    <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={styles.scrollView}>
-      <View onStartShouldSetResponder={() => true}>{tokens.map((line, index) => renderLine(line, index))}</View>
+    <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={[baseStyles.scrollView, stylesheet.base as unknown as TokenStyle]}>
+      <View style={baseStyles.container} onStartShouldSetResponder={() => true}>
+        {tokens.map((line, index) => renderLine(line, index))}
+      </View>
     </ScrollView>
   )
 }