Skip to content

feat: 提交第六周作业 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sxyuzhenhua wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: 提交第六周作业 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { elementOpen, text, elementEnd, currentInfo } = require('../vdom/vnodeBack.js');
const { elementOpen, text, elementEnd, currentInfo } = require('../vdom/vnode.js');

describe('idom', () => {
test('校验idom结构', async () => {
Expand All @@ -19,7 +19,6 @@ describe('idom2', () => {
elementOpen('p')
text('1')
elementEnd('p')
text('2')
elementEnd('div')
var currentNode = currentInfo.currentNode
elementOpen('div')
Expand Down
71 changes: 59 additions & 12 deletions vdom/vnode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,70 @@
*/

var currentInfo = {
currentNode: null,
currentParent: null
currentNode: null,
currentParent: null
}
function elementOpen(tagName) {
// TODO
function elementOpen (tagName) {
const { currentNode, currentParent } = currentInfo;
// 第一次进来
// {
// currentNode: { tagName: 'div' },
// currentParent: { isRoot: true }
// }
// 第二次进来
// {
// currentNode: { tagName: 'p' },
// currentParent: {
// currentNode: { tagName: 'div', children: [{ tagName: 'p' }] },
// currentParent: { isRoot: true }
// }
// }
// 老师，是这种数据吗？
Copy link
Copy Markdown
Collaborator

@cubicwork cubicwork Oct 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是的

if (!currentParent) {
currentInfo.currentParent = { isRoot: true };
currentInfo.currentNode = { tagName };
return ;
}
if (!currentNode.children) {
currentInfo.currentNode.children = []
}
const thisTimeNode = { tagName };
currentNode.children.push(thisTimeNode);
currentInfo.currentParent = {
currentNode,
currentParent
}
currentInfo.currentNode = thisTimeNode

}

function text(textContent) {
// TODO
function text (textContent) {
// TODO
const { currentNode } = currentInfo;
if (!currentNode) {
throw Error('text 必须在标签内部');
}
currentNode.text = textContent
}

function elementEnd(tagName) {
// TODO

function elementEnd (tagName) {
const { currentParent, currentNode } = currentInfo;
if (currentNode && currentNode.tagName === tagName) {
if (!currentParent.isRoot) {
currentInfo.currentNode = currentParent.currentNode;
currentInfo.currentParent = currentParent.currentParent;
} else {
// root节点
currentInfo.currentParent = null;
}
} else {
throw new Error('标签闭合不对')
}
}
module.exports = {
elementOpen,
text,
elementEnd,
currentInfo
elementOpen,
text,
elementEnd,
currentInfo
};