survey-analytics 2.3.0 → 2.3.2

package/fesm/shared2.mjs

@@ -1,10 +1,10 @@
 /*!
- * surveyjs - SurveyJS Dashboard library v2.3.0
+ * surveyjs - SurveyJS Dashboard library v2.3.2
  * Copyright (c) 2015-2025 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
 
-import { D as DocumentHelper, l as localization, f as createLoadingIndicator, a as DataHelper, e as svgTemplate, d as createCommercialLicenseLink, t as toPrecision } from './shared.mjs';
+import { D as DocumentHelper, l as localization, g as createLoadingIndicator, b as DataHelper, f as svgTemplate, e as createCommercialLicenseLink, t as toPrecision } from './shared.mjs';
 import { Event, QuestionCommentModel, settings, ItemValue, hasLicense, surveyLocalization, IsTouch } from 'survey-core';
 
 /******************************************************************************
@@ -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) {
@@ -1894,7 +1915,7 @@ class HistogramModel extends SelectBase {
         super(question, data, options, name || "histogram");
         this.valueType = "number";
         this._cachedValues = undefined;
-        this._continiousData = undefined;
+        this._continuousData = undefined;
         this._cachedIntervals = undefined;
         this._intervalPrecision = 2;
         this._transposeData = false;
@@ -1910,11 +1931,11 @@ class HistogramModel extends SelectBase {
         }
     }
     reset() {
-        this._continiousData = undefined;
+        this._continuousData = undefined;
         this._cachedValues = undefined;
         this._cachedIntervals = undefined;
     }
-    getContiniousValue(value) {
+    getContinuousValue(value) {
         if (this.valueType === "date") {
             return Date.parse(value);
         }
@@ -1931,7 +1952,7 @@ class HistogramModel extends SelectBase {
         return Math.round(base * value) / base;
     }
     getSelectedItemByText(itemText) {
-        if (this.hasCustomIntervals || this.getContiniousValues().length > HistogramModel.UseIntervalsFrom) {
+        if (this.hasCustomIntervals || this.getContinuousValues().length > HistogramModel.UseIntervalsFrom) {
             const interval = this.intervals.filter(interval => interval.label === itemText)[0];
             return new ItemValue(interval, interval !== undefined ? interval.label : "");
         }
@@ -1950,26 +1971,26 @@ class HistogramModel extends SelectBase {
         this.reset();
         super.onDataChanged();
     }
-    getContiniousValues() {
+    getContinuousValues() {
         if (this._cachedValues === undefined) {
             const series = this.getSeriesValues();
             if (series.length === 0) {
                 series.push("");
             }
-            this._continiousData = {};
-            series.forEach(seriesValue => this._continiousData[seriesValue] = []);
+            this._continuousData = {};
+            series.forEach(seriesValue => this._continuousData[seriesValue] = []);
             const hash = {};
             this.data.forEach(dataItem => {
                 const answerData = dataItem[this.name];
                 if (answerData !== undefined) {
                     const seriesValue = dataItem[DataProvider.seriesMarkerKey] || "";
-                    // TODO: _continiousData should be sorted in order to speed-up statistics calculation in the getData function
-                    this._continiousData[seriesValue].push(this.getContiniousValue(answerData));
+                    // TODO: _continuousData should be sorted in order to speed-up statistics calculation in the getData function
+                    this._continuousData[seriesValue].push(this.getContinuousValue(answerData));
                     hash[answerData] = answerData;
                 }
             });
-            this._cachedValues = Object.keys(hash).map(key => ({ original: hash[key], continious: this.getContiniousValue(key) }));
-            this._cachedValues.sort((a, b) => a.continious - b.continious);
+            this._cachedValues = Object.keys(hash).map(key => ({ original: hash[key], continuous: this.getContinuousValue(key) }));
+            this._cachedValues.sort((a, b) => a.continuous - b.continuous);
         }
         return this._cachedValues;
     }
@@ -2015,11 +2036,11 @@ class HistogramModel extends SelectBase {
             }
         }
         if (this._cachedIntervals === undefined) {
-            const continiousValues = this.getContiniousValues();
+            const continuousValues = this.getContinuousValues();
             this._cachedIntervals = [];
-            if (continiousValues.length) {
-                let start = continiousValues[0].continious;
-                const end = continiousValues[continiousValues.length - 1].continious;
+            if (continuousValues.length) {
+                let start = continuousValues[0].continuous;
+                const end = continuousValues[continuousValues.length - 1].continuous;
                 const intervalsCount = HistogramModel.IntervalsCount;
                 const delta = (end - start) / intervalsCount;
                 for (let i = 0; i < intervalsCount; ++i) {
@@ -2041,8 +2062,8 @@ class HistogramModel extends SelectBase {
         return [externalCalculatedData];
     }
     getCalculatedValuesCore() {
-        this.getContiniousValues();
-        return histogramStatisticsCalculator(this._continiousData, this.intervals, this.getSeriesValues());
+        this.getContinuousValues();
+        return histogramStatisticsCalculator(this._continuousData, this.intervals, this.getSeriesValues());
     }
     getValueType() {
         return this.valueType;
@@ -2142,7 +2163,7 @@ class PivotModel extends SelectBase {
         this.questions = questions;
         this.valueType = "enum";
         this._cachedValues = undefined;
-        this._continiousData = undefined;
+        this._continuousData = undefined;
         this._cachedIntervals = undefined;
         this._intervalPrecision = 2;
         this.axisYSelectors = [];
@@ -2158,7 +2179,12 @@ class PivotModel extends SelectBase {
                 value: question.name,
                 text: question.title || question.name,
             };
-        }), (option) => this.axisXQuestionName === option.value, (e) => { this.axisXQuestionName = e.target.value; this.setupPivot(); }, localization.getString("axisXSelectorTitle")));
+        }), (option) => this.axisXQuestionName === option.value, (e) => {
+            this.axisXQuestionName = e.target.value;
+            this.updateQuestionsSelection();
+            this.updateToolbar();
+            this.setupPivot();
+        }, () => this.isXYChart() ? localization.getString("axisXSelectorTitle") : localization.getString("axisXAlternativeSelectorTitle")));
         this.registerToolbarItem("axisYSelector0", this.createYSelecterGenerator());
         this.setupPivot();
     }
@@ -2170,6 +2196,9 @@ class PivotModel extends SelectBase {
                 selector = this.createAxisYSelector(selectorIndex);
                 this.axisYSelectors.push(selector);
             }
+            else {
+                selector["__updateSelect"] && selector["__updateSelect"]();
+            }
             return selector;
         };
     }
@@ -2190,26 +2219,62 @@ class PivotModel extends SelectBase {
                 }
                 this.axisYSelectors = this.axisYSelectors.slice(0, index + 1);
                 this.axisYQuestionNames = this.axisYQuestionNames.slice(0, index + 1);
-                this.updateToolbar();
             }
         }
         else {
             if (!!value) {
                 this.registerToolbarItem("axisYSelector" + this.axisYSelectors.length, this.createYSelecterGenerator());
-                this.updateToolbar();
             }
         }
+        this.updateQuestionsSelection();
+        this.updateToolbar();
         this.setupPivot();
     }
+    updateQuestionsSelection() {
+        const selectedQuestions = [this.axisXQuestionName];
+        for (let i = 0; i < this.axisYQuestionNames.length; ++i) {
+            const questionName = this.axisYQuestionNames[i];
+            if (selectedQuestions.indexOf(questionName) !== -1) {
+                this.onAxisYSelectorChanged(i, undefined);
+                break;
+            }
+            else {
+                selectedQuestions.push(questionName);
+            }
+        }
+    }
     createAxisYSelector(selectorIndex) {
-        const selector = DocumentHelper.createSelector([{ value: "", text: "Not selected" }].concat(this.questions.map((question) => {
-            return {
-                value: question.name,
-                text: question.title || question.name,
-            };
-        })), (option) => this.axisYQuestionNames[selectorIndex] === option.value, (e) => { this.onAxisYSelectorChanged(selectorIndex, e.target.value); }, selectorIndex ? undefined : localization.getString("axisYSelectorTitle"));
+        const getChoices = () => {
+            const choices = this.questions.filter(q => {
+                if (q.name === this.axisXQuestionName) {
+                    return false;
+                }
+                const usedIndex = this.axisYQuestionNames.indexOf(q.name);
+                return usedIndex == -1 || usedIndex >= selectorIndex;
+            }).map((question) => {
+                return {
+                    value: question.name,
+                    text: question.title || question.name,
+                };
+            });
+            return [{ value: "", text: localization.getString("notSelected") }].concat(choices);
+        };
+        if (getChoices().length == 1) {
+            return undefined;
+        }
+        const selector = DocumentHelper.createSelector(getChoices, (option) => this.axisYQuestionNames[selectorIndex] === option.value, (e) => { this.onAxisYSelectorChanged(selectorIndex, e.target.value); }, () => selectorIndex ? undefined : (this.isXYChart() ? localization.getString("axisYSelectorTitle") : localization.getString("axisYAlternativeSelectorTitle")));
         return selector;
     }
+    setChartType(chartType) {
+        const prev2Dchart = this.isXYChart();
+        super.setChartType(chartType);
+        if (prev2Dchart !== this.isXYChart()) {
+            this.updateToolbar();
+        }
+    }
+    isXYChart() {
+        return ["pie", "doughnut"].indexOf(this.chartType) === -1;
+    }
     getQuestionValueType(question) {
         const questionType = question.getType();
         if (questionType === "text" && (question["inputType"] === "date" || question["inputType"] === "datetime")) {
@@ -2236,11 +2301,11 @@ class PivotModel extends SelectBase {
         this.onDataChanged();
     }
     reset() {
-        this._continiousData = undefined;
+        this._continuousData = undefined;
         this._cachedValues = undefined;
         this._cachedIntervals = undefined;
     }
-    getContiniousValue(value) {
+    getContinuousValue(value) {
         if (this.valueType === "date") {
             return Date.parse(value);
         }
@@ -2257,7 +2322,7 @@ class PivotModel extends SelectBase {
         return Math.round(base * value) / base;
     }
     getSelectedItemByText(itemText) {
-        if (this.hasCustomIntervals || this.getContiniousValues().length > PivotModel.UseIntervalsFrom) {
+        if (this.hasCustomIntervals || this.getContinuousValues().length > PivotModel.UseIntervalsFrom) {
             const interval = this.intervals.filter(interval => interval.label === itemText)[0];
             return new ItemValue(interval, interval !== undefined ? interval.label : "");
         }
@@ -2276,9 +2341,9 @@ class PivotModel extends SelectBase {
         this.reset();
         super.onDataChanged();
     }
-    getContiniousValues() {
+    getContinuousValues() {
         if (this._cachedValues === undefined) {
-            this._continiousData = [];
+            this._continuousData = [];
             if (this.valueType === "enum") {
                 this._cachedValues = [];
                 return this._cachedValues;
@@ -2287,13 +2352,13 @@ class PivotModel extends SelectBase {
             this.data.forEach(dataItem => {
                 const answerData = dataItem[this.name];
                 if (answerData !== undefined) {
-                    // TODO: _continiousData should be sorted in order to speed-up statistics calculation in the getData function
-                    this._continiousData.push({ continious: this.getContiniousValue(answerData), row: dataItem });
+                    // TODO: _continuousData should be sorted in order to speed-up statistics calculation in the getData function
+                    this._continuousData.push({ continuous: this.getContinuousValue(answerData), row: dataItem });
                     hash[answerData] = { value: answerData, row: dataItem };
                 }
             });
-            this._cachedValues = Object.keys(hash).map(key => ({ original: hash[key].value, continious: this.getContiniousValue(key), row: hash[key].row }));
-            this._cachedValues.sort((a, b) => a.continious - b.continious);
+            this._cachedValues = Object.keys(hash).map(key => ({ original: hash[key].value, continuous: this.getContinuousValue(key), row: hash[key].row }));
+            this._cachedValues.sort((a, b) => a.continuous - b.continuous);
         }
         return this._cachedValues;
     }
@@ -2378,11 +2443,11 @@ class PivotModel extends SelectBase {
             }
         }
         if (this._cachedIntervals === undefined) {
-            const continiousValues = this.getContiniousValues();
+            const continuousValues = this.getContinuousValues();
             this._cachedIntervals = [];
-            if (continiousValues.length) {
-                let start = continiousValues[0].continious;
-                const end = continiousValues[continiousValues.length - 1].continious;
+            if (continuousValues.length) {
+                let start = continuousValues[0].continuous;
+                const end = continuousValues[continuousValues.length - 1].continuous;
                 const intervalsCount = PivotModel.IntervalsCount;
                 const delta = (end - start) / intervalsCount;
                 for (let i = 0; i < intervalsCount; ++i) {
@@ -2464,14 +2529,14 @@ class PivotModel extends SelectBase {
             });
         }
         else {
-            this.getContiniousValues();
+            this.getContinuousValues();
             const intervals = this.intervals;
             for (var i = 0; i < series.length; ++i) {
                 statistics.push(intervals.map(i => 0));
             }
-            this._continiousData.forEach(dataValue => {
+            this._continuousData.forEach(dataValue => {
                 for (let valueIndex = 0; valueIndex < intervals.length; ++valueIndex) {
-                    if (intervals[valueIndex].start <= dataValue.continious && (dataValue.continious < intervals[valueIndex].end || valueIndex == intervals.length - 1)) {
+                    if (intervals[valueIndex].start <= dataValue.continuous && (dataValue.continuous < intervals[valueIndex].end || valueIndex == intervals.length - 1)) {
                         if (this.questionsY.length === 0) {
                             statistics[0][valueIndex]++;
                         }
@@ -2552,12 +2617,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 +2635,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 +9838,7 @@ class VisualizationPanel extends VisualizerBase {
                     }
                 });
             }, localization.getString("resetFilter"));
-        });
+        }, 900);
         this.registerToolbarItem("addElement", (toolbar) => {
             if (this.allowHideQuestions) {
                 let addElementSelector = undefined;
@@ -9812,7 +9879,7 @@ class VisualizationPanel extends VisualizerBase {
             const localeChoices = this.locales.map((element) => {
                 return {
                     value: element,
-                    text: localization.localeNames[element] || localization.getString(element) || element
+                    text: localization.getLocaleName(element)
                 };
             });
             // localeChoices.unshift({
@@ -9944,7 +10011,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 +10036,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);