fixed issue with bold copy

mientjan · mientjan · commit cbe0d9bfca82 · 2018-06-04T12:35:37.000+02:00
#39
diff --git a/example/App.js b/example/App.js
@@ -128,43 +128,9 @@ const initialLayout = {
 export default class App extends Component {
   state = {
     index: 0,
-    routes: [{ key: 'all', title: 'All Markdown' }, { key: 'linkedimg', title: 'Linked Images' }],
+    routes: [{ key: 'linkedimg', title: 'Linked Images' }],
   };
 
-  getView(value) {
-    switch (value) {
-      case 0: {
-        return <Markdown children={copyAll} />;
-      }
-      case 1: {
-        return <Markdown renderer={renderer.render} children={copyAll} />;
-      }
-      case 2: {
-        return <Markdown style={customMarkdownStyle} children={copyAll} />;
-      }
-      case 3: {
-        return <Markdown rules={rules} children={copyAll} />;
-      }
-      case 4: {
-        return <Markdown rules={rules} style={customMarkdownStyle} children={copyAll} />;
-      }
-      case 5: {
-        return (
-          <Markdown
-            rules={pluginRules}
-            plugins={[new PluginContainer(markdownItCheckbox, { divWrap: true })]}
-            style={customMarkdownStyle}
-            children={copyAllCheckboxPlugin}
-          />
-        );
-      }
-
-      default: {
-        return <Markdown># Text</Markdown>;
-      }
-    }
-  }
-
   handleChangeValue = (itemValue, itemIndex) => {
     this.setState({ view: itemIndex });
   };
diff --git a/example/react-native-markdown-renderer/lib/parser.js b/example/react-native-markdown-renderer/lib/parser.js
@@ -16,8 +16,6 @@ export function parser(source, renderer, markdownIt) {
 
   let tokens = stringToTokens(source, markdownIt);
   tokens = cleanupTokens(tokens);
-
-  // console.log(JSON.stringify(tokens));
   tokens = groupTextTokens(tokens);
 
   const astTree = tokensToAST(tokens);
diff --git a/example/react-native-markdown-renderer/lib/renderRules.js b/example/react-native-markdown-renderer/lib/renderRules.js
@@ -29,13 +29,16 @@ const renderRules = {
   },
 
   text: (node, children, parent, styles) => {
+    console.log('text', node.content);
+    console.log('parent', parent);
     return <Text key={node.key}>{node.content}</Text>;
   },
   span: (node, children, parent, styles) => {
     return <Text key={node.key}>{children}</Text>;
   },
 
   strong: (node, children, parent, styles) => {
+    console.log('strong', children);
     return (
       <Text key={node.key} style={styles.strong}>
         {children}
diff --git a/example/react-native-markdown-renderer/lib/util/Token.js b/example/react-native-markdown-renderer/lib/util/Token.js
@@ -1,8 +1,8 @@
 export default class Token {
-  constructor(type, nesting = 0, children = null) {
+  constructor(type, nesting = 0, children = null, block = false) {
     this.type = type;
     this.nesting = nesting;
     this.children = children;
-    this.block = false;
+    this.block = block;
   }
 }
diff --git a/example/react-native-markdown-renderer/lib/util/groupTextTokens.js b/example/react-native-markdown-renderer/lib/util/groupTextTokens.js
@@ -12,9 +12,7 @@ export default function groupTextTokens(tokens) {
       result.push(new Token('textgroup', 1));
       result.push(token);
     } else if (!token.block && hasGroup) {
-      hasGroup = false;
       result.push(token);
-      result.push(new Token('textgroup', -1));
     } else if (token.block && hasGroup) {
       hasGroup = false;
       result.push(new Token('textgroup', -1));
diff --git a/example/react-native-markdown-renderer/lib/util/tokensToAST.js b/example/react-native-markdown-renderer/lib/util/tokensToAST.js
@@ -3,7 +3,7 @@ import getTokenTypeByToken from './getTokenTypeByToken';
 
 /**
  *
- * @param {{type: string, tag:string, content: string, children: *, attrs: Array, meta, info}} token
+ * @param {{type: string, tag:string, content: string, children: *, attrs: Array, meta, info, block: boolean}} token
  * @param {number} tokenIndex
  * @return {{type: string, content, tokenIndex: *, index: number, attributes: {}, children: *}}
  */
@@ -25,6 +25,7 @@ function createNode(token, tokenIndex) {
     sourceType: token.type,
     sourceInfo: token.info,
     sourceMeta: token.meta,
+    block: token.block,
     key: getUniqueID(),
     content,
     tokenIndex,
diff --git a/example/src/copy/all.js b/example/src/copy/all.js
@@ -4,6 +4,8 @@ foo
  
 # code inline
 
+**Foo  Bar**
+
 Hello \`code inline\` code_inline
 
 __Advertisement :)__
diff --git a/example/src/copy/linkedimg.js b/example/src/copy/linkedimg.js
@@ -1,4 +1,7 @@
+
 const copy = `
+**test**
+
 ## Linked Images
 [![Minion](https://octodex.github.com/images/minion.png)](https://google.com)
 [![Stormtroopocat](https://octodex.github.com/images/stormtroopocat.png)](https://google.com)
diff --git a/src/lib/parser.js b/src/lib/parser.js
@@ -16,8 +16,6 @@ export function parser(source, renderer, markdownIt) {
 
   let tokens = stringToTokens(source, markdownIt);
   tokens = cleanupTokens(tokens);
-
-  // console.log(JSON.stringify(tokens));
   tokens = groupTextTokens(tokens);
 
   const astTree = tokensToAST(tokens);
diff --git a/src/lib/renderRules.js b/src/lib/renderRules.js
@@ -29,13 +29,16 @@ const renderRules = {
   },
 
   text: (node, children, parent, styles) => {
+    console.log('text', node.content);
+    console.log('parent', parent);
     return <Text key={node.key}>{node.content}</Text>;
   },
   span: (node, children, parent, styles) => {
     return <Text key={node.key}>{children}</Text>;
   },
 
   strong: (node, children, parent, styles) => {
+    console.log('strong', children);
     return (
       <Text key={node.key} style={styles.strong}>
         {children}
diff --git a/src/lib/util/Token.js b/src/lib/util/Token.js
@@ -1,9 +1,8 @@
 export default class Token {
-  constructor(type, nesting = 0, children = null) {
+  constructor(type, nesting = 0, children = null, block = false) {
     this.type = type;
     this.nesting = nesting;
     this.children = children;
-    this.block = false;
-
+    this.block = block;
   }
 }
diff --git a/src/lib/util/groupTextTokens.js b/src/lib/util/groupTextTokens.js
@@ -12,9 +12,7 @@ export default function groupTextTokens(tokens) {
       result.push(new Token('textgroup', 1));
       result.push(token);
     } else if (!token.block && hasGroup) {
-      hasGroup = false;
       result.push(token);
-      result.push(new Token('textgroup', -1));
     } else if (token.block && hasGroup) {
       hasGroup = false;
       result.push(new Token('textgroup', -1));
diff --git a/src/lib/util/tokensToAST.js b/src/lib/util/tokensToAST.js
@@ -3,7 +3,7 @@ import getTokenTypeByToken from './getTokenTypeByToken';
 
 /**
  *
- * @param {{type: string, tag:string, content: string, children: *, attrs: Array, meta, info}} token
+ * @param {{type: string, tag:string, content: string, children: *, attrs: Array, meta, info, block: boolean}} token
  * @param {number} tokenIndex
  * @return {{type: string, content, tokenIndex: *, index: number, attributes: {}, children: *}}
  */
@@ -25,6 +25,7 @@ function createNode(token, tokenIndex) {
     sourceType: token.type,
     sourceInfo: token.info,
     sourceMeta: token.meta,
+    block: token.block,
     key: getUniqueID(),
     content,
     tokenIndex,

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`export default class Token {`
`2`		`- constructor(type, nesting = 0, children = null) {`
	`2`	`+ constructor(type, nesting = 0, children = null, block = false) {`
`3`	`3`	`this.type = type;`
`4`	`4`	`this.nesting = nesting;`
`5`	`5`	`this.children = children;`
`6`		`- this.block = false;`
	`6`	`+ this.block = block;`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`export default class Token {`
`2`		`- constructor(type, nesting = 0, children = null) {`
	`2`	`+ constructor(type, nesting = 0, children = null, block = false) {`
`3`	`3`	`this.type = type;`
`4`	`4`	`this.nesting = nesting;`
`5`	`5`	`this.children = children;`
`6`		`- this.block = false;`
`7`		`-`
	`6`	`+ this.block = block;`
`8`	`7`	`}`
`9`	`8`	`}`