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.

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: ensure components added with an index are added in the correct location #6297

Merged
merged 2 commits into from
Nov 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/js/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,12 @@ class Component {
// Add the UI object's element to the container div (box)
// Having an element is not required
if (typeof component.el === 'function' && component.el()) {
const childNodes = this.contentEl().children;
const refNode = childNodes[index] || null;
// 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_;
}

this.contentEl().insertBefore(component.el(), refNode);
}
Expand Down
18 changes: 18 additions & 0 deletions test/unit/component.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,24 @@ QUnit.test('should add a child component to an index', function(assert) {
comp.dispose();
});

QUnit.test('should insert element relative to the element of the component to insert before', function(assert) {

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

const comp = new Component(getFakePlayer());

const child0 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c0'})});
const child1 = comp.addChild('component', {createEl: false});
const child2 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c2'})});
const child3 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c3'})});
const child4 = comp.addChild('component', {el: Dom.createEl('div', {}, {class: 'c4'})}, comp.children_.indexOf(child2));

assert.ok(child2.el_.previousSibling === child4.el_, 'addChild should insert el before its next sibling\'s 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