Skip to content
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

Jump to bottom

Custom Element support #113

Closed
wants to merge 5 commits into from
Closed

Custom Element support #113

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1066f9b
Add a beforeAttach event that allows a listener to delay or prevent D…
devpaul Aug 7, 2017
fd16bde
Add a delayAttach property that will delay attaching a node to the dom
devpaul Aug 19, 2017
baa46d8
add explicit check for custom elements
devpaul Aug 22, 2017
5f2863a
removed unused declarations
devpaul Aug 22, 2017
9bea89a
switched regular expression for an indexOf
devpaul Aug 27, 2017
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
29 changes: 20 additions & 9 deletions dist/maquette.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/maquette.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/maquette.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/maquette.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"animation",
"transitions"
],
"version": "2.5.3",
"version": "2.5.4-pre.1",
"author": "Johan Gorter <johan@johangorter.com>",
"repository": {
"type": "git",
Expand Down
34 changes: 24 additions & 10 deletions src/maquette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,17 +749,29 @@ let initPropertiesAndChildren = function(domNode: Node, vnode: VNode, projection
}
};

let insertNode = function (parentNode: Node, domNode: Node, vnode: VNode, beforeNode?: Node | null): void {
if (beforeNode) {
parentNode.insertBefore(domNode, beforeNode);
} else if (domNode.parentNode !== parentNode) {
parentNode.appendChild(domNode);
}
};

/**
* Identifies custom element tags as defined in custom elements v1 draft spec
*
* @see https://www.w3.org/TR/custom-elements/#custom-elements-core-concepts
*/
const customElementRegex = /^[a-z][^-]*-/;

createDom = function(vnode, parentNode, insertBefore, projectionOptions) {
let domNode: Node | undefined, i: number, c: string, start = 0, type: string, found: string;
let vnodeSelector = vnode.vnodeSelector;
const delayAttach = customElementRegex.test(vnodeSelector);
let doc = parentNode.ownerDocument;
if (vnodeSelector === '') {
domNode = vnode.domNode = doc.createTextNode(vnode.text!);
if (insertBefore !== undefined) {
parentNode.insertBefore(domNode, insertBefore);
} else {
parentNode.appendChild(domNode);
}
insertNode(parentNode, domNode, vnode, insertBefore);
} else {
for (i = 0; i <= vnodeSelector.length; ++i) {
c = vnodeSelector.charAt(i);
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than using a regex, testing if c === '-' would be more performant

Expand All @@ -780,19 +792,21 @@ createDom = function(vnode, parentNode, insertBefore, projectionOptions) {
domNode = vnode.domNode = (vnode.domNode || doc.createElement(found));
if (found === 'input' && vnode.properties && vnode.properties.type !== undefined) {
// IE8 and older don't support setting input type after the DOM Node has been added to the document
(domNode as Element).setAttribute("type", vnode.properties.type);
(domNode as Element).setAttribute('type', vnode.properties.type);
}
}
if (insertBefore !== undefined) {
parentNode.insertBefore(domNode, insertBefore);
} else if (domNode.parentNode !== parentNode) {
parentNode.appendChild(domNode);
if (!delayAttach) {
insertNode(parentNode, domNode, vnode, insertBefore);
}
}
start = i + 1;
}
}
initPropertiesAndChildren(domNode!, vnode, projectionOptions);

if (delayAttach) {
insertNode(parentNode, domNode!, vnode, insertBefore);
}
}
};

Expand Down
6 changes: 6 additions & 0 deletions test/dom/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,11 @@ describe('dom', function() {
expect(spy.called).to.be.false;
});

it('should delay attaching custom elements until after attribute and properties have been added', () => {
let projection = dom.create(h('custom-element', {
'data-attr': 'attribute'
}));
expect(projection.domNode.outerHTML).to.equal('<custom-element data-attr="attribute"></custom-element>');
});
});
});