Skip to content

Commit 64e591c

Browse files
chore(all): prepare release 1.0.0-beta.6
1 parent 0143114 commit 64e591c

File tree

11 files changed

+120
-26
lines changed

11 files changed

+120
-26
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-ui-virtualization",
3-
"version": "1.0.0-beta.5",
3+
"version": "1.0.0-beta.6",
44
"description": "A plugin that provides a virtualized repeater and other virtualization services.",
55
"keywords": [
66
"aurelia",

dist/amd/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@ define(['exports', 'aurelia-binding', 'aurelia-templating', 'aurelia-templating-
6868
var Math$floor = Math.floor;
6969
var $isNaN = isNaN;
7070

71+
var getScrollContainer = function (element) {
72+
var current = element.parentNode;
73+
while (current !== null && current !== document) {
74+
if (hasOverflowScroll(current)) {
75+
return current;
76+
}
77+
current = current.parentNode;
78+
}
79+
return document.documentElement;
80+
};
7181
var getElementDistanceToTopOfDocument = function (element) {
7282
var box = element.getBoundingClientRect();
7383
var documentElement = document.documentElement;
@@ -77,8 +87,8 @@ define(['exports', 'aurelia-binding', 'aurelia-templating', 'aurelia-templating-
7787
return Math$round(top);
7888
};
7989
var hasOverflowScroll = function (element) {
80-
var style = element.style;
81-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
90+
var style = window.getComputedStyle(element);
91+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
8292
};
8393
var getStyleValues = function (element) {
8494
var styles = [];
@@ -453,7 +463,7 @@ define(['exports', 'aurelia-binding', 'aurelia-templating', 'aurelia-templating-
453463
function DefaultTemplateStrategy() {
454464
}
455465
DefaultTemplateStrategy.prototype.getScrollContainer = function (element) {
456-
return element.parentNode;
466+
return getScrollContainer(element);
457467
};
458468
DefaultTemplateStrategy.prototype.moveViewFirst = function (view, topBuffer) {
459469
insertBeforeNode(view, aureliaPal.DOM.nextElementSibling(topBuffer));

dist/commonjs/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ var Math$round = Math.round;
7676
var Math$floor = Math.floor;
7777
var $isNaN = isNaN;
7878

79+
var getScrollContainer = function (element) {
80+
var current = element.parentNode;
81+
while (current !== null && current !== document) {
82+
if (hasOverflowScroll(current)) {
83+
return current;
84+
}
85+
current = current.parentNode;
86+
}
87+
return document.documentElement;
88+
};
7989
var getElementDistanceToTopOfDocument = function (element) {
8090
var box = element.getBoundingClientRect();
8191
var documentElement = document.documentElement;
@@ -85,8 +95,8 @@ var getElementDistanceToTopOfDocument = function (element) {
8595
return Math$round(top);
8696
};
8797
var hasOverflowScroll = function (element) {
88-
var style = element.style;
89-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
98+
var style = window.getComputedStyle(element);
99+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
90100
};
91101
var getStyleValues = function (element) {
92102
var styles = [];
@@ -461,7 +471,7 @@ var DefaultTemplateStrategy = (function () {
461471
function DefaultTemplateStrategy() {
462472
}
463473
DefaultTemplateStrategy.prototype.getScrollContainer = function (element) {
464-
return element.parentNode;
474+
return getScrollContainer(element);
465475
};
466476
DefaultTemplateStrategy.prototype.moveViewFirst = function (view, topBuffer) {
467477
insertBeforeNode(view, aureliaPal.DOM.nextElementSibling(topBuffer));

dist/es2015/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ const Math$round = Math.round;
4343
const Math$floor = Math.floor;
4444
const $isNaN = isNaN;
4545

46+
const getScrollContainer = (element) => {
47+
let current = element.parentNode;
48+
while (current !== null && current !== document) {
49+
if (hasOverflowScroll(current)) {
50+
return current;
51+
}
52+
current = current.parentNode;
53+
}
54+
return document.documentElement;
55+
};
4656
const getElementDistanceToTopOfDocument = (element) => {
4757
let box = element.getBoundingClientRect();
4858
let documentElement = document.documentElement;
@@ -52,8 +62,8 @@ const getElementDistanceToTopOfDocument = (element) => {
5262
return Math$round(top);
5363
};
5464
const hasOverflowScroll = (element) => {
55-
let style = element.style;
56-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
65+
const style = window.getComputedStyle(element);
66+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
5767
};
5868
const getStyleValues = (element, ...styles) => {
5969
let currentStyle = window.getComputedStyle(element);
@@ -410,7 +420,7 @@ class VirtualRepeatStrategyLocator {
410420

411421
class DefaultTemplateStrategy {
412422
getScrollContainer(element) {
413-
return element.parentNode;
423+
return getScrollContainer(element);
414424
}
415425
moveViewFirst(view, topBuffer) {
416426
insertBeforeNode(view, DOM.nextElementSibling(topBuffer));

dist/es2017/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ const Math$round = Math.round;
4343
const Math$floor = Math.floor;
4444
const $isNaN = isNaN;
4545

46+
const getScrollContainer = (element) => {
47+
let current = element.parentNode;
48+
while (current !== null && current !== document) {
49+
if (hasOverflowScroll(current)) {
50+
return current;
51+
}
52+
current = current.parentNode;
53+
}
54+
return document.documentElement;
55+
};
4656
const getElementDistanceToTopOfDocument = (element) => {
4757
let box = element.getBoundingClientRect();
4858
let documentElement = document.documentElement;
@@ -52,8 +62,8 @@ const getElementDistanceToTopOfDocument = (element) => {
5262
return Math$round(top);
5363
};
5464
const hasOverflowScroll = (element) => {
55-
let style = element.style;
56-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
65+
const style = window.getComputedStyle(element);
66+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
5767
};
5868
const getStyleValues = (element, ...styles) => {
5969
let currentStyle = window.getComputedStyle(element);
@@ -410,7 +420,7 @@ class VirtualRepeatStrategyLocator {
410420

411421
class DefaultTemplateStrategy {
412422
getScrollContainer(element) {
413-
return element.parentNode;
423+
return getScrollContainer(element);
414424
}
415425
moveViewFirst(view, topBuffer) {
416426
insertBeforeNode(view, DOM.nextElementSibling(topBuffer));

dist/native-modules/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ var Math$round = Math.round;
7272
var Math$floor = Math.floor;
7373
var $isNaN = isNaN;
7474

75+
var getScrollContainer = function (element) {
76+
var current = element.parentNode;
77+
while (current !== null && current !== document) {
78+
if (hasOverflowScroll(current)) {
79+
return current;
80+
}
81+
current = current.parentNode;
82+
}
83+
return document.documentElement;
84+
};
7585
var getElementDistanceToTopOfDocument = function (element) {
7686
var box = element.getBoundingClientRect();
7787
var documentElement = document.documentElement;
@@ -81,8 +91,8 @@ var getElementDistanceToTopOfDocument = function (element) {
8191
return Math$round(top);
8292
};
8393
var hasOverflowScroll = function (element) {
84-
var style = element.style;
85-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
94+
var style = window.getComputedStyle(element);
95+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
8696
};
8797
var getStyleValues = function (element) {
8898
var styles = [];
@@ -457,7 +467,7 @@ var DefaultTemplateStrategy = (function () {
457467
function DefaultTemplateStrategy() {
458468
}
459469
DefaultTemplateStrategy.prototype.getScrollContainer = function (element) {
460-
return element.parentNode;
470+
return getScrollContainer(element);
461471
};
462472
DefaultTemplateStrategy.prototype.moveViewFirst = function (view, topBuffer) {
463473
insertBeforeNode(view, DOM.nextElementSibling(topBuffer));

dist/system/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@ System.register(['aurelia-binding', 'aurelia-templating', 'aurelia-templating-re
100100
var Math$floor = Math.floor;
101101
var $isNaN = isNaN;
102102

103+
var getScrollContainer = function (element) {
104+
var current = element.parentNode;
105+
while (current !== null && current !== document) {
106+
if (hasOverflowScroll(current)) {
107+
return current;
108+
}
109+
current = current.parentNode;
110+
}
111+
return document.documentElement;
112+
};
103113
var getElementDistanceToTopOfDocument = function (element) {
104114
var box = element.getBoundingClientRect();
105115
var documentElement = document.documentElement;
@@ -109,8 +119,8 @@ System.register(['aurelia-binding', 'aurelia-templating', 'aurelia-templating-re
109119
return Math$round(top);
110120
};
111121
var hasOverflowScroll = function (element) {
112-
var style = element.style;
113-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
122+
var style = window.getComputedStyle(element);
123+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
114124
};
115125
var getStyleValues = function (element) {
116126
var styles = [];
@@ -485,7 +495,7 @@ System.register(['aurelia-binding', 'aurelia-templating', 'aurelia-templating-re
485495
function DefaultTemplateStrategy() {
486496
}
487497
DefaultTemplateStrategy.prototype.getScrollContainer = function (element) {
488-
return element.parentNode;
498+
return getScrollContainer(element);
489499
};
490500
DefaultTemplateStrategy.prototype.moveViewFirst = function (view, topBuffer) {
491501
insertBeforeNode(view, DOM.nextElementSibling(topBuffer));

dist/umd-es2015/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@
4343
const Math$floor = Math.floor;
4444
const $isNaN = isNaN;
4545

46+
const getScrollContainer = (element) => {
47+
let current = element.parentNode;
48+
while (current !== null && current !== document) {
49+
if (hasOverflowScroll(current)) {
50+
return current;
51+
}
52+
current = current.parentNode;
53+
}
54+
return document.documentElement;
55+
};
4656
const getElementDistanceToTopOfDocument = (element) => {
4757
let box = element.getBoundingClientRect();
4858
let documentElement = document.documentElement;
@@ -52,8 +62,8 @@
5262
return Math$round(top);
5363
};
5464
const hasOverflowScroll = (element) => {
55-
let style = element.style;
56-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
65+
const style = window.getComputedStyle(element);
66+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
5767
};
5868
const getStyleValues = (element, ...styles) => {
5969
let currentStyle = window.getComputedStyle(element);
@@ -410,7 +420,7 @@
410420

411421
class DefaultTemplateStrategy {
412422
getScrollContainer(element) {
413-
return element.parentNode;
423+
return getScrollContainer(element);
414424
}
415425
moveViewFirst(view, topBuffer) {
416426
insertBeforeNode(view, aureliaPal.DOM.nextElementSibling(topBuffer));

dist/umd/aurelia-ui-virtualization.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@
7272
var Math$floor = Math.floor;
7373
var $isNaN = isNaN;
7474

75+
var getScrollContainer = function (element) {
76+
var current = element.parentNode;
77+
while (current !== null && current !== document) {
78+
if (hasOverflowScroll(current)) {
79+
return current;
80+
}
81+
current = current.parentNode;
82+
}
83+
return document.documentElement;
84+
};
7585
var getElementDistanceToTopOfDocument = function (element) {
7686
var box = element.getBoundingClientRect();
7787
var documentElement = document.documentElement;
@@ -81,8 +91,8 @@
8191
return Math$round(top);
8292
};
8393
var hasOverflowScroll = function (element) {
84-
var style = element.style;
85-
return style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto';
94+
var style = window.getComputedStyle(element);
95+
return style && (style.overflowY === 'scroll' || style.overflow === 'scroll' || style.overflowY === 'auto' || style.overflow === 'auto');
8696
};
8797
var getStyleValues = function (element) {
8898
var styles = [];
@@ -457,7 +467,7 @@
457467
function DefaultTemplateStrategy() {
458468
}
459469
DefaultTemplateStrategy.prototype.getScrollContainer = function (element) {
460-
return element.parentNode;
470+
return getScrollContainer(element);
461471
};
462472
DefaultTemplateStrategy.prototype.moveViewFirst = function (view, topBuffer) {
463473
insertBeforeNode(view, aureliaPal.DOM.nextElementSibling(topBuffer));

doc/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [1.0.0-beta.6](https://github.com/aurelia/ui-virtualization/compare/1.0.0-beta.5...1.0.0-beta.6) (2019-03-28)
2+
3+
4+
### Bug Fixes
5+
6+
* **utilities-dom:** use window.getComputedStyle for hasOverflowScroll ([4b015d2](https://github.com/aurelia/ui-virtualization/commit/4b015d2))
7+
8+
9+
### Features
10+
11+
* **template-strategy-default:** walk up the DOM tree and determine what element will be scroller for virtual repeat ([6ebf907](https://github.com/aurelia/ui-virtualization/commit/6ebf907))
12+
13+
14+
115
# [1.0.0-beta.5](https://github.com/aurelia/ui-virtualization/compare/1.0.0-beta.4...1.0.0-beta.5) (2019-03-27)
216

317

0 commit comments

Comments
 (0)