flexmonster 2.9.23 → 2.9.26-1

package/toolbar/flexmonster.toolbar.js

@@ -1,6 +1,6 @@
 /** 
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
- * April 2022 (v. 2.9.23)
+ * May 2022 (v. 2.9.26)
  * Copyright (c) 2022 Flexmonster. All rights reserved.
  *
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -14,6 +14,7 @@ var FlexmonsterToolbar = function (pivotContainer, pivot, _, width, labels, data
     this.Labels = labels;
     this.dataSourceType = dataSourceType || 5;
     this.showShareReportTab = false;
+    this.singleAggregationFormatting = false;
 }
 FlexmonsterToolbar.prototype.getTabs = function () {
     var tabs = [];
@@ -474,7 +475,7 @@ FlexmonsterToolbar.prototype.init = function () {
                 if (_this.toolbar.scrollLeft + luft * epsillon >= maxWidth && _this.rightScrollButton.classList.contains("fm-scroll-arrow")) {
                     changeListWrapperWidth("remove");
                     _this.rightScrollButton.classList.remove("fm-scroll-arrow");
-                } else if (_this.toolbar.scrollLeft < maxWidth && !_this.rightScrollButton.classList.contains("fm-scroll-arrow")) {
+                } else if (_this.toolbar.scrollLeft + luft * epsillon < maxWidth && !_this.rightScrollButton.classList.contains("fm-scroll-arrow")) {
                     changeListWrapperWidth("add");
                     _this.addClass(_this.rightScrollButton, "fm-scroll-arrow");
                 }
@@ -1574,7 +1575,9 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         var measure = null;
         for (var i = 0; i < measuresList.length; i++) {
             measure = getMeasureFromUniqueName(measuresList[i]);
-            self.pivot.setFormat(formatVO, (measure[0] == "" ? null : measure[0]), measure[1]);
+            self.pivot.setFormat(formatVO, 
+                (measure[0] == "" ? null : measure[0]), 
+                (self.singleAggregationFormatting ? undefined : measure[1]));
         }
         // if (valuesDropDown.getValue() === "" && currentReport.hasOwnProperty("formats")) {
         //     var reportMeasures = currentReport.slice.measures;
@@ -1603,7 +1606,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
         var aggregation = aggregationLabelIndex === -1 || measure.aggregation === "none" || measure.calculated ?
             null :
             measure.availableAggregationsCaptions[aggregationLabelIndex];
-        return aggregation === null ?
+        return aggregation === null || self.singleAggregationFormatting ?
             measure.name :
             measure.name + " (" + aggregation + ")";
     }
@@ -1638,7 +1641,7 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, meas
     var _measures = self.pivot.getMeasures();
     for (var i = 0; i < _measures.length; i++) {
         if (!_uniqueNames[_measures[i].uniqueName] ||
-            (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation])) {
+            (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] && !this.singleAggregationFormatting)) {
             if (!_uniqueNames[_measures[i].uniqueName]) _uniqueNames[_measures[i].uniqueName] = {};
             _uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] = true;
             measuresDataProvider.push({
@@ -3190,29 +3193,37 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
 
     function show() {
         parentTab.classList.add("fm-opened");
-        parentTab.classList.remove("fm-align-right");
         menuList.classList.remove("fm-dropdown-scrollable-left");
         menuList.classList.remove("fm-dropdown-scrollable-right");
         menuContainer.style.right = menuContainer.style.left = null;
+
         var menuRect = menuContainer.getBoundingClientRect();
+        var parentRect = parentTab.getBoundingClientRect();
         var toolbarRect = _this.toolbarWrapper.getBoundingClientRect();
         var leftScrollArrow = _this.container.querySelector(".fm-left-scroll-button");
+        var leftScrollArrowRect = leftScrollArrow ? leftScrollArrow.getBoundingClientRect() : null;
         var rightScrollArrow = _this.container.querySelector(".fm-right-scroll-button");
         var arrowWidth = (leftScrollArrow ? leftScrollArrow.offsetWidth : 0) + (rightScrollArrow ? rightScrollArrow.offsetWidth : 0);
-        if (menuRect.right > toolbarRect.right - arrowWidth) {
-            menuContainer.style.right = 0;
-            _this.addClass(parentTab, "fm-align-right");
+
+        if ((menuRect.left > parentRect.right - arrowWidth || menuRect.left < parentRect.left + arrowWidth) 
+            && parentRect.right + menuRect.width < toolbarRect.right && _this.toolbar.scrollLeft > 0) {// this case handles left positioning with scroll           
+            menuContainer.style.left = 0;
             menuRect = menuContainer.getBoundingClientRect();
-            if (menuRect.right > toolbarRect.right - (rightScrollArrow ? rightScrollArrow.offsetWidth : 0)) {
-                var luft = menuRect.right - rightScrollArrow.getBoundingClientRect().left + 5;
-                menuContainer.style.right = luft + "px";
-                _this.removeClass(parentTab, "fm-align-right");
-                menuList.classList.add("fm-dropdown-scrollable-right");
-            }
-        } else if (menuRect.left < toolbarRect.left + (leftScrollArrow ? leftScrollArrow.offsetWidth : 0)) { //this block handles cases when scrolling tabs are partly hidden
-            var luft = (leftScrollArrow ? leftScrollArrow.getBoundingClientRect().right : 0) - menuRect.left + 5;
+
+            var luft = Math.round(parentRect.right - menuRect.left - parentRect.width * 0.6);
             menuContainer.style.left = luft + "px";
             menuList.classList.add("fm-dropdown-scrollable-left");
+        } else if (menuRect.right > toolbarRect.right - arrowWidth 
+            && parentRect.left + parentRect.width / 2 - menuRect.width > 0) {//this case handles right positioning
+            menuContainer.style.right = 0;
+            menuRect = menuContainer.getBoundingClientRect();
+            
+            var luft = Math.round(menuRect.right - parentRect.left - parentRect.width * 0.6);
+            menuContainer.style.right = luft + "px";
+            menuList.classList.add("fm-dropdown-scrollable-right");
+        } else if (leftScrollArrowRect && parentRect.left < leftScrollArrowRect.right) {// this case handles left positon on the edge
+            menuContainer.style.left = 0;
+            menuList.classList.add("fm-dropdown-scrollable-left");
         }
         setActiveItemAt(-2);
         parentTab.querySelector("a").setAttribute("aria-activedescendant", menuList.children.item(0).id);