Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6672 Drop-down menu doesn't disappear after clicking on the button. #7023

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<sv-ng-string *ngIf="model.selectedItemLocText" [model]="model.selectedItemLocText"></sv-ng-string>
<div>{{ model.readOnlyText }}</div>
</div>
<div *ngIf="model.cssClasses.chevronButtonIconId" [class]="model.cssClasses.chevronButton">
<div *ngIf="model.cssClasses.chevronButtonIconId" [class]="model.cssClasses.chevronButton" (pointerdown)="chevronPointerDown($event)">
<svg [iconName]="model.cssClasses.chevronButtonIconId" [partCss]="model.cssClasses.chevronButtonSvg" [size]="'auto'" sv-ng-svg-icon></svg>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ export class DropdownComponent extends BaseAngular implements OnInit {
click(event: any) {
this.dropdownModel?.onClick(event);
}
chevronPointerDown(event: any) {
this.dropdownModel?.chevronPointerDown(event);
}
clear(event: any) {
this.dropdownModel?.onClear(event);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div disabled *ngIf="model.isReadOnly" [class]="model.getControlClass()" [attr.id]="model.inputId">
<div>{{ model.readOnlyText }}</div>
</div>
<div *ngIf="model.cssClasses.chevronButtonIconId" [class]="model.cssClasses.chevronButton">
<div *ngIf="model.cssClasses.chevronButtonIconId" [class]="model.cssClasses.chevronButton" (pointerdown)="chevronPointerDown($event)">
<svg [iconName]="model.cssClasses.chevronButtonIconId" [partCss]="model.cssClasses.chevronButtonSvg" [size]="'auto'" sv-ng-svg-icon></svg>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ export class TagboxComponent implements OnInit {
click(event: any) {
this.dropdownModel?.onClick(event);
}
chevronPointerDown(event: any) {
this.dropdownModel?.chevronPointerDown(event);
}
clear(event: any) {
this.dropdownModel?.onClear(event);
}
Expand Down
4 changes: 4 additions & 0 deletions packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
</div>
<div
:class="question.cssClasses.chevronButton"
v-on:pointerdown="chevronPointerDown"
v-if="question.cssClasses.chevronButtonIconId"
>
<sv-svg-icon
Expand Down Expand Up @@ -134,6 +135,9 @@ const model = computed(() => {
const click = (event: any) => {
model.value?.onClick(event);
};
const chevronPointerDown = (event: any) => {
model.value?.chevronPointerDown(event);
};
const clear = (event: any) => {
model.value?.onClear(event);
};
Expand Down
4 changes: 4 additions & 0 deletions packages/survey-vue3-ui/src/components/tagbox/Tagbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
</div>
<div
:class="question.cssClasses.chevronButton"
v-on:pointerdown="chevronPointerDown"
v-if="question.cssClasses.chevronButtonIconId"
>
<sv-svg-icon
Expand Down Expand Up @@ -88,6 +89,9 @@ const model = computed(() => {
const click = (event: any) => {
model.value?.onClick(event);
};
const chevronPointerDown = (event: any) => {
model.value?.chevronPointerDown(event);
};
const clear = (event: any) => {
model.value?.onClear(event);
};
Expand Down
11 changes: 7 additions & 4 deletions src/defaultV2-theme/blocks/sd-dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
font-family: var(--font-family, $font-family);
font-size: calcFontSize(1);
}
.sd-dropdown input[readonly] {
pointer-events: none;
}

.sd-dropdown__value {
width: 100%;
Expand All @@ -48,7 +51,7 @@
font-weight: $font-editorfont-weight;
color: $font-editorfont-color;
font-size: $font-editorfont-size;

position: relative;
}

Expand All @@ -58,7 +61,7 @@
align-items: center;
padding: 0 calcSize(1);
margin: auto 0;
}
}

.sd-dropdown_chevron-button {
position: absolute;
Expand All @@ -76,7 +79,7 @@
.sd-dropdown_clean-button-svg {
width: multiply(1.5, $font-editorfont-size);
height: multiply(1.5, $font-editorfont-size);
}
}

.sd-input.sd-dropdown:focus-within {
box-shadow: 0 0 0 2px $primary;
Expand Down Expand Up @@ -128,7 +131,7 @@

.sd-dropdown__hint-prefix {
color: $font-editorfont-placeholdercolor;

span {
white-space: pre;
}
Expand Down
10 changes: 5 additions & 5 deletions src/dropdownListModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ export class DropdownListModel extends Base {
if (this.question.readOnly || this.question.isDesignMode) return;
this._popupModel.toggleVisibility();
this.focusItemOnClickAndPopup();
if (this.searchEnabled && !!event && !!event.target) {
const input = event.target.querySelector("input");
if (!!input) {
input.focus();
}
this.question.focus();
}
public chevronPointerDown(event: any): void {
if (this._popupModel.isVisible) {
event.preventDefault();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/knockout/components/dropdown/dropdown.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>
<!-- /ko -->
<!-- ko if: question.cssClasses.chevronButtonIconId -->
<div data-bind="css: question.cssClasses.chevronButton">
<div data-bind="css: question.cssClasses.chevronButton, event: {pointerdown: chevronPointerDown}">
<!-- ko component: { name: 'sv-svg-icon', params: { css: question.cssClasses.chevronButtonSvg, iconName: question.cssClasses.chevronButtonIconId, size: 'auto' } } -->
<!-- /ko -->
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/knockout/components/dropdown/dropdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ ko.components.register("sv-dropdown", {
const click = (_: any, e: any) => {
q.dropdownListModel?.onClick(e);
};
const chevronPointerDown = (_: any, e: any) => {
q.dropdownListModel?.chevronPointerDown(e);
};
const clear = (_: any, e: any) => {
q.dropdownListModel?.onClear(e);
};
Expand All @@ -30,7 +33,7 @@ ko.components.register("sv-dropdown", {
q.dropdownListModel = new DropdownListModel(params.question);
}
new ImplementorBase(q.dropdownListModel);
return { question: q, model: q.dropdownListModel, click: click, clear: clear, keyhandler: keyhandler, blur: blur, focus: focus };
return { question: q, model: q.dropdownListModel, click: click, clear: clear, keyhandler: keyhandler, blur: blur, focus: focus, chevronPointerDown: chevronPointerDown };
},
},
template: template,
Expand Down
2 changes: 1 addition & 1 deletion src/knockout/components/tagbox/tagbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
<!-- /ko -->
<!-- ko if: question.cssClasses.chevronButtonIconId -->
<div data-bind="css: question.cssClasses.chevronButton">
<div data-bind="css: question.cssClasses.chevronButton, event: {pointerdown: chevronPointerDown}">
<!-- ko component: { name: 'sv-svg-icon', params: { css: question.cssClasses.chevronButtonSvg, iconName: question.cssClasses.chevronButtonIconId, size: 'auto' } } -->
<!-- /ko -->
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/knockout/components/tagbox/tagbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ ko.components.register("sv-tagbox", {
const click = (_: any, e: any) => {
q.dropdownListModel?.onClick(e);
};
const chevronPointerDown = (_: any, e: any) => {
q.dropdownListModel?.chevronPointerDown(e);
};
const clear = (_: any, e: any) => {
q.dropdownListModel?.onClear(e);
};
Expand All @@ -34,7 +37,7 @@ ko.components.register("sv-tagbox", {
q.dropdownListModel = new DropdownMultiSelectListModel(q);
}
new ImplementorBase(q.dropdownListModel);
return { question: q, model: q.dropdownListModel, click: click, clear: clear, keyhandler: keyhandler, blur: blur, focus: focus, inputKeyHandler: inputKeyHandler };
return { question: q, model: q.dropdownListModel, click: click, clear: clear, keyhandler: keyhandler, blur: blur, focus: focus, inputKeyHandler: inputKeyHandler, chevronPointerDown: chevronPointerDown };
},
},
template: template,
Expand Down
3 changes: 3 additions & 0 deletions src/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,9 @@ body {
}
}

.sv_q_dropdown_control input[readonly] {
pointer-events: none;
}
@import "./main.rtl.scss";
@import "./main.m600.scss";

Expand Down
3 changes: 3 additions & 0 deletions src/modern/blocks/sv-dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
justify-content: space-between;
}

.sv-dropdown input[readonly] {
pointer-events: none;
}
.sv-dropdown:focus,
.sv-dropdown:focus-within {
background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3C!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --%3E%3Csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 10 10' style='enable-background:new 0 0 10 10;' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0%7Bfill:%231AB394;%7D%0A%3C/style%3E%3Cpolygon class='st0' points='2,2 0,4 5,9 10,4 8,2 5,5 '/%3E%3C/svg%3E ");
Expand Down
6 changes: 5 additions & 1 deletion src/react/dropdown-base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export class SurveyQuestionDropdownBase<T extends Question> extends SurveyQuesti
click = (event: any) => {
this.question.dropdownListModel?.onClick(event);
};
chevronPointerDown = (event: any) => {
this.question.dropdownListModel?.chevronPointerDown(event);
};
clear = (event: any) => {
this.question.dropdownListModel?.onClear(event);
};
Expand Down Expand Up @@ -157,7 +160,8 @@ export class SurveyQuestionDropdownBase<T extends Question> extends SurveyQuesti
if (!this.question.cssClasses.chevronButtonIconId) return null;

return (
<div className={this.question.cssClasses.chevronButton}>
<div className={this.question.cssClasses.chevronButton}
onPointerDown={this.chevronPointerDown}>
<SvgIcon
className={this.question.cssClasses.chevronButtonSvg}
iconName={this.question.cssClasses.chevronButtonIconId}
Expand Down
4 changes: 4 additions & 0 deletions src/vue/components/dropdown/dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
</div>
<div
:class="question.cssClasses.chevronButton"
v-on:pointerdown="chevronPointerDown"
v-if="question.cssClasses.chevronButtonIconId"
>
<sv-svg-icon
Expand Down Expand Up @@ -127,6 +128,9 @@ export class DropdownComponent extends BaseVue {
public click(event: any) {
this.model?.onClick(event);
}
public chevronPointerDown(event: any) {
this.model?.chevronPointerDown(event);
}
public clear(event: any) {
this.model?.onClear(event);
}
Expand Down
4 changes: 4 additions & 0 deletions src/vue/components/tagbox/tagbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
</div>
<div
:class="question.cssClasses.chevronButton"
v-on:pointerdown="chevronPointerDown"
v-if="question.cssClasses.chevronButtonIconId"
>
<sv-svg-icon
Expand Down Expand Up @@ -87,6 +88,9 @@ export class TagboxComponent extends BaseVue {
public clear(event: any) {
this.question.dropdownListModel?.onClear(event);
}
public chevronPointerDown(event: any) {
this.question.dropdownListModel?.chevronPointerDown(event);
}
public keyhandler(event: any) {
this.question.dropdownListModel?.keyHandler(event);
}
Expand Down
51 changes: 51 additions & 0 deletions testCafe/questions/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -1943,6 +1943,57 @@ frameworks.forEach((framework) => {
.expect(popupContainer.visible).ok()

.click(questionDropdownV2Select, { offsetX: dropdownWidth - 20, offsetY: 20 })
.expect(popupContainer.visible).notOk()

.click(questionDropdownV2Select, { offsetX: dropdownWidth - 20, offsetY: 20 })
.expect(popupContainer.visible).ok()

.click("body", { offsetX: 600, offsetY: 20 })
.expect(popupContainer.visible).notOk();
});

test.page(`${url_test}${theme}/${framework}`)("Check dropdown popup opens after beak click - search enabled", async (t) => {
await t.resizeWindow(800, 600);
const jsonWithDropDown = {
questions: [
{
type: "dropdown",
name: "cars",
title: "Dropdown",
choices: [
"Ford",
"Vauxhall",
"Volkswagen",
"Nissan",
"Audi",
"Mercedes-Benz",
"BMW",
"Peugeot",
"Toyota",
"Citroen"
]
}
]
};
await initSurvey(framework, jsonWithDropDown);

const questionDropdownV2Select = Selector(".sd-dropdown");
const popupContainer = Selector(".sv-popup__container").filterVisible();
const dropdownWidth = await questionDropdownV2Select.getBoundingClientRectProperty("width");
await t
.expect(dropdownWidth).gt(550)
.expect(popupContainer.visible).notOk()

.click(questionDropdownV2Select, { offsetX: dropdownWidth - 20, offsetY: 20 })
.expect(popupContainer.visible).ok()

.click(questionDropdownV2Select, { offsetX: dropdownWidth - 20, offsetY: 20 })
.expect(popupContainer.visible).notOk()

.click(questionDropdownV2Select, { offsetX: dropdownWidth - 20, offsetY: 20 })
.expect(popupContainer.visible).ok()

.click("body", { offsetX: 600, offsetY: 20 })
.expect(popupContainer.visible).notOk();
});

Expand Down
Loading