Skip to content

Commit 989806e

Browse files
Made linkTo nested and fixed nested linkTo code preview, added react-router to drag and drop panel, Co-authored-by: Ron Fu<[email protected]>
1 parent 908d5bd commit 989806e

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

app/src/helperFunctions/generateCode.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,16 @@ const generateUnformattedCode = (
5252
} else if (child.type === 'HTML Element') {
5353
const referencedHTML = HTMLTypes.find(elem => elem.id === child.typeId);
5454
child['tag'] = referencedHTML.tag;
55+
console.log(referencedHTML);
5556
if (
5657
referencedHTML.tag === 'div' ||
5758
referencedHTML.tag === 'separator' ||
5859
referencedHTML.tag === 'form' ||
5960
referencedHTML.tag === 'ul' ||
6061
referencedHTML.tag === 'ol' ||
6162
referencedHTML.tag === 'menu' ||
62-
referencedHTML.tag === 'li'
63+
referencedHTML.tag === 'li' ||
64+
referencedHTML.tag === 'Link'
6365
) {
6466
child.children = getEnrichedChildren(child);
6567
}
@@ -120,18 +122,18 @@ const generateUnformattedCode = (
120122
childElement.tag === 'ol' ||
121123
childElement.tag === 'ul' ||
122124
childElement.tag === 'menu' ||
123-
childElement.tag === 'li'||
124-
childElement.tag === 'Switch';
125+
childElement.tag === 'li';
125126

126127
if (childElement.tag === 'img') {
127128
return `${levelSpacer(level, 5)}<${childElement.tag} src="${activeLink}" ${elementTagDetails(childElement)}/>${levelSpacer(2, (3 + level))}`;
128129
} else if (childElement.tag === 'a') {
129130
return `${levelSpacer(level, 5)}<${childElement.tag} href="${activeLink}" ${elementTagDetails(childElement)}>${innerText}</${childElement.tag}>${levelSpacer(2, (3 + level))}`;
130-
}
131-
else if (childElement.tag === 'Link') {
132-
return `${levelSpacer(level, 5)}<${childElement.tag} to="${activeLink}" ${elementTagDetails(childElement)}>${innerText}</${childElement.tag}>${levelSpacer(2, (3 + level))}`;
133131
} else if (childElement.tag === 'input') {
134132
return `${levelSpacer(level, 5)}<${childElement.tag}${elementTagDetails(childElement)}></${childElement.tag}>${levelSpacer(2, (3 + level))}`;
133+
} else if (childElement.tag === 'Link') {
134+
return `${levelSpacer(level, 5)}<${childElement.tag} to="${activeLink}" ${elementTagDetails(childElement)}>${innerText}
135+
${tabSpacer(level)}${writeNestedElements(childElement.children, level + 1)}
136+
${tabSpacer(level - 1)}</${childElement.tag}>${levelSpacer(2, (3 + level))}`;
135137
} else if (nestable) {
136138
return `${levelSpacer(level, 5)}<${childElement.tag}${elementTagDetails(childElement)}>${innerText}
137139
${tabSpacer(level)}${writeNestedElements(childElement.children, level + 1)}
@@ -201,6 +203,8 @@ const generateUnformattedCode = (
201203

202204
// create final component code. component code differs between classic react, next.js, gatsby.js
203205
// classic react code
206+
207+
//import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom";
204208
if (projectType === 'Classic React') {
205209
return `
206210
${stateful && !classBased ? `import React, {useState} from 'react';` : ''}

0 commit comments

Comments
 (0)