bm-core-ui 2.11.3 → 2.11.5

package/build/BMCollectionView/BMCollectionView.js

@@ -305,7 +305,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 
 		this._usesLegacyDataSet = NO;
 		this._dataSource = source;
-		this._dataSet = BMCollectionViewDataSetAdapter.adapterWithDataSource(source);
+		this._dataSet = BMCollectionViewDataSetAdapter.adapterWithDataSource(this, source);
 
 		this.dataSetDidChangeFromDataSet(oldDataSet);
 	},

package/build/BMView/BMMenu.js

@@ -889,22 +889,32 @@ BMMenu.prototype = {
         }
 
         // Make the menu expand
+        menuNode.style.overflow = 'hidden';
         __BMVelocityAnimate(menuNode, {scaleX: 1, scaleY: 1, opacity: 1, translateZ: 0, translateY: 0, translateX: 0}, {
             duration,
             easing,
-            complete: _ => ((menuNode.style.pointerEvents = 'all'), menuContainer.style.pointerEvents = 'all')
+            complete: _ => {
+                menuNode.style.pointerEvents = 'all';
+                menuContainer.style.pointerEvents = 'all';
+            }
         }, BMMENU_USE_WEB_ANIMATIONS);
 
         // Animate each child node in
         let delay = 50;
-        for (let child of menuNode.childNodes) {
+        let delayIncrement = Math.min(16, 100 / menuNode.childNodes.length);
+        
+        for (let i = 0; i < menuNode.childNodes.length; i++) {
+            const child = menuNode.childNodes[i];
             BMHook(child, {translateY: '16px', translateZ: 0, opacity: 0});
             __BMVelocityAnimate(child, {translateY: '0px', translateZ: 0, opacity: 1}, {
                 duration: 100,
                 easing: 'easeOutQuad',
-                delay: delay
+                delay: delay,
+                complete: i == menuNode.childNodes.length - 1 ? () => {
+                    menuNode.style.overflow = '';
+                } : undefined,
             }, BMMENU_USE_WEB_ANIMATIONS);
-            delay += 16;
+            delay += delayIncrement;
         }
 
         // Retain the preivously focused node, to restore its focus when the menu closes
@@ -1008,7 +1018,7 @@ BMMenu.prototype = {
             if (point.x > windowWidth / 2) {
                 transformOriginX = '100%';
 
-                menuNode.style.maxWidth = point.x + 'px';
+                menuNode.style.maxWidth = rect.origin.x + 'px';
                 point.x = rect.origin.x - width;
             }
             else {
@@ -1020,7 +1030,7 @@ BMMenu.prototype = {
             if (point.y > windowHeight / 2) {
                 transformOriginY = ' 100%';
 
-                menuNode.style.maxHeight = point.y + 'px';
+                menuNode.style.maxHeight = rect.bottom + 'px';
                 point.y = Math.max(rect.bottom + paddingBottom - height, 0);
             }
             else {
@@ -1035,22 +1045,32 @@ BMMenu.prototype = {
         menuNode.style.top = point.y + 'px';
 
         // Animate the menu in
+        menuNode.style.overflow = 'hidden';
         (window.Velocity || $.Velocity).animate(menuNode, {scaleX: 1, scaleY: 1, opacity: 1, translateZ: 0}, {
             duration: 200,
             easing: 'easeOutQuad',
-            complete: _ => ((menuNode.style.pointerEvents = 'all'), menuContainer.style.pointerEvents = 'all')
+            complete: _ => {
+                menuNode.style.pointerEvents = 'all';
+                menuContainer.style.pointerEvents = 'all';
+            }
         });
 
         // Animate each menu item in
         let delay = 0;
-        for (let child of menuNode.childNodes) {
+        let delayIncrement = Math.min(16, 100 / menuNode.childNodes.length);
+
+        for (let i = 0; i < menuNode.childNodes.length; i++) {
+            const child = menuNode.childNodes[i];
             BMHook(child, {translateY: '16px', translateZ: 0, opacity: 0});
             (window.Velocity || $.Velocity).animate(child, {translateY: '0px', translateZ: 0, opacity: 1}, {
                 duration: 100,
                 easing: 'easeOutQuad',
-                delay: delay
+                delay: delay,
+                complete: i == menuNode.childNodes.length - 1 ? () => {
+                    menuNode.style.overflow = '';
+                } : undefined,
             });
-            delay += 16;
+            delay += delayIncrement;
         }
 
         // Retain the preivously focused node, to restore its focus when the menu closes
@@ -1367,6 +1387,8 @@ BMMenu.prototype = {
 
         this._isSupermenuClosing = NO;
 
+        this._node.style.pointerEvents = 'none';
+
         __BMVelocityAnimate(this._node, {
             scaleX: this._kind == BMMenuKind.PullDownMenu ? 1 : scale, 
             scaleY: scale,