rn-shiki 0.0.37-23 → 0.0.37-24

package/package.json

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

package/src/components/syntax/SyntaxHighlighter.tsx

@@ -1,4 +1,4 @@
-import type { ColorValue, StyleProp, TextStyle } from 'react-native'
+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'
@@ -12,49 +12,44 @@ const monospaceFont = Platform.select({
   default: 'monospace',
 })
 
-interface TokenStyle extends Omit<TextStyle, 'color'> {
-  color?: ColorValue
-  fontFamily?: string
-}
-
-interface ThemeStyles {
-  token: TokenStyle
-  [key: string]: TokenStyle
+interface Styles {
+  scrollView: ViewStyle
+  lineContainer: ViewStyle
+  token: TextStyle
+  container: ViewStyle
 }
 
-const baseStyles = StyleSheet.create({
+const baseStyles = StyleSheet.create<Styles>({
   scrollView: {
     flex: 1,
     minHeight: 20,
-    backgroundColor: '#24292e', // GitHub Dark default background
   },
   lineContainer: {
     flexDirection: 'row',
     flexWrap: 'wrap',
-    paddingHorizontal: 16,
-    paddingVertical: 8,
   },
   token: {
     fontFamily: monospaceFont,
-    fontSize: 14,
-    color: '#e1e4e8', // GitHub Dark default text color
   },
   container: {
     flex: 1,
   },
 })
 
-const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, languageId, theme, fontSize = 14 }) => {
-  const styles = useMemo(() => {
-    const themeStyles = getRNStylesFromShikiStyle(theme as ReactStyle)
-    return StyleSheet.create<ThemeStyles>({
-      ...themeStyles,
-      token: {
-        ...baseStyles.token,
-        fontSize,
-      },
-    })
-  }, [theme, fontSize])
+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 }) => {
+  const stylesheet = useMemo(() => {
+    const styles = getRNStylesFromShikiStyle(theme as ReactStyle)
+    return StyleSheet.create(styles)
+  }, [theme])
 
   const { tokens } = useSyntaxHighlighter({
     text,
@@ -64,32 +59,38 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
   })
 
   const renderToken = (token: any, index: number, lineIndex: number) => {
-    // Start with the base token style
-    const tokenStyles: StyleProp<TokenStyle>[] = [styles.token]
+    const styles: StyleProp<TokenStyle>[] = [baseStyles.token]
+
+    if (stylesheet.base) {
+      styles.push(stylesheet.base as unknown as TokenStyle)
+    }
 
-    // Add token-specific styles from stylesheet based on scope
     const tokenScopes = Array.isArray(token.scope) ? token.scope : [token.scope]
     tokenScopes.forEach((scope: string) => {
-      if (styles[scope]) {
-        tokenStyles.push(styles[scope])
+      if (stylesheet[scope]) {
+        styles.push(stylesheet[scope] as unknown as TokenStyle)
       }
     })
 
-    // Add token-specific styles from the token itself
+    const tokenStyles: TokenStyle = {}
     if (token.color) {
-      tokenStyles.push({ color: token.color })
+      tokenStyles.color = token.color
     }
     if (token.fontStyle === 'italic') {
-      tokenStyles.push({ fontStyle: 'italic' })
+      tokenStyles.fontStyle = 'italic'
     }
     if (token.fontWeight === 'bold') {
-      tokenStyles.push({ fontWeight: 'bold' })
+      tokenStyles.fontWeight = 'bold'
+    }
+
+    if (Object.keys(tokenStyles).length > 0) {
+      styles.push(tokenStyles)
     }
 
-    const finalStyle = StyleSheet.flatten(tokenStyles)
+    const combinedStyles = StyleSheet.flatten(styles)
 
     return (
-      <Text key={`${lineIndex}-${index}`} style={finalStyle}>
+      <Text key={`${lineIndex}-${index}`} style={combinedStyles}>
         {token.content.replace(/ /g, '\u00A0')}
       </Text>
     )
@@ -102,8 +103,10 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
   )
 
   return (
-    <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={baseStyles.scrollView} contentContainerStyle={baseStyles.container}>
-      {tokens.map((line, index) => renderLine(line, index))}
+    <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>
   )
 }