survey-react-ui 1.10.5 → 1.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "survey-react-ui",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "survey.js is a JavaScript Survey Library. It is a modern way to add a survey to your website. It uses JSON for survey metadata and results.",
   "keywords": [
     "Survey",
@@ -21,7 +21,7 @@
   },
   "typings": "survey-react-ui.d.ts",
   "peerDependencies": {
-    "survey-core": "1.10.5",
+    "survey-core": "1.10.6",
     "react": "^16.5.0 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.5.0 || ^17.0.1 || ^18.2.0"
   }

package/survey-react-ui.js

@@ -1,5 +1,5 @@
 /*!
- * surveyjs - Survey JavaScript library v1.10.5
+ * surveyjs - Survey JavaScript library v1.10.6
  * Copyright (c) 2015-2024 Devsoft Baltic OÜ  - http://surveyjs.io/
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -105,13 +105,14 @@ return /******/ (function(modules) { // webpackBootstrap
 /*!*******************************!*\
   !*** ./src/actions/action.ts ***!
   \*******************************/
-/*! exports provided: createDropdownActionModel, createDropdownActionModelAdvanced, getActionDropdownButtonTarget, BaseAction, Action, ActionDropdownViewModel */
+/*! exports provided: createDropdownActionModel, createDropdownActionModelAdvanced, createPopupModelWithListModel, getActionDropdownButtonTarget, BaseAction, Action, ActionDropdownViewModel */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createDropdownActionModel", function() { return createDropdownActionModel; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createDropdownActionModelAdvanced", function() { return createDropdownActionModelAdvanced; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createPopupModelWithListModel", function() { return createPopupModelWithListModel; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getActionDropdownButtonTarget", function() { return getActionDropdownButtonTarget; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BaseAction", function() { return BaseAction; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; });
@@ -152,36 +153,53 @@ var __decorate = (undefined && undefined.__decorate) || function (decorators, ta
 
 
 function createDropdownActionModel(actionOptions, dropdownOptions, locOwner) {
-    return createDropdownActionModelAdvanced(actionOptions, dropdownOptions, dropdownOptions, locOwner);
+    dropdownOptions.locOwner = locOwner;
+    return createDropdownActionModelAdvanced(actionOptions, dropdownOptions, dropdownOptions);
 }
-function createDropdownActionModelAdvanced(actionOptions, listOptions, popupOptions, locOwner) {
-    var listModel = new _list__WEBPACK_IMPORTED_MODULE_3__["ListModel"](listOptions.items, function (item) {
+function createDropdownActionModelAdvanced(actionOptions, listOptions, popupOptions) {
+    var _a;
+    var originalSelectionChanged = listOptions.onSelectionChanged;
+    listOptions.onSelectionChanged = function (item) {
+        var params = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            params[_i - 1] = arguments[_i];
+        }
         if (newAction.hasTitle) {
             newAction.title = item.title;
         }
-        listOptions.onSelectionChanged(item);
-        innerPopupModel.toggleVisibility();
-    }, listOptions.allowSelection, listOptions.selectedItem);
-    listModel.locOwner = locOwner;
-    listModel.setOnFilterStringChangedCallback(listOptions.onFilterStringChangedCallback);
-    var options = popupOptions || {};
-    options.onDispose = function () { listModel.dispose(); };
-    var innerPopupModel = new _popup__WEBPACK_IMPORTED_MODULE_4__["PopupModel"]("sv-list", { model: listModel }, options);
-    innerPopupModel.displayMode = popupOptions === null || popupOptions === void 0 ? void 0 : popupOptions.displayMode;
+        originalSelectionChanged(item, params);
+    };
+    var popupModel = createPopupModelWithListModel(listOptions, popupOptions);
     var newActionOptions = Object.assign({}, actionOptions, {
         component: "sv-action-bar-item-dropdown",
-        popupModel: innerPopupModel,
+        popupModel: popupModel,
         action: function (action, isUserAction) {
             !!(actionOptions.action) && actionOptions.action();
-            innerPopupModel.isFocusedContent = !isUserAction || listModel.showFilter;
-            innerPopupModel.toggleVisibility();
-            listModel.scrollToSelectedItem();
+            popupModel.isFocusedContent = popupModel.isFocusedContent || !isUserAction;
+            popupModel.show();
         },
     });
     var newAction = new Action(newActionOptions);
-    newAction.data = listModel;
+    newAction.data = (_a = popupModel.contentComponentData) === null || _a === void 0 ? void 0 : _a.model;
     return newAction;
 }
+function createPopupModelWithListModel(listOptions, popupOptions) {
+    var listModel = new _list__WEBPACK_IMPORTED_MODULE_3__["ListModel"](listOptions);
+    listModel.onSelectionChanged = function (item) {
+        listOptions.onSelectionChanged(item);
+        popupModel.hide();
+    };
+    var _popupOptions = popupOptions || {};
+    _popupOptions.onDispose = function () { listModel.dispose(); };
+    var popupModel = new _popup__WEBPACK_IMPORTED_MODULE_4__["PopupModel"]("sv-list", { model: listModel }, _popupOptions);
+    popupModel.isFocusedContent = listModel.showFilter;
+    popupModel.onShow = function () {
+        if (!!_popupOptions.onShow)
+            _popupOptions.onShow();
+        listModel.scrollToSelectedItem();
+    };
+    return popupModel;
+}
 function getActionDropdownButtonTarget(container) {
     return container === null || container === void 0 ? void 0 : container.previousElementSibling;
 }
@@ -3638,7 +3656,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-Object(survey_core__WEBPACK_IMPORTED_MODULE_2__["checkLibraryVersion"])("" + "1.10.5", "survey-react-ui");
+Object(survey_core__WEBPACK_IMPORTED_MODULE_2__["checkLibraryVersion"])("" + "1.10.6", "survey-react-ui");
 
 
 /***/ }),
@@ -10623,8 +10641,28 @@ var ListModel = /** @class */ (function (_super) {
             var level = itemValue.level || 0;
             return (level + 1) * ListModel.INDENT + "px";
         };
-        _this.setItems(items);
-        _this.selectedItem = selectedItem;
+        if (Object.keys(items).indexOf("items") !== -1) {
+            var options_1 = items;
+            Object.keys(options_1).forEach(function (key) {
+                switch (key) {
+                    case "items":
+                        _this.setItems(options_1.items);
+                        break;
+                    case "onFilterStringChangedCallback":
+                        _this.setOnFilterStringChangedCallback(options_1.onFilterStringChangedCallback);
+                        break;
+                    case "onTextSearchCallback":
+                        _this.setOnTextSearchCallback(options_1.onTextSearchCallback);
+                        break;
+                    default:
+                        _this[key] = options_1[key];
+                }
+            });
+        }
+        else {
+            _this.setItems(items);
+            _this.selectedItem = selectedItem;
+        }
         return _this;
     }
     ListModel.prototype.hasText = function (item, filterStringInLow) {
@@ -10851,6 +10889,7 @@ var ListModel = /** @class */ (function (_super) {
     };
     ListModel.prototype.addScrollEventListener = function (handler) {
         if (!!handler) {
+            this.removeScrollEventListener();
             this.scrollHandler = handler;
         }
         if (!!this.scrollHandler) {
@@ -11754,13 +11793,6 @@ var PopupModel = /** @class */ (function (_super) {
             }
             this.setPropertyValue("isVisible", value);
             this.onVisibilityChanged.fire(this, { model: this, isVisible: value });
-            if (this.isVisible) {
-                this.onShow();
-            }
-            else {
-                this.refreshInnerModel();
-                this.onHide();
-            }
         },
         enumerable: false,
         configurable: true
@@ -11768,6 +11800,14 @@ var PopupModel = /** @class */ (function (_super) {
     PopupModel.prototype.toggleVisibility = function () {
         this.isVisible = !this.isVisible;
     };
+    PopupModel.prototype.show = function () {
+        if (!this.isVisible)
+            this.isVisible = true;
+    };
+    PopupModel.prototype.hide = function () {
+        if (this.isVisible)
+            this.isVisible = false;
+    };
     PopupModel.prototype.recalculatePosition = function (isResetHeight) {
         this.onRecalculatePosition.fire(this, { isResetHeight: isResetHeight });
     };
@@ -11776,6 +11816,10 @@ var PopupModel = /** @class */ (function (_super) {
         this.onFooterActionsCreated.fire(this, options);
         return options.actions;
     };
+    PopupModel.prototype.onHiding = function () {
+        this.refreshInnerModel();
+        this.onHide();
+    };
     PopupModel.prototype.dispose = function () {
         _super.prototype.dispose.call(this);
         this.onDispose();
@@ -19942,6 +19986,8 @@ var SurveyQuestionMatrixDropdownCell = /** @class */ (function (_super) {
         return this.cell.headers;
     };
     SurveyQuestionMatrixDropdownCell.prototype.renderQuestion = function () {
+        if (!this.question.isVisible)
+            return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null);
         if (!this.cell.isChoice)
             return _reactquestion__WEBPACK_IMPORTED_MODULE_2__["SurveyQuestion"].renderQuestionBody(this.creator, this.question);
         if (this.cell.isOtherChoice)