Skip to content

fix(GlModal): Hide close button if modal-header slot used

Simon Knox requested to merge psi-modal-close-config into main

What does this MR do?

Hide close button when using custom modal header slot. Review app

Required for gitlab!82687 (closed) - we are adding a button next to the close button so need to customise the look of the button.

Previously we always showed the close button with no way to remove it, which meant the #modal-header and #modal-title slots did basically the same thing. Following this change using the #modal-header slot will not show the close button.

Match the behaviour of b-modal - https://bootstrap-vue.org/docs/components/modal

Also, if you use the modal-header slot, the default header X close button will not be present, nor can you use the modal-title slot.

before after
Screen_Shot_2022-03-15_at_8.37.54_pm Screen_Shot_2022-03-15_at_8.36.40_pm

Does this MR meet the acceptance criteria?

Conformity

  • Code review guidelines.
  • GitLab UI's contributing guidlines.
  • If it changes a Pajamas-compliant component's look & feel, the MR has been reviewed by a UX designer.
  • If it changes GitLab UI's documentation guidelines, the MR has been reviewed by a Technical Writer.
  • If the MR changes a component's API, integration MR(s) have been opened in the following projects to ensure that the @gitlab/ui package can be upgraded quickly after the changes are released:
  • Added the ~"component:*" label(s) if applicable.

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • Security reports checked/validated by a reviewer from the AppSec team

Accessibility

If this MR adds or modifies a component, take a few moments to review the following:

  • All actions and functionality can be done with a keyboard.
  • Links, buttons, and controls have a visible focus state.
  • All content is presented in text or with a text equivalent. For example, alt text for SVG, or aria-label for icons that have meaning or perform actions.
  • Changes in a component’s state are announced by a screen reader. For example, changing aria-expanded="false" to aria-expanded="true" when an accordion is expanded.
  • Color combinations have sufficient contrast.
Edited by Austin Regnery

Merge request reports