rn-shiki 0.0.37-30 → 0.0.37-34

Sign up to get free protection for your applications and to get access to all the features.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "rn-shiki",
3
3
  "type": "module",
4
- "version": "0.0.37-30",
4
+ "version": "0.0.37-34",
5
5
  "description": "Shiki syntax highlighter for React Native.",
6
6
  "author": "Ryan Skinner <hello@ryanskinner.com>",
7
7
  "license": "MIT",
@@ -34,26 +34,30 @@ const baseStyles = StyleSheet.create({
34
34
  minHeight: 20,
35
35
  backgroundColor: '#1e1e1e',
36
36
  },
37
+ contentContainer: {
38
+ flexGrow: 1,
39
+ minWidth: '100%',
40
+ },
41
+ codeContainer: {
42
+ paddingVertical: 8,
43
+ minWidth: '100%',
44
+ },
37
45
  lineContainer: {
38
46
  flexDirection: 'row',
39
- flexWrap: 'wrap',
40
47
  minWidth: '100%',
41
48
  paddingHorizontal: 16,
42
- paddingVertical: 4,
49
+ paddingVertical: 1,
50
+ },
51
+ line: {
52
+ flexDirection: 'row',
53
+ flexWrap: 'wrap',
54
+ flex: 1,
43
55
  },
44
56
  token: {
45
57
  fontFamily: monospaceFont,
46
58
  fontSize: 14,
47
59
  color: '#d4d4d4',
48
60
  },
49
- container: {
50
- paddingVertical: 8,
51
- },
52
- line: {
53
- flexDirection: 'row',
54
- flexWrap: 'wrap',
55
- width: '100%',
56
- },
57
61
  })
58
62
 
59
63
  const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, languageId, theme, fontSize = 14 }) => {
@@ -71,6 +75,15 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
71
75
  fontSize,
72
76
  color: themeRegistration.colors?.['editor.foreground'] || '#d4d4d4',
73
77
  },
78
+ lineNumber: {
79
+ width: 40,
80
+ paddingRight: 16,
81
+ textAlign: 'right',
82
+ color: themeRegistration.colors?.['editorLineNumber.foreground'] || '#858585',
83
+ fontFamily: monospaceFont,
84
+ fontSize,
85
+ opacity: 0.5,
86
+ },
74
87
  })
75
88
  }, [theme, fontSize])
76
89
 
@@ -84,16 +97,12 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
84
97
  const renderToken = (token: ThemedToken, index: number) => {
85
98
  const styles: StyleProp<TokenStyle>[] = [stylesheet.token]
86
99
 
87
- // Always apply the token color if it exists
88
100
  if (token.color) {
89
101
  styles.push({ color: token.color })
90
102
  }
91
103
 
92
- // Add font styles
93
104
  if (token.fontStyle) {
94
105
  styles.push({
95
- // fontStyle: token.fontStyle.includes('italic') ? 'italic' : 'normal',
96
- // fontWeight: token.fontStyle.includes('bold') ? 'bold' : 'normal',
97
106
  fontStyle: token.fontStyle as unknown as 'normal' | 'italic',
98
107
  fontWeight: (token.fontStyle as unknown as string).includes('bold') ? 'bold' : 'normal',
99
108
  })
@@ -107,15 +116,14 @@ const SyntaxHighlighter: React.FC<SyntaxHighlighterProps> = ({ text, language, l
107
116
  }
108
117
 
109
118
  const renderLine = (line: ThemedToken[], lineIndex: number) => (
110
- <View key={lineIndex} style={baseStyles.line}>
111
- {line.map((token, tokenIndex) => renderToken(token, tokenIndex))}
112
- <Text>{'\n'}</Text>
119
+ <View key={lineIndex} style={baseStyles.lineContainer}>
120
+ <View style={baseStyles.line}>{line.map((token, tokenIndex) => renderToken(token, tokenIndex))}</View>
113
121
  </View>
114
122
  )
115
123
 
116
124
  return (
117
- <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={[baseStyles.scrollView, stylesheet.editor]} contentContainerStyle={baseStyles.container}>
118
- <View>{tokens.map((line, index) => renderLine(line, index))}</View>
125
+ <ScrollView horizontal showsHorizontalScrollIndicator={Platform.OS !== 'web'} style={[baseStyles.scrollView, stylesheet.editor]} contentContainerStyle={baseStyles.contentContainer}>
126
+ <View style={baseStyles.codeContainer}>{tokens.map((line, index) => renderLine(line, index))}</View>
119
127
  </ScrollView>
120
128
  )
121
129
  }
@@ -55,7 +55,7 @@ export function getRNStylesFromShikiStyle(theme: ThemeRegistration): Highlighter
55
55
 
56
56
  return styles
57
57
  }
58
- catch (error) {
58
+ catch {
59
59
  return {
60
60
  editor: { backgroundColor: '#1e1e1e' },
61
61
  base: { color: '#d4d4d4' },