Merge branch 'master' into feature/vue3

surveyjs · Jan 30, 2023 · ed06a9a · ed06a9a
2 parents 749afb6 + 7f2536b
commit ed06a9a
Show file tree

Hide file tree

Showing 313 changed files with 7,511 additions and 1,697 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+### [1.9.70](https://github.com/surveyjs/survey-library/compare/v1.9.69...v1.9.70) (2023-01-24)
+
+### [1.9.69](https://github.com/surveyjs/survey-library/compare/v1.9.68...v1.9.69) (2023-01-17)
+
+### [1.9.68](https://github.com/surveyjs/survey-library/compare/v1.9.67...v1.9.68) (2023-01-11)
+
 ### [1.9.67](https://github.com/surveyjs/survey-library/compare/v1.9.66...v1.9.67) (2023-01-05)
 
 ### [1.9.66](https://github.com/surveyjs/survey-library/compare/v1.9.65...v1.9.66) (2022-12-30)

diff --git a/build-scripts/survey-angular/tsconfig.typing.angular.json b/build-scripts/survey-angular/tsconfig.typing.angular.json
@@ -22,8 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-angular/survey-angular.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/angular.ts"

diff --git a/build-scripts/survey-angular/webpack.config.js b/build-scripts/survey-angular/webpack.config.js
@@ -17,7 +17,7 @@ const config = {
   plugins: [
     new DtsGeneratorPlugin({
       tsConfigPath: "./build-scripts/survey-angular/tsconfig.typing.angular.json",
-      filePath: "build/survey-angular/survey-angular.d.ts",
+      filePath: "build/survey-angular/survey.angular.d.ts",
       moduleName: "survey-angular",
       importName: "entries/angular"
     }),

diff --git a/build-scripts/survey-core/package.json b/build-scripts/survey-core/package.json
@@ -28,12 +28,12 @@
     "survey.core.min.js",
     "survey.i18n.js",
     "survey.i18n.min.js",
-    "bootstrap-integration.d.ts",
-    "bootstrap-integration.js",
-    "bootstrap-integration.min.js",
-    "bootstrap-material-integration.d.ts",
-    "bootstrap-material-integration.js",
-    "bootstrap-material-integration.min.js"
+    "plugins/bootstrap-integration.d.ts",
+    "plugins/bootstrap-integration.js",
+    "plugins/bootstrap-integration.min.js",
+    "plugins/bootstrap-material-integration.d.ts",
+    "plugins/bootstrap-material-integration.js",
+    "plugins/bootstrap-material-integration.min.js"
   ],
   "main": "survey.core.js",
   "repository": {

diff --git a/build-scripts/survey-core/tsconfig.typing.json b/build-scripts/survey-core/tsconfig.typing.json
@@ -22,8 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-core/survey.core.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/core.ts"

diff --git a/build-scripts/survey-jquery/tsconfig.typing.jquery.json b/build-scripts/survey-jquery/tsconfig.typing.jquery.json
@@ -22,8 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-jquery/survey-jquery.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/jquery.ts"

diff --git a/build-scripts/survey-jquery/webpack.config.js b/build-scripts/survey-jquery/webpack.config.js
@@ -23,7 +23,7 @@ const config = {
   plugins: [
     new DtsGeneratorPlugin({
       tsConfigPath: "./build-scripts/survey-jquery/tsconfig.typing.jquery.json",
-      filePath: "build/survey-jquery/survey-jquery.d.ts",
+      filePath: "build/survey-jquery/survey.jquery.d.ts",
       moduleName: "survey-jquery",
       importName: "entries/jquery"
     }),

diff --git a/build-scripts/survey-knockout-ui/tsconfig.typing.ko-ui.json b/build-scripts/survey-knockout-ui/tsconfig.typing.ko-ui.json
@@ -22,8 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-knockout-ui/survey-knockout-ui.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/knockout-ui-model.ts"

diff --git a/build-scripts/survey-knockout/tsconfig.typing.ko.json b/build-scripts/survey-knockout/tsconfig.typing.ko.json
@@ -22,8 +22,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-knockout/survey-knockout.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/knockout.ts"

diff --git a/build-scripts/survey-knockout/webpack.config.js b/build-scripts/survey-knockout/webpack.config.js
@@ -10,7 +10,7 @@ const config = {
   entry: {
     survey: path.resolve(__dirname, "../../src/main.scss"),
     modern: path.resolve(__dirname, "../../src/modern.scss"),
-    defaultV2: path.resolve(__dirname, "../../src/defaultV2-theme/defaultV2.scss")  
+    defaultV2: path.resolve(__dirname, "../../src/defaultV2-theme/defaultV2.scss")
   },
   externals: {
     knockout: {
@@ -23,7 +23,7 @@ const config = {
   plugins: [
     new DtsGeneratorPlugin({
       tsConfigPath: "./build-scripts/survey-knockout/tsconfig.typing.ko.json",
-      filePath: "build/survey-knockout/survey-knockout.d.ts",
+      filePath: "build/survey-knockout/survey.ko.d.ts",
       moduleName: "survey-knockout",
       importName: "entries/knockout"
     }),

diff --git a/build-scripts/survey-react-ui/tsconfig.typing.react-ui.json b/build-scripts/survey-react-ui/tsconfig.typing.react-ui.json
@@ -24,8 +24,7 @@
     "jsx": "react",
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-react-ui/survey-react-ui.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/react-ui-model.ts"

diff --git a/build-scripts/survey-react/tsconfig.typing.react.json b/build-scripts/survey-react/tsconfig.typing.react.json
@@ -23,8 +23,7 @@
     "jsx": "react",
     "declaration": true,
     "emitDeclarationOnly": true,
-    "skipLibCheck": true,
-    "outFile": "../../build/survey-react/survey-react.d.ts"
+    "skipLibCheck": true
   },
   "include": [
     "../../src/entries/react.ts"

diff --git a/build-scripts/survey-react/webpack.config.js b/build-scripts/survey-react/webpack.config.js
@@ -29,7 +29,7 @@ const config = {
   plugins: [
     new DtsGeneratorPlugin({
       tsConfigPath: "./build-scripts/survey-react/tsconfig.typing.react.json",
-      filePath: "build/survey-react/survey-react.d.ts",
+      filePath: "build/survey-react/survey.react.d.ts",
       moduleName: "survey-react",
       importName: "entries/react"
     }),

diff --git a/build-scripts/survey-vue-ui/tsconfig.typing.vue-ui.json b/build-scripts/survey-vue-ui/tsconfig.typing.vue-ui.json
@@ -21,8 +21,7 @@
     "emitDeclarationOnly": true,
     "skipLibCheck": true,
     "experimentalDecorators": true,
-    "moduleResolution": "Node",
-    "outFile": "../../build/survey-vue-ui/survey-vue-ui.d.ts",
+    "moduleResolution": "Node"
   },
   "include": [
     "../../src/entries/vue-ui-model.ts"

diff --git a/build-scripts/survey-vue/tsconfig.typing.vue.json b/build-scripts/survey-vue/tsconfig.typing.vue.json
@@ -23,8 +23,7 @@
     "skipLibCheck": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
-    "moduleResolution": "Node",
-    "outFile": "../../build/survey-vue/survey-vue.d.ts",
+    "moduleResolution": "Node"
   },
   "include": [
     "../../src/entries/vue.ts"

diff --git a/build-scripts/survey-vue/webpack.config.js b/build-scripts/survey-vue/webpack.config.js
@@ -13,18 +13,18 @@ const config = {
     defaultV2: path.resolve(__dirname, "../../src/defaultV2-theme/defaultV2.scss")
   },
   externals: {
-      vue: {
-        root: "Vue",
-        commonjs2: "vue",
-        commonjs: "vue",
-        amd: "vue"
-      }
+    vue: {
+      root: "Vue",
+      commonjs2: "vue",
+      commonjs: "vue",
+      amd: "vue"
+    }
   },
   plugins: [
     new DtsGeneratorPlugin({
       tsCommand: "vue-tsc --project",
       tsConfigPath: "./build-scripts/survey-vue/tsconfig.typing.vue.json",
-      filePath: "build/survey-vue/survey-vue.d.ts",
+      filePath: "build/survey-vue/survey.vue.d.ts",
       moduleName: "survey-vue",
       importName: "entries/vue"
     }),

diff --git a/build-scripts/webpack-dts-generator.js b/build-scripts/webpack-dts-generator.js
@@ -4,19 +4,19 @@ const fs = require('fs');
 const child_process = require('child_process');
 
 module.exports = function DtsGeneratorProgressPlugin(options) {
-  return new webpack.ProgressPlugin(function(progress) {
+  return new webpack.ProgressPlugin(function (progress) {
     if (progress === 1) {
       console.log("typescript start");
       const tsConfigPath = options.tsConfigPath || "tsconfig.typing.json";
       const tsCommand = options.tsCommand || "tsc --p";
-      const command = tsCommand + " " + tsConfigPath;
+      const command = tsCommand + " " + tsConfigPath + " --outFile " + options.filePath;
       console.log("tsc command is \"" + command + "\"");
       child_process.execSync(command);
       console.log("typescript end");
 
       const content = "\ndeclare module \"" + options.moduleName + "\" { import main = require(\"" + options.importName + "\"); export = main; }";
       console.log("\"" + content + "\"");
-      fs.writeFile(options.filePath, content, { flag: 'a' }, err => { if(err) { console.error(err); } });
+      fs.writeFile(options.filePath, content, { flag: 'a' }, err => { if (err) { console.error(err); } });
     }
   });
 };
diff --git a/doc_generator/lib_docgenerator.js b/doc_generator/lib_docgenerator.js
@@ -6,4 +6,4 @@ doc.setJsonObj(Survey.Serializer);
 
 doc.generateDocumentation(process.argv.slice(2), {
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
-});
+}, { generateJSONDefinition: true });
diff --git a/docs/design-survey-conditional-logic.md b/docs/design-survey-conditional-logic.md
@@ -55,6 +55,8 @@ const surveyJson = {
 };
 ```
 
+In single- and multiple-selection question types (Dropdown, Checkbox, Radiogroup, Tag Box, Image Picker), items can contain a display value in addition to a question value. In this case, placeholders are replaced with display values. If you want to use question values instead, disable the [`useDisplayValuesInDynamicTexts`](https://surveyjs.io/form-library/documentation/api-reference/question#useDisplayValuesInDynamicTexts) property.
+
 Certain question types can contain multiple values. Use a dot symbol to access a specific value (item or cell):
 
 | Question Type                                                            | Syntax                              |

diff --git a/docs/design-survey-create-a-simple-survey.md b/docs/design-survey-create-a-simple-survey.md
@@ -16,7 +16,7 @@ This article illustrates a SurveyJS survey structure and the different ways you
 
 A survey consists of one or several pages. A page can contain panels and questions. Panels are used to group questions and control them as one. A panel can contain other panels and questions (nested panels are supported). The following image illustrates this structure:
 
-<img src="images/survey-structure.svg" width="860" alt="SurveyJS: Survey Structure">
+<img src="../images/survey-structure.svg" width="860" alt="SurveyJS: Survey Structure">
 
 ## Create a Survey Model
 

diff --git a/docs/design-survey-pre-populate-form-fields.md b/docs/design-survey-pre-populate-form-fields.md
@@ -68,7 +68,7 @@ survey.data = {
 }
 ```
 
-The code above *replaces* the old `data` object and erases entered data if there was any. If you want to *merge* the new and old objects, call the [`mergeData(newDataObj)`](https://surveyjs.io/form-library/documentation/surveymodel#mergeData) method:
+The code above *replaces* the old `data` object and erases default question values and entered data. If you want to *merge* the new and old objects, call the [`mergeData(newDataObj)`](https://surveyjs.io/form-library/documentation/surveymodel#mergeData) method:
 
 ```js
 import { Model } from "survey-core";

diff --git a/docs/get-started-angular.md b/docs/get-started-angular.md
@@ -73,21 +73,7 @@ Open the `angular.json` file and reference a style sheet that implements the req
 }
 ```
 
-To apply the referenced theme, call the `applyTheme(themeName)` method. Depending on the theme, pass `"modern"` or `"defaultV2"` as the method's argument. For instance, the following code applies the Default V2 theme:
-
-```js
-import { Component } from '@angular/core';
-import { StylesManager } from "survey-core";
-
-StylesManager.applyTheme("defaultV2");
-
-@Component({
-  // ...
-})
-export class AppComponent {
-  // ...
-}
-```
+For more information about SurveyJS themes, refer to the following help topic: [Themes & Styles](https://surveyjs.io/form-library/documentation/manage-default-themes-and-styles).
 
 ## Create a Model
 
@@ -132,9 +118,7 @@ export class AppComponent implements OnInit {
 
 ```js
 import { Component, OnInit } from '@angular/core';
-import { Model, StylesManager } from "survey-core";
-
-StylesManager.applyTheme("defaultV2");
+import { Model } from "survey-core";
 
 const surveyJson = {
   elements: [{
@@ -207,9 +191,7 @@ If you replicate the code correctly, you should see the following survey:
 ```js
 // app.component.ts
 import { Component, OnInit } from '@angular/core';
-import { Model, StylesManager } from "survey-core";
-
-StylesManager.applyTheme("defaultV2");
+import { Model } from "survey-core";
 
 const surveyJson = {
   elements: [{
@@ -341,9 +323,7 @@ To view the application, run `ng serve` in a command line and open [http://local
 ```js
 // app.component.ts
 import { Component, OnInit } from '@angular/core';
-import { Model, StylesManager } from "survey-core";
-
-StylesManager.applyTheme("defaultV2");
+import { Model } from "survey-core";
 
 const surveyJson = {
   elements: [{

diff --git a/docs/get-started-jquery.md b/docs/get-started-jquery.md
@@ -46,11 +46,7 @@ Insert links to the script and one of the style sheets within the `<head>` tag o
 </head>
 ```
 
-To apply the linked theme, call the `applyTheme(themeName)` method. Depending on the theme, pass `"modern"` or `"defaultV2"` as the method's argument. For instance, the following code applies the Default V2 theme:
-
-```js
-Survey.StylesManager.applyTheme("defaultV2");
-```
+For more information about SurveyJS themes, refer to the following help topic: [Themes & Styles](https://surveyjs.io/form-library/documentation/manage-default-themes-and-styles).
 
 ## Create a Model
 
@@ -104,10 +100,6 @@ const survey = new Survey.Model(surveyJson);
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",
@@ -173,10 +165,6 @@ If you replicate the code correctly, you should see the following survey:
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",
@@ -273,10 +261,6 @@ As you can see, survey results are saved in a JSON object. Its properties corres
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",

diff --git a/docs/get-started-knockout.md b/docs/get-started-knockout.md
@@ -46,11 +46,7 @@ Insert links to the scripts and style sheets within the `<head>` tag on your HTM
 </head>
 ```
 
-To apply the linked theme, call the `applyTheme(themeName)` method. Depending on the theme, pass `"modern"` or `"defaultV2"` as the method's argument. For instance, the following code applies the Default V2 theme:
-
-```js
-Survey.StylesManager.applyTheme("defaultV2");
-```
+For more information about SurveyJS themes, refer to the following help topic: [Themes & Styles](https://surveyjs.io/form-library/documentation/manage-default-themes-and-styles).
 
 ## Create a Model
 
@@ -105,10 +101,6 @@ const survey = new Survey.Model(surveyJson);
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",
@@ -179,10 +171,6 @@ If you replicate the code correctly, you should see the following survey:
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",
@@ -282,10 +270,6 @@ As you can see, survey results are saved in a JSON object. Its properties corres
 ```
 
 ```js
-Survey
-    .StylesManager
-    .applyTheme("defaultV2");
-
 const surveyJson = {
     elements: [{
         name: "FirstName",