survey-analytics 2.3.0 → 2.3.1

package/fesm/shared2.mjs

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - SurveyJS Dashboard library v2.3.0
+ * surveyjs - SurveyJS Dashboard library v2.3.1
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -317,17 +317,24 @@ function defaultStatisticsCalculator(data, dataInfo) {
         }
         statistics.push(dataNameStatistics);
     }
+    const getValueIndex = (val) => {
+        if (val !== null && typeof val === "object")
+            return valuesIndex[val.value];
+        return valuesIndex[val];
+    };
     data.forEach((row) => {
         dataNames.forEach((dataName, index) => {
             const rowValue = row[dataName];
             if (rowValue !== undefined || processMissingAnswers) {
                 const rowValues = Array.isArray(rowValue) ? rowValue : [rowValue];
                 if (series.length > 0) {
-                    if (row[DataProvider.seriesMarkerKey] !== undefined) {
+                    const rowName = row[DataProvider.seriesMarkerKey];
+                    if (rowName !== undefined) {
                         // Series are labelled by seriesMarkerKey in row data
-                        const seriesNo = seriesIndex[row[DataProvider.seriesMarkerKey]] || 0;
+                        const seriesNo = seriesIndex[rowName] || 0;
                         rowValues.forEach((val) => {
-                            statistics[index][seriesNo][valuesIndex[val]]++;
+                            const valIndex = getValueIndex(val);
+                            statistics[index][seriesNo][valIndex]++;
                         });
                     }
                     else {
@@ -337,7 +344,11 @@ function defaultStatisticsCalculator(data, dataInfo) {
                             series.forEach((seriesName) => {
                                 if (val[seriesName] !== undefined) {
                                     const seriesNo = seriesIndex[seriesName] || 0;
-                                    statistics[index][seriesNo][valuesIndex[val[seriesName]]]++;
+                                    const values = Array.isArray(val[seriesName]) ? val[seriesName] : [val[seriesName]];
+                                    values.forEach(value => {
+                                        const valIndex = getValueIndex(value);
+                                        statistics[index][seriesNo][valIndex]++;
+                                    });
                                 }
                             });
                         });
@@ -345,7 +356,10 @@ function defaultStatisticsCalculator(data, dataInfo) {
                 }
                 else {
                     // No series
-                    rowValues.forEach((val) => statistics[0][0][valuesIndex[val]]++);
+                    rowValues.forEach((val) => {
+                        const valIndex = getValueIndex(val);
+                        statistics[0][0][valIndex]++;
+                    });
                 }
             }
         });
@@ -439,6 +453,9 @@ class VisualizerBase {
         }
         this.onStateChanged.fire(this, this.getState());
     }
+    getToolbarItemCreators() {
+        return Object.assign({}, this.toolbarItemCreators, this.onGetToolbarItemCreators && this.onGetToolbarItemCreators() || {});
+    }
     constructor(question, data, options = {}, _type) {
         var _a;
         this.question = question;
@@ -645,8 +662,8 @@ class VisualizerBase {
      * @param creator A function that accepts the toolbar and should return an `HTMLElement` with the toolbar item.
      * @see unregisterToolbarItem
      */
-    registerToolbarItem(name, creator) {
-        this.toolbarItemCreators[name] = creator;
+    registerToolbarItem(name, creator, order = 100) {
+        this.toolbarItemCreators[name] = { creator, order };
     }
     /**
      *
@@ -657,9 +674,9 @@ class VisualizerBase {
      */
     unregisterToolbarItem(name) {
         if (this.toolbarItemCreators[name] !== undefined) {
-            const creator = this.toolbarItemCreators[name];
+            const item = this.toolbarItemCreators[name];
             delete this.toolbarItemCreators[name];
-            return creator;
+            return item.creator;
         }
         return undefined;
     }
@@ -741,8 +758,12 @@ class VisualizerBase {
         }
     }
     createToolbarItems(toolbar) {
-        Object.keys(this.toolbarItemCreators || {}).forEach((toolbarItemName) => {
-            let toolbarItem = this.toolbarItemCreators[toolbarItemName](toolbar);
+        const toolbarItemCreators = this.getToolbarItemCreators();
+        const sortedItems = Object.keys(toolbarItemCreators || {})
+            .map(name => (Object.assign({ name }, toolbarItemCreators[name])))
+            .sort((a, b) => a.order - b.order);
+        sortedItems.forEach((item) => {
+            let toolbarItem = item.creator(toolbar);
             if (!!toolbarItem) {
                 toolbar.appendChild(toolbarItem);
             }
@@ -1377,7 +1398,7 @@ class SelectBase extends VisualizerBase {
                 this.updateEmptyAnswersBtn();
             }
             return this.emptyAnswersBtn;
-        });
+        }, 1000);
         this.registerToolbarItem("topNAnswers", () => {
             if (this.options.allowTopNAnswers &&
                 this.getSeriesValues().length === 0) {
@@ -2552,12 +2573,14 @@ class AlternativeVisualizersWrapper extends VisualizerBase {
          * The event is fired right after AlternativeVisualizersWrapper content type has been changed.
          **/
         this.onVisualizerChanged = new Event();
+        this.showToolbar = false;
         this.loadingData = false;
         if (!visualizers || visualizers.length < 2) {
             throw new Error("VisualizerArrayWrapper works with visualizers collection only.");
         }
         this.visualizers.forEach((visualizer) => {
             visualizer.onUpdate = () => this.invokeOnUpdate();
+            visualizer.onGetToolbarItemCreators = () => this.toolbarItemCreators;
             if (visualizer.supportSelection) {
                 this._supportSelection = true;
                 this.visualizersWithSelection.push(visualizer);
@@ -2568,7 +2591,7 @@ class AlternativeVisualizersWrapper extends VisualizerBase {
                 value: visualizer.type,
                 text: localization.getString("visualizer_" + visualizer.type),
             };
-        }), (option) => this.visualizer.type === option.value, (e) => this.setVisualizer(e.target.value)));
+        }), (option) => this.visualizer.type === option.value, (e) => this.setVisualizer(e.target.value)), 0);
         this.visualizer = visualizers[0];
         this.visualizer.onAfterRender.add(this.onAfterVisualizerRenderCallback);
         this.visualizer.onStateChanged.add(this.onVisualizerStateChangedCallback);
@@ -9771,7 +9794,7 @@ class VisualizationPanel extends VisualizerBase {
                     }
                 });
             }, localization.getString("resetFilter"));
-        });
+        }, 900);
         this.registerToolbarItem("addElement", (toolbar) => {
             if (this.allowHideQuestions) {
                 let addElementSelector = undefined;
@@ -9944,7 +9967,7 @@ class VisualizationPanel extends VisualizerBase {
                     return DocumentHelper.createButton(() => {
                         setTimeout(() => this.hideElement(question.name), 0);
                     }, localization.getString("hideButton"));
-                });
+                }, 1000);
             }
             if (this.allowMakeQuestionsPrivate) {
                 visualizer.registerToolbarItem("makePrivatePublic", () => {
@@ -9969,7 +9992,7 @@ class VisualizationPanel extends VisualizerBase {
                 visualizer.registerToolbarItem("questionFilterInfo", () => {
                     filterInfo.update(visualizerWithSelection.selection);
                     return filterInfo.htmlElement;
-                });
+                }, 900);
                 visualizerWithSelection.onDataItemSelected = (selectedValue, selectedText) => {
                     filterInfo.update({ value: selectedValue, text: selectedText });
                     this.setFilter(question.name, selectedValue);