Skip to content

Commit a09b54e

Browse files
author
OlgaLarina
committed
Merge branch 'master' of github.com:surveyjs/survey-creator into issue/6427-remove-sass-variables-usage
# Conflicts: # visualRegressionTests-V2/tests/designer/etalons/pg-logic-popup-mobile.png # visualRegressionTests/tests/designer/etalons/pg-logic-popup-mobile.png
2 parents 9e5989a + 5628d86 commit a09b54e

File tree

110 files changed

+1449
-1172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1449
-1172
lines changed

‎build-packages.yml

+17-18
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ resources:
99
type: github
1010
endpoint: github.com_surveyjsdeveloper
1111
name: surveyjs/service
12-
ref: V2
1312
- repository: EmptyRepo
1413
type: github
1514
endpoint: github.com_surveyjsdeveloper
@@ -219,26 +218,26 @@ jobs:
219218
# read about the problem with git output ($env:GIT_REDIRECT_STDERR = '2>&1') :
220219
# https://github.com/microsoft/azure-pipelines-yaml/issues/248
221220
# https://stackoverflow.com/questions/58485585/azure-pipeline-powershell-and-git-on-windows-server-2019-gives-error-in-output
222-
# - powershell: |
223-
# cd $(Build.SourcesDirectory)/service
224-
# git pull origin master
225-
# git fetch origin master --tags --force
226-
# git checkout master
227-
# git add surveyjs.io/App_Data/DocsEditor
228-
# git commit -m "updated survey-creator docs [azurepipelines skip]"
229-
# git pull origin master
230-
# git push origin master
231-
# displayName: "Git surveyjs/service push updated docs"
232221
- powershell: |
233222
cd $(Build.SourcesDirectory)/service
234-
git pull origin V2
235-
git fetch origin V2 --tags --force
236-
git checkout V2
223+
git pull origin master
224+
git fetch origin master --tags --force
225+
git checkout master
237226
git add surveyjs.io/App_Data/DocsEditor
238-
git commit -m "updated survey-creator V2 docs [azurepipelines skip]"
239-
git pull origin V2
240-
git push origin V2
241-
displayName: "git surveyjs/service push updated V2 docs"
227+
git commit -m "updated survey-creator docs [azurepipelines skip]"
228+
git pull origin master
229+
git push origin master
230+
displayName: "Git surveyjs/service push updated docs"
231+
# - powershell: |
232+
# cd $(Build.SourcesDirectory)/service
233+
# git pull origin V2
234+
# git fetch origin V2 --tags --force
235+
# git checkout V2
236+
# git add surveyjs.io/App_Data/DocsEditor
237+
# git commit -m "updated survey-creator V2 docs [azurepipelines skip]"
238+
# git pull origin V2
239+
# git push origin V2
240+
# displayName: "git surveyjs/service push updated V2 docs"
242241

243242
- job: CreatorV2React
244243
dependsOn: CreatorV2Core

