cps-dialog: let closeOnEscape be scoped to focus inside the dialog (for non-modal dialogs)

未关闭
#951 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看

维护者通常 1 天内回复

还没有人认领这个 Issue。

评估

难度
3/5
预计耗时
1-2 天
新手友好度
35/100
Issue 类型
功能
描述清晰度
基本清楚
活跃度
活跃
领域
frontend

调研方向

Start in projects/cps-ui-kit/src/lib/services/cps-dialog/utils/cps-dialog-config.ts (the closeOnEscape type, around line 102), then cps-dialog.component.ts: bindGlobalListeners() (around line 840) and bindDocumentEscapeListener() (around line 868). Done when closeOnEscape accepts 'focus-within', Esc inside the dialog (including the frame) closes only the topmost dialog, Esc outside is left unprevented, and unit tests plus a Playwright spec in playwright/cps-ui-kit/components/ cover those cases.

由索引模型根据 Issue 内容生成。

描述

enhancement

Summary

cps-dialog can only close on Esc in two ways: anywhere on the page (closeOnEscape: true, the default) or never (closeOnEscape: false). A non-modal dialog that sits next to an application (a tools or inspector panel, a side panel) needs a third behaviour: close on Esc only when focus is inside the dialog, and only when the dialog is the topmost overlay.

Today an application has to choose false and write its own Esc handler. That handler lives outside the kit's stacking logic, so it cannot follow the rule the kit applies everywhere else ("Esc closes the topmost overlay"), and it misses some cases.

Proposal: let closeOnEscape also accept a focus-scoped mode, for example 'focus-within'. true and false keep their current meaning.

Current behaviour

  • CpsDialogConfig.closeOnEscape is a plain boolean: "Specifies if pressing escape key should hide the dialog." (projects/cps-ui-kit/src/lib/services/cps-dialog/utils/cps-dialog-config.ts, around line 102.)
  • In cps-dialog.component.ts, bindGlobalListeners() (around line 840) binds bindDocumentEscapeListener() when closeOnEscape !== false. That listener (around line 868) is a document-level keydown listener. It hides the dialog when parseInt(this.container.style.zIndex) === ZIndexUtils.getCurrent(), that is, when the dialog is the topmost overlay, wherever focus is. Since 21.33.0 it also calls event.preventDefault() for the keypress it handled.
  • The notification service (cps-notification.service.ts, _onKeydown, around line 262) clears notifications on Esc unless event.defaultPrevented, and only if a notification container isOnTop().
  • Checked in 21.32.0, 21.33.0 and 22.3.0: the dialog's Esc logic is the same apart from the preventDefault().

Why neither value works for a non-modal dialog

An application whose dialog stays open beside the page (it is not modal and the user keeps working in the app) sees this:

  • closeOnEscape: true: pressing Esc in an unrelated field of the page closes the dialog. This was measured in an application: with focus in a text field outside the dialog, Esc closed it. Because the kit also calls preventDefault(), other handlers on the page that respect defaultPrevented treat that Esc as already handled.
  • closeOnEscape: false: the application has to listen for Esc itself, only inside the dialog, to close it. That has three problems:
    1. It ignores the kit's stacking rule. If a notification (or any overlay) is on top, the kit's own rule is "dismiss that first, close the dialog on the next Esc". An application cannot read the stack, so it closes the dialog while the notification is on top, or closes both.
    2. The application's handler has to mark the event handled (preventDefault()) by hand, otherwise the notification service also clears the notifications on the same keypress. This is easy to forget, and the convention is not documented for dialogs.
    3. Focus can be on the dialog frame itself (div.cps-dialog[tabindex="-1"]), for example after clicking the header. An application listener attached to the dialog's content does not receive the keydown, so Esc does nothing at all there. (With closeOnEscape: true it closes, as expected.)

The kit already contains everything needed to get this right (the z-index stack, the handled-event convention). It only lacks a way to scope the existing dialog listener to focus.

Proposed behaviour

Extend the type:

closeOnEscape?: boolean | 'focus-within';
  • true (default): unchanged.
  • false: unchanged.
  • 'focus-within': the dialog closes on Esc only if
    • the key event's target is inside the dialog container (the content, the header, or the frame itself), and
    • the dialog is the topmost overlay, using the same z-index check as today, and
    • the event is handled the way it is today (preventDefault() when the dialog closes).

An Esc from outside the dialog is left alone: it is not prevented, so the application and other overlays handle it as they do now. Overlays opened from inside the dialog (menus and tooltips were checked) already take the Esc first through the stack check and their own handlers, so nothing changes for them.

Suggested implementation: in bindDocumentEscapeListener(), when the option is 'focus-within', add this.container.contains(event.target as Node) to the existing condition. bindGlobalListeners() already tests closeOnEscape !== false, so it keeps binding the listener for the new value.

Acceptance criteria

  • With closeOnEscape: 'focus-within':
    • Esc pressed in an element inside the dialog closes it.
    • Esc pressed on the dialog frame itself closes it (for example after a click on the header).
    • Esc pressed in a field outside the dialog does not close it, and the event is not defaultPrevented.
    • With a notification on top of the dialog, the first Esc inside the dialog dismisses the notification and leaves the dialog open, and the next Esc closes the dialog.
    • With a menu opened from the dialog, the first Esc closes the menu, not the dialog.
  • closeOnEscape: true and false behave exactly as before. The existing dialog specs still pass.
  • Unit tests for each case above, and a Playwright test next to the existing dialog specs (playwright/cps-ui-kit/components/) for the "Esc in a field outside the dialog" and "Esc on the frame" cases.
  • The dialog documentation describes the three values, with a note that 'focus-within' is meant for non-modal dialogs.

Related

  • #948: the focus ring on the dialog frame covers the dialog and blocks clicks. It is reached by the same steps (click the header, then press a key), and the frame-focus case above is where the two meet.
  • #943 (draft): Esc ordering between tooltips, notifications and tree-select. This request follows the same direction, for dialogs.

Alternatives considered

  • Documenting that apps should call preventDefault() in their own handler. This avoids the double close but still cannot follow the stacking rule and still misses the frame-focus case.
  • Making notifications ignore an Esc that starts inside a dialog. This would change the behaviour for every dialog, including ones that have disabled closing, where Esc should still dismiss notifications.
主要语言
TypeScript
星标
9
派生
8
平均合并
1 天 6 小时
30 天内合并 PR
25

环境准备

这个项目没有提供开发容器、Dockerfile 或贡献指南,环境需要你自己搭建:先看它的 README,通用步骤见我们的新手贡献指南。

从这里开始

  1. 先读完整个 Issue,再读项目的贡献指南。
  2. 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
  3. Fork 仓库,在一个分支上完成修改。
  4. 提交 Pull Request,并在描述里引用这个 Issue 编号。

AbsaOSS/cps-shared-ui 的其他 Issue

查看 AbsaOSS/cps-shared-ui 的全部 Issue

相似的 Issue

更多 TypeScript Issue

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。