Skip to content

Adds optional cancelButton to end of tabs #110

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

Merged
merged 3 commits into from
Sep 2, 2019
Merged

Adds optional cancelButton to end of tabs #110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f2e164
Adds feature to add cancelButton to end of tabs
megoth Aug 28, 2019
c737fe1
Making sure that cancelButton works with vertical tabs as well
megoth Aug 28, 2019
2b0260f
Making sure that tests work with the new cancelButton
megoth Sep 2, 2019
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
43 changes: 37 additions & 6 deletions src/tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const utils = require('./utils')
// options.showMain(div, subject) function to show subject in div when tab selected
// options.renderTabSettings function(subject, domContainer)
// options.renderTabSettings like showMain but when user has held Alt down
// options.onClose if given, will present a cancelButton next to tabs that calls this optional method
//

UI.tabs.tabWidget = function (options) {
Expand All @@ -41,6 +42,7 @@ UI.tabs.tabWidget = function (options) {
var wholetable = box.appendChild(dom.createElement('table'))
var mainTR, mainTD, tabTR
var tabContainer, tabElement
var onClose = options.onClose

var isLight = function (x) {
var total = 0
Expand Down Expand Up @@ -140,7 +142,11 @@ UI.tabs.tabWidget = function (options) {

var resetTabStyle = function () {
for (var i = 0; i < tabContainer.children.length; i++) {
tabContainer.children[i].firstChild.setAttribute('style', unselectedStyle)
const tab = tabContainer.children[i]
if (tab.classList.contains('unstyled')) {
continue
}
tab.firstChild.setAttribute('style', unselectedStyle)
}
}
var resetBodyStyle = function () {
Expand Down Expand Up @@ -193,14 +199,14 @@ UI.tabs.tabWidget = function (options) {
var orderedSync = function () {
var items = getItems()
if (!vertical) {
mainTD.setAttribute('colspan', items.length)
mainTD.setAttribute('colspan', items.length + (onClose ? 1 : 0))
}
var slot, i, j, left, right
var differ = false
// Find how many match at each end
for (left = 0; left < tabContainer.children.length; left++) {
slot = tabContainer.children[left]
if (left >= items.length || !slot.subject.sameTerm(items[left])) {
if (left >= items.length || (slot.subject && !slot.subject.sameTerm(items[left]))) {
differ = true
break
}
Expand All @@ -211,7 +217,7 @@ UI.tabs.tabWidget = function (options) {
for (right = tabContainer.children.length - 1; right >= 0; right--) {
slot = tabContainer.children[right]
j = right - tabContainer.children.length + items.length
if (!slot.subject.sameTerm(items[j])) {
if (slot.subject && !slot.subject.sameTerm(items[j])) {
break
}
}
Expand All @@ -238,13 +244,16 @@ UI.tabs.tabWidget = function (options) {
bodyContainer.insertBefore(newBodyTR, bodyContainer.children[left + i])
}
}
if (onClose) {
addCancelButton(tabContainer)
}
}

// UNMAINTAINED
// UNMAINTAINED
var unorderedSync = function () {
var items = getItems()
if (!vertical) {
mainTD.setAttribute('colspan', items.length)
mainTD.setAttribute('colspan', items.length + (onClose ? 1 : 0))
}
var slot, i, j, found, pair
var missing = []
Expand Down Expand Up @@ -280,6 +289,10 @@ UI.tabs.tabWidget = function (options) {
tabContainer.removeChild(slot)
}
}

if (onClose) {
addCancelButton(tabContainer)
}
}

var sync = function () {
Expand Down Expand Up @@ -310,4 +323,22 @@ UI.tabs.tabWidget = function (options) {
tabContainer.children[0].firstChild.click() // Open first tab
}
return box

function addCancelButton (tabContainer) {
if (tabContainer.dataset.onCloseSet) {
// @@ TODO: this is only here to make the tests work
// Discussion at https://github.com/solid/solid-ui/pull/110#issuecomment-527080663
const existingCancelButton = tabContainer.querySelector('.unstyled')
tabContainer.removeChild(existingCancelButton)
}
const extraTab = dom.createElement(tabElement)
extraTab.classList.add('unstyled')
if (tabElement === 'td') {
extraTab.style.textAlign = 'right'
}
const cancelButton = UI.widgets.cancelButton(dom, onClose)
extraTab.appendChild(cancelButton)
tabContainer.appendChild(extraTab)
tabContainer.dataset.onCloseSet = 'true'
}
}