‎docs/customize-survey-creation-process.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ You can control the visibility of adorners using the [`onElementAllowOperations`
2828
| `allowChangeInputType` | Shows or hides the adorner that changes the [`inputType`](https://surveyjs.io/form-library/documentation/api-reference/text-entry-question-model#inputType) property of Single-Line Input questions. |
2929
| `allowCopy` | Shows or hides the adorner that duplicates the survey element. |
3030
| `allowDelete` | Shows or hides the adorner that deletes the survey element. |
31-
| `allowDragging` | Shows or hides the adorner that allows users to drag and drop survey elements. |
31+
| `allowDrag` | Shows or hides the adorner that allows users to drag and drop survey elements. |
3232
| `allowEdit` | Shows or hides the adorners that allow users to edit survey element properties on the design surface. If you disable this property, users can edit survey element properties only in the Property Grid. |
3333
| `allowShowSettings` | Shows or hides the adorner that allow users to open the Property Grid for survey element configuration. |
3434

3535
The following code hides the "Change Type" adorner for Dropdown questions:
3636

3737
```js
38-
creator.onElementAllowOperations.add(function (_, options) {
39-
if (options.obj?.getType() === "dropdown") {
38+
creator.onElementAllowOperations.add((_, options) => {
39+
if (options.element?.getType() === "dropdown") {
4040
options.allowChangeType = false;
4141
}
4242
});

‎docs/get-started-angular.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Open the `angular.json` file and reference Survey Creator and SurveyJS Form Libr
5959
// ...
6060
"styles": [
6161
"src/styles.css",
62-
"node_modules/survey-core/defaultV2.min.css",
62+
"node_modules/survey-core/survey-core.min.css",
6363
"node_modules/survey-creator-core/survey-creator-core.min.css"
6464
],
6565
// ...
@@ -75,24 +75,24 @@ When [using standalone components](https://github.com/surveyjs/code-examples/tre
7575

7676
```js
7777
// survey-creator.component.ts
78-
import "survey-core/defaultV2.css";
79-
import "survey-creator-core/survey-creator-core.css";
78+
import "survey-core/survey-core.min.css";
79+
import "survey-creator-core/survey-creator-core.min.css";
8080
```
8181

8282
## Configure Survey Creator
8383

8484
To configure the Survey Creator component, specify [its properties](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions) in a configuration object. In this tutorial, the object enables the following properties:
8585

86-
- [`showLogicTab`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#showLogicTab)
87-
Displays the Logic tab in the tab panel.
88-
89-
- [`isAutoSave`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#isAutoSave)
86+
- [`autoSaveEnabled`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#autoSaveEnabled)
9087
Automatically saves the survey JSON schema on every change.
9188

89+
- [`collapseOnDrag`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#collapseOnDrag)
90+
Collapses pages on the design surface when users start dragging a survey element.
91+
9292
```js
9393
const creatorOptions = {
94-
showLogicTab: true,
95-
isAutoSave: true
94+
autoSaveEnabled: true,
95+
collapseOnDrag: true
9696
};
9797
```
9898

@@ -124,8 +124,8 @@ import { Component, OnInit } from "@angular/core";
124124
import { SurveyCreatorModel } from "survey-creator-core";
125125

126126
const creatorOptions = {
127-
showLogicTab: true,
128-
isAutoSave: true
127+
autoSaveEnabled: true,
128+
collapseOnDrag: true
129129
};
130130

131131
@Component({
@@ -212,8 +212,8 @@ import { Component, OnInit } from "@angular/core";
212212
import { SurveyCreatorModel } from "survey-creator-core";
213213

214214
const creatorOptions = {
215-
showLogicTab: true,
216-
isAutoSave: true
215+
autoSaveEnabled: true,
216+
collapseOnDrag: true
217217
};
218218

219219
@Component({
@@ -386,8 +386,8 @@ import { Component, OnInit } from "@angular/core";
386386
import { SurveyCreatorModel } from "survey-creator-core";
387387

388388
const creatorOptions = {
389-
showLogicTab: true,
390-
isAutoSave: true
389+
autoSaveEnabled: true,
390+
collapseOnDrag: true
391391
};
392392

393393
const defaultJson = {
@@ -541,8 +541,8 @@ import { Component, OnInit } from "@angular/core";
541541
import { SurveyCreatorModel } from "survey-creator-core";
542542

543543
const creatorOptions = {
544-
showLogicTab: true,
545-
isAutoSave: true
544+
autoSaveEnabled: true,
545+
collapseOnDrag: true
546546
};
547547

548548
const defaultJson = {

‎docs/get-started-html-css-javascript.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Survey Creator consists of two parts: `survey-creator-core` (platform-independen
2121
<head>
2222
<!-- ... -->
2323
<!-- SurveyJS Form Library resources -->
24-
<link href="https://unpkg.com/survey-core/defaultV2.min.css" type="text/css" rel="stylesheet">
24+
<link href="https://unpkg.com/survey-core/survey-core.min.css" type="text/css" rel="stylesheet">
2525
<script src="https://unpkg.com/survey-core/survey.core.min.js"></script>
2626
<script src="https://unpkg.com/survey-js-ui/survey-js-ui.min.js"></script>
2727

@@ -40,16 +40,16 @@ Survey Creator consists of two parts: `survey-creator-core` (platform-independen
4040

4141
To configure the Survey Creator component, specify [its properties](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions) in a configuration object. In this tutorial, the object enables the following properties:
4242

43-
- [`showLogicTab`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#showLogicTab)
44-
Displays the Logic tab in the tab panel.
45-
46-
- [`isAutoSave`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#isAutoSave)
43+
- [`autoSaveEnabled`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#autoSaveEnabled)
4744
Automatically saves the survey JSON schema on every change.
4845

46+
- [`collapseOnDrag`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#collapseOnDrag)
47+
Collapses pages on the design surface when users start dragging a survey element.
48+
4949
```js
5050
const creatorOptions = {
51-
showLogicTab: true,
52-
isAutoSave: true
51+
autoSaveEnabled: true,
52+
collapseOnDrag: true
5353
};
5454
```
5555

@@ -68,7 +68,7 @@ const creator = new SurveyCreator.SurveyCreator(creatorOptions);
6868
<head>
6969
<title>Survey Creator / Form Builder</title>
7070
<meta charset="utf-8">
71-
<link href="https://unpkg.com/survey-core/defaultV2.min.css" type="text/css" rel="stylesheet">
71+
<link href="https://unpkg.com/survey-core/survey-core.min.css" type="text/css" rel="stylesheet">
7272
<script src="https://unpkg.com/survey-core/survey.core.min.js"></script>
7373
<script src="https://unpkg.com/survey-js-ui/survey-js-ui.min.js"></script>
7474

@@ -86,8 +86,8 @@ const creator = new SurveyCreator.SurveyCreator(creatorOptions);
8686

8787
```js
8888
const creatorOptions = {
89-
showLogicTab: true,
90-
isAutoSave: true
89+
autoSaveEnabled: true,
90+
collapseOnDrag: true
9191
};
9292

9393
const creator = new SurveyCreator.SurveyCreator(creatorOptions);
@@ -129,7 +129,7 @@ $(function() {
129129
<head>
130130
<title>Survey Creator / Form Builder</title>
131131
<meta charset="utf-8">
132-
<link href="https://unpkg.com/survey-core/defaultV2.min.css" type="text/css" rel="stylesheet">
132+
<link href="https://unpkg.com/survey-core/survey-core.min.css" type="text/css" rel="stylesheet">
133133
<script src="https://unpkg.com/survey-core/survey.core.min.js"></script>
134134
<script src="https://unpkg.com/survey-js-ui/survey-js-ui.min.js"></script>
135135

@@ -147,8 +147,8 @@ $(function() {
147147

148148
```js
149149
const creatorOptions = {
150-
showLogicTab: true,
151-
isAutoSave: true
150+
autoSaveEnabled: true,
151+
collapseOnDrag: true
152152
};
153153

154154
const creator = new SurveyCreator.SurveyCreator(creatorOptions);
@@ -254,7 +254,7 @@ creator.text = window.localStorage.getItem("survey-json") || JSON.stringify(defa
254254
<head>
255255
<title>Survey Creator / Form Builder</title>
256256
<meta charset="utf-8">
257-
<link href="https://unpkg.com/survey-core/defaultV2.min.css" type="text/css" rel="stylesheet">
257+
<link href="https://unpkg.com/survey-core/survey-core.min.css" type="text/css" rel="stylesheet">
258258
<script src="https://unpkg.com/survey-core/survey.core.min.js"></script>
259259
<script src="https://unpkg.com/survey-js-ui/survey-js-ui.min.js"></script>
260260

@@ -272,8 +272,8 @@ creator.text = window.localStorage.getItem("survey-json") || JSON.stringify(defa
272272

273273
```js
274274
const creatorOptions = {
275-
showLogicTab: true,
276-
isAutoSave: true
275+
autoSaveEnabled: true,
276+
collapseOnDrag: true
277277
};
278278

279279
const defaultJson = {
@@ -368,7 +368,7 @@ creator.onUploadFile.add((_, options) => {
368368
<head>
369369
<title>Survey Creator / Form Builder</title>
370370
<meta charset="utf-8">
371-
<link href="https://unpkg.com/survey-core/defaultV2.min.css" type="text/css" rel="stylesheet">
371+
<link href="https://unpkg.com/survey-core/survey-core.min.css" type="text/css" rel="stylesheet">
372372
<script src="https://unpkg.com/survey-core/survey.core.min.js"></script>
373373
<script src="https://unpkg.com/survey-js-ui/survey-js-ui.min.js"></script>
374374

@@ -386,8 +386,8 @@ creator.onUploadFile.add((_, options) => {
386386

387387
```js
388388
const creatorOptions = {
389-
showLogicTab: true,
390-
isAutoSave: true
389+
autoSaveEnabled: true,
390+
collapseOnDrag: true
391391
};
392392

393393
const defaultJson = {

‎docs/get-started-react.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,24 @@ npm install survey-creator-react --save
3838
Import Survey Creator and SurveyJS Form Library style sheets as shown below:
3939

4040
```js
41-
import "survey-core/defaultV2.min.css";
41+
import "survey-core/survey-core.min.css";
4242
import "survey-creator-core/survey-creator-core.min.css";
4343
```
4444

4545
## Configure Survey Creator
4646

4747
To configure the Survey Creator component, specify [its properties](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions) in a configuration object. In this tutorial, the object enables the following properties:
4848

49-
- [`showLogicTab`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#showLogicTab)
50-
Displays the Logic tab in the tab panel.
51-
52-
- [`isAutoSave`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#isAutoSave)
49+
- [`autoSaveEnabled`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#autoSaveEnabled)
5350
Automatically saves the survey JSON schema on every change.
5451

52+
- [`collapseOnDrag`](https://surveyjs.io/survey-creator/documentation/api-reference/icreatoroptions#collapseOnDrag)
53+
Collapses pages on the design surface when users start dragging a survey element.
54+
5555
```js
5656
const creatorOptions = {
57-
showLogicTab: true,
58-
isAutoSave: true
57+
autoSaveEnabled: true,
58+
collapseOnDrag: true
5959
};
6060
```
6161

@@ -76,12 +76,12 @@ export function SurveyCreatorWidget() {
7676

7777
```js
7878
import { SurveyCreator } from "survey-creator-react";
79-
import "survey-core/defaultV2.min.css";
79+
import "survey-core/survey-core.min.css";
8080
import "survey-creator-core/survey-creator-core.min.css";
8181

8282
const creatorOptions = {
83-
showLogicTab: true,
84-
isAutoSave: true
83+
autoSaveEnabled: true,
84+
collapseOnDrag: true
8585
};
8686

8787
export function SurveyCreatorWidget() {
@@ -124,12 +124,12 @@ export function SurveyCreatorWidget() {
124124
// 'use client'
125125

126126
import { SurveyCreatorComponent, SurveyCreator } from "survey-creator-react";
127-
import "survey-core/defaultV2.min.css";
127+
import "survey-core/survey-core.min.css";
128128
import "survey-creator-core/survey-creator-core.min.css";
129129

130130
const creatorOptions = {
131-
showLogicTab: true,
132-
isAutoSave: true
131+
autoSaveEnabled: true,
132+
collapseOnDrag: true
133133
};
134134

135135
export function SurveyCreatorWidget() {
@@ -246,12 +246,12 @@ export function SurveyCreatorWidget() {
246246
// 'use client'
247247

248248
import { SurveyCreatorComponent, SurveyCreator } from "survey-creator-react";
249-
import "survey-core/defaultV2.min.css";
249+
import "survey-core/survey-core.min.css";
250250
import "survey-creator-core/survey-creator-core.min.css";
251251

252252
const creatorOptions = {
253-
showLogicTab: true,
254-
isAutoSave: true
253+
autoSaveEnabled: true,
254+
collapseOnDrag: true
255255
};
256256

257257
const defaultJson = {
@@ -352,12 +352,12 @@ To view the application, run `npm run start` in a command line and open [http://
352352
// 'use client'
353353

354354
import { SurveyCreatorComponent, SurveyCreator } from "survey-creator-react";
355-
import "survey-core/defaultV2.min.css";
355+
import "survey-core/survey-core.min.css";
356356
import "survey-creator-core/survey-creator-core.min.css";
357357

358358
const creatorOptions = {
359-
showLogicTab: true,
360-
isAutoSave: true
359+
autoSaveEnabled: true,
360+
collapseOnDrag: true
361361
};
362362

363363
const defaultJson = {

0 commit comments

Comments
 (0)