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

fix: addChild with index should allow for children that are elements #6671

Merged
merged 2 commits into from
May 26, 2020
Merged

fix: addChild with index should allow for children that are elements #6671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4226f2
fix: consider children that are elements in addChild
mister-ben May 12, 2020
2b59d1c
add test
mister-ben May 12, 2020
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
9 changes: 7 additions & 2 deletions src/js/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,13 @@ class Component {
// If inserting before a component, insert before that component's element
let refNode = null;

if (this.children_[index + 1] && this.children_[index + 1].el_) {
refNode = this.children_[index + 1].el_;
if (this.children_[index + 1]) {
// Most children are components, but the video tech is an HTML element
if (this.children_[index + 1].el_) {
refNode = this.children_[index + 1].el_;
} else if (Dom.isEl(this.children_[index + 1])) {
refNode = this.children_[index + 1];
}
}

this.contentEl().insertBefore(component.el(), refNode);
Expand Down
20 changes: 20 additions & 0 deletions test/unit/component.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,26 @@ QUnit.test('should insert element relative to the element of the component to in
/* eslint-enable no-unused-vars */
});

QUnit.test('should allow for children that are elements', function(assert) {

// for legibility of the test itself:
/* eslint-disable no-unused-vars */

const comp = new Component(getFakePlayer());
const testEl = Dom.createEl('div');

// Add element as video el gets added to player
comp.el().appendChild(testEl);
comp.children_.unshift(testEl);

const child1 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c1'})});
const child2 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c4'})}, 0);

assert.ok(child2.el_.nextSibling === testEl, 'addChild should insert el before a sibling that is an element');

/* eslint-enable no-unused-vars */
});

QUnit.test('addChild should throw if the child does not exist', function(assert) {
const comp = new Component(getFakePlayer());

Expand Down