Merge remote-tracking branch 'origin/master' into issue/6917-Property-Grid-can-be-stretched-to-completely-overlap-the-design-area

Author: novikov82

docs/images/download-obfuscated-json.png

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.1.0](https://github.com/surveyjs/survey-creator/compare/v2.0.10...v2.1.0) (2025-05-27)
+
 ### [2.0.10](https://github.com/surveyjs/survey-creator/compare/v2.0.9...v2.0.10) (2025-05-20)
 
 ### [2.0.9](https://github.com/surveyjs/survey-creator/compare/v2.0.8...v2.0.9) (2025-05-14)

packages/survey-creator-angular/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "survey-creator-angular",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "description": "Use SurveyJS Creator to create or edit JSON for SurveyJS Form Library.",
   "homepage": "https://surveyjs.io/Overview/Survey-Creator",
   "license": "https://surveyjs.io/Licenses#SurveyCreator",

packages/survey-creator-angular/package.json

@@ -6,20 +6,18 @@
         [attr.required]="model.isRequired" 
         [attr.tabindex]= "model.isInputReadOnly ? undefined : 0"
         [attr.disabled]="model.isInputReadOnly"
-        [attr.role]="model.ariaRole"
-        [attr.aria-required]="model.ariaRequired"
-        [attr.aria-label]="model.ariaLabel"
-        [attr.aria-labelledby]="model.ariaLabelledBy"
-        [attr.aria-invalid]="model.ariaInvalid"
-        [attr.aria-errormessage]="model.ariaErrormessage"
-        [attr.aria-expanded]="model.ariaExpanded"
+        [attr.role]="dropdownModel.ariaQuestionRole"
+        [attr.aria-required]="dropdownModel.ariaQuestionRequired"
+        [attr.aria-invalid]="dropdownModel.ariaQuestionInvalid"
+        [attr.aria-errormessage]="dropdownModel.ariaQuestionErrorMessage" 
+        [attr.aria-expanded]="dropdownModel.ariaQuestionExpanded"
+        [attr.aria-label]="dropdownModel.ariaQuestionLabel" 
+        [attr.aria-labelledby]="dropdownModel.ariaQuestionLabelledby"
+        [attr.aria-controls]="dropdownModel.ariaQuestionControls"
       >
         <div [class]="model.cssClasses.controlValue">
           <sv-ng-string *ngIf="model.locReadOnlyText" [model]="model.locReadOnlyText"></sv-ng-string>
         </div>
-        <div *ngIf="model.allowClear && model.cssClasses.cleanButtonIconId" [class]="model.cssClasses.cleanButton" (click)="clear($event)" [visible]="!model.isEmpty()">
-          <svg [class]="model.cssClasses.cleanButtonSvg" [iconName]="model.cssClasses.cleanButtonIconId" [size]="'auto'" [title]="model.clearCaption" sv-ng-svg-icon></svg>
-        </div>
       </div>
         <sv-ng-popup [popupModel]="model.popupModel"></sv-ng-popup>
     </ng-container>

packages/survey-creator-angular/src/questions/logic-operator.component.html

@@ -10,15 +10,15 @@ import { initLogicOperator } from "survey-creator-core";
 })
 export class LogicOperatorComponent extends QuestionAngular<QuestionDropdownModel> {
   private dropdownListModel?: DropdownListModel;
-  get dropdownModel(): DropdownListModel | undefined {
+  get dropdownModel(): DropdownListModel {
+    if (!this.dropdownListModel) {
+      this.dropdownListModel = new DropdownListModel(this.model);
+    }
     return this.dropdownListModel;
   }
   click(event: any) {
     this.dropdownListModel?.onClick(event);
   }
-  clear(event: any) {
-    this.dropdownListModel?.onClear(event);
-  }
   keyup(event: any) {
     this.dropdownListModel?.keyHandler(event);
   }

packages/survey-creator-angular/src/questions/logic-operator.component.ts

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.1.0](https://github.com/surveyjs/survey-creator/compare/v2.0.10...v2.1.0) (2025-05-27)
+
 ### [2.0.10](https://github.com/surveyjs/survey-creator/compare/v2.0.9...v2.0.10) (2025-05-20)
 
 ### [2.0.9](https://github.com/surveyjs/survey-creator/compare/v2.0.8...v2.0.9) (2025-05-14)

packages/survey-creator-core/CHANGELOG.md

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.10",
+  "version": "2.1.0",
   "name": "survey-creator-core",
   "homepage": "https://surveyjs.io/Overview/Survey-Creator",
   "license": "SEE LICENSE IN LICENSE",

packages/survey-creator-core/package.json

@@ -131,7 +131,7 @@ export class MatrixCellWrapperViewModel extends Base {
       return;
     }
     const contextType = model.context.getType();
-    if (contextType === "itemvalue") {
+    if (Serializer.isDescendantOf(contextType, "itemvalue")) {
       model.creator.selectElement(model.context.locOwner, model.context.ownerPropertyName, false);
     } else {
       model.creator.selectElement(model.context);
@@ -143,7 +143,7 @@ export class MatrixCellWrapperViewModel extends Base {
     return SurveyHelper.isSupportCellEditor(this.question.getType());
   }
   public hover(event: MouseEvent, element: HTMLElement | any) {
-    if (!this.row && this.context && this.context.getPropertyValue && this.context.getType && this.context.getType() !== "itemvalue") {
+    if (!this.row && this.context && this.context.getPropertyValue && this.context.getType && !this.context.isDescendantOf("itemvalue")) {
       toggleHovered(event, element);
     }
   }

packages/survey-creator-core/src/components/matrix-cell.ts

@@ -2734,7 +2734,7 @@ export class SurveyCreatorModel extends Base
       if ((el.isQuestion || Serializer.isDescendantOf(el.getType(), "matrixdropdowncolumn")) && name === "name") {
         this.clearNonDefaultLocalesInStrByValue(el.locTitle);
       } else {
-        if (Serializer.isDescendantOf(el.getType(), "itemvalue") && name === "value") {
+        if (el.isDescendantOf("itemvalue") && name === "value") {
           this.clearNonDefaultLocalesInStrByValue(el.locText);
         } else {
           const prop = Serializer.findProperty(el.getType(), name);
@@ -4568,7 +4568,7 @@ export function initializeDesignTimeSurveyModel(model: any, creator: SurveyCreat
     if (opt.wrapperName === "row") {
       opt.componentName = "svc-row";
     }
-    if (opt.wrapperName === "itemvalue") {
+    if (Serializer.isDescendantOf(opt.wrapperName, "itemvalue")) {
       opt.componentName = getItemValueWrapperComponentName(opt.item, opt.element);
     }
     opt.componentName = opt.componentName || compName;
@@ -4581,7 +4581,7 @@ export function initializeDesignTimeSurveyModel(model: any, creator: SurveyCreat
     if (opt.wrapperName === "row") {
       opt.data = { creator: creator, row: opt.element };
     }
-    if (opt.wrapperName === "itemvalue") {
+    if (Serializer.isDescendantOf(opt.wrapperName, "itemvalue")) {
       opt.data = getItemValueWrapperComponentData(opt.item, opt.element, creator);
     }
     opt.data = opt.data || data;

packages/survey-creator-core/src/creator-base.ts

@@ -47,6 +47,7 @@ export var enStrings = {
     paneldynamic: "Dynamic Panel",
     radiogroup: "Radio Button Group",
     rating: "Rating Scale",
+    slider: "Slider",
     text: "Single-Line Input",
     boolean: "Yes/No (Boolean)",
     expression: "Expression (read-only)",
@@ -744,6 +745,19 @@ export var enStrings = {
     rateValues: "Custom rating values",
     rateCount: "Rating count",
     autoGenerate: "Rating configuration",
+    slider: {
+      min: "Min value",
+      max: "Max value",
+      step: "Step value",
+      showLabels: "Show scale labels",
+      // segmentCount: "Number of segments",
+      tooltipVisibilityPG: "Show tooltips",
+      allowSwap: "Allow thumb crossing",
+      labelCount: "Number of auto-generated labels",
+      minValueExpression: "Min value expression",
+      maxValueExpression: "Max value expression",
+      autoGenerate: "Scale labels configuration"
+    },
     hideIfChoicesEmpty: "Hide the question if it has no choices",
     minWidth: "Minimum width",
     maxWidth: "Maximum width",
@@ -826,6 +840,7 @@ export var enStrings = {
       enableIf: "Editable If",
       requiredIf: "Required If",
       rateValues: "Rating Values",
+      sliderSettings: "Slider Settings",
       choicesByUrl: "Choices from a Web Service",
       matrixChoices: "Default Choices",
       multipleTextItems: "Text Inputs",
@@ -1048,6 +1063,10 @@ export var enStrings = {
       url: "URL",
       week: "Week"
     },
+    sliderType: {
+      single: "Single-Value",
+      range: "Range"
+    },
     autocomplete: {
       "name": "Full Name",
       "honorific-prefix": "Prefix",