Skip to content

Commit

Permalink
Merge branch 'master' of github.com:surveyjs/survey-creator into issu…
Browse files Browse the repository at this point in the history
…e/PG-new-look
  • Loading branch information
OlgaLarina committed Sep 23, 2024
2 parents 1024cc9 + 2403cde commit 80e39de
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 1 deletion.
12 changes: 11 additions & 1 deletion packages/survey-creator-core/src/components/creator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,22 @@ survey-creator,
}
}

survey-creator {
survey-creator,
.svc-creator {
.sv-drag-drop-choices-shortcut {
.sv-drag-drop-choices-shortcut__content {
background: var(--ctr-survey-radio-button-group-item-background-color-floating, $background);

.sd-item__decorator {}

.svc-item-value__item {
overflow: hidden;

.sv-string-viewer,
.sv-string-editor {
white-space: nowrap;
}
}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions packages/survey-creator-core/src/components/item-value.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
flex-shrink: 0;
min-width: 72px;
justify-content: flex-end;
align-self: flex-start;
}

.svc-item-value-controls__button {
Expand Down Expand Up @@ -198,6 +199,12 @@
}
}

.sv-drag-drop-choices-shortcut {
.sv-ranking-item__text {
overflow: hidden;
}
}

.svc-item-value--ghost {
.svc-item-value__ghost {
display: block;
Expand All @@ -206,6 +213,17 @@
.svc-item-value-controls {
visibility: hidden;
}

.svc-item-value__item {
display: none;
}

height: calcSize(6);

.sv-string-viewer,
.sv-string-editor {
white-space: unset;
}
}

.svc-item-value--movedown {
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-creator-core/src/localization/english.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,7 @@ export var enStrings = {
inheritWidthFrom: "The \"Same as container\" option auto-adjusts the header content area width to fit into the HTML element the survey is placed in.",
textAreaWidth: "The width of the header area that contains the survey title and description, measured in pixels.",
overlapEnabled: "Makes the bottom of the header overlaid with the top of the survey.",
mobileHeight: "When set to 0, the height is calculated automatically to accommodate the header's content.",
},
panellayoutcolumn: {
effectiveWidth: "Accepts values %.",
Expand Down Expand Up @@ -1602,6 +1603,7 @@ export var enStrings = {
imageFit: "Image and thumbnail fit",
altText: "Alt text",
height: "Height", // Auto-generated string
mobileHeight: "Height on smartphones",
penColor: "Pen color", // Auto-generated string
backgroundColor: "Background color",
templateElements: "Template elements", // Auto-generated string
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-creator-knockout/tests/creator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ test("isGhost value for attached element", (): any => {
);
expect(creator.survey.pages).toHaveLength(1);
expect(designerPlugin.model.newPage).toBeTruthy();
designerPlugin.model.newPage.unRegisterFunctionOnPropertiesValueChanged(["title"]);
creator.survey.pages[0].unRegisterFunctionOnPropertiesValueChanged(["title"]);
let pageAdornerModel = new CreatorSurveyPageComponent(creator as any, designerPlugin.model.newPage as any);
expect(pageAdornerModel.isGhost).toBeTruthy();
expect(designerPlugin.model.newPage["onPropChangeFunctions"].filter(f => f.name === "title").length).toBe(1);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 80e39de

Please sign in to comment.