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

Add onFocus for action Item #8524

Merged
merged 1 commit into from
Jul 9, 2024
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
@@ -1,5 +1,5 @@
<ng-template #template>
<button type="button" (click)="model.doAction($event)" [key2click]="{ processEsc: false, disableTabStop: model.disableTabStop }" [class]="model.getActionBarItemCss()" [attr.title]="model.tooltip || model.title" [attr.aria-checked]="model.ariaChecked" [attr.aria-expanded]="model.ariaExpanded" [attr.role]="model.ariaRole" [disabled]="model.disabled">
<button type="button" (click)="model.doAction($event)" (mousedown)="model.doMouseDown()" (focus)="model.doFocus($event)" [key2click]="{ processEsc: false, disableTabStop: model.disableTabStop }" [class]="model.getActionBarItemCss()" [attr.title]="model.tooltip || model.title" [attr.aria-checked]="model.ariaChecked" [attr.aria-expanded]="model.ariaExpanded" [attr.role]="model.ariaRole" [disabled]="model.disabled">
<svg *ngIf="model.iconName" [iconName]="model.iconName" [size]="model.iconSize" [title]="model.tooltip || model.title" [class]="model.cssClasses.itemIcon" sv-ng-svg-icon></svg>
<span *ngIf="model.hasTitle" [class]="model.getActionBarItemTitleCss()">{{ model.title }}</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
evt.stopPropagation();
}
"
v-on:mousedown="
() => {
item.doMouseDown();
}
"
v-on:focus="
(event) => {
item.doFocus(event);
}
"
v-bind:disabled="item.disabled"
v-bind:title="item.tooltip || item.title"
v-bind:aria-checked="item.ariaChecked"
Expand Down
13 changes: 13 additions & 0 deletions src/actions/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export interface IAction {
* [View Demo](https://surveyjs.io/form-library/examples/add-custom-navigation-button/ (linkStyle))
*/
action?: (context?: any) => void;
onFocus?: (isMouse: boolean, event: any) => void;
/**
* One or several CSS classes that you want to apply to the outer `<div>` element.
*
Expand Down Expand Up @@ -463,6 +464,7 @@ export class Action extends BaseAction implements IAction, ILocalizableOwner {
}) locTooltipName?: string;
@property() private _enabled: boolean;
@property() action: (context?: any, isUserAction?: boolean) => void;
@property() onFocus: (isMouse: boolean, event: any) => void;
@property() _component: string;
@property() items: any;
@property({
Expand Down Expand Up @@ -509,6 +511,17 @@ export class Action extends BaseAction implements IAction, ILocalizableOwner {
evt.stopPropagation();
return true;
}
private isMouseDown: boolean;
public doMouseDown() : void {
this.isMouseDown = true;
}
public doFocus(args: any): void {
if(!!this.onFocus) {
const evt = !!args.originalEvent ? args.originalEvent : args;
this.onFocus(this.isMouseDown, evt);
}
this.isMouseDown = false;
}
private locStrChangedInPopupModel(): void {
if (!this.popupModel || !this.popupModel.contentComponentData || !this.popupModel.contentComponentData.model) return;
const model = this.popupModel.contentComponentData.model;
Expand Down
9 changes: 8 additions & 1 deletion src/knockout/components/action-bar/action-bar-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ export let ActionBarItemViewModel: any;

ko.components.register("sv-action-bar-item", {
viewModel: {
createViewModel: (params: any) => {
createViewModel: (params: any, componentInfo: any) => {
let el = componentInfo.element;
el = !!el.nextElementSibling ? el.nextElementSibling : el.parentElement.firstElementChild;
if(!!el) {
const item = params.item;
el.onfocus = function (args: any) { item.doFocus(args); };
el.onmousedown = function () { item.doMouseDown(); };
}
return params;
},
},
Expand Down
2 changes: 2 additions & 0 deletions src/react/components/action-bar/action-bar-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ export class SurveyActionBarItem extends SurveyElementBase<
className={className}
type="button"
disabled={this.item.disabled}
onMouseDown={() => this.item.doMouseDown()}
onFocus={(args) => this.item.doFocus(args)}
onClick={(args) => this.item.doAction(args)}
title={title}
tabIndex={tabIndex}
Expand Down
6 changes: 6 additions & 0 deletions src/vue/components/action-bar/action-bar-item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
evt.stopPropagation();
}
"
v-on:mousedown="
() => { item.doMouseDown(); }
"
v-on:focus="
(event) => { item.doFocus(event); }
"
v-bind:disabled="item.disabled"
v-bind:title="item.tooltip || item.title"
v-bind:aria-checked="item.ariaChecked"
Expand Down
39 changes: 39 additions & 0 deletions testCafe/survey/titleActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,42 @@ frameworks.forEach((framework) => {
})()).gt(0);
});
});

function addTitleActionForFocus(_, opt) {
opt.titleActions = [{
title: "main_action",
action: () => {},
onFocus: (isMouse, event) => {
opt.question.value = isMouse ? "focus_mouse" : "focus_keyboard";
event.stopPropagation();
}
}];
}

frameworks.forEach(async framework => {
fixture`${framework} ${title}`
.page`${url_test}${themeName}/${framework}`.beforeEach(async (t) => {
await applyTheme(themeName);
});

test("Check Action focus", async t => {
await initSurvey(framework, {
elements: [
{
type: "text",
name: "q1"
}
]
}, { onGetQuestionTitleActions: addTitleActionForFocus });
const action = Selector(".sv-action");

await t
.wait(1000)
.click(action)
.expect(Selector("input").value).eql("focus_mouse")
.pressKey("tab")
.expect(Selector("input").value).eql("focus_mouse")
.pressKey("shift+tab")
.expect(Selector("input").value).eql("focus_keyboard");
});
});
Loading