diff --git a/.cspell.json b/.cspell.json index 315a89979..2ba78447b 100644 --- a/.cspell.json +++ b/.cspell.json @@ -91,7 +91,9 @@ "scrollspy", "Segoe", "semibold", + "socio", "srcset", + "stackblitz", "stickied", "Stylelint", "subnav", diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index be4ad836d..476fddb91 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -69,7 +69,7 @@ Guidelines for bug reports: 3. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example. - [This JS Bin](https://jsbin.com/lolome/edit?html,output) is a helpful template. + These [v4 CodePen](https://codepen.io/team/bootstrap/pen/yLabNQL) and [v5 CodePen](https://codepen.io/team/bootstrap/pen/qBamdLj) are helpful templates. A good bug report shouldn't leave others needing to chase you up for more diff --git a/.github/workflows/issue-labeled.yml b/.github/workflows/issue-labeled.yml index 74c194679..fac58493b 100644 --- a/.github/workflows/issue-labeled.yml +++ b/.github/workflows/issue-labeled.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: awaiting reply - if: github.event.label.name == 'awaiting-reply' + if: github.event.label.name == 'needs-example' uses: actions-cool/issues-helper@v3 with: actions: "create-comment" token: ${{ secrets.GITHUB_TOKEN }} body: | - Hello @${{ github.event.issue.user.login }}. Bug reports must include a **live demo** of the issue. Per our [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md), please create a reduced test case on [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/) and report back with your link, Bootstrap version, and specific browser and Operating System details. + Hello @${{ github.event.issue.user.login }}. Bug reports must include a **live demo** of the issue. Per our [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md), please create a reduced test case on [CodePen](https://codepen.io/) or [StackBlitz](https://stackblitz.com/) and report back with your link, Bootstrap version, and specific browser and Operating System details. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e25e2bca5..28fd5e8d4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -2,42 +2,131 @@ ## Our Pledge -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. ## Our Standards -Examples of behavior that contributes to creating a positive environment include: +Examples of behavior that contributes to a positive environment for our +community include: -- Using welcoming and inclusive language -- Being respectful of differing viewpoints and experiences -- Gracefully accepting constructive criticism -- Focusing on what is best for the community -- Showing empathy towards other community members +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community -Examples of unacceptable behavior by participants include: +Examples of unacceptable behavior include: -- The use of sexualized language or imagery and unwelcome sexual attention or advances -- Trolling, insulting/derogatory comments, and personal or political attacks -- Public or private harassment -- Publishing others' private information, such as a physical or electronic address, without explicit permission -- Other conduct which could reasonably be considered inappropriate in a professional setting +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting -## Our Responsibilities +## Enforcement Responsibilities -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. ## Scope -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mdo@getbootstrap.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +mdo@getbootstrap.com. +All complaints will be reviewed and investigated promptly and fairly. -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/), version 1.4, available at +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/js/src/carousel.js b/js/src/carousel.js index b23a85b96..5f2f6342e 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -78,7 +78,7 @@ const Default = { } const DefaultType = { - interval: '(number|boolean)', + interval: '(number|boolean)', // TODO:v6 remove boolean support keyboard: 'boolean', pause: '(string|boolean)', ride: '(boolean|string)', diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js index 8bed9b39b..0aa628c66 100644 --- a/js/src/dom/event-handler.js +++ b/js/src/dom/event-handler.js @@ -89,7 +89,7 @@ function getElementEvents(element) { function bootstrapHandler(element, fn) { return function handler(event) { - event.delegateTarget = element + hydrateObj(event, { delegateTarget: element }) if (handler.oneOff) { EventHandler.off(element, event.type, fn) @@ -109,7 +109,7 @@ function bootstrapDelegationHandler(element, selector, fn) { continue } - event.delegateTarget = target + hydrateObj(event, { delegateTarget: target }) if (handler.oneOff) { EventHandler.off(element, event.type, selector, fn) @@ -234,7 +234,7 @@ const EventHandler = { if (typeof callable !== 'undefined') { // Simplest case: handler is passed, remove that listener ONLY. - if (!storeElementEvent) { + if (!Object.keys(storeElementEvent).length) { return } @@ -302,11 +302,16 @@ const EventHandler = { function hydrateObj(obj, meta) { for (const [key, value] of Object.entries(meta || {})) { - Object.defineProperty(obj, key, { - get() { - return value - } - }) + try { + obj[key] = value + } catch { + Object.defineProperty(obj, key, { + configurable: true, + get() { + return value + } + }) + } } return obj diff --git a/js/src/modal.js b/js/src/modal.js index d3f0540bb..6efb13d9d 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -30,7 +30,7 @@ const EVENT_HIDDEN = `hidden${EVENT_KEY}` const EVENT_SHOW = `show${EVENT_KEY}` const EVENT_SHOWN = `shown${EVENT_KEY}` const EVENT_RESIZE = `resize${EVENT_KEY}` -const EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY}` +const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY}` const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY}` const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}` @@ -221,7 +221,7 @@ class Modal extends BaseComponent { } }) - EventHandler.on(this._element, EVENT_CLICK_DISMISS, event => { + EventHandler.on(this._element, EVENT_MOUSEDOWN_DISMISS, event => { if (event.target !== event.currentTarget) { // click is inside modal-dialog return } diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 323194c53..33447c2bd 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -128,7 +128,7 @@ class ScrollSpy extends BaseComponent { const root = this._rootElement || window const height = observableSection.offsetTop - this._element.offsetTop if (root.scrollTo) { - root.scrollTo({ top: height }) + root.scrollTo({ top: height, behavior: 'smooth' }) return } diff --git a/js/src/tab.js b/js/src/tab.js index 74bfc4148..9fad63e92 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -109,13 +109,9 @@ class Tab extends BaseComponent { this._activate(getElementFromSelector(element)) // Search and activate/show the proper section - const isAnimated = element.classList.contains(CLASS_NAME_FADE) const complete = () => { - if (isAnimated) { // todo: maybe is redundant - element.classList.add(CLASS_NAME_SHOW) - } - if (element.getAttribute('role') !== 'tab') { + element.classList.add(CLASS_NAME_SHOW) return } @@ -128,7 +124,7 @@ class Tab extends BaseComponent { }) } - this._queueCallback(complete, element, isAnimated) + this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE)) } _deactivate(element, relatedElem) { @@ -141,13 +137,9 @@ class Tab extends BaseComponent { this._deactivate(getElementFromSelector(element)) // Search and deactivate the shown section too - const isAnimated = element.classList.contains(CLASS_NAME_FADE) const complete = () => { - if (isAnimated) { // todo maybe is redundant - element.classList.remove(CLASS_NAME_SHOW) - } - if (element.getAttribute('role') !== 'tab') { + element.classList.remove(CLASS_NAME_SHOW) return } @@ -157,7 +149,7 @@ class Tab extends BaseComponent { EventHandler.trigger(element, EVENT_HIDDEN, { relatedTarget: relatedElem }) } - this._queueCallback(complete, element, isAnimated) + this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE)) } _keydown(event) { diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 92770091d..f8d97f240 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -115,6 +115,7 @@ class Tooltip extends BaseComponent { this._activeTrigger = {} this._popper = null this._templateFactory = null + this._newContent = null // Protected this.tip = null @@ -205,6 +206,12 @@ class Tooltip extends BaseComponent { return } + // todo v6 remove this OR make it optional + if (this.tip) { + this.tip.remove() + this.tip = null + } + const tip = this._getTipElement() this._element.setAttribute('aria-describedby', tip.getAttribute('id')) @@ -219,7 +226,7 @@ class Tooltip extends BaseComponent { if (this._popper) { this._popper.update() } else { - this._createPopper(tip) + this._popper = this._createPopper(tip) } tip.classList.add(CLASS_NAME_SHOW) @@ -305,7 +312,7 @@ class Tooltip extends BaseComponent { _getTipElement() { if (!this.tip) { - this.tip = this._createTipElement(this._getContentForTemplate()) + this.tip = this._createTipElement(this._newContent || this._getContentForTemplate()) } return this.tip @@ -335,17 +342,11 @@ class Tooltip extends BaseComponent { } setContent(content) { - let isShown = false - if (this.tip) { - isShown = this._isShown() + this._newContent = content + if (this._isShown()) { this.tip.remove() this.tip = null - } - - this._disposePopper() - this.tip = this._createTipElement(content) - - if (isShown) { + this._disposePopper() this.show() } } @@ -373,7 +374,7 @@ class Tooltip extends BaseComponent { } _getTitle() { - return this._config.title + return this._resolvePossibleFunction(this._config.title) || this._config.originalTitle } // Private @@ -394,7 +395,7 @@ class Tooltip extends BaseComponent { this._config.placement.call(this, tip, this._element) : this._config.placement const attachment = AttachmentMap[placement.toUpperCase()] - this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment)) + return Popper.createPopper(this._element, tip, this._getPopperConfig(attachment)) } _getOffset() { @@ -517,7 +518,7 @@ class Tooltip extends BaseComponent { return } - if (!this._element.getAttribute('aria-label') && !this._element.textContent) { + if (!this._element.getAttribute('aria-label') && !this._element.textContent.trim()) { this._element.setAttribute('aria-label', title) } @@ -592,7 +593,6 @@ class Tooltip extends BaseComponent { } config.originalTitle = this._element.getAttribute('title') || '' - config.title = this._resolvePossibleFunction(config.title) || config.originalTitle if (typeof config.title === 'number') { config.title = config.title.toString() } diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js index 7f8aea74a..d951bd5ae 100644 --- a/js/tests/unit/carousel.spec.js +++ b/js/tests/unit/carousel.spec.js @@ -406,7 +406,7 @@ describe('Carousel', () => { Simulator.setType('pointer') fixtureEl.innerHTML = [ - '
', + '
', '
', '