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

No individual shadow roots for each separate cell, better content selectors #488

Merged
merged 1 commit into from
Oct 14, 2016
Merged

No individual shadow roots for each separate cell, better content selectors #488

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
80 changes: 24 additions & 56 deletions vaadin-grid-table-cell.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,6 @@
<dom-module id="vaadin-grid-table-cell-styles">
<template>
<style>
::content>div {
padding: 8px;
width: 100%;
box-sizing: border-box;
display: flex;
justify-content: center;
flex-direction: column;
white-space: nowrap;
}

:host {
flex-shrink: 0;
flex-grow: 1;
flex-basis: 100px;
box-sizing: border-box;
display: flex;
overflow: hidden;
}
</style>
</template>
</dom-module>

<dom-module id="vaadin-grid-table-cell">
<template>
<style include="vaadin-grid-table-cell-styles"></style>
<content></content>
</template>
</dom-module>

<dom-module id="vaadin-grid-table-header-cell">
<template>
<style include="vaadin-grid-table-cell-styles"></style>
<content></content>
</template>
</dom-module>

<dom-module id="vaadin-grid-table-footer-cell">
<template>
<style include="vaadin-grid-table-cell-styles"></style>
<content></content>
</template>
</dom-module>
<dom-module id="vaadin-grid-table-cell"></dom-module>
<dom-module id="vaadin-grid-table-header-cell"></dom-module>
<dom-module id="vaadin-grid-table-footer-cell"></dom-module>

<script>
(function() {
Expand All @@ -66,7 +24,8 @@
'_indexChanged(index, instance)',
'_itemChanged(item, instance)',
'_forwardedParentPropsChanged(_forwardedParentProps.*, instance)',
'_selectedChanged(selected, instance)'
'_selectedChanged(selected, instance)',
'_toggleContent(isAttached, _cellContent)'
],

created: function() {
Expand Down Expand Up @@ -105,6 +64,16 @@
instance.notifyPath('selected', selected);
},

_toggleContent: function(isAttached, cellContent) {
if (Polymer.Settings.useShadow) {
if (isAttached) {
Polymer.dom(this.target).appendChild(cellContent);
} else if (cellContent.parentNode) {
Polymer.dom(this.target).removeChild(cellContent);
}
}
},

_templateChanged: function(template, target) {
this.templatize(template);

Expand Down Expand Up @@ -133,34 +102,33 @@
}

this.style.height = '';
var item = document.createElement('div');
var itemClass = 'item-' + target.childElementCount;
item.classList.add(itemClass);
this._cellContent = document.createElement('div');
this._cellContent.setAttribute('class', 'cell-content');

if (Polymer.Settings.useShadow) {

Polymer.dom(target).appendChild(item);
// Shadow
target._contentIndex = target._contentIndex + 1 || 0;
this._cellContent.setAttribute('cell-content-id', target._contentIndex);

var content = document.createElement('content');
content.setAttribute('select', '.' + itemClass);
content.setAttribute('select', '[cell-content-id="' + target._contentIndex +'"]');
Polymer.dom(this).appendChild(content);

} else {
// Non-shadow

// Can't use Polymer.dom.appendChild here as using it will "fix"
// the item later with the style scope of vaadin-grid-table
this.appendChild(item);
this.appendChild(this._cellContent);

// wait until item is really attached to DOM. (Polymer.dom.flush())
// not helping here for some reason.
this.async(function() {
if (this.target.domHost) {
Polymer.StyleTransformer.dom(item, this.target.domHost.tagName.toLowerCase(), false, false);
Polymer.StyleTransformer.dom(this._cellContent, this.target.domHost.tagName.toLowerCase(), false, false);
}
});
}
Polymer.dom(item).appendChild(this.instance.root);
Polymer.dom(this._cellContent).appendChild(this.instance.root);
},

_forwardInstanceProp: function(inst, prop, value) {
Expand Down
22 changes: 20 additions & 2 deletions vaadin-grid-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,29 @@

td, th {
background-color: #fff;

/* Bootstrap adds 8px padding to each cell, IE flexbasis ignores border-box so need to revert */
padding: 0 !important;
flex-shrink: 0;
flex-grow: 1;
flex-basis: 100px;
box-sizing: border-box;
display: flex;
overflow: hidden;
}

/* Selector for non-shadow */
td::content > .cell-content,
th::content > .cell-content,
/* Selector for shadow */
::content > .cell-content {
padding: 8px;
width: 100%;
box-sizing: border-box;
display: flex;
justify-content: center;
flex-direction: column;
white-space: nowrap;
}

tr:hover td {
/*background-color: lightgrey;*/
}
Expand Down