aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/twbs/bootstrap/dist/js/bootstrap.esm.js
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-08-19 13:15:48 +0000
committerMario <mario@mariovavti.com>2022-08-19 13:15:48 +0000
commit185ddf1eaf82e08586be6c7689507ee924d9dd47 (patch)
tree218ff6da6fb1511a1b2823729607c7c4b13e30e9 /vendor/twbs/bootstrap/dist/js/bootstrap.esm.js
parent7dee47183d05b6e1f7d5c5588e2df9993fb294dd (diff)
downloadvolse-hubzilla-185ddf1eaf82e08586be6c7689507ee924d9dd47.tar.gz
volse-hubzilla-185ddf1eaf82e08586be6c7689507ee924d9dd47.tar.bz2
volse-hubzilla-185ddf1eaf82e08586be6c7689507ee924d9dd47.zip
update to bootstrap 5.2 and fixes
Diffstat (limited to 'vendor/twbs/bootstrap/dist/js/bootstrap.esm.js')
-rw-r--r--vendor/twbs/bootstrap/dist/js/bootstrap.esm.js3919
1 files changed, 2062 insertions, 1857 deletions
diff --git a/vendor/twbs/bootstrap/dist/js/bootstrap.esm.js b/vendor/twbs/bootstrap/dist/js/bootstrap.esm.js
index 559541913..b32daa8c4 100644
--- a/vendor/twbs/bootstrap/dist/js/bootstrap.esm.js
+++ b/vendor/twbs/bootstrap/dist/js/bootstrap.esm.js
@@ -1,31 +1,29 @@
/*!
- * Bootstrap v5.1.3 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+ * Bootstrap v5.2.0 (https://getbootstrap.com/)
+ * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
import * as Popper from '@popperjs/core';
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/index.js
+ * Bootstrap (v5.2.0): util/index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
const MAX_UID = 1000000;
const MILLISECONDS_MULTIPLIER = 1000;
-const TRANSITION_END = 'transitionend'; // Shoutout AngusCroll (https://goo.gl/pxwQGp)
+const TRANSITION_END = 'transitionend'; // Shout-out Angus Croll (https://goo.gl/pxwQGp)
-const toType = obj => {
- if (obj === null || obj === undefined) {
- return `${obj}`;
+const toType = object => {
+ if (object === null || object === undefined) {
+ return `${object}`;
}
- return {}.toString.call(obj).match(/\s([a-z]+)/i)[1].toLowerCase();
+ return Object.prototype.toString.call(object).match(/\s([a-z]+)/i)[1].toLowerCase();
};
/**
- * --------------------------------------------------------------------------
- * Public Util Api
- * --------------------------------------------------------------------------
+ * Public Util API
*/
@@ -41,21 +39,21 @@ const getSelector = element => {
let selector = element.getAttribute('data-bs-target');
if (!selector || selector === '#') {
- let hrefAttr = element.getAttribute('href'); // The only valid content that could double as a selector are IDs or classes,
+ let hrefAttribute = element.getAttribute('href'); // The only valid content that could double as a selector are IDs or classes,
// so everything starting with `#` or `.`. If a "real" URL is used as the selector,
// `document.querySelector` will rightfully complain it is invalid.
// See https://github.com/twbs/bootstrap/issues/32273
- if (!hrefAttr || !hrefAttr.includes('#') && !hrefAttr.startsWith('.')) {
+ if (!hrefAttribute || !hrefAttribute.includes('#') && !hrefAttribute.startsWith('.')) {
return null;
} // Just in case some CMS puts out a full URL with the anchor appended
- if (hrefAttr.includes('#') && !hrefAttr.startsWith('#')) {
- hrefAttr = `#${hrefAttr.split('#')[1]}`;
+ if (hrefAttribute.includes('#') && !hrefAttribute.startsWith('#')) {
+ hrefAttribute = `#${hrefAttribute.split('#')[1]}`;
}
- selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : null;
+ selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null;
}
return selector;
@@ -103,49 +101,57 @@ const triggerTransitionEnd = element => {
element.dispatchEvent(new Event(TRANSITION_END));
};
-const isElement = obj => {
- if (!obj || typeof obj !== 'object') {
+const isElement = object => {
+ if (!object || typeof object !== 'object') {
return false;
}
- if (typeof obj.jquery !== 'undefined') {
- obj = obj[0];
+ if (typeof object.jquery !== 'undefined') {
+ object = object[0];
}
- return typeof obj.nodeType !== 'undefined';
+ return typeof object.nodeType !== 'undefined';
};
-const getElement = obj => {
- if (isElement(obj)) {
- // it's a jQuery object or a node element
- return obj.jquery ? obj[0] : obj;
+const getElement = object => {
+ // it's a jQuery object or a node element
+ if (isElement(object)) {
+ return object.jquery ? object[0] : object;
}
- if (typeof obj === 'string' && obj.length > 0) {
- return document.querySelector(obj);
+ if (typeof object === 'string' && object.length > 0) {
+ return document.querySelector(object);
}
return null;
};
-const typeCheckConfig = (componentName, config, configTypes) => {
- Object.keys(configTypes).forEach(property => {
- const expectedTypes = configTypes[property];
- const value = config[property];
- const valueType = value && isElement(value) ? 'element' : toType(value);
-
- if (!new RegExp(expectedTypes).test(valueType)) {
- throw new TypeError(`${componentName.toUpperCase()}: Option "${property}" provided type "${valueType}" but expected type "${expectedTypes}".`);
- }
- });
-};
-
const isVisible = element => {
if (!isElement(element) || element.getClientRects().length === 0) {
return false;
}
- return getComputedStyle(element).getPropertyValue('visibility') === 'visible';
+ const elementIsVisible = getComputedStyle(element).getPropertyValue('visibility') === 'visible'; // Handle `details` element as its content may falsie appear visible when it is closed
+
+ const closedDetails = element.closest('details:not([open])');
+
+ if (!closedDetails) {
+ return elementIsVisible;
+ }
+
+ if (closedDetails !== element) {
+ const summary = element.closest('summary');
+
+ if (summary && summary.parentNode !== closedDetails) {
+ return false;
+ }
+
+ if (summary === null) {
+ return false;
+ }
+ }
+
+ return elementIsVisible;
};
const isDisabled = element => {
@@ -199,17 +205,12 @@ const noop = () => {};
const reflow = element => {
- // eslint-disable-next-line no-unused-expressions
- element.offsetHeight;
+ element.offsetHeight; // eslint-disable-line no-unused-expressions
};
const getjQuery = () => {
- const {
- jQuery
- } = window;
-
- if (jQuery && !document.body.hasAttribute('data-bs-no-jquery')) {
- return jQuery;
+ if (window.jQuery && !document.body.hasAttribute('data-bs-no-jquery')) {
+ return window.jQuery;
}
return null;
@@ -222,7 +223,9 @@ const onDOMContentLoaded = callback => {
// add listener on the first call when the document is in loading state
if (!DOMContentLoadedCallbacks.length) {
document.addEventListener('DOMContentLoaded', () => {
- DOMContentLoadedCallbacks.forEach(callback => callback());
+ for (const callback of DOMContentLoadedCallbacks) {
+ callback();
+ }
});
}
@@ -300,13 +303,14 @@ const executeAfterTransition = (callback, transitionElement, waitForTransition =
const getNextActiveElement = (list, activeElement, shouldGetNext, isCycleAllowed) => {
- let index = list.indexOf(activeElement); // if the element does not exist in the list return an element depending on the direction and if cycle is allowed
+ const listLength = list.length;
+ let index = list.indexOf(activeElement); // if the element does not exist in the list return an element
+ // depending on the direction and if cycle is allowed
if (index === -1) {
- return list[!shouldGetNext && isCycleAllowed ? list.length - 1 : 0];
+ return !shouldGetNext && isCycleAllowed ? list[listLength - 1] : list[0];
}
- const listLength = list.length;
index += shouldGetNext ? 1 : -1;
if (isCycleAllowed) {
@@ -318,14 +322,12 @@ const getNextActiveElement = (list, activeElement, shouldGetNext, isCycleAllowed
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): dom/event-handler.js
+ * Bootstrap (v5.2.0): dom/event-handler.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const namespaceRegex = /[^.]*(?=\..*)\.|.*/;
@@ -338,20 +340,17 @@ const customEvents = {
mouseenter: 'mouseover',
mouseleave: 'mouseout'
};
-const customEventsRegex = /^(mouseenter|mouseleave)/i;
const nativeEvents = new Set(['click', 'dblclick', 'mouseup', 'mousedown', 'contextmenu', 'mousewheel', 'DOMMouseScroll', 'mouseover', 'mouseout', 'mousemove', 'selectstart', 'selectend', 'keydown', 'keypress', 'keyup', 'orientationchange', 'touchstart', 'touchmove', 'touchend', 'touchcancel', 'pointerdown', 'pointermove', 'pointerup', 'pointerleave', 'pointercancel', 'gesturestart', 'gesturechange', 'gestureend', 'focus', 'blur', 'change', 'reset', 'select', 'submit', 'focusin', 'focusout', 'load', 'unload', 'beforeunload', 'resize', 'move', 'DOMContentLoaded', 'readystatechange', 'error', 'abort', 'scroll']);
/**
- * ------------------------------------------------------------------------
* Private methods
- * ------------------------------------------------------------------------
*/
-function getUidEvent(element, uid) {
+function makeEventUid(element, uid) {
return uid && `${uid}::${uidEvent++}` || element.uidEvent || uidEvent++;
}
-function getEvent(element) {
- const uid = getUidEvent(element);
+function getElementEvents(element) {
+ const uid = makeEventUid(element);
element.uidEvent = uid;
eventRegistry[uid] = eventRegistry[uid] || {};
return eventRegistry[uid];
@@ -359,7 +358,9 @@ function getEvent(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);
@@ -376,65 +377,52 @@ function bootstrapDelegationHandler(element, selector, fn) {
for (let {
target
} = event; target && target !== this; target = target.parentNode) {
- for (let i = domElements.length; i--;) {
- if (domElements[i] === target) {
- event.delegateTarget = target;
+ for (const domElement of domElements) {
+ if (domElement !== target) {
+ continue;
+ }
- if (handler.oneOff) {
- EventHandler.off(element, event.type, selector, fn);
- }
+ hydrateObj(event, {
+ delegateTarget: target
+ });
- return fn.apply(target, [event]);
+ if (handler.oneOff) {
+ EventHandler.off(element, event.type, selector, fn);
}
- }
- } // To please ESLint
-
- return null;
+ return fn.apply(target, [event]);
+ }
+ }
};
}
-function findHandler(events, handler, delegationSelector = null) {
- const uidEventList = Object.keys(events);
-
- for (let i = 0, len = uidEventList.length; i < len; i++) {
- const event = events[uidEventList[i]];
-
- if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {
- return event;
- }
- }
-
- return null;
+function findHandler(events, callable, delegationSelector = null) {
+ return Object.values(events).find(event => event.callable === callable && event.delegationSelector === delegationSelector);
}
-function normalizeParams(originalTypeEvent, handler, delegationFn) {
- const delegation = typeof handler === 'string';
- const originalHandler = delegation ? delegationFn : handler;
+function normalizeParameters(originalTypeEvent, handler, delegationFunction) {
+ const isDelegated = typeof handler === 'string'; // todo: tooltip passes `false` instead of selector, so we need to check
+
+ const callable = isDelegated ? delegationFunction : handler || delegationFunction;
let typeEvent = getTypeEvent(originalTypeEvent);
- const isNative = nativeEvents.has(typeEvent);
- if (!isNative) {
+ if (!nativeEvents.has(typeEvent)) {
typeEvent = originalTypeEvent;
}
- return [delegation, originalHandler, typeEvent];
+ return [isDelegated, callable, typeEvent];
}
-function addHandler(element, originalTypeEvent, handler, delegationFn, oneOff) {
+function addHandler(element, originalTypeEvent, handler, delegationFunction, oneOff) {
if (typeof originalTypeEvent !== 'string' || !element) {
return;
}
- if (!handler) {
- handler = delegationFn;
- delegationFn = null;
- } // in case of mouseenter or mouseleave wrap the handler within a function that checks for its DOM position
+ let [isDelegated, callable, typeEvent] = normalizeParameters(originalTypeEvent, handler, delegationFunction); // in case of mouseenter or mouseleave wrap the handler within a function that checks for its DOM position
// this prevents the handler from being dispatched the same way as mouseover or mouseout does
-
- if (customEventsRegex.test(originalTypeEvent)) {
- const wrapFn = fn => {
+ if (originalTypeEvent in customEvents) {
+ const wrapFunction = fn => {
return function (event) {
if (!event.relatedTarget || event.relatedTarget !== event.delegateTarget && !event.delegateTarget.contains(event.relatedTarget)) {
return fn.call(this, event);
@@ -442,31 +430,26 @@ function addHandler(element, originalTypeEvent, handler, delegationFn, oneOff) {
};
};
- if (delegationFn) {
- delegationFn = wrapFn(delegationFn);
- } else {
- handler = wrapFn(handler);
- }
+ callable = wrapFunction(callable);
}
- const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
- const events = getEvent(element);
+ const events = getElementEvents(element);
const handlers = events[typeEvent] || (events[typeEvent] = {});
- const previousFn = findHandler(handlers, originalHandler, delegation ? handler : null);
+ const previousFunction = findHandler(handlers, callable, isDelegated ? handler : null);
- if (previousFn) {
- previousFn.oneOff = previousFn.oneOff && oneOff;
+ if (previousFunction) {
+ previousFunction.oneOff = previousFunction.oneOff && oneOff;
return;
}
- const uid = getUidEvent(originalHandler, originalTypeEvent.replace(namespaceRegex, ''));
- const fn = delegation ? bootstrapDelegationHandler(element, handler, delegationFn) : bootstrapHandler(element, handler);
- fn.delegationSelector = delegation ? handler : null;
- fn.originalHandler = originalHandler;
+ const uid = makeEventUid(callable, originalTypeEvent.replace(namespaceRegex, ''));
+ const fn = isDelegated ? bootstrapDelegationHandler(element, handler, callable) : bootstrapHandler(element, callable);
+ fn.delegationSelector = isDelegated ? handler : null;
+ fn.callable = callable;
fn.oneOff = oneOff;
fn.uidEvent = uid;
handlers[uid] = fn;
- element.addEventListener(typeEvent, fn, delegation);
+ element.addEventListener(typeEvent, fn, isDelegated);
}
function removeHandler(element, events, typeEvent, handler, delegationSelector) {
@@ -482,12 +465,13 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
function removeNamespacedHandlers(element, events, typeEvent, namespace) {
const storeElementEvent = events[typeEvent] || {};
- Object.keys(storeElementEvent).forEach(handlerKey => {
+
+ for (const handlerKey of Object.keys(storeElementEvent)) {
if (handlerKey.includes(namespace)) {
const event = storeElementEvent[handlerKey];
- removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector);
+ removeHandler(element, events, typeEvent, event.callable, event.delegationSelector);
}
- });
+ }
}
function getTypeEvent(event) {
@@ -497,49 +481,49 @@ function getTypeEvent(event) {
}
const EventHandler = {
- on(element, event, handler, delegationFn) {
- addHandler(element, event, handler, delegationFn, false);
+ on(element, event, handler, delegationFunction) {
+ addHandler(element, event, handler, delegationFunction, false);
},
- one(element, event, handler, delegationFn) {
- addHandler(element, event, handler, delegationFn, true);
+ one(element, event, handler, delegationFunction) {
+ addHandler(element, event, handler, delegationFunction, true);
},
- off(element, originalTypeEvent, handler, delegationFn) {
+ off(element, originalTypeEvent, handler, delegationFunction) {
if (typeof originalTypeEvent !== 'string' || !element) {
return;
}
- const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
+ const [isDelegated, callable, typeEvent] = normalizeParameters(originalTypeEvent, handler, delegationFunction);
const inNamespace = typeEvent !== originalTypeEvent;
- const events = getEvent(element);
+ const events = getElementEvents(element);
+ const storeElementEvent = events[typeEvent] || {};
const isNamespace = originalTypeEvent.startsWith('.');
- if (typeof originalHandler !== 'undefined') {
+ if (typeof callable !== 'undefined') {
// Simplest case: handler is passed, remove that listener ONLY.
- if (!events || !events[typeEvent]) {
+ if (!Object.keys(storeElementEvent).length) {
return;
}
- removeHandler(element, events, typeEvent, originalHandler, delegation ? handler : null);
+ removeHandler(element, events, typeEvent, callable, isDelegated ? handler : null);
return;
}
if (isNamespace) {
- Object.keys(events).forEach(elementEvent => {
+ for (const elementEvent of Object.keys(events)) {
removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1));
- });
+ }
}
- const storeElementEvent = events[typeEvent] || {};
- Object.keys(storeElementEvent).forEach(keyHandlers => {
+ for (const keyHandlers of Object.keys(storeElementEvent)) {
const handlerKey = keyHandlers.replace(stripUidRegex, '');
if (!inNamespace || originalTypeEvent.includes(handlerKey)) {
const event = storeElementEvent[keyHandlers];
- removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector);
+ removeHandler(element, events, typeEvent, event.callable, event.delegationSelector);
}
- });
+ }
},
trigger(element, event, args) {
@@ -550,12 +534,10 @@ const EventHandler = {
const $ = getjQuery();
const typeEvent = getTypeEvent(event);
const inNamespace = event !== typeEvent;
- const isNative = nativeEvents.has(typeEvent);
- let jQueryEvent;
+ let jQueryEvent = null;
let bubbles = true;
let nativeDispatch = true;
let defaultPrevented = false;
- let evt = null;
if (inNamespace && $) {
jQueryEvent = $.Event(event, args);
@@ -565,27 +547,11 @@ const EventHandler = {
defaultPrevented = jQueryEvent.isDefaultPrevented();
}
- if (isNative) {
- evt = document.createEvent('HTMLEvents');
- evt.initEvent(typeEvent, bubbles, true);
- } else {
- evt = new CustomEvent(event, {
- bubbles,
- cancelable: true
- });
- } // merge custom information in our event
-
-
- if (typeof args !== 'undefined') {
- Object.keys(args).forEach(key => {
- Object.defineProperty(evt, key, {
- get() {
- return args[key];
- }
-
- });
- });
- }
+ let evt = new Event(event, {
+ bubbles,
+ cancelable: true
+ });
+ evt = hydrateObj(evt, args);
if (defaultPrevented) {
evt.preventDefault();
@@ -595,7 +561,7 @@ const EventHandler = {
element.dispatchEvent(evt);
}
- if (evt.defaultPrevented && typeof jQueryEvent !== 'undefined') {
+ if (evt.defaultPrevented && jQueryEvent) {
jQueryEvent.preventDefault();
}
@@ -604,17 +570,34 @@ const EventHandler = {
};
+function hydrateObj(obj, meta) {
+ for (const [key, value] of Object.entries(meta || {})) {
+ try {
+ obj[key] = value;
+ } catch (_unused) {
+ Object.defineProperty(obj, key, {
+ configurable: true,
+
+ get() {
+ return value;
+ }
+
+ });
+ }
+ }
+
+ return obj;
+}
+
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): dom/data.js
+ * Bootstrap (v5.2.0): dom/data.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const elementMap = new Map();
const Data = {
@@ -660,20 +643,153 @@ const Data = {
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): base-component.js
+ * Bootstrap (v5.2.0): dom/manipulator.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+function normalizeData(value) {
+ if (value === 'true') {
+ return true;
+ }
+
+ if (value === 'false') {
+ return false;
+ }
+
+ if (value === Number(value).toString()) {
+ return Number(value);
+ }
+
+ if (value === '' || value === 'null') {
+ return null;
+ }
+
+ if (typeof value !== 'string') {
+ return value;
+ }
+
+ try {
+ return JSON.parse(decodeURIComponent(value));
+ } catch (_unused) {
+ return value;
+ }
+}
+
+function normalizeDataKey(key) {
+ return key.replace(/[A-Z]/g, chr => `-${chr.toLowerCase()}`);
+}
+
+const Manipulator = {
+ setDataAttribute(element, key, value) {
+ element.setAttribute(`data-bs-${normalizeDataKey(key)}`, value);
+ },
+
+ removeDataAttribute(element, key) {
+ element.removeAttribute(`data-bs-${normalizeDataKey(key)}`);
+ },
+
+ getDataAttributes(element) {
+ if (!element) {
+ return {};
+ }
+
+ const attributes = {};
+ const bsKeys = Object.keys(element.dataset).filter(key => key.startsWith('bs') && !key.startsWith('bsConfig'));
+
+ for (const key of bsKeys) {
+ let pureKey = key.replace(/^bs/, '');
+ pureKey = pureKey.charAt(0).toLowerCase() + pureKey.slice(1, pureKey.length);
+ attributes[pureKey] = normalizeData(element.dataset[key]);
+ }
+
+ return attributes;
+ },
+
+ getDataAttribute(element, key) {
+ return normalizeData(element.getAttribute(`data-bs-${normalizeDataKey(key)}`));
+ }
+
+};
+
+/**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.2.0): util/config.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+/**
+ * Class definition
+ */
+
+class Config {
+ // Getters
+ static get Default() {
+ return {};
+ }
+
+ static get DefaultType() {
+ return {};
+ }
+
+ static get NAME() {
+ throw new Error('You have to implement the static method "NAME", for each component!');
+ }
+
+ _getConfig(config) {
+ config = this._mergeConfigObj(config);
+ config = this._configAfterMerge(config);
+
+ this._typeCheckConfig(config);
+
+ return config;
+ }
+
+ _configAfterMerge(config) {
+ return config;
+ }
+
+ _mergeConfigObj(config, element) {
+ const jsonConfig = isElement(element) ? Manipulator.getDataAttribute(element, 'config') : {}; // try to parse
+
+ return { ...this.constructor.Default,
+ ...(typeof jsonConfig === 'object' ? jsonConfig : {}),
+ ...(isElement(element) ? Manipulator.getDataAttributes(element) : {}),
+ ...(typeof config === 'object' ? config : {})
+ };
+ }
+
+ _typeCheckConfig(config, configTypes = this.constructor.DefaultType) {
+ for (const property of Object.keys(configTypes)) {
+ const expectedTypes = configTypes[property];
+ const value = config[property];
+ const valueType = isElement(value) ? 'element' : toType(value);
+
+ if (!new RegExp(expectedTypes).test(valueType)) {
+ throw new TypeError(`${this.constructor.NAME.toUpperCase()}: Option "${property}" provided type "${valueType}" but expected type "${expectedTypes}".`);
+ }
+ }
+ }
+
+}
+
+/**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.2.0): base-component.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const VERSION = '5.1.3';
+const VERSION = '5.2.0';
+/**
+ * Class definition
+ */
-class BaseComponent {
- constructor(element) {
+class BaseComponent extends Config {
+ constructor(element, config) {
+ super();
element = getElement(element);
if (!element) {
@@ -681,21 +797,32 @@ class BaseComponent {
}
this._element = element;
+ this._config = this._getConfig(config);
Data.set(this._element, this.constructor.DATA_KEY, this);
- }
+ } // Public
+
dispose() {
Data.remove(this._element, this.constructor.DATA_KEY);
EventHandler.off(this._element, this.constructor.EVENT_KEY);
- Object.getOwnPropertyNames(this).forEach(propertyName => {
+
+ for (const propertyName of Object.getOwnPropertyNames(this)) {
this[propertyName] = null;
- });
+ }
}
_queueCallback(callback, element, isAnimated = true) {
executeAfterTransition(callback, element, isAnimated);
}
- /** Static */
+
+ _getConfig(config) {
+ config = this._mergeConfigObj(config, this._element);
+ config = this._configAfterMerge(config);
+
+ this._typeCheckConfig(config);
+
+ return config;
+ } // Static
static getInstance(element) {
@@ -710,10 +837,6 @@ class BaseComponent {
return VERSION;
}
- static get NAME() {
- throw new Error('You have to implement the static method "NAME", for each component!');
- }
-
static get DATA_KEY() {
return `bs.${this.NAME}`;
}
@@ -722,11 +845,15 @@ class BaseComponent {
return `.${this.DATA_KEY}`;
}
+ static eventName(name) {
+ return `${name}${this.EVENT_KEY}`;
+ }
+
}
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/component-functions.js
+ * Bootstrap (v5.2.0): util/component-functions.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -752,33 +879,29 @@ const enableDismissTrigger = (component, method = 'hide') => {
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): alert.js
+ * Bootstrap (v5.2.0): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$d = 'alert';
-const DATA_KEY$c = 'bs.alert';
-const EVENT_KEY$c = `.${DATA_KEY$c}`;
-const EVENT_CLOSE = `close${EVENT_KEY$c}`;
-const EVENT_CLOSED = `closed${EVENT_KEY$c}`;
+const NAME$f = 'alert';
+const DATA_KEY$a = 'bs.alert';
+const EVENT_KEY$b = `.${DATA_KEY$a}`;
+const EVENT_CLOSE = `close${EVENT_KEY$b}`;
+const EVENT_CLOSED = `closed${EVENT_KEY$b}`;
const CLASS_NAME_FADE$5 = 'fade';
const CLASS_NAME_SHOW$8 = 'show';
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Alert extends BaseComponent {
// Getters
static get NAME() {
- return NAME$d;
+ return NAME$f;
} // Public
@@ -823,51 +946,42 @@ class Alert extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
enableDismissTrigger(Alert, 'close');
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Alert to jQuery only if jQuery is present
*/
defineJQueryPlugin(Alert);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): button.js
+ * Bootstrap (v5.2.0): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$c = 'button';
-const DATA_KEY$b = 'bs.button';
-const EVENT_KEY$b = `.${DATA_KEY$b}`;
-const DATA_API_KEY$7 = '.data-api';
+const NAME$e = 'button';
+const DATA_KEY$9 = 'bs.button';
+const EVENT_KEY$a = `.${DATA_KEY$9}`;
+const DATA_API_KEY$6 = '.data-api';
const CLASS_NAME_ACTIVE$3 = 'active';
const SELECTOR_DATA_TOGGLE$5 = '[data-bs-toggle="button"]';
-const EVENT_CLICK_DATA_API$6 = `click${EVENT_KEY$b}${DATA_API_KEY$7}`;
+const EVENT_CLICK_DATA_API$6 = `click${EVENT_KEY$a}${DATA_API_KEY$6}`;
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Button extends BaseComponent {
// Getters
static get NAME() {
- return NAME$c;
+ return NAME$e;
} // Public
@@ -889,9 +1003,7 @@ class Button extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -902,95 +1014,21 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$6, SELECTOR_DATA_TOGGLE$5, event
data.toggle();
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Button to jQuery only if jQuery is present
*/
defineJQueryPlugin(Button);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): dom/manipulator.js
+ * Bootstrap (v5.2.0): dom/selector-engine.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
-function normalizeData(val) {
- if (val === 'true') {
- return true;
- }
-
- if (val === 'false') {
- return false;
- }
-
- if (val === Number(val).toString()) {
- return Number(val);
- }
-
- if (val === '' || val === 'null') {
- return null;
- }
-
- return val;
-}
-
-function normalizeDataKey(key) {
- return key.replace(/[A-Z]/g, chr => `-${chr.toLowerCase()}`);
-}
-
-const Manipulator = {
- setDataAttribute(element, key, value) {
- element.setAttribute(`data-bs-${normalizeDataKey(key)}`, value);
- },
-
- removeDataAttribute(element, key) {
- element.removeAttribute(`data-bs-${normalizeDataKey(key)}`);
- },
-
- getDataAttributes(element) {
- if (!element) {
- return {};
- }
-
- const attributes = {};
- Object.keys(element.dataset).filter(key => key.startsWith('bs')).forEach(key => {
- let pureKey = key.replace(/^bs/, '');
- pureKey = pureKey.charAt(0).toLowerCase() + pureKey.slice(1, pureKey.length);
- attributes[pureKey] = normalizeData(element.dataset[key]);
- });
- return attributes;
- },
-
- getDataAttribute(element, key) {
- return normalizeData(element.getAttribute(`data-bs-${normalizeDataKey(key)}`));
- },
-
- offset(element) {
- const rect = element.getBoundingClientRect();
- return {
- top: rect.top + window.pageYOffset,
- left: rect.left + window.pageXOffset
- };
- },
-
- position(element) {
- return {
- top: element.offsetTop,
- left: element.offsetLeft
- };
- }
-
-};
-
/**
- * --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): dom/selector-engine.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * --------------------------------------------------------------------------
+ * Constants
*/
-const NODE_TEXT = 3;
+
const SelectorEngine = {
find(selector, element = document.documentElement) {
return [].concat(...Element.prototype.querySelectorAll.call(element, selector));
@@ -1006,14 +1044,11 @@ const SelectorEngine = {
parents(element, selector) {
const parents = [];
- let ancestor = element.parentNode;
-
- while (ancestor && ancestor.nodeType === Node.ELEMENT_NODE && ancestor.nodeType !== NODE_TEXT) {
- if (ancestor.matches(selector)) {
- parents.push(ancestor);
- }
+ let ancestor = element.parentNode.closest(selector);
- ancestor = ancestor.parentNode;
+ while (ancestor) {
+ parents.push(ancestor);
+ ancestor = ancestor.parentNode.closest(selector);
}
return parents;
@@ -1033,6 +1068,7 @@ const SelectorEngine = {
return [];
},
+ // TODO: this is now unused; remove later along with prev()
next(element, selector) {
let next = element.nextElementSibling;
@@ -1048,7 +1084,7 @@ const SelectorEngine = {
},
focusableChildren(element) {
- const focusables = ['a', 'button', 'input', 'textarea', 'select', 'details', '[tabindex]', '[contenteditable="true"]'].map(selector => `${selector}:not([tabindex^="-"])`).join(', ');
+ const focusables = ['a', 'button', 'input', 'textarea', 'select', 'details', '[tabindex]', '[contenteditable="true"]'].map(selector => `${selector}:not([tabindex^="-"])`).join(',');
return this.find(focusables, element).filter(el => !isDisabled(el) && isVisible(el));
}
@@ -1056,62 +1092,170 @@ const SelectorEngine = {
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): carousel.js
+ * Bootstrap (v5.2.0): util/swipe.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$b = 'carousel';
-const DATA_KEY$a = 'bs.carousel';
-const EVENT_KEY$a = `.${DATA_KEY$a}`;
-const DATA_API_KEY$6 = '.data-api';
-const ARROW_LEFT_KEY = 'ArrowLeft';
-const ARROW_RIGHT_KEY = 'ArrowRight';
-const TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
-
+const NAME$d = 'swipe';
+const EVENT_KEY$9 = '.bs.swipe';
+const EVENT_TOUCHSTART = `touchstart${EVENT_KEY$9}`;
+const EVENT_TOUCHMOVE = `touchmove${EVENT_KEY$9}`;
+const EVENT_TOUCHEND = `touchend${EVENT_KEY$9}`;
+const EVENT_POINTERDOWN = `pointerdown${EVENT_KEY$9}`;
+const EVENT_POINTERUP = `pointerup${EVENT_KEY$9}`;
+const POINTER_TYPE_TOUCH = 'touch';
+const POINTER_TYPE_PEN = 'pen';
+const CLASS_NAME_POINTER_EVENT = 'pointer-event';
const SWIPE_THRESHOLD = 40;
-const Default$a = {
- interval: 5000,
- keyboard: true,
- slide: false,
- pause: 'hover',
- wrap: true,
- touch: true
+const Default$c = {
+ endCallback: null,
+ leftCallback: null,
+ rightCallback: null
};
-const DefaultType$a = {
- interval: '(number|boolean)',
- keyboard: 'boolean',
- slide: '(boolean|string)',
- pause: '(string|boolean)',
- wrap: 'boolean',
- touch: 'boolean'
+const DefaultType$c = {
+ endCallback: '(function|null)',
+ leftCallback: '(function|null)',
+ rightCallback: '(function|null)'
};
+/**
+ * Class definition
+ */
+
+class Swipe extends Config {
+ constructor(element, config) {
+ super();
+ this._element = element;
+
+ if (!element || !Swipe.isSupported()) {
+ return;
+ }
+
+ this._config = this._getConfig(config);
+ this._deltaX = 0;
+ this._supportPointerEvents = Boolean(window.PointerEvent);
+
+ this._initEvents();
+ } // Getters
+
+
+ static get Default() {
+ return Default$c;
+ }
+
+ static get DefaultType() {
+ return DefaultType$c;
+ }
+
+ static get NAME() {
+ return NAME$d;
+ } // Public
+
+
+ dispose() {
+ EventHandler.off(this._element, EVENT_KEY$9);
+ } // Private
+
+
+ _start(event) {
+ if (!this._supportPointerEvents) {
+ this._deltaX = event.touches[0].clientX;
+ return;
+ }
+
+ if (this._eventIsPointerPenTouch(event)) {
+ this._deltaX = event.clientX;
+ }
+ }
+
+ _end(event) {
+ if (this._eventIsPointerPenTouch(event)) {
+ this._deltaX = event.clientX - this._deltaX;
+ }
+
+ this._handleSwipe();
+
+ execute(this._config.endCallback);
+ }
+
+ _move(event) {
+ this._deltaX = event.touches && event.touches.length > 1 ? 0 : event.touches[0].clientX - this._deltaX;
+ }
+
+ _handleSwipe() {
+ const absDeltaX = Math.abs(this._deltaX);
+
+ if (absDeltaX <= SWIPE_THRESHOLD) {
+ return;
+ }
+
+ const direction = absDeltaX / this._deltaX;
+ this._deltaX = 0;
+
+ if (!direction) {
+ return;
+ }
+
+ execute(direction > 0 ? this._config.rightCallback : this._config.leftCallback);
+ }
+
+ _initEvents() {
+ if (this._supportPointerEvents) {
+ EventHandler.on(this._element, EVENT_POINTERDOWN, event => this._start(event));
+ EventHandler.on(this._element, EVENT_POINTERUP, event => this._end(event));
+
+ this._element.classList.add(CLASS_NAME_POINTER_EVENT);
+ } else {
+ EventHandler.on(this._element, EVENT_TOUCHSTART, event => this._start(event));
+ EventHandler.on(this._element, EVENT_TOUCHMOVE, event => this._move(event));
+ EventHandler.on(this._element, EVENT_TOUCHEND, event => this._end(event));
+ }
+ }
+
+ _eventIsPointerPenTouch(event) {
+ return this._supportPointerEvents && (event.pointerType === POINTER_TYPE_PEN || event.pointerType === POINTER_TYPE_TOUCH);
+ } // Static
+
+
+ static isSupported() {
+ return 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
+ }
+
+}
+
+/**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.2.0): carousel.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+/**
+ * Constants
+ */
+
+const NAME$c = 'carousel';
+const DATA_KEY$8 = 'bs.carousel';
+const EVENT_KEY$8 = `.${DATA_KEY$8}`;
+const DATA_API_KEY$5 = '.data-api';
+const ARROW_LEFT_KEY$1 = 'ArrowLeft';
+const ARROW_RIGHT_KEY$1 = 'ArrowRight';
+const TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
+
const ORDER_NEXT = 'next';
const ORDER_PREV = 'prev';
const DIRECTION_LEFT = 'left';
const DIRECTION_RIGHT = 'right';
-const KEY_TO_DIRECTION = {
- [ARROW_LEFT_KEY]: DIRECTION_RIGHT,
- [ARROW_RIGHT_KEY]: DIRECTION_LEFT
-};
-const EVENT_SLIDE = `slide${EVENT_KEY$a}`;
-const EVENT_SLID = `slid${EVENT_KEY$a}`;
-const EVENT_KEYDOWN = `keydown${EVENT_KEY$a}`;
-const EVENT_MOUSEENTER = `mouseenter${EVENT_KEY$a}`;
-const EVENT_MOUSELEAVE = `mouseleave${EVENT_KEY$a}`;
-const EVENT_TOUCHSTART = `touchstart${EVENT_KEY$a}`;
-const EVENT_TOUCHMOVE = `touchmove${EVENT_KEY$a}`;
-const EVENT_TOUCHEND = `touchend${EVENT_KEY$a}`;
-const EVENT_POINTERDOWN = `pointerdown${EVENT_KEY$a}`;
-const EVENT_POINTERUP = `pointerup${EVENT_KEY$a}`;
-const EVENT_DRAG_START = `dragstart${EVENT_KEY$a}`;
-const EVENT_LOAD_DATA_API$2 = `load${EVENT_KEY$a}${DATA_API_KEY$6}`;
-const EVENT_CLICK_DATA_API$5 = `click${EVENT_KEY$a}${DATA_API_KEY$6}`;
+const EVENT_SLIDE = `slide${EVENT_KEY$8}`;
+const EVENT_SLID = `slid${EVENT_KEY$8}`;
+const EVENT_KEYDOWN$1 = `keydown${EVENT_KEY$8}`;
+const EVENT_MOUSEENTER$1 = `mouseenter${EVENT_KEY$8}`;
+const EVENT_MOUSELEAVE$1 = `mouseleave${EVENT_KEY$8}`;
+const EVENT_DRAG_START = `dragstart${EVENT_KEY$8}`;
+const EVENT_LOAD_DATA_API$3 = `load${EVENT_KEY$8}${DATA_API_KEY$5}`;
+const EVENT_CLICK_DATA_API$5 = `click${EVENT_KEY$8}${DATA_API_KEY$5}`;
const CLASS_NAME_CAROUSEL = 'carousel';
const CLASS_NAME_ACTIVE$2 = 'active';
const CLASS_NAME_SLIDE = 'slide';
@@ -1119,50 +1263,66 @@ const CLASS_NAME_END = 'carousel-item-end';
const CLASS_NAME_START = 'carousel-item-start';
const CLASS_NAME_NEXT = 'carousel-item-next';
const CLASS_NAME_PREV = 'carousel-item-prev';
-const CLASS_NAME_POINTER_EVENT = 'pointer-event';
-const SELECTOR_ACTIVE$1 = '.active';
-const SELECTOR_ACTIVE_ITEM = '.active.carousel-item';
+const SELECTOR_ACTIVE = '.active';
const SELECTOR_ITEM = '.carousel-item';
+const SELECTOR_ACTIVE_ITEM = SELECTOR_ACTIVE + SELECTOR_ITEM;
const SELECTOR_ITEM_IMG = '.carousel-item img';
-const SELECTOR_NEXT_PREV = '.carousel-item-next, .carousel-item-prev';
const SELECTOR_INDICATORS = '.carousel-indicators';
-const SELECTOR_INDICATOR = '[data-bs-target]';
const SELECTOR_DATA_SLIDE = '[data-bs-slide], [data-bs-slide-to]';
const SELECTOR_DATA_RIDE = '[data-bs-ride="carousel"]';
-const POINTER_TYPE_TOUCH = 'touch';
-const POINTER_TYPE_PEN = 'pen';
+const KEY_TO_DIRECTION = {
+ [ARROW_LEFT_KEY$1]: DIRECTION_RIGHT,
+ [ARROW_RIGHT_KEY$1]: DIRECTION_LEFT
+};
+const Default$b = {
+ interval: 5000,
+ keyboard: true,
+ pause: 'hover',
+ ride: false,
+ touch: true,
+ wrap: true
+};
+const DefaultType$b = {
+ interval: '(number|boolean)',
+ // TODO:v6 remove boolean support
+ keyboard: 'boolean',
+ pause: '(string|boolean)',
+ ride: '(boolean|string)',
+ touch: 'boolean',
+ wrap: 'boolean'
+};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Carousel extends BaseComponent {
constructor(element, config) {
- super(element);
- this._items = null;
+ super(element, config);
this._interval = null;
this._activeElement = null;
- this._isPaused = false;
this._isSliding = false;
this.touchTimeout = null;
- this.touchStartX = 0;
- this.touchDeltaX = 0;
- this._config = this._getConfig(config);
+ this._swipeHelper = null;
this._indicatorsElement = SelectorEngine.findOne(SELECTOR_INDICATORS, this._element);
- this._touchSupported = 'ontouchstart' in document.documentElement || navigator.maxTouchPoints > 0;
- this._pointerEvent = Boolean(window.PointerEvent);
this._addEventListeners();
+
+ if (this._config.ride === CLASS_NAME_CAROUSEL) {
+ this.cycle();
+ }
} // Getters
static get Default() {
- return Default$a;
+ return Default$b;
+ }
+
+ static get DefaultType() {
+ return DefaultType$b;
}
static get NAME() {
- return NAME$b;
+ return NAME$c;
} // Public
@@ -1171,6 +1331,7 @@ class Carousel extends BaseComponent {
}
nextWhenVisible() {
+ // FIXME TODO use `document.visibilityState`
// Don't call next when the page isn't visible
// or the carousel or its parent isn't visible
if (!document.hidden && isVisible(this._element)) {
@@ -1182,43 +1343,39 @@ class Carousel extends BaseComponent {
this._slide(ORDER_PREV);
}
- pause(event) {
- if (!event) {
- this._isPaused = true;
- }
-
- if (SelectorEngine.findOne(SELECTOR_NEXT_PREV, this._element)) {
+ pause() {
+ if (this._isSliding) {
triggerTransitionEnd(this._element);
- this.cycle(true);
}
- clearInterval(this._interval);
- this._interval = null;
+ this._clearInterval();
}
- cycle(event) {
- if (!event) {
- this._isPaused = false;
- }
+ cycle() {
+ this._clearInterval();
- if (this._interval) {
- clearInterval(this._interval);
- this._interval = null;
- }
+ this._updateInterval();
- if (this._config && this._config.interval && !this._isPaused) {
- this._updateInterval();
+ this._interval = setInterval(() => this.nextWhenVisible(), this._config.interval);
+ }
- this._interval = setInterval((document.visibilityState ? this.nextWhenVisible : this.next).bind(this), this._config.interval);
+ _maybeEnableCycle() {
+ if (!this._config.ride) {
+ return;
}
+
+ if (this._isSliding) {
+ EventHandler.one(this._element, EVENT_SLID, () => this.cycle());
+ return;
+ }
+
+ this.cycle();
}
to(index) {
- this._activeElement = SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element);
-
- const activeIndex = this._getItemIndex(this._activeElement);
+ const items = this._getItems();
- if (index > this._items.length - 1 || index < 0) {
+ if (index > items.length - 1 || index < 0) {
return;
}
@@ -1227,116 +1384,78 @@ class Carousel extends BaseComponent {
return;
}
+ const activeIndex = this._getItemIndex(this._getActive());
+
if (activeIndex === index) {
- this.pause();
- this.cycle();
return;
}
const order = index > activeIndex ? ORDER_NEXT : ORDER_PREV;
- this._slide(order, this._items[index]);
- } // Private
-
-
- _getConfig(config) {
- config = { ...Default$a,
- ...Manipulator.getDataAttributes(this._element),
- ...(typeof config === 'object' ? config : {})
- };
- typeCheckConfig(NAME$b, config, DefaultType$a);
- return config;
+ this._slide(order, items[index]);
}
- _handleSwipe() {
- const absDeltax = Math.abs(this.touchDeltaX);
-
- if (absDeltax <= SWIPE_THRESHOLD) {
- return;
+ dispose() {
+ if (this._swipeHelper) {
+ this._swipeHelper.dispose();
}
- const direction = absDeltax / this.touchDeltaX;
- this.touchDeltaX = 0;
+ super.dispose();
+ } // Private
- if (!direction) {
- return;
- }
- this._slide(direction > 0 ? DIRECTION_RIGHT : DIRECTION_LEFT);
+ _configAfterMerge(config) {
+ config.defaultInterval = config.interval;
+ return config;
}
_addEventListeners() {
if (this._config.keyboard) {
- EventHandler.on(this._element, EVENT_KEYDOWN, event => this._keydown(event));
+ EventHandler.on(this._element, EVENT_KEYDOWN$1, event => this._keydown(event));
}
if (this._config.pause === 'hover') {
- EventHandler.on(this._element, EVENT_MOUSEENTER, event => this.pause(event));
- EventHandler.on(this._element, EVENT_MOUSELEAVE, event => this.cycle(event));
+ EventHandler.on(this._element, EVENT_MOUSEENTER$1, () => this.pause());
+ EventHandler.on(this._element, EVENT_MOUSELEAVE$1, () => this._maybeEnableCycle());
}
- if (this._config.touch && this._touchSupported) {
+ if (this._config.touch && Swipe.isSupported()) {
this._addTouchEventListeners();
}
}
_addTouchEventListeners() {
- const hasPointerPenTouch = event => {
- return this._pointerEvent && (event.pointerType === POINTER_TYPE_PEN || event.pointerType === POINTER_TYPE_TOUCH);
- };
-
- const start = event => {
- if (hasPointerPenTouch(event)) {
- this.touchStartX = event.clientX;
- } else if (!this._pointerEvent) {
- this.touchStartX = event.touches[0].clientX;
- }
- };
-
- const move = event => {
- // ensure swiping with one touch and not pinching
- this.touchDeltaX = event.touches && event.touches.length > 1 ? 0 : event.touches[0].clientX - this.touchStartX;
- };
-
- const end = event => {
- if (hasPointerPenTouch(event)) {
- this.touchDeltaX = event.clientX - this.touchStartX;
- }
+ for (const img of SelectorEngine.find(SELECTOR_ITEM_IMG, this._element)) {
+ EventHandler.on(img, EVENT_DRAG_START, event => event.preventDefault());
+ }
- this._handleSwipe();
+ const endCallBack = () => {
+ if (this._config.pause !== 'hover') {
+ return;
+ } // If it's a touch-enabled device, mouseenter/leave are fired as
+ // part of the mouse compatibility events on first tap - the carousel
+ // would stop cycling until user tapped out of it;
+ // here, we listen for touchend, explicitly pause the carousel
+ // (as if it's the second time we tap on it, mouseenter compat event
+ // is NOT fired) and after a timeout (to allow for mouse compatibility
+ // events to fire) we explicitly restart cycling
- if (this._config.pause === 'hover') {
- // If it's a touch-enabled device, mouseenter/leave are fired as
- // part of the mouse compatibility events on first tap - the carousel
- // would stop cycling until user tapped out of it;
- // here, we listen for touchend, explicitly pause the carousel
- // (as if it's the second time we tap on it, mouseenter compat event
- // is NOT fired) and after a timeout (to allow for mouse compatibility
- // events to fire) we explicitly restart cycling
- this.pause();
- if (this.touchTimeout) {
- clearTimeout(this.touchTimeout);
- }
+ this.pause();
- this.touchTimeout = setTimeout(event => this.cycle(event), TOUCHEVENT_COMPAT_WAIT + this._config.interval);
+ if (this.touchTimeout) {
+ clearTimeout(this.touchTimeout);
}
- };
- SelectorEngine.find(SELECTOR_ITEM_IMG, this._element).forEach(itemImg => {
- EventHandler.on(itemImg, EVENT_DRAG_START, event => event.preventDefault());
- });
-
- if (this._pointerEvent) {
- EventHandler.on(this._element, EVENT_POINTERDOWN, event => start(event));
- EventHandler.on(this._element, EVENT_POINTERUP, event => end(event));
+ this.touchTimeout = setTimeout(() => this._maybeEnableCycle(), TOUCHEVENT_COMPAT_WAIT + this._config.interval);
+ };
- this._element.classList.add(CLASS_NAME_POINTER_EVENT);
- } else {
- EventHandler.on(this._element, EVENT_TOUCHSTART, event => start(event));
- EventHandler.on(this._element, EVENT_TOUCHMOVE, event => move(event));
- EventHandler.on(this._element, EVENT_TOUCHEND, event => end(event));
- }
+ const swipeConfig = {
+ leftCallback: () => this._slide(this._directionToOrder(DIRECTION_LEFT)),
+ rightCallback: () => this._slide(this._directionToOrder(DIRECTION_RIGHT)),
+ endCallback: endCallBack
+ };
+ this._swipeHelper = new Swipe(this._element, swipeConfig);
}
_keydown(event) {
@@ -1349,95 +1468,67 @@ class Carousel extends BaseComponent {
if (direction) {
event.preventDefault();
- this._slide(direction);
+ this._slide(this._directionToOrder(direction));
}
}
_getItemIndex(element) {
- this._items = element && element.parentNode ? SelectorEngine.find(SELECTOR_ITEM, element.parentNode) : [];
- return this._items.indexOf(element);
- }
-
- _getItemByOrder(order, activeElement) {
- const isNext = order === ORDER_NEXT;
- return getNextActiveElement(this._items, activeElement, isNext, this._config.wrap);
+ return this._getItems().indexOf(element);
}
- _triggerSlideEvent(relatedTarget, eventDirectionName) {
- const targetIndex = this._getItemIndex(relatedTarget);
-
- const fromIndex = this._getItemIndex(SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element));
-
- return EventHandler.trigger(this._element, EVENT_SLIDE, {
- relatedTarget,
- direction: eventDirectionName,
- from: fromIndex,
- to: targetIndex
- });
- }
+ _setActiveIndicatorElement(index) {
+ if (!this._indicatorsElement) {
+ return;
+ }
- _setActiveIndicatorElement(element) {
- if (this._indicatorsElement) {
- const activeIndicator = SelectorEngine.findOne(SELECTOR_ACTIVE$1, this._indicatorsElement);
- activeIndicator.classList.remove(CLASS_NAME_ACTIVE$2);
- activeIndicator.removeAttribute('aria-current');
- const indicators = SelectorEngine.find(SELECTOR_INDICATOR, this._indicatorsElement);
+ const activeIndicator = SelectorEngine.findOne(SELECTOR_ACTIVE, this._indicatorsElement);
+ activeIndicator.classList.remove(CLASS_NAME_ACTIVE$2);
+ activeIndicator.removeAttribute('aria-current');
+ const newActiveIndicator = SelectorEngine.findOne(`[data-bs-slide-to="${index}"]`, this._indicatorsElement);
- for (let i = 0; i < indicators.length; i++) {
- if (Number.parseInt(indicators[i].getAttribute('data-bs-slide-to'), 10) === this._getItemIndex(element)) {
- indicators[i].classList.add(CLASS_NAME_ACTIVE$2);
- indicators[i].setAttribute('aria-current', 'true');
- break;
- }
- }
+ if (newActiveIndicator) {
+ newActiveIndicator.classList.add(CLASS_NAME_ACTIVE$2);
+ newActiveIndicator.setAttribute('aria-current', 'true');
}
}
_updateInterval() {
- const element = this._activeElement || SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element);
+ const element = this._activeElement || this._getActive();
if (!element) {
return;
}
const elementInterval = Number.parseInt(element.getAttribute('data-bs-interval'), 10);
-
- if (elementInterval) {
- this._config.defaultInterval = this._config.defaultInterval || this._config.interval;
- this._config.interval = elementInterval;
- } else {
- this._config.interval = this._config.defaultInterval || this._config.interval;
- }
+ this._config.interval = elementInterval || this._config.defaultInterval;
}
- _slide(directionOrOrder, element) {
- const order = this._directionToOrder(directionOrOrder);
-
- const activeElement = SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element);
-
- const activeElementIndex = this._getItemIndex(activeElement);
-
- const nextElement = element || this._getItemByOrder(order, activeElement);
+ _slide(order, element = null) {
+ if (this._isSliding) {
+ return;
+ }
- const nextElementIndex = this._getItemIndex(nextElement);
+ const activeElement = this._getActive();
- const isCycling = Boolean(this._interval);
const isNext = order === ORDER_NEXT;
- const directionalClassName = isNext ? CLASS_NAME_START : CLASS_NAME_END;
- const orderClassName = isNext ? CLASS_NAME_NEXT : CLASS_NAME_PREV;
+ const nextElement = element || getNextActiveElement(this._getItems(), activeElement, isNext, this._config.wrap);
- const eventDirectionName = this._orderToDirection(order);
-
- if (nextElement && nextElement.classList.contains(CLASS_NAME_ACTIVE$2)) {
- this._isSliding = false;
+ if (nextElement === activeElement) {
return;
}
- if (this._isSliding) {
- return;
- }
+ const nextElementIndex = this._getItemIndex(nextElement);
- const slideEvent = this._triggerSlideEvent(nextElement, eventDirectionName);
+ const triggerEvent = eventName => {
+ return EventHandler.trigger(this._element, eventName, {
+ relatedTarget: nextElement,
+ direction: this._orderToDirection(order),
+ from: this._getItemIndex(activeElement),
+ to: nextElementIndex
+ });
+ };
+
+ const slideEvent = triggerEvent(EVENT_SLIDE);
if (slideEvent.defaultPrevented) {
return;
@@ -1445,60 +1536,59 @@ class Carousel extends BaseComponent {
if (!activeElement || !nextElement) {
// Some weirdness is happening, so we bail
+ // todo: change tests that use empty divs to avoid this check
return;
}
+ const isCycling = Boolean(this._interval);
+ this.pause();
this._isSliding = true;
- if (isCycling) {
- this.pause();
- }
-
- this._setActiveIndicatorElement(nextElement);
+ this._setActiveIndicatorElement(nextElementIndex);
this._activeElement = nextElement;
+ const directionalClassName = isNext ? CLASS_NAME_START : CLASS_NAME_END;
+ const orderClassName = isNext ? CLASS_NAME_NEXT : CLASS_NAME_PREV;
+ nextElement.classList.add(orderClassName);
+ reflow(nextElement);
+ activeElement.classList.add(directionalClassName);
+ nextElement.classList.add(directionalClassName);
- const triggerSlidEvent = () => {
- EventHandler.trigger(this._element, EVENT_SLID, {
- relatedTarget: nextElement,
- direction: eventDirectionName,
- from: activeElementIndex,
- to: nextElementIndex
- });
- };
-
- if (this._element.classList.contains(CLASS_NAME_SLIDE)) {
- nextElement.classList.add(orderClassName);
- reflow(nextElement);
- activeElement.classList.add(directionalClassName);
- nextElement.classList.add(directionalClassName);
-
- const completeCallBack = () => {
- nextElement.classList.remove(directionalClassName, orderClassName);
- nextElement.classList.add(CLASS_NAME_ACTIVE$2);
- activeElement.classList.remove(CLASS_NAME_ACTIVE$2, orderClassName, directionalClassName);
- this._isSliding = false;
- setTimeout(triggerSlidEvent, 0);
- };
-
- this._queueCallback(completeCallBack, activeElement, true);
- } else {
- activeElement.classList.remove(CLASS_NAME_ACTIVE$2);
+ const completeCallBack = () => {
+ nextElement.classList.remove(directionalClassName, orderClassName);
nextElement.classList.add(CLASS_NAME_ACTIVE$2);
+ activeElement.classList.remove(CLASS_NAME_ACTIVE$2, orderClassName, directionalClassName);
this._isSliding = false;
- triggerSlidEvent();
- }
+ triggerEvent(EVENT_SLID);
+ };
+
+ this._queueCallback(completeCallBack, activeElement, this._isAnimated());
if (isCycling) {
this.cycle();
}
}
- _directionToOrder(direction) {
- if (![DIRECTION_RIGHT, DIRECTION_LEFT].includes(direction)) {
- return direction;
+ _isAnimated() {
+ return this._element.classList.contains(CLASS_NAME_SLIDE);
+ }
+
+ _getActive() {
+ return SelectorEngine.findOne(SELECTOR_ACTIVE_ITEM, this._element);
+ }
+
+ _getItems() {
+ return SelectorEngine.find(SELECTOR_ITEM, this._element);
+ }
+
+ _clearInterval() {
+ if (this._interval) {
+ clearInterval(this._interval);
+ this._interval = null;
}
+ }
+ _directionToOrder(direction) {
if (isRTL()) {
return direction === DIRECTION_LEFT ? ORDER_PREV : ORDER_NEXT;
}
@@ -1507,10 +1597,6 @@ class Carousel extends BaseComponent {
}
_orderToDirection(order) {
- if (![ORDER_NEXT, ORDER_PREV].includes(order)) {
- return order;
- }
-
if (isRTL()) {
return order === ORDER_PREV ? DIRECTION_LEFT : DIRECTION_RIGHT;
}
@@ -1519,119 +1605,94 @@ class Carousel extends BaseComponent {
} // Static
- static carouselInterface(element, config) {
- const data = Carousel.getOrCreateInstance(element, config);
- let {
- _config
- } = data;
-
- if (typeof config === 'object') {
- _config = { ..._config,
- ...config
- };
- }
-
- const action = typeof config === 'string' ? config : _config.slide;
+ static jQueryInterface(config) {
+ return this.each(function () {
+ const data = Carousel.getOrCreateInstance(this, config);
- if (typeof config === 'number') {
- data.to(config);
- } else if (typeof action === 'string') {
- if (typeof data[action] === 'undefined') {
- throw new TypeError(`No method named "${action}"`);
+ if (typeof config === 'number') {
+ data.to(config);
+ return;
}
- data[action]();
- } else if (_config.interval && _config.ride) {
- data.pause();
- data.cycle();
- }
- }
+ if (typeof config === 'string') {
+ if (data[config] === undefined || config.startsWith('_') || config === 'constructor') {
+ throw new TypeError(`No method named "${config}"`);
+ }
- static jQueryInterface(config) {
- return this.each(function () {
- Carousel.carouselInterface(this, config);
+ data[config]();
+ }
});
}
- static dataApiClickHandler(event) {
- const target = getElementFromSelector(this);
+}
+/**
+ * Data API implementation
+ */
- if (!target || !target.classList.contains(CLASS_NAME_CAROUSEL)) {
- return;
- }
- const config = { ...Manipulator.getDataAttributes(target),
- ...Manipulator.getDataAttributes(this)
- };
- const slideIndex = this.getAttribute('data-bs-slide-to');
+EventHandler.on(document, EVENT_CLICK_DATA_API$5, SELECTOR_DATA_SLIDE, function (event) {
+ const target = getElementFromSelector(this);
- if (slideIndex) {
- config.interval = false;
- }
+ if (!target || !target.classList.contains(CLASS_NAME_CAROUSEL)) {
+ return;
+ }
+
+ event.preventDefault();
+ const carousel = Carousel.getOrCreateInstance(target);
+ const slideIndex = this.getAttribute('data-bs-slide-to');
- Carousel.carouselInterface(target, config);
+ if (slideIndex) {
+ carousel.to(slideIndex);
- if (slideIndex) {
- Carousel.getInstance(target).to(slideIndex);
- }
+ carousel._maybeEnableCycle();
- event.preventDefault();
+ return;
}
-}
-/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
- */
+ if (Manipulator.getDataAttribute(this, 'slide') === 'next') {
+ carousel.next();
+ carousel._maybeEnableCycle();
-EventHandler.on(document, EVENT_CLICK_DATA_API$5, SELECTOR_DATA_SLIDE, Carousel.dataApiClickHandler);
-EventHandler.on(window, EVENT_LOAD_DATA_API$2, () => {
+ return;
+ }
+
+ carousel.prev();
+
+ carousel._maybeEnableCycle();
+});
+EventHandler.on(window, EVENT_LOAD_DATA_API$3, () => {
const carousels = SelectorEngine.find(SELECTOR_DATA_RIDE);
- for (let i = 0, len = carousels.length; i < len; i++) {
- Carousel.carouselInterface(carousels[i], Carousel.getInstance(carousels[i]));
+ for (const carousel of carousels) {
+ Carousel.getOrCreateInstance(carousel);
}
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Carousel to jQuery only if jQuery is present
*/
defineJQueryPlugin(Carousel);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): collapse.js
+ * Bootstrap (v5.2.0): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$a = 'collapse';
-const DATA_KEY$9 = 'bs.collapse';
-const EVENT_KEY$9 = `.${DATA_KEY$9}`;
-const DATA_API_KEY$5 = '.data-api';
-const Default$9 = {
- toggle: true,
- parent: null
-};
-const DefaultType$9 = {
- toggle: 'boolean',
- parent: '(null|element)'
-};
-const EVENT_SHOW$5 = `show${EVENT_KEY$9}`;
-const EVENT_SHOWN$5 = `shown${EVENT_KEY$9}`;
-const EVENT_HIDE$5 = `hide${EVENT_KEY$9}`;
-const EVENT_HIDDEN$5 = `hidden${EVENT_KEY$9}`;
-const EVENT_CLICK_DATA_API$4 = `click${EVENT_KEY$9}${DATA_API_KEY$5}`;
+const NAME$b = 'collapse';
+const DATA_KEY$7 = 'bs.collapse';
+const EVENT_KEY$7 = `.${DATA_KEY$7}`;
+const DATA_API_KEY$4 = '.data-api';
+const EVENT_SHOW$6 = `show${EVENT_KEY$7}`;
+const EVENT_SHOWN$6 = `shown${EVENT_KEY$7}`;
+const EVENT_HIDE$6 = `hide${EVENT_KEY$7}`;
+const EVENT_HIDDEN$6 = `hidden${EVENT_KEY$7}`;
+const EVENT_CLICK_DATA_API$4 = `click${EVENT_KEY$7}${DATA_API_KEY$4}`;
const CLASS_NAME_SHOW$7 = 'show';
const CLASS_NAME_COLLAPSE = 'collapse';
const CLASS_NAME_COLLAPSING = 'collapsing';
@@ -1642,28 +1703,30 @@ const WIDTH = 'width';
const HEIGHT = 'height';
const SELECTOR_ACTIVES = '.collapse.show, .collapse.collapsing';
const SELECTOR_DATA_TOGGLE$4 = '[data-bs-toggle="collapse"]';
+const Default$a = {
+ parent: null,
+ toggle: true
+};
+const DefaultType$a = {
+ parent: '(null|element)',
+ toggle: 'boolean'
+};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Collapse extends BaseComponent {
constructor(element, config) {
- super(element);
+ super(element, config);
this._isTransitioning = false;
- this._config = this._getConfig(config);
this._triggerArray = [];
const toggleList = SelectorEngine.find(SELECTOR_DATA_TOGGLE$4);
- for (let i = 0, len = toggleList.length; i < len; i++) {
- const elem = toggleList[i];
+ for (const elem of toggleList) {
const selector = getSelectorFromElement(elem);
- const filterElement = SelectorEngine.find(selector).filter(foundElem => foundElem === this._element);
+ const filterElement = SelectorEngine.find(selector).filter(foundElement => foundElement === this._element);
if (selector !== null && filterElement.length) {
- this._selector = selector;
-
this._triggerArray.push(elem);
}
}
@@ -1681,11 +1744,15 @@ class Collapse extends BaseComponent {
static get Default() {
- return Default$9;
+ return Default$a;
+ }
+
+ static get DefaultType() {
+ return DefaultType$a;
}
static get NAME() {
- return NAME$a;
+ return NAME$b;
} // Public
@@ -1702,42 +1769,27 @@ class Collapse extends BaseComponent {
return;
}
- let actives = [];
- let activesData;
+ let activeChildren = []; // find active children
if (this._config.parent) {
- const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent);
- actives = SelectorEngine.find(SELECTOR_ACTIVES, this._config.parent).filter(elem => !children.includes(elem)); // remove children if greater depth
+ activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES).filter(element => element !== this._element).map(element => Collapse.getOrCreateInstance(element, {
+ toggle: false
+ }));
}
- const container = SelectorEngine.findOne(this._selector);
-
- if (actives.length) {
- const tempActiveData = actives.find(elem => container !== elem);
- activesData = tempActiveData ? Collapse.getInstance(tempActiveData) : null;
-
- if (activesData && activesData._isTransitioning) {
- return;
- }
+ if (activeChildren.length && activeChildren[0]._isTransitioning) {
+ return;
}
- const startEvent = EventHandler.trigger(this._element, EVENT_SHOW$5);
+ const startEvent = EventHandler.trigger(this._element, EVENT_SHOW$6);
if (startEvent.defaultPrevented) {
return;
}
- actives.forEach(elemActive => {
- if (container !== elemActive) {
- Collapse.getOrCreateInstance(elemActive, {
- toggle: false
- }).hide();
- }
-
- if (!activesData) {
- Data.set(elemActive, DATA_KEY$9, null);
- }
- });
+ for (const activeInstance of activeChildren) {
+ activeInstance.hide();
+ }
const dimension = this._getDimension();
@@ -1759,7 +1811,7 @@ class Collapse extends BaseComponent {
this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$7);
this._element.style[dimension] = '';
- EventHandler.trigger(this._element, EVENT_SHOWN$5);
+ EventHandler.trigger(this._element, EVENT_SHOWN$6);
};
const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
@@ -1775,7 +1827,7 @@ class Collapse extends BaseComponent {
return;
}
- const startEvent = EventHandler.trigger(this._element, EVENT_HIDE$5);
+ const startEvent = EventHandler.trigger(this._element, EVENT_HIDE$6);
if (startEvent.defaultPrevented) {
return;
@@ -1790,13 +1842,10 @@ class Collapse extends BaseComponent {
this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$7);
- const triggerArrayLength = this._triggerArray.length;
+ for (const trigger of this._triggerArray) {
+ const element = getElementFromSelector(trigger);
- for (let i = 0; i < triggerArrayLength; i++) {
- const trigger = this._triggerArray[i];
- const elem = getElementFromSelector(trigger);
-
- if (elem && !this._isShown(elem)) {
+ if (element && !this._isShown(element)) {
this._addAriaAndCollapsedClass([trigger], false);
}
}
@@ -1810,7 +1859,7 @@ class Collapse extends BaseComponent {
this._element.classList.add(CLASS_NAME_COLLAPSE);
- EventHandler.trigger(this._element, EVENT_HIDDEN$5);
+ EventHandler.trigger(this._element, EVENT_HIDDEN$6);
};
this._element.style[dimension] = '';
@@ -1823,15 +1872,10 @@ class Collapse extends BaseComponent {
} // Private
- _getConfig(config) {
- config = { ...Default$9,
- ...Manipulator.getDataAttributes(this._element),
- ...config
- };
+ _configAfterMerge(config) {
config.toggle = Boolean(config.toggle); // Coerce string values
config.parent = getElement(config.parent);
- typeCheckConfig(NAME$a, config, DefaultType$9);
return config;
}
@@ -1844,14 +1888,21 @@ class Collapse extends BaseComponent {
return;
}
- const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent);
- SelectorEngine.find(SELECTOR_DATA_TOGGLE$4, this._config.parent).filter(elem => !children.includes(elem)).forEach(element => {
+ const children = this._getFirstLevelChildren(SELECTOR_DATA_TOGGLE$4);
+
+ for (const element of children) {
const selected = getElementFromSelector(element);
if (selected) {
this._addAriaAndCollapsedClass([element], this._isShown(selected));
}
- });
+ }
+ }
+
+ _getFirstLevelChildren(selector) {
+ const children = SelectorEngine.find(CLASS_NAME_DEEPER_CHILDREN, this._config.parent); // remove children if greater depth
+
+ return SelectorEngine.find(selector, this._config.parent).filter(element => !children.includes(element));
}
_addAriaAndCollapsedClass(triggerArray, isOpen) {
@@ -1859,26 +1910,21 @@ class Collapse extends BaseComponent {
return;
}
- triggerArray.forEach(elem => {
- if (isOpen) {
- elem.classList.remove(CLASS_NAME_COLLAPSED);
- } else {
- elem.classList.add(CLASS_NAME_COLLAPSED);
- }
-
- elem.setAttribute('aria-expanded', isOpen);
- });
+ for (const element of triggerArray) {
+ element.classList.toggle(CLASS_NAME_COLLAPSED, !isOpen);
+ element.setAttribute('aria-expanded', isOpen);
+ }
} // Static
static jQueryInterface(config) {
- return this.each(function () {
- const _config = {};
+ const _config = {};
- if (typeof config === 'string' && /show|hide/.test(config)) {
- _config.toggle = false;
- }
+ if (typeof config === 'string' && /show|hide/.test(config)) {
+ _config.toggle = false;
+ }
+ return this.each(function () {
const data = Collapse.getOrCreateInstance(this, _config);
if (typeof config === 'string') {
@@ -1893,9 +1939,7 @@ class Collapse extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -1907,59 +1951,56 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$4, SELECTOR_DATA_TOGGLE$4, functi
const selector = getSelectorFromElement(this);
const selectorElements = SelectorEngine.find(selector);
- selectorElements.forEach(element => {
+
+ for (const element of selectorElements) {
Collapse.getOrCreateInstance(element, {
toggle: false
}).toggle();
- });
+ }
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Collapse to jQuery only if jQuery is present
*/
defineJQueryPlugin(Collapse);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): dropdown.js
+ * Bootstrap (v5.2.0): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$9 = 'dropdown';
-const DATA_KEY$8 = 'bs.dropdown';
-const EVENT_KEY$8 = `.${DATA_KEY$8}`;
-const DATA_API_KEY$4 = '.data-api';
+const NAME$a = 'dropdown';
+const DATA_KEY$6 = 'bs.dropdown';
+const EVENT_KEY$6 = `.${DATA_KEY$6}`;
+const DATA_API_KEY$3 = '.data-api';
const ESCAPE_KEY$2 = 'Escape';
-const SPACE_KEY = 'Space';
const TAB_KEY$1 = 'Tab';
-const ARROW_UP_KEY = 'ArrowUp';
-const ARROW_DOWN_KEY = 'ArrowDown';
+const ARROW_UP_KEY$1 = 'ArrowUp';
+const ARROW_DOWN_KEY$1 = 'ArrowDown';
const RIGHT_MOUSE_BUTTON = 2; // MouseEvent.button value for the secondary button, usually the right button
-const REGEXP_KEYDOWN = new RegExp(`${ARROW_UP_KEY}|${ARROW_DOWN_KEY}|${ESCAPE_KEY$2}`);
-const EVENT_HIDE$4 = `hide${EVENT_KEY$8}`;
-const EVENT_HIDDEN$4 = `hidden${EVENT_KEY$8}`;
-const EVENT_SHOW$4 = `show${EVENT_KEY$8}`;
-const EVENT_SHOWN$4 = `shown${EVENT_KEY$8}`;
-const EVENT_CLICK_DATA_API$3 = `click${EVENT_KEY$8}${DATA_API_KEY$4}`;
-const EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY$8}${DATA_API_KEY$4}`;
-const EVENT_KEYUP_DATA_API = `keyup${EVENT_KEY$8}${DATA_API_KEY$4}`;
+const EVENT_HIDE$5 = `hide${EVENT_KEY$6}`;
+const EVENT_HIDDEN$5 = `hidden${EVENT_KEY$6}`;
+const EVENT_SHOW$5 = `show${EVENT_KEY$6}`;
+const EVENT_SHOWN$5 = `shown${EVENT_KEY$6}`;
+const EVENT_CLICK_DATA_API$3 = `click${EVENT_KEY$6}${DATA_API_KEY$3}`;
+const EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY$6}${DATA_API_KEY$3}`;
+const EVENT_KEYUP_DATA_API = `keyup${EVENT_KEY$6}${DATA_API_KEY$3}`;
const CLASS_NAME_SHOW$6 = 'show';
const CLASS_NAME_DROPUP = 'dropup';
const CLASS_NAME_DROPEND = 'dropend';
const CLASS_NAME_DROPSTART = 'dropstart';
-const CLASS_NAME_NAVBAR = 'navbar';
-const SELECTOR_DATA_TOGGLE$3 = '[data-bs-toggle="dropdown"]';
+const CLASS_NAME_DROPUP_CENTER = 'dropup-center';
+const CLASS_NAME_DROPDOWN_CENTER = 'dropdown-center';
+const SELECTOR_DATA_TOGGLE$3 = '[data-bs-toggle="dropdown"]:not(.disabled):not(:disabled)';
+const SELECTOR_DATA_TOGGLE_SHOWN = `${SELECTOR_DATA_TOGGLE$3}.${CLASS_NAME_SHOW$6}`;
const SELECTOR_MENU = '.dropdown-menu';
+const SELECTOR_NAVBAR = '.navbar';
const SELECTOR_NAVBAR_NAV = '.navbar-nav';
const SELECTOR_VISIBLE_ITEMS = '.dropdown-menu .dropdown-item:not(.disabled):not(:disabled)';
const PLACEMENT_TOP = isRTL() ? 'top-end' : 'top-start';
@@ -1968,48 +2009,49 @@ const PLACEMENT_BOTTOM = isRTL() ? 'bottom-end' : 'bottom-start';
const PLACEMENT_BOTTOMEND = isRTL() ? 'bottom-start' : 'bottom-end';
const PLACEMENT_RIGHT = isRTL() ? 'left-start' : 'right-start';
const PLACEMENT_LEFT = isRTL() ? 'right-start' : 'left-start';
-const Default$8 = {
- offset: [0, 2],
+const PLACEMENT_TOPCENTER = 'top';
+const PLACEMENT_BOTTOMCENTER = 'bottom';
+const Default$9 = {
+ autoClose: true,
boundary: 'clippingParents',
- reference: 'toggle',
display: 'dynamic',
+ offset: [0, 2],
popperConfig: null,
- autoClose: true
+ reference: 'toggle'
};
-const DefaultType$8 = {
- offset: '(array|string|function)',
+const DefaultType$9 = {
+ autoClose: '(boolean|string)',
boundary: '(string|element)',
- reference: '(string|element|object)',
display: 'string',
+ offset: '(array|string|function)',
popperConfig: '(null|object|function)',
- autoClose: '(boolean|string)'
+ reference: '(string|element|object)'
};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Dropdown extends BaseComponent {
constructor(element, config) {
- super(element);
+ super(element, config);
this._popper = null;
- this._config = this._getConfig(config);
- this._menu = this._getMenuElement();
+ this._parent = this._element.parentNode; // dropdown wrapper
+
+ this._menu = SelectorEngine.findOne(SELECTOR_MENU, this._parent);
this._inNavbar = this._detectNavbar();
} // Getters
static get Default() {
- return Default$8;
+ return Default$9;
}
static get DefaultType() {
- return DefaultType$8;
+ return DefaultType$9;
}
static get NAME() {
- return NAME$9;
+ return NAME$a;
} // Public
@@ -2018,33 +2060,29 @@ class Dropdown extends BaseComponent {
}
show() {
- if (isDisabled(this._element) || this._isShown(this._menu)) {
+ if (isDisabled(this._element) || this._isShown()) {
return;
}
const relatedTarget = {
relatedTarget: this._element
};
- const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$4, relatedTarget);
+ const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$5, relatedTarget);
if (showEvent.defaultPrevented) {
return;
}
- const parent = Dropdown.getParentFromElement(this._element); // Totally disable Popper for Dropdowns in Navbar
-
- if (this._inNavbar) {
- Manipulator.setDataAttribute(this._menu, 'popper', 'none');
- } else {
- this._createPopper(parent);
- } // If this is a touch-enabled device we add extra
+ this._createPopper(); // If this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
- if ('ontouchstart' in document.documentElement && !parent.closest(SELECTOR_NAVBAR_NAV)) {
- [].concat(...document.body.children).forEach(elem => EventHandler.on(elem, 'mouseover', noop));
+ if ('ontouchstart' in document.documentElement && !this._parent.closest(SELECTOR_NAVBAR_NAV)) {
+ for (const element of [].concat(...document.body.children)) {
+ EventHandler.on(element, 'mouseover', noop);
+ }
}
this._element.focus();
@@ -2055,11 +2093,11 @@ class Dropdown extends BaseComponent {
this._element.classList.add(CLASS_NAME_SHOW$6);
- EventHandler.trigger(this._element, EVENT_SHOWN$4, relatedTarget);
+ EventHandler.trigger(this._element, EVENT_SHOWN$5, relatedTarget);
}
hide() {
- if (isDisabled(this._element) || !this._isShown(this._menu)) {
+ if (isDisabled(this._element) || !this._isShown()) {
return;
}
@@ -2088,7 +2126,7 @@ class Dropdown extends BaseComponent {
_completeHide(relatedTarget) {
- const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$4, relatedTarget);
+ const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$5, relatedTarget);
if (hideEvent.defaultPrevented) {
return;
@@ -2097,7 +2135,9 @@ class Dropdown extends BaseComponent {
if ('ontouchstart' in document.documentElement) {
- [].concat(...document.body.children).forEach(elem => EventHandler.off(elem, 'mouseover', noop));
+ for (const element of [].concat(...document.body.children)) {
+ EventHandler.off(element, 'mouseover', noop);
+ }
}
if (this._popper) {
@@ -2111,25 +2151,21 @@ class Dropdown extends BaseComponent {
this._element.setAttribute('aria-expanded', 'false');
Manipulator.removeDataAttribute(this._menu, 'popper');
- EventHandler.trigger(this._element, EVENT_HIDDEN$4, relatedTarget);
+ EventHandler.trigger(this._element, EVENT_HIDDEN$5, relatedTarget);
}
_getConfig(config) {
- config = { ...this.constructor.Default,
- ...Manipulator.getDataAttributes(this._element),
- ...config
- };
- typeCheckConfig(NAME$9, config, this.constructor.DefaultType);
+ config = super._getConfig(config);
if (typeof config.reference === 'object' && !isElement(config.reference) && typeof config.reference.getBoundingClientRect !== 'function') {
// Popper virtual elements require a getBoundingClientRect method
- throw new TypeError(`${NAME$9.toUpperCase()}: Option "reference" provided type "object" without a required "getBoundingClientRect" method.`);
+ throw new TypeError(`${NAME$a.toUpperCase()}: Option "reference" provided type "object" without a required "getBoundingClientRect" method.`);
}
return config;
}
- _createPopper(parent) {
+ _createPopper() {
if (typeof Popper === 'undefined') {
throw new TypeError('Bootstrap\'s dropdowns require Popper (https://popper.js.org)');
}
@@ -2137,7 +2173,7 @@ class Dropdown extends BaseComponent {
let referenceElement = this._element;
if (this._config.reference === 'parent') {
- referenceElement = parent;
+ referenceElement = this._parent;
} else if (isElement(this._config.reference)) {
referenceElement = getElement(this._config.reference);
} else if (typeof this._config.reference === 'object') {
@@ -2146,24 +2182,15 @@ class Dropdown extends BaseComponent {
const popperConfig = this._getPopperConfig();
- const isDisplayStatic = popperConfig.modifiers.find(modifier => modifier.name === 'applyStyles' && modifier.enabled === false);
this._popper = Popper.createPopper(referenceElement, this._menu, popperConfig);
-
- if (isDisplayStatic) {
- Manipulator.setDataAttribute(this._menu, 'popper', 'static');
- }
- }
-
- _isShown(element = this._element) {
- return element.classList.contains(CLASS_NAME_SHOW$6);
}
- _getMenuElement() {
- return SelectorEngine.next(this._element, SELECTOR_MENU)[0];
+ _isShown() {
+ return this._menu.classList.contains(CLASS_NAME_SHOW$6);
}
_getPlacement() {
- const parentDropdown = this._element.parentNode;
+ const parentDropdown = this._parent;
if (parentDropdown.classList.contains(CLASS_NAME_DROPEND)) {
return PLACEMENT_RIGHT;
@@ -2171,6 +2198,14 @@ class Dropdown extends BaseComponent {
if (parentDropdown.classList.contains(CLASS_NAME_DROPSTART)) {
return PLACEMENT_LEFT;
+ }
+
+ if (parentDropdown.classList.contains(CLASS_NAME_DROPUP_CENTER)) {
+ return PLACEMENT_TOPCENTER;
+ }
+
+ if (parentDropdown.classList.contains(CLASS_NAME_DROPDOWN_CENTER)) {
+ return PLACEMENT_BOTTOMCENTER;
} // We need to trim the value because custom properties can also include spaces
@@ -2184,7 +2219,7 @@ class Dropdown extends BaseComponent {
}
_detectNavbar() {
- return this._element.closest(`.${CLASS_NAME_NAVBAR}`) !== null;
+ return this._element.closest(SELECTOR_NAVBAR) !== null;
}
_getOffset() {
@@ -2193,7 +2228,7 @@ class Dropdown extends BaseComponent {
} = this._config;
if (typeof offset === 'string') {
- return offset.split(',').map(val => Number.parseInt(val, 10));
+ return offset.split(',').map(value => Number.parseInt(value, 10));
}
if (typeof offset === 'function') {
@@ -2217,9 +2252,11 @@ class Dropdown extends BaseComponent {
offset: this._getOffset()
}
}]
- }; // Disable Popper if we have a static display
+ }; // Disable Popper if we have a static display or Dropdown is in Navbar
+
+ if (this._inNavbar || this._config.display === 'static') {
+ Manipulator.setDataAttribute(this._menu, 'popper', 'static'); // todo:v6 remove
- if (this._config.display === 'static') {
defaultBsPopperConfig.modifiers = [{
name: 'applyStyles',
enabled: false
@@ -2235,7 +2272,7 @@ class Dropdown extends BaseComponent {
key,
target
}) {
- const items = SelectorEngine.find(SELECTOR_VISIBLE_ITEMS, this._menu).filter(isVisible);
+ const items = SelectorEngine.find(SELECTOR_VISIBLE_ITEMS, this._menu).filter(element => isVisible(element));
if (!items.length) {
return;
@@ -2243,7 +2280,7 @@ class Dropdown extends BaseComponent {
// allow cycling to get the last item in case key equals ARROW_UP_KEY
- getNextActiveElement(items, target, key === ARROW_DOWN_KEY, !items.includes(target)).focus();
+ getNextActiveElement(items, target, key === ARROW_DOWN_KEY$1, !items.includes(target)).focus();
} // Static
@@ -2264,20 +2301,28 @@ class Dropdown extends BaseComponent {
}
static clearMenus(event) {
- if (event && (event.button === RIGHT_MOUSE_BUTTON || event.type === 'keyup' && event.key !== TAB_KEY$1)) {
+ if (event.button === RIGHT_MOUSE_BUTTON || event.type === 'keyup' && event.key !== TAB_KEY$1) {
return;
}
- const toggles = SelectorEngine.find(SELECTOR_DATA_TOGGLE$3);
+ const openToggles = SelectorEngine.find(SELECTOR_DATA_TOGGLE_SHOWN);
- for (let i = 0, len = toggles.length; i < len; i++) {
- const context = Dropdown.getInstance(toggles[i]);
+ for (const toggle of openToggles) {
+ const context = Dropdown.getInstance(toggle);
if (!context || context._config.autoClose === false) {
continue;
}
- if (!context._isShown()) {
+ const composedPath = event.composedPath();
+ const isMenuTarget = composedPath.includes(context._menu);
+
+ if (composedPath.includes(context._element) || context._config.autoClose === 'inside' && !isMenuTarget || context._config.autoClose === 'outside' && isMenuTarget) {
+ continue;
+ } // Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu
+
+
+ if (context._menu.contains(event.target) && (event.type === 'keyup' && event.key === TAB_KEY$1 || /input|select|option|textarea|form/i.test(event.target.tagName))) {
continue;
}
@@ -2285,85 +2330,53 @@ class Dropdown extends BaseComponent {
relatedTarget: context._element
};
- if (event) {
- const composedPath = event.composedPath();
- const isMenuTarget = composedPath.includes(context._menu);
-
- if (composedPath.includes(context._element) || context._config.autoClose === 'inside' && !isMenuTarget || context._config.autoClose === 'outside' && isMenuTarget) {
- continue;
- } // Tab navigation through the dropdown menu or events from contained inputs shouldn't close the menu
-
-
- if (context._menu.contains(event.target) && (event.type === 'keyup' && event.key === TAB_KEY$1 || /input|select|option|textarea|form/i.test(event.target.tagName))) {
- continue;
- }
-
- if (event.type === 'click') {
- relatedTarget.clickEvent = event;
- }
+ if (event.type === 'click') {
+ relatedTarget.clickEvent = event;
}
context._completeHide(relatedTarget);
}
}
- static getParentFromElement(element) {
- return getElementFromSelector(element) || element.parentNode;
- }
-
static dataApiKeydownHandler(event) {
- // If not input/textarea:
- // - And not a key in REGEXP_KEYDOWN => not a dropdown command
- // If input/textarea:
- // - If space key => not a dropdown command
- // - If key is other than escape
- // - If key is not up or down => not a dropdown command
- // - If trigger inside the menu => not a dropdown command
- if (/input|textarea/i.test(event.target.tagName) ? event.key === SPACE_KEY || event.key !== ESCAPE_KEY$2 && (event.key !== ARROW_DOWN_KEY && event.key !== ARROW_UP_KEY || event.target.closest(SELECTOR_MENU)) : !REGEXP_KEYDOWN.test(event.key)) {
- return;
- }
+ // If not an UP | DOWN | ESCAPE key => not a dropdown command
+ // If input/textarea && if key is other than ESCAPE => not a dropdown command
+ const isInput = /input|textarea/i.test(event.target.tagName);
+ const isEscapeEvent = event.key === ESCAPE_KEY$2;
+ const isUpOrDownEvent = [ARROW_UP_KEY$1, ARROW_DOWN_KEY$1].includes(event.key);
- const isActive = this.classList.contains(CLASS_NAME_SHOW$6);
-
- if (!isActive && event.key === ESCAPE_KEY$2) {
+ if (!isUpOrDownEvent && !isEscapeEvent) {
return;
}
- event.preventDefault();
- event.stopPropagation();
-
- if (isDisabled(this)) {
+ if (isInput && !isEscapeEvent) {
return;
}
- const getToggleButton = this.matches(SELECTOR_DATA_TOGGLE$3) ? this : SelectorEngine.prev(this, SELECTOR_DATA_TOGGLE$3)[0];
+ event.preventDefault();
+ const getToggleButton = SelectorEngine.findOne(SELECTOR_DATA_TOGGLE$3, event.delegateTarget.parentNode);
const instance = Dropdown.getOrCreateInstance(getToggleButton);
- if (event.key === ESCAPE_KEY$2) {
- instance.hide();
- return;
- }
-
- if (event.key === ARROW_UP_KEY || event.key === ARROW_DOWN_KEY) {
- if (!isActive) {
- instance.show();
- }
+ if (isUpOrDownEvent) {
+ event.stopPropagation();
+ instance.show();
instance._selectMenuItem(event);
return;
}
- if (!isActive || event.key === SPACE_KEY) {
- Dropdown.clearMenus();
+ if (instance._isShown()) {
+ // else is escape and we check if it is shown
+ event.stopPropagation();
+ instance.hide();
+ getToggleButton.focus();
}
}
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -2376,27 +2389,34 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$3, SELECTOR_DATA_TOGGLE$3, functi
Dropdown.getOrCreateInstance(this).toggle();
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Dropdown to jQuery only if jQuery is present
*/
defineJQueryPlugin(Dropdown);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/scrollBar.js
+ * Bootstrap (v5.2.0): util/scrollBar.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
+/**
+ * Constants
+ */
+
const SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
const SELECTOR_STICKY_CONTENT = '.sticky-top';
+const PROPERTY_PADDING = 'padding-right';
+const PROPERTY_MARGIN = 'margin-right';
+/**
+ * Class definition
+ */
class ScrollBarHelper {
constructor() {
this._element = document.body;
- }
+ } // Public
+
getWidth() {
// https://developer.mozilla.org/en-US/docs/Web/API/Window/innerWidth#usage_notes
@@ -2410,21 +2430,36 @@ class ScrollBarHelper {
this._disableOverFlow(); // give padding to element to balance the hidden scrollbar width
- this._setElementAttributes(this._element, 'paddingRight', calculatedValue => calculatedValue + width); // trick: We adjust positive paddingRight and negative marginRight to sticky-top elements to keep showing fullwidth
+ this._setElementAttributes(this._element, PROPERTY_PADDING, calculatedValue => calculatedValue + width); // trick: We adjust positive paddingRight and negative marginRight to sticky-top elements to keep showing fullwidth
- this._setElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight', calculatedValue => calculatedValue + width);
+ this._setElementAttributes(SELECTOR_FIXED_CONTENT, PROPERTY_PADDING, calculatedValue => calculatedValue + width);
- this._setElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight', calculatedValue => calculatedValue - width);
+ this._setElementAttributes(SELECTOR_STICKY_CONTENT, PROPERTY_MARGIN, calculatedValue => calculatedValue - width);
}
+ reset() {
+ this._resetElementAttributes(this._element, 'overflow');
+
+ this._resetElementAttributes(this._element, PROPERTY_PADDING);
+
+ this._resetElementAttributes(SELECTOR_FIXED_CONTENT, PROPERTY_PADDING);
+
+ this._resetElementAttributes(SELECTOR_STICKY_CONTENT, PROPERTY_MARGIN);
+ }
+
+ isOverflowing() {
+ return this.getWidth() > 0;
+ } // Private
+
+
_disableOverFlow() {
this._saveInitialAttribute(this._element, 'overflow');
this._element.style.overflow = 'hidden';
}
- _setElementAttributes(selector, styleProp, callback) {
+ _setElementAttributes(selector, styleProperty, callback) {
const scrollbarWidth = this.getWidth();
const manipulationCallBack = element => {
@@ -2432,43 +2467,34 @@ class ScrollBarHelper {
return;
}
- this._saveInitialAttribute(element, styleProp);
+ this._saveInitialAttribute(element, styleProperty);
- const calculatedValue = window.getComputedStyle(element)[styleProp];
- element.style[styleProp] = `${callback(Number.parseFloat(calculatedValue))}px`;
+ const calculatedValue = window.getComputedStyle(element).getPropertyValue(styleProperty);
+ element.style.setProperty(styleProperty, `${callback(Number.parseFloat(calculatedValue))}px`);
};
this._applyManipulationCallback(selector, manipulationCallBack);
}
- reset() {
- this._resetElementAttributes(this._element, 'overflow');
-
- this._resetElementAttributes(this._element, 'paddingRight');
-
- this._resetElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight');
-
- this._resetElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight');
- }
-
- _saveInitialAttribute(element, styleProp) {
- const actualValue = element.style[styleProp];
+ _saveInitialAttribute(element, styleProperty) {
+ const actualValue = element.style.getPropertyValue(styleProperty);
if (actualValue) {
- Manipulator.setDataAttribute(element, styleProp, actualValue);
+ Manipulator.setDataAttribute(element, styleProperty, actualValue);
}
}
- _resetElementAttributes(selector, styleProp) {
+ _resetElementAttributes(selector, styleProperty) {
const manipulationCallBack = element => {
- const value = Manipulator.getDataAttribute(element, styleProp);
+ const value = Manipulator.getDataAttribute(element, styleProperty); // We only want to remove the property if the value is `null`; the value can also be zero
- if (typeof value === 'undefined') {
- element.style.removeProperty(styleProp);
- } else {
- Manipulator.removeDataAttribute(element, styleProp);
- element.style[styleProp] = value;
+ if (value === null) {
+ element.style.removeProperty(styleProperty);
+ return;
}
+
+ Manipulator.removeDataAttribute(element, styleProperty);
+ element.style.setProperty(styleProperty, value);
};
this._applyManipulationCallback(selector, manipulationCallBack);
@@ -2477,51 +2503,72 @@ class ScrollBarHelper {
_applyManipulationCallback(selector, callBack) {
if (isElement(selector)) {
callBack(selector);
- } else {
- SelectorEngine.find(selector, this._element).forEach(callBack);
+ return;
}
- }
- isOverflowing() {
- return this.getWidth() > 0;
+ for (const sel of SelectorEngine.find(selector, this._element)) {
+ callBack(sel);
+ }
}
}
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/backdrop.js
+ * Bootstrap (v5.2.0): util/backdrop.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
-const Default$7 = {
+/**
+ * Constants
+ */
+
+const NAME$9 = 'backdrop';
+const CLASS_NAME_FADE$4 = 'fade';
+const CLASS_NAME_SHOW$5 = 'show';
+const EVENT_MOUSEDOWN = `mousedown.bs.${NAME$9}`;
+const Default$8 = {
className: 'modal-backdrop',
+ clickCallback: null,
+ isAnimated: false,
isVisible: true,
// if false, we use the backdrop helper without adding any element to the dom
- isAnimated: false,
- rootElement: 'body',
- // give the choice to place backdrop under different elements
- clickCallback: null
+ rootElement: 'body' // give the choice to place backdrop under different elements
+
};
-const DefaultType$7 = {
+const DefaultType$8 = {
className: 'string',
- isVisible: 'boolean',
+ clickCallback: '(function|null)',
isAnimated: 'boolean',
- rootElement: '(element|string)',
- clickCallback: '(function|null)'
+ isVisible: 'boolean',
+ rootElement: '(element|string)'
};
-const NAME$8 = 'backdrop';
-const CLASS_NAME_FADE$4 = 'fade';
-const CLASS_NAME_SHOW$5 = 'show';
-const EVENT_MOUSEDOWN = `mousedown.bs.${NAME$8}`;
+/**
+ * Class definition
+ */
-class Backdrop {
+class Backdrop extends Config {
constructor(config) {
+ super();
this._config = this._getConfig(config);
this._isAppended = false;
this._element = null;
+ } // Getters
+
+
+ static get Default() {
+ return Default$8;
}
+ static get DefaultType() {
+ return DefaultType$8;
+ }
+
+ static get NAME() {
+ return NAME$9;
+ } // Public
+
+
show(callback) {
if (!this._config.isVisible) {
execute(callback);
@@ -2530,11 +2577,13 @@ class Backdrop {
this._append();
+ const element = this._getElement();
+
if (this._config.isAnimated) {
- reflow(this._getElement());
+ reflow(element);
}
- this._getElement().classList.add(CLASS_NAME_SHOW$5);
+ element.classList.add(CLASS_NAME_SHOW$5);
this._emulateAnimation(() => {
execute(callback);
@@ -2553,6 +2602,18 @@ class Backdrop {
this.dispose();
execute(callback);
});
+ }
+
+ dispose() {
+ if (!this._isAppended) {
+ return;
+ }
+
+ EventHandler.off(this._element, EVENT_MOUSEDOWN);
+
+ this._element.remove();
+
+ this._isAppended = false;
} // Private
@@ -2571,13 +2632,9 @@ class Backdrop {
return this._element;
}
- _getConfig(config) {
- config = { ...Default$7,
- ...(typeof config === 'object' ? config : {})
- }; // use getElement() with the default "body" to get a fresh Element on each instantiation
-
+ _configAfterMerge(config) {
+ // use getElement() with the default "body" to get a fresh Element on each instantiation
config.rootElement = getElement(config.rootElement);
- typeCheckConfig(NAME$8, config, DefaultType$7);
return config;
}
@@ -2586,26 +2643,16 @@ class Backdrop {
return;
}
- this._config.rootElement.append(this._getElement());
+ const element = this._getElement();
- EventHandler.on(this._getElement(), EVENT_MOUSEDOWN, () => {
+ this._config.rootElement.append(element);
+
+ EventHandler.on(element, EVENT_MOUSEDOWN, () => {
execute(this._config.clickCallback);
});
this._isAppended = true;
}
- dispose() {
- if (!this._isAppended) {
- return;
- }
-
- EventHandler.off(this._element, EVENT_MOUSEDOWN);
-
- this._element.remove();
-
- this._isAppended = false;
- }
-
_emulateAnimation(callback) {
executeAfterTransition(callback, this._getElement(), this._config.isAnimated);
}
@@ -2614,52 +2661,69 @@ class Backdrop {
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/focustrap.js
+ * Bootstrap (v5.2.0): util/focustrap.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
-const Default$6 = {
- trapElement: null,
- // The element to trap focus inside of
- autofocus: true
-};
-const DefaultType$6 = {
- trapElement: 'element',
- autofocus: 'boolean'
-};
-const NAME$7 = 'focustrap';
-const DATA_KEY$7 = 'bs.focustrap';
-const EVENT_KEY$7 = `.${DATA_KEY$7}`;
-const EVENT_FOCUSIN$1 = `focusin${EVENT_KEY$7}`;
-const EVENT_KEYDOWN_TAB = `keydown.tab${EVENT_KEY$7}`;
+/**
+ * Constants
+ */
+
+const NAME$8 = 'focustrap';
+const DATA_KEY$5 = 'bs.focustrap';
+const EVENT_KEY$5 = `.${DATA_KEY$5}`;
+const EVENT_FOCUSIN$2 = `focusin${EVENT_KEY$5}`;
+const EVENT_KEYDOWN_TAB = `keydown.tab${EVENT_KEY$5}`;
const TAB_KEY = 'Tab';
const TAB_NAV_FORWARD = 'forward';
const TAB_NAV_BACKWARD = 'backward';
+const Default$7 = {
+ autofocus: true,
+ trapElement: null // The element to trap focus inside of
-class FocusTrap {
+};
+const DefaultType$7 = {
+ autofocus: 'boolean',
+ trapElement: 'element'
+};
+/**
+ * Class definition
+ */
+
+class FocusTrap extends Config {
constructor(config) {
+ super();
this._config = this._getConfig(config);
this._isActive = false;
this._lastTabNavDirection = null;
+ } // Getters
+
+
+ static get Default() {
+ return Default$7;
}
- activate() {
- const {
- trapElement,
- autofocus
- } = this._config;
+ static get DefaultType() {
+ return DefaultType$7;
+ }
+ static get NAME() {
+ return NAME$8;
+ } // Public
+
+
+ activate() {
if (this._isActive) {
return;
}
- if (autofocus) {
- trapElement.focus();
+ if (this._config.autofocus) {
+ this._config.trapElement.focus();
}
- EventHandler.off(document, EVENT_KEY$7); // guard against infinite focus loop
+ EventHandler.off(document, EVENT_KEY$5); // guard against infinite focus loop
- EventHandler.on(document, EVENT_FOCUSIN$1, event => this._handleFocusin(event));
+ EventHandler.on(document, EVENT_FOCUSIN$2, event => this._handleFocusin(event));
EventHandler.on(document, EVENT_KEYDOWN_TAB, event => this._handleKeydown(event));
this._isActive = true;
}
@@ -2670,19 +2734,16 @@ class FocusTrap {
}
this._isActive = false;
- EventHandler.off(document, EVENT_KEY$7);
+ EventHandler.off(document, EVENT_KEY$5);
} // Private
_handleFocusin(event) {
const {
- target
- } = event;
- const {
trapElement
} = this._config;
- if (target === document || target === trapElement || trapElement.contains(target)) {
+ if (event.target === document || event.target === trapElement || trapElement.contains(event.target)) {
return;
}
@@ -2705,54 +2766,32 @@ class FocusTrap {
this._lastTabNavDirection = event.shiftKey ? TAB_NAV_BACKWARD : TAB_NAV_FORWARD;
}
- _getConfig(config) {
- config = { ...Default$6,
- ...(typeof config === 'object' ? config : {})
- };
- typeCheckConfig(NAME$7, config, DefaultType$6);
- return config;
- }
-
}
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): modal.js
+ * Bootstrap (v5.2.0): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$6 = 'modal';
-const DATA_KEY$6 = 'bs.modal';
-const EVENT_KEY$6 = `.${DATA_KEY$6}`;
-const DATA_API_KEY$3 = '.data-api';
+const NAME$7 = 'modal';
+const DATA_KEY$4 = 'bs.modal';
+const EVENT_KEY$4 = `.${DATA_KEY$4}`;
+const DATA_API_KEY$2 = '.data-api';
const ESCAPE_KEY$1 = 'Escape';
-const Default$5 = {
- backdrop: true,
- keyboard: true,
- focus: true
-};
-const DefaultType$5 = {
- backdrop: '(boolean|string)',
- keyboard: 'boolean',
- focus: 'boolean'
-};
-const EVENT_HIDE$3 = `hide${EVENT_KEY$6}`;
-const EVENT_HIDE_PREVENTED = `hidePrevented${EVENT_KEY$6}`;
-const EVENT_HIDDEN$3 = `hidden${EVENT_KEY$6}`;
-const EVENT_SHOW$3 = `show${EVENT_KEY$6}`;
-const EVENT_SHOWN$3 = `shown${EVENT_KEY$6}`;
-const EVENT_RESIZE = `resize${EVENT_KEY$6}`;
-const EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY$6}`;
-const EVENT_KEYDOWN_DISMISS$1 = `keydown.dismiss${EVENT_KEY$6}`;
-const EVENT_MOUSEUP_DISMISS = `mouseup.dismiss${EVENT_KEY$6}`;
-const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY$6}`;
-const EVENT_CLICK_DATA_API$2 = `click${EVENT_KEY$6}${DATA_API_KEY$3}`;
+const EVENT_HIDE$4 = `hide${EVENT_KEY$4}`;
+const EVENT_HIDE_PREVENTED$1 = `hidePrevented${EVENT_KEY$4}`;
+const EVENT_HIDDEN$4 = `hidden${EVENT_KEY$4}`;
+const EVENT_SHOW$4 = `show${EVENT_KEY$4}`;
+const EVENT_SHOWN$4 = `shown${EVENT_KEY$4}`;
+const EVENT_RESIZE$1 = `resize${EVENT_KEY$4}`;
+const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY$4}`;
+const EVENT_KEYDOWN_DISMISS$1 = `keydown.dismiss${EVENT_KEY$4}`;
+const EVENT_CLICK_DATA_API$2 = `click${EVENT_KEY$4}${DATA_API_KEY$2}`;
const CLASS_NAME_OPEN = 'modal-open';
const CLASS_NAME_FADE$3 = 'fade';
const CLASS_NAME_SHOW$4 = 'show';
@@ -2761,32 +2800,44 @@ const OPEN_SELECTOR$1 = '.modal.show';
const SELECTOR_DIALOG = '.modal-dialog';
const SELECTOR_MODAL_BODY = '.modal-body';
const SELECTOR_DATA_TOGGLE$2 = '[data-bs-toggle="modal"]';
+const Default$6 = {
+ backdrop: true,
+ focus: true,
+ keyboard: true
+};
+const DefaultType$6 = {
+ backdrop: '(boolean|string)',
+ focus: 'boolean',
+ keyboard: 'boolean'
+};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Modal extends BaseComponent {
constructor(element, config) {
- super(element);
- this._config = this._getConfig(config);
+ super(element, config);
this._dialog = SelectorEngine.findOne(SELECTOR_DIALOG, this._element);
this._backdrop = this._initializeBackDrop();
this._focustrap = this._initializeFocusTrap();
this._isShown = false;
- this._ignoreBackdropClick = false;
this._isTransitioning = false;
this._scrollBar = new ScrollBarHelper();
+
+ this._addEventListeners();
} // Getters
static get Default() {
- return Default$5;
+ return Default$6;
+ }
+
+ static get DefaultType() {
+ return DefaultType$6;
}
static get NAME() {
- return NAME$6;
+ return NAME$7;
} // Public
@@ -2799,7 +2850,7 @@ class Modal extends BaseComponent {
return;
}
- const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$3, {
+ const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$4, {
relatedTarget
});
@@ -2808,10 +2859,7 @@ class Modal extends BaseComponent {
}
this._isShown = true;
-
- if (this._isAnimated()) {
- this._isTransitioning = true;
- }
+ this._isTransitioning = true;
this._scrollBar.hide();
@@ -2819,19 +2867,7 @@ class Modal extends BaseComponent {
this._adjustDialog();
- this._setEscapeEvent();
-
- this._setResizeEvent();
-
- EventHandler.on(this._dialog, EVENT_MOUSEDOWN_DISMISS, () => {
- EventHandler.one(this._element, EVENT_MOUSEUP_DISMISS, event => {
- if (event.target === this._element) {
- this._ignoreBackdropClick = true;
- }
- });
- });
-
- this._showBackdrop(() => this._showElement(relatedTarget));
+ this._backdrop.show(() => this._showElement(relatedTarget));
}
hide() {
@@ -2839,36 +2875,26 @@ class Modal extends BaseComponent {
return;
}
- const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$3);
+ const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$4);
if (hideEvent.defaultPrevented) {
return;
}
this._isShown = false;
-
- const isAnimated = this._isAnimated();
-
- if (isAnimated) {
- this._isTransitioning = true;
- }
-
- this._setEscapeEvent();
-
- this._setResizeEvent();
+ this._isTransitioning = true;
this._focustrap.deactivate();
this._element.classList.remove(CLASS_NAME_SHOW$4);
- EventHandler.off(this._element, EVENT_CLICK_DISMISS);
- EventHandler.off(this._dialog, EVENT_MOUSEDOWN_DISMISS);
-
- this._queueCallback(() => this._hideModal(), this._element, isAnimated);
+ this._queueCallback(() => this._hideModal(), this._element, this._isAnimated());
}
dispose() {
- [window, this._dialog].forEach(htmlElement => EventHandler.off(htmlElement, EVENT_KEY$6));
+ for (const htmlElement of [window, this._dialog]) {
+ EventHandler.off(htmlElement, EVENT_KEY$4);
+ }
this._backdrop.dispose();
@@ -2885,7 +2911,7 @@ class Modal extends BaseComponent {
_initializeBackDrop() {
return new Backdrop({
isVisible: Boolean(this._config.backdrop),
- // 'static' option will be translated to true, and booleans will keep their value
+ // 'static' option will be translated to true, and booleans will keep their value,
isAnimated: this._isAnimated()
});
}
@@ -2896,22 +2922,9 @@ class Modal extends BaseComponent {
});
}
- _getConfig(config) {
- config = { ...Default$5,
- ...Manipulator.getDataAttributes(this._element),
- ...(typeof config === 'object' ? config : {})
- };
- typeCheckConfig(NAME$6, config, DefaultType$5);
- return config;
- }
-
_showElement(relatedTarget) {
- const isAnimated = this._isAnimated();
-
- const modalBody = SelectorEngine.findOne(SELECTOR_MODAL_BODY, this._dialog);
-
- if (!this._element.parentNode || this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
- // Don't move modal's DOM position
+ // try to append dynamic modal
+ if (!document.body.contains(this._element)) {
document.body.append(this._element);
}
@@ -2924,14 +2937,13 @@ class Modal extends BaseComponent {
this._element.setAttribute('role', 'dialog');
this._element.scrollTop = 0;
+ const modalBody = SelectorEngine.findOne(SELECTOR_MODAL_BODY, this._dialog);
if (modalBody) {
modalBody.scrollTop = 0;
}
- if (isAnimated) {
- reflow(this._element);
- }
+ reflow(this._element);
this._element.classList.add(CLASS_NAME_SHOW$4);
@@ -2941,35 +2953,49 @@ class Modal extends BaseComponent {
}
this._isTransitioning = false;
- EventHandler.trigger(this._element, EVENT_SHOWN$3, {
+ EventHandler.trigger(this._element, EVENT_SHOWN$4, {
relatedTarget
});
};
- this._queueCallback(transitionComplete, this._dialog, isAnimated);
+ this._queueCallback(transitionComplete, this._dialog, this._isAnimated());
}
- _setEscapeEvent() {
- if (this._isShown) {
- EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS$1, event => {
- if (this._config.keyboard && event.key === ESCAPE_KEY$1) {
- event.preventDefault();
- this.hide();
- } else if (!this._config.keyboard && event.key === ESCAPE_KEY$1) {
- this._triggerBackdropTransition();
- }
- });
- } else {
- EventHandler.off(this._element, EVENT_KEYDOWN_DISMISS$1);
- }
- }
+ _addEventListeners() {
+ EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS$1, event => {
+ if (event.key !== ESCAPE_KEY$1) {
+ return;
+ }
- _setResizeEvent() {
- if (this._isShown) {
- EventHandler.on(window, EVENT_RESIZE, () => this._adjustDialog());
- } else {
- EventHandler.off(window, EVENT_RESIZE);
- }
+ if (this._config.keyboard) {
+ event.preventDefault();
+ this.hide();
+ return;
+ }
+
+ this._triggerBackdropTransition();
+ });
+ EventHandler.on(window, EVENT_RESIZE$1, () => {
+ if (this._isShown && !this._isTransitioning) {
+ this._adjustDialog();
+ }
+ });
+ EventHandler.on(this._element, EVENT_MOUSEDOWN_DISMISS, event => {
+ if (event.target !== event.currentTarget) {
+ // click is inside modal-dialog
+ return;
+ }
+
+ if (this._config.backdrop === 'static') {
+ this._triggerBackdropTransition();
+
+ return;
+ }
+
+ if (this._config.backdrop) {
+ this.hide();
+ }
+ });
}
_hideModal() {
@@ -2990,73 +3016,47 @@ class Modal extends BaseComponent {
this._scrollBar.reset();
- EventHandler.trigger(this._element, EVENT_HIDDEN$3);
+ EventHandler.trigger(this._element, EVENT_HIDDEN$4);
});
}
- _showBackdrop(callback) {
- EventHandler.on(this._element, EVENT_CLICK_DISMISS, event => {
- if (this._ignoreBackdropClick) {
- this._ignoreBackdropClick = false;
- return;
- }
-
- if (event.target !== event.currentTarget) {
- return;
- }
-
- if (this._config.backdrop === true) {
- this.hide();
- } else if (this._config.backdrop === 'static') {
- this._triggerBackdropTransition();
- }
- });
-
- this._backdrop.show(callback);
- }
-
_isAnimated() {
return this._element.classList.contains(CLASS_NAME_FADE$3);
}
_triggerBackdropTransition() {
- const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED);
+ const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED$1);
if (hideEvent.defaultPrevented) {
return;
}
- const {
- classList,
- scrollHeight,
- style
- } = this._element;
- const isModalOverflowing = scrollHeight > document.documentElement.clientHeight; // return if the following background transition hasn't yet completed
+ const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
+ const initialOverflowY = this._element.style.overflowY; // return if the following background transition hasn't yet completed
- if (!isModalOverflowing && style.overflowY === 'hidden' || classList.contains(CLASS_NAME_STATIC)) {
+ if (initialOverflowY === 'hidden' || this._element.classList.contains(CLASS_NAME_STATIC)) {
return;
}
if (!isModalOverflowing) {
- style.overflowY = 'hidden';
+ this._element.style.overflowY = 'hidden';
}
- classList.add(CLASS_NAME_STATIC);
+ this._element.classList.add(CLASS_NAME_STATIC);
this._queueCallback(() => {
- classList.remove(CLASS_NAME_STATIC);
+ this._element.classList.remove(CLASS_NAME_STATIC);
- if (!isModalOverflowing) {
- this._queueCallback(() => {
- style.overflowY = '';
- }, this._dialog);
- }
+ this._queueCallback(() => {
+ this._element.style.overflowY = initialOverflowY;
+ }, this._dialog);
}, this._dialog);
this._element.focus();
- } // ----------------------------------------------------------------------
- // the following methods are used to handle overflowing modals
- // ----------------------------------------------------------------------
+ }
+ /**
+ * The following methods are used to handle overflowing modals
+ */
_adjustDialog() {
@@ -3066,12 +3066,14 @@ class Modal extends BaseComponent {
const isBodyOverflowing = scrollbarWidth > 0;
- if (!isBodyOverflowing && isModalOverflowing && !isRTL() || isBodyOverflowing && !isModalOverflowing && isRTL()) {
- this._element.style.paddingLeft = `${scrollbarWidth}px`;
+ if (isBodyOverflowing && !isModalOverflowing) {
+ const property = isRTL() ? 'paddingLeft' : 'paddingRight';
+ this._element.style[property] = `${scrollbarWidth}px`;
}
- if (isBodyOverflowing && !isModalOverflowing && !isRTL() || !isBodyOverflowing && isModalOverflowing && isRTL()) {
- this._element.style.paddingRight = `${scrollbarWidth}px`;
+ if (!isBodyOverflowing && isModalOverflowing) {
+ const property = isRTL() ? 'paddingRight' : 'paddingLeft';
+ this._element.style[property] = `${scrollbarWidth}px`;
}
}
@@ -3099,9 +3101,7 @@ class Modal extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -3112,23 +3112,23 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$2, SELECTOR_DATA_TOGGLE$2, functi
event.preventDefault();
}
- EventHandler.one(target, EVENT_SHOW$3, showEvent => {
+ EventHandler.one(target, EVENT_SHOW$4, showEvent => {
if (showEvent.defaultPrevented) {
// only register focus restorer if modal will actually get shown
return;
}
- EventHandler.one(target, EVENT_HIDDEN$3, () => {
+ EventHandler.one(target, EVENT_HIDDEN$4, () => {
if (isVisible(this)) {
this.focus();
}
});
- }); // avoid conflict when clicking moddal toggler while another one is open
+ }); // avoid conflict when clicking modal toggler while another one is open
- const allReadyOpen = SelectorEngine.findOne(OPEN_SELECTOR$1);
+ const alreadyOpen = SelectorEngine.findOne(OPEN_SELECTOR$1);
- if (allReadyOpen) {
- Modal.getInstance(allReadyOpen).hide();
+ if (alreadyOpen) {
+ Modal.getInstance(alreadyOpen).hide();
}
const data = Modal.getOrCreateInstance(target);
@@ -3136,62 +3136,58 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$2, SELECTOR_DATA_TOGGLE$2, functi
});
enableDismissTrigger(Modal);
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Modal to jQuery only if jQuery is present
*/
defineJQueryPlugin(Modal);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): offcanvas.js
+ * Bootstrap (v5.2.0): offcanvas.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$5 = 'offcanvas';
-const DATA_KEY$5 = 'bs.offcanvas';
-const EVENT_KEY$5 = `.${DATA_KEY$5}`;
-const DATA_API_KEY$2 = '.data-api';
-const EVENT_LOAD_DATA_API$1 = `load${EVENT_KEY$5}${DATA_API_KEY$2}`;
+const NAME$6 = 'offcanvas';
+const DATA_KEY$3 = 'bs.offcanvas';
+const EVENT_KEY$3 = `.${DATA_KEY$3}`;
+const DATA_API_KEY$1 = '.data-api';
+const EVENT_LOAD_DATA_API$2 = `load${EVENT_KEY$3}${DATA_API_KEY$1}`;
const ESCAPE_KEY = 'Escape';
-const Default$4 = {
+const CLASS_NAME_SHOW$3 = 'show';
+const CLASS_NAME_SHOWING$1 = 'showing';
+const CLASS_NAME_HIDING = 'hiding';
+const CLASS_NAME_BACKDROP = 'offcanvas-backdrop';
+const OPEN_SELECTOR = '.offcanvas.show';
+const EVENT_SHOW$3 = `show${EVENT_KEY$3}`;
+const EVENT_SHOWN$3 = `shown${EVENT_KEY$3}`;
+const EVENT_HIDE$3 = `hide${EVENT_KEY$3}`;
+const EVENT_HIDE_PREVENTED = `hidePrevented${EVENT_KEY$3}`;
+const EVENT_HIDDEN$3 = `hidden${EVENT_KEY$3}`;
+const EVENT_RESIZE = `resize${EVENT_KEY$3}`;
+const EVENT_CLICK_DATA_API$1 = `click${EVENT_KEY$3}${DATA_API_KEY$1}`;
+const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY$3}`;
+const SELECTOR_DATA_TOGGLE$1 = '[data-bs-toggle="offcanvas"]';
+const Default$5 = {
backdrop: true,
keyboard: true,
scroll: false
};
-const DefaultType$4 = {
- backdrop: 'boolean',
+const DefaultType$5 = {
+ backdrop: '(boolean|string)',
keyboard: 'boolean',
scroll: 'boolean'
};
-const CLASS_NAME_SHOW$3 = 'show';
-const CLASS_NAME_BACKDROP = 'offcanvas-backdrop';
-const OPEN_SELECTOR = '.offcanvas.show';
-const EVENT_SHOW$2 = `show${EVENT_KEY$5}`;
-const EVENT_SHOWN$2 = `shown${EVENT_KEY$5}`;
-const EVENT_HIDE$2 = `hide${EVENT_KEY$5}`;
-const EVENT_HIDDEN$2 = `hidden${EVENT_KEY$5}`;
-const EVENT_CLICK_DATA_API$1 = `click${EVENT_KEY$5}${DATA_API_KEY$2}`;
-const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY$5}`;
-const SELECTOR_DATA_TOGGLE$1 = '[data-bs-toggle="offcanvas"]';
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Offcanvas extends BaseComponent {
constructor(element, config) {
- super(element);
- this._config = this._getConfig(config);
+ super(element, config);
this._isShown = false;
this._backdrop = this._initializeBackDrop();
this._focustrap = this._initializeFocusTrap();
@@ -3200,12 +3196,16 @@ class Offcanvas extends BaseComponent {
} // Getters
- static get NAME() {
- return NAME$5;
+ static get Default() {
+ return Default$5;
}
- static get Default() {
- return Default$4;
+ static get DefaultType() {
+ return DefaultType$5;
+ }
+
+ static get NAME() {
+ return NAME$6;
} // Public
@@ -3218,7 +3218,7 @@ class Offcanvas extends BaseComponent {
return;
}
- const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$2, {
+ const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$3, {
relatedTarget
});
@@ -3227,7 +3227,6 @@ class Offcanvas extends BaseComponent {
}
this._isShown = true;
- this._element.style.visibility = 'visible';
this._backdrop.show();
@@ -3235,20 +3234,22 @@ class Offcanvas extends BaseComponent {
new ScrollBarHelper().hide();
}
- this._element.removeAttribute('aria-hidden');
-
this._element.setAttribute('aria-modal', true);
this._element.setAttribute('role', 'dialog');
- this._element.classList.add(CLASS_NAME_SHOW$3);
+ this._element.classList.add(CLASS_NAME_SHOWING$1);
const completeCallBack = () => {
- if (!this._config.scroll) {
+ if (!this._config.scroll || this._config.backdrop) {
this._focustrap.activate();
}
- EventHandler.trigger(this._element, EVENT_SHOWN$2, {
+ this._element.classList.add(CLASS_NAME_SHOW$3);
+
+ this._element.classList.remove(CLASS_NAME_SHOWING$1);
+
+ EventHandler.trigger(this._element, EVENT_SHOWN$3, {
relatedTarget
});
};
@@ -3261,7 +3262,7 @@ class Offcanvas extends BaseComponent {
return;
}
- const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$2);
+ const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$3);
if (hideEvent.defaultPrevented) {
return;
@@ -3273,24 +3274,22 @@ class Offcanvas extends BaseComponent {
this._isShown = false;
- this._element.classList.remove(CLASS_NAME_SHOW$3);
+ this._element.classList.add(CLASS_NAME_HIDING);
this._backdrop.hide();
const completeCallback = () => {
- this._element.setAttribute('aria-hidden', true);
+ this._element.classList.remove(CLASS_NAME_SHOW$3, CLASS_NAME_HIDING);
this._element.removeAttribute('aria-modal');
this._element.removeAttribute('role');
- this._element.style.visibility = 'hidden';
-
if (!this._config.scroll) {
new ScrollBarHelper().reset();
}
- EventHandler.trigger(this._element, EVENT_HIDDEN$2);
+ EventHandler.trigger(this._element, EVENT_HIDDEN$3);
};
this._queueCallback(completeCallback, this._element, true);
@@ -3305,22 +3304,24 @@ class Offcanvas extends BaseComponent {
} // Private
- _getConfig(config) {
- config = { ...Default$4,
- ...Manipulator.getDataAttributes(this._element),
- ...(typeof config === 'object' ? config : {})
- };
- typeCheckConfig(NAME$5, config, DefaultType$4);
- return config;
- }
-
_initializeBackDrop() {
+ const clickCallback = () => {
+ if (this._config.backdrop === 'static') {
+ EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED);
+ return;
+ }
+
+ this.hide();
+ }; // 'static' option will be translated to true, and booleans will keep their value
+
+
+ const isVisible = Boolean(this._config.backdrop);
return new Backdrop({
className: CLASS_NAME_BACKDROP,
- isVisible: this._config.backdrop,
+ isVisible,
isAnimated: true,
rootElement: this._element.parentNode,
- clickCallback: () => this.hide()
+ clickCallback: isVisible ? clickCallback : null
});
}
@@ -3332,9 +3333,16 @@ class Offcanvas extends BaseComponent {
_addEventListeners() {
EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS, event => {
- if (this._config.keyboard && event.key === ESCAPE_KEY) {
- this.hide();
+ if (event.key !== ESCAPE_KEY) {
+ return;
+ }
+
+ if (!this._config.keyboard) {
+ EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED);
+ return;
}
+
+ this.hide();
});
} // Static
@@ -3357,9 +3365,7 @@ class Offcanvas extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -3374,35 +3380,44 @@ EventHandler.on(document, EVENT_CLICK_DATA_API$1, SELECTOR_DATA_TOGGLE$1, functi
return;
}
- EventHandler.one(target, EVENT_HIDDEN$2, () => {
+ EventHandler.one(target, EVENT_HIDDEN$3, () => {
// focus on trigger when it is closed
if (isVisible(this)) {
this.focus();
}
}); // avoid conflict when clicking a toggler of an offcanvas, while another is open
- const allReadyOpen = SelectorEngine.findOne(OPEN_SELECTOR);
+ const alreadyOpen = SelectorEngine.findOne(OPEN_SELECTOR);
- if (allReadyOpen && allReadyOpen !== target) {
- Offcanvas.getInstance(allReadyOpen).hide();
+ if (alreadyOpen && alreadyOpen !== target) {
+ Offcanvas.getInstance(alreadyOpen).hide();
}
const data = Offcanvas.getOrCreateInstance(target);
data.toggle(this);
});
-EventHandler.on(window, EVENT_LOAD_DATA_API$1, () => SelectorEngine.find(OPEN_SELECTOR).forEach(el => Offcanvas.getOrCreateInstance(el).show()));
+EventHandler.on(window, EVENT_LOAD_DATA_API$2, () => {
+ for (const selector of SelectorEngine.find(OPEN_SELECTOR)) {
+ Offcanvas.getOrCreateInstance(selector).show();
+ }
+});
+EventHandler.on(window, EVENT_RESIZE, () => {
+ for (const element of SelectorEngine.find('[aria-modal][class*=show][class*=offcanvas-]')) {
+ if (getComputedStyle(element).position !== 'fixed') {
+ Offcanvas.getOrCreateInstance(element).hide();
+ }
+ }
+});
enableDismissTrigger(Offcanvas);
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
*/
defineJQueryPlugin(Offcanvas);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): util/sanitizer.js
+ * Bootstrap (v5.2.0): util/sanitizer.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -3411,14 +3426,14 @@ const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i;
/**
* A pattern that recognizes a commonly useful subset of URLs that are safe.
*
- * Shoutout to Angular https://github.com/angular/angular/blob/12.2.x/packages/core/src/sanitization/url_sanitizer.ts
+ * Shout-out to Angular https://github.com/angular/angular/blob/12.2.x/packages/core/src/sanitization/url_sanitizer.ts
*/
const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file|sms):|[^#&/:?]*(?:[#/?]|$))/i;
/**
* A pattern that matches safe data URLs. Only matches image, video and audio types.
*
- * Shoutout to Angular https://github.com/angular/angular/blob/12.2.x/packages/core/src/sanitization/url_sanitizer.ts
+ * Shout-out to Angular https://github.com/angular/angular/blob/12.2.x/packages/core/src/sanitization/url_sanitizer.ts
*/
const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i;
@@ -3432,17 +3447,10 @@ const allowedAttribute = (attribute, allowedAttributeList) => {
}
return true;
- }
+ } // Check if a regular expression validates the attribute.
- const regExp = allowedAttributeList.filter(attributeRegex => attributeRegex instanceof RegExp); // Check if a regular expression validates the attribute.
-
- for (let i = 0, len = regExp.length; i < len; i++) {
- if (regExp[i].test(attributeName)) {
- return true;
- }
- }
- return false;
+ return allowedAttributeList.filter(attributeRegex => attributeRegex instanceof RegExp).some(regex => regex.test(attributeName));
};
const DefaultAllowlist = {
@@ -3478,21 +3486,20 @@ const DefaultAllowlist = {
u: [],
ul: []
};
-function sanitizeHtml(unsafeHtml, allowList, sanitizeFn) {
+function sanitizeHtml(unsafeHtml, allowList, sanitizeFunction) {
if (!unsafeHtml.length) {
return unsafeHtml;
}
- if (sanitizeFn && typeof sanitizeFn === 'function') {
- return sanitizeFn(unsafeHtml);
+ if (sanitizeFunction && typeof sanitizeFunction === 'function') {
+ return sanitizeFunction(unsafeHtml);
}
const domParser = new window.DOMParser();
const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html');
const elements = [].concat(...createdDocument.body.querySelectorAll('*'));
- for (let i = 0, len = elements.length; i < len; i++) {
- const element = elements[i];
+ for (const element of elements) {
const elementName = element.nodeName.toLowerCase();
if (!Object.keys(allowList).includes(elementName)) {
@@ -3502,11 +3509,12 @@ function sanitizeHtml(unsafeHtml, allowList, sanitizeFn) {
const attributeList = [].concat(...element.attributes);
const allowedAttributes = [].concat(allowList['*'] || [], allowList[elementName] || []);
- attributeList.forEach(attribute => {
+
+ for (const attribute of attributeList) {
if (!allowedAttribute(attribute, allowedAttributes)) {
element.removeAttribute(attribute.nodeName);
}
- });
+ }
}
return createdDocument.body.innerHTML;
@@ -3514,40 +3522,194 @@ function sanitizeHtml(unsafeHtml, allowList, sanitizeFn) {
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): tooltip.js
+ * Bootstrap (v5.2.0): util/template-factory.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
-const NAME$4 = 'tooltip';
-const DATA_KEY$4 = 'bs.tooltip';
-const EVENT_KEY$4 = `.${DATA_KEY$4}`;
-const CLASS_PREFIX$1 = 'bs-tooltip';
-const DISALLOWED_ATTRIBUTES = new Set(['sanitize', 'allowList', 'sanitizeFn']);
-const DefaultType$3 = {
- animation: 'boolean',
- template: 'string',
- title: '(string|element|function)',
- trigger: 'string',
- delay: '(number|object)',
+const NAME$5 = 'TemplateFactory';
+const Default$4 = {
+ allowList: DefaultAllowlist,
+ content: {},
+ // { selector : text , selector2 : text2 , }
+ extraClass: '',
+ html: false,
+ sanitize: true,
+ sanitizeFn: null,
+ template: '<div></div>'
+};
+const DefaultType$4 = {
+ allowList: 'object',
+ content: 'object',
+ extraClass: '(string|function)',
html: 'boolean',
- selector: '(string|boolean)',
- placement: '(string|function)',
- offset: '(array|string|function)',
- container: '(string|element|boolean)',
- fallbackPlacements: 'array',
- boundary: '(string|element)',
- customClass: '(string|function)',
sanitize: 'boolean',
sanitizeFn: '(null|function)',
- allowList: 'object',
- popperConfig: '(null|object|function)'
+ template: 'string'
+};
+const DefaultContentType = {
+ entry: '(string|element|function|null)',
+ selector: '(string|element)'
};
+/**
+ * Class definition
+ */
+
+class TemplateFactory extends Config {
+ constructor(config) {
+ super();
+ this._config = this._getConfig(config);
+ } // Getters
+
+
+ static get Default() {
+ return Default$4;
+ }
+
+ static get DefaultType() {
+ return DefaultType$4;
+ }
+
+ static get NAME() {
+ return NAME$5;
+ } // Public
+
+
+ getContent() {
+ return Object.values(this._config.content).map(config => this._resolvePossibleFunction(config)).filter(Boolean);
+ }
+
+ hasContent() {
+ return this.getContent().length > 0;
+ }
+
+ changeContent(content) {
+ this._checkContent(content);
+
+ this._config.content = { ...this._config.content,
+ ...content
+ };
+ return this;
+ }
+
+ toHtml() {
+ const templateWrapper = document.createElement('div');
+ templateWrapper.innerHTML = this._maybeSanitize(this._config.template);
+
+ for (const [selector, text] of Object.entries(this._config.content)) {
+ this._setContent(templateWrapper, text, selector);
+ }
+
+ const template = templateWrapper.children[0];
+
+ const extraClass = this._resolvePossibleFunction(this._config.extraClass);
+
+ if (extraClass) {
+ template.classList.add(...extraClass.split(' '));
+ }
+
+ return template;
+ } // Private
+
+
+ _typeCheckConfig(config) {
+ super._typeCheckConfig(config);
+
+ this._checkContent(config.content);
+ }
+
+ _checkContent(arg) {
+ for (const [selector, content] of Object.entries(arg)) {
+ super._typeCheckConfig({
+ selector,
+ entry: content
+ }, DefaultContentType);
+ }
+ }
+
+ _setContent(template, content, selector) {
+ const templateElement = SelectorEngine.findOne(selector, template);
+
+ if (!templateElement) {
+ return;
+ }
+
+ content = this._resolvePossibleFunction(content);
+
+ if (!content) {
+ templateElement.remove();
+ return;
+ }
+
+ if (isElement(content)) {
+ this._putElementInTemplate(getElement(content), templateElement);
+
+ return;
+ }
+
+ if (this._config.html) {
+ templateElement.innerHTML = this._maybeSanitize(content);
+ return;
+ }
+
+ templateElement.textContent = content;
+ }
+
+ _maybeSanitize(arg) {
+ return this._config.sanitize ? sanitizeHtml(arg, this._config.allowList, this._config.sanitizeFn) : arg;
+ }
+
+ _resolvePossibleFunction(arg) {
+ return typeof arg === 'function' ? arg(this) : arg;
+ }
+
+ _putElementInTemplate(element, templateElement) {
+ if (this._config.html) {
+ templateElement.innerHTML = '';
+ templateElement.append(element);
+ return;
+ }
+
+ templateElement.textContent = element.textContent;
+ }
+
+}
+
+/**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.2.0): tooltip.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+/**
+ * Constants
+ */
+
+const NAME$4 = 'tooltip';
+const DISALLOWED_ATTRIBUTES = new Set(['sanitize', 'allowList', 'sanitizeFn']);
+const CLASS_NAME_FADE$2 = 'fade';
+const CLASS_NAME_MODAL = 'modal';
+const CLASS_NAME_SHOW$2 = 'show';
+const SELECTOR_TOOLTIP_INNER = '.tooltip-inner';
+const SELECTOR_MODAL = `.${CLASS_NAME_MODAL}`;
+const EVENT_MODAL_HIDE = 'hide.bs.modal';
+const TRIGGER_HOVER = 'hover';
+const TRIGGER_FOCUS = 'focus';
+const TRIGGER_CLICK = 'click';
+const TRIGGER_MANUAL = 'manual';
+const EVENT_HIDE$2 = 'hide';
+const EVENT_HIDDEN$2 = 'hidden';
+const EVENT_SHOW$2 = 'show';
+const EVENT_SHOWN$2 = 'shown';
+const EVENT_INSERTED = 'inserted';
+const EVENT_CLICK$1 = 'click';
+const EVENT_FOCUSIN$1 = 'focusin';
+const EVENT_FOCUSOUT$1 = 'focusout';
+const EVENT_MOUSEENTER = 'mouseenter';
+const EVENT_MOUSELEAVE = 'mouseleave';
const AttachmentMap = {
AUTO: 'auto',
TOP: 'top',
@@ -3556,52 +3718,45 @@ const AttachmentMap = {
LEFT: isRTL() ? 'right' : 'left'
};
const Default$3 = {
+ allowList: DefaultAllowlist,
animation: true,
- template: '<div class="tooltip" role="tooltip">' + '<div class="tooltip-arrow"></div>' + '<div class="tooltip-inner"></div>' + '</div>',
- trigger: 'hover focus',
- title: '',
+ boundary: 'clippingParents',
+ container: false,
+ customClass: '',
delay: 0,
+ fallbackPlacements: ['top', 'right', 'bottom', 'left'],
html: false,
- selector: false,
- placement: 'top',
offset: [0, 0],
- container: false,
- fallbackPlacements: ['top', 'right', 'bottom', 'left'],
- boundary: 'clippingParents',
- customClass: '',
+ placement: 'top',
+ popperConfig: null,
sanitize: true,
sanitizeFn: null,
- allowList: DefaultAllowlist,
- popperConfig: null
+ selector: false,
+ template: '<div class="tooltip" role="tooltip">' + '<div class="tooltip-arrow"></div>' + '<div class="tooltip-inner"></div>' + '</div>',
+ title: '',
+ trigger: 'hover focus'
};
-const Event$2 = {
- HIDE: `hide${EVENT_KEY$4}`,
- HIDDEN: `hidden${EVENT_KEY$4}`,
- SHOW: `show${EVENT_KEY$4}`,
- SHOWN: `shown${EVENT_KEY$4}`,
- INSERTED: `inserted${EVENT_KEY$4}`,
- CLICK: `click${EVENT_KEY$4}`,
- FOCUSIN: `focusin${EVENT_KEY$4}`,
- FOCUSOUT: `focusout${EVENT_KEY$4}`,
- MOUSEENTER: `mouseenter${EVENT_KEY$4}`,
- MOUSELEAVE: `mouseleave${EVENT_KEY$4}`
+const DefaultType$3 = {
+ allowList: 'object',
+ animation: 'boolean',
+ boundary: '(string|element)',
+ container: '(string|element|boolean)',
+ customClass: '(string|function)',
+ delay: '(number|object)',
+ fallbackPlacements: 'array',
+ html: 'boolean',
+ offset: '(array|string|function)',
+ placement: '(string|function)',
+ popperConfig: '(null|object|function)',
+ sanitize: 'boolean',
+ sanitizeFn: '(null|function)',
+ selector: '(string|boolean)',
+ template: 'string',
+ title: '(string|element|function)',
+ trigger: 'string'
};
-const CLASS_NAME_FADE$2 = 'fade';
-const CLASS_NAME_MODAL = 'modal';
-const CLASS_NAME_SHOW$2 = 'show';
-const HOVER_STATE_SHOW = 'show';
-const HOVER_STATE_OUT = 'out';
-const SELECTOR_TOOLTIP_INNER = '.tooltip-inner';
-const SELECTOR_MODAL = `.${CLASS_NAME_MODAL}`;
-const EVENT_MODAL_HIDE = 'hide.bs.modal';
-const TRIGGER_HOVER = 'hover';
-const TRIGGER_FOCUS = 'focus';
-const TRIGGER_CLICK = 'click';
-const TRIGGER_MANUAL = 'manual';
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Tooltip extends BaseComponent {
@@ -3610,15 +3765,16 @@ class Tooltip extends BaseComponent {
throw new TypeError('Bootstrap\'s tooltips require Popper (https://popper.js.org)');
}
- super(element); // private
+ super(element, config); // Private
this._isEnabled = true;
this._timeout = 0;
- this._hoverState = '';
+ this._isHovered = false;
this._activeTrigger = {};
- this._popper = null; // Protected
+ this._popper = null;
+ this._templateFactory = null;
+ this._newContent = null; // Protected
- this._config = this._getConfig(config);
this.tip = null;
this._setListeners();
@@ -3629,16 +3785,12 @@ class Tooltip extends BaseComponent {
return Default$3;
}
- static get NAME() {
- return NAME$4;
- }
-
- static get Event() {
- return Event$2;
- }
-
static get DefaultType() {
return DefaultType$3;
+ }
+
+ static get NAME() {
+ return NAME$4;
} // Public
@@ -3665,19 +3817,21 @@ class Tooltip extends BaseComponent {
context._activeTrigger.click = !context._activeTrigger.click;
if (context._isWithActiveTrigger()) {
- context._enter(null, context);
+ context._enter();
} else {
- context._leave(null, context);
+ context._leave();
}
- } else {
- if (this.getTipElement().classList.contains(CLASS_NAME_SHOW$2)) {
- this._leave(null, this);
- return;
- }
+ return;
+ }
+
+ if (this._isShown()) {
+ this._leave();
- this._enter(null, this);
+ return;
}
+
+ this._enter();
}
dispose() {
@@ -3698,233 +3852,206 @@ class Tooltip extends BaseComponent {
throw new Error('Please use show on visible elements');
}
- if (!(this.isWithContent() && this._isEnabled)) {
+ if (!(this._isWithContent() && this._isEnabled)) {
return;
}
- const showEvent = EventHandler.trigger(this._element, this.constructor.Event.SHOW);
+ const showEvent = EventHandler.trigger(this._element, this.constructor.eventName(EVENT_SHOW$2));
const shadowRoot = findShadowRoot(this._element);
- const isInTheDom = shadowRoot === null ? this._element.ownerDocument.documentElement.contains(this._element) : shadowRoot.contains(this._element);
+
+ const isInTheDom = (shadowRoot || this._element.ownerDocument.documentElement).contains(this._element);
if (showEvent.defaultPrevented || !isInTheDom) {
return;
- } // A trick to recreate a tooltip in case a new title is given by using the NOT documented `data-bs-original-title`
- // This will be removed later in favor of a `setContent` method
+ } // todo v6 remove this OR make it optional
- if (this.constructor.NAME === 'tooltip' && this.tip && this.getTitle() !== this.tip.querySelector(SELECTOR_TOOLTIP_INNER).innerHTML) {
- this._disposePopper();
-
+ if (this.tip) {
this.tip.remove();
this.tip = null;
}
- const tip = this.getTipElement();
- const tipId = getUID(this.constructor.NAME);
- tip.setAttribute('id', tipId);
-
- this._element.setAttribute('aria-describedby', tipId);
-
- if (this._config.animation) {
- tip.classList.add(CLASS_NAME_FADE$2);
- }
-
- const placement = typeof this._config.placement === 'function' ? this._config.placement.call(this, tip, this._element) : this._config.placement;
-
- const attachment = this._getAttachment(placement);
+ const tip = this._getTipElement();
- this._addAttachmentClass(attachment);
+ this._element.setAttribute('aria-describedby', tip.getAttribute('id'));
const {
container
} = this._config;
- Data.set(tip, this.constructor.DATA_KEY, this);
if (!this._element.ownerDocument.documentElement.contains(this.tip)) {
container.append(tip);
- EventHandler.trigger(this._element, this.constructor.Event.INSERTED);
+ EventHandler.trigger(this._element, this.constructor.eventName(EVENT_INSERTED));
}
if (this._popper) {
this._popper.update();
} else {
- this._popper = Popper.createPopper(this._element, tip, this._getPopperConfig(attachment));
+ this._popper = this._createPopper(tip);
}
- tip.classList.add(CLASS_NAME_SHOW$2);
-
- const customClass = this._resolvePossibleFunction(this._config.customClass);
-
- if (customClass) {
- tip.classList.add(...customClass.split(' '));
- } // If this is a touch-enabled device we add extra
+ tip.classList.add(CLASS_NAME_SHOW$2); // If this is a touch-enabled device we add extra
// empty mouseover listeners to the body's immediate children;
// only needed because of broken event delegation on iOS
// https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
-
if ('ontouchstart' in document.documentElement) {
- [].concat(...document.body.children).forEach(element => {
+ for (const element of [].concat(...document.body.children)) {
EventHandler.on(element, 'mouseover', noop);
- });
+ }
}
const complete = () => {
- const prevHoverState = this._hoverState;
- this._hoverState = null;
- EventHandler.trigger(this._element, this.constructor.Event.SHOWN);
+ const previousHoverState = this._isHovered;
+ this._isHovered = false;
+ EventHandler.trigger(this._element, this.constructor.eventName(EVENT_SHOWN$2));
- if (prevHoverState === HOVER_STATE_OUT) {
- this._leave(null, this);
+ if (previousHoverState) {
+ this._leave();
}
};
- const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE$2);
-
- this._queueCallback(complete, this.tip, isAnimated);
+ this._queueCallback(complete, this.tip, this._isAnimated());
}
hide() {
- if (!this._popper) {
+ if (!this._isShown()) {
return;
}
- const tip = this.getTipElement();
-
- const complete = () => {
- if (this._isWithActiveTrigger()) {
- return;
- }
-
- if (this._hoverState !== HOVER_STATE_SHOW) {
- tip.remove();
- }
-
- this._cleanTipClass();
-
- this._element.removeAttribute('aria-describedby');
-
- EventHandler.trigger(this._element, this.constructor.Event.HIDDEN);
-
- this._disposePopper();
- };
-
- const hideEvent = EventHandler.trigger(this._element, this.constructor.Event.HIDE);
+ const hideEvent = EventHandler.trigger(this._element, this.constructor.eventName(EVENT_HIDE$2));
if (hideEvent.defaultPrevented) {
return;
}
+ const tip = this._getTipElement();
+
tip.classList.remove(CLASS_NAME_SHOW$2); // If this is a touch-enabled device we remove the extra
// empty mouseover listeners we added for iOS support
if ('ontouchstart' in document.documentElement) {
- [].concat(...document.body.children).forEach(element => EventHandler.off(element, 'mouseover', noop));
+ for (const element of [].concat(...document.body.children)) {
+ EventHandler.off(element, 'mouseover', noop);
+ }
}
this._activeTrigger[TRIGGER_CLICK] = false;
this._activeTrigger[TRIGGER_FOCUS] = false;
this._activeTrigger[TRIGGER_HOVER] = false;
- const isAnimated = this.tip.classList.contains(CLASS_NAME_FADE$2);
+ this._isHovered = false;
- this._queueCallback(complete, this.tip, isAnimated);
+ const complete = () => {
+ if (this._isWithActiveTrigger()) {
+ return;
+ }
- this._hoverState = '';
+ if (!this._isHovered) {
+ tip.remove();
+ }
+
+ this._element.removeAttribute('aria-describedby');
+
+ EventHandler.trigger(this._element, this.constructor.eventName(EVENT_HIDDEN$2));
+
+ this._disposePopper();
+ };
+
+ this._queueCallback(complete, this.tip, this._isAnimated());
}
update() {
- if (this._popper !== null) {
+ if (this._popper) {
this._popper.update();
}
} // Protected
- isWithContent() {
- return Boolean(this.getTitle());
+ _isWithContent() {
+ return Boolean(this._getTitle());
}
- getTipElement() {
- if (this.tip) {
- return this.tip;
+ _getTipElement() {
+ if (!this.tip) {
+ this.tip = this._createTipElement(this._newContent || this._getContentForTemplate());
}
- const element = document.createElement('div');
- element.innerHTML = this._config.template;
- const tip = element.children[0];
- this.setContent(tip);
- tip.classList.remove(CLASS_NAME_FADE$2, CLASS_NAME_SHOW$2);
- this.tip = tip;
return this.tip;
}
- setContent(tip) {
- this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TOOLTIP_INNER);
- }
+ _createTipElement(content) {
+ const tip = this._getTemplateFactory(content).toHtml(); // todo: remove this check on v6
- _sanitizeAndSetContent(template, content, selector) {
- const templateElement = SelectorEngine.findOne(selector, template);
- if (!content && templateElement) {
- templateElement.remove();
- return;
- } // we use append for html objects to maintain js events
+ if (!tip) {
+ return null;
+ }
+ tip.classList.remove(CLASS_NAME_FADE$2, CLASS_NAME_SHOW$2); // todo: on v6 the following can be achieved with CSS only
- this.setElementContent(templateElement, content);
- }
+ tip.classList.add(`bs-${this.constructor.NAME}-auto`);
+ const tipId = getUID(this.constructor.NAME).toString();
+ tip.setAttribute('id', tipId);
- setElementContent(element, content) {
- if (element === null) {
- return;
+ if (this._isAnimated()) {
+ tip.classList.add(CLASS_NAME_FADE$2);
}
- if (isElement(content)) {
- content = getElement(content); // content is a DOM node or a jQuery
+ return tip;
+ }
- if (this._config.html) {
- if (content.parentNode !== element) {
- element.innerHTML = '';
- element.append(content);
- }
- } else {
- element.textContent = content.textContent;
- }
+ setContent(content) {
+ this._newContent = content;
- return;
- }
+ if (this._isShown()) {
+ this._disposePopper();
- if (this._config.html) {
- if (this._config.sanitize) {
- content = sanitizeHtml(content, this._config.allowList, this._config.sanitizeFn);
- }
+ this.show();
+ }
+ }
- element.innerHTML = content;
+ _getTemplateFactory(content) {
+ if (this._templateFactory) {
+ this._templateFactory.changeContent(content);
} else {
- element.textContent = content;
+ this._templateFactory = new TemplateFactory({ ...this._config,
+ // the `content` var has to be after `this._config`
+ // to override config.content in case of popover
+ content,
+ extraClass: this._resolvePossibleFunction(this._config.customClass)
+ });
}
- }
- getTitle() {
- const title = this._element.getAttribute('data-bs-original-title') || this._config.title;
+ return this._templateFactory;
+ }
- return this._resolvePossibleFunction(title);
+ _getContentForTemplate() {
+ return {
+ [SELECTOR_TOOLTIP_INNER]: this._getTitle()
+ };
}
- updateAttachment(attachment) {
- if (attachment === 'right') {
- return 'end';
- }
+ _getTitle() {
+ return this._resolvePossibleFunction(this._config.title) || this._config.originalTitle;
+ } // Private
- if (attachment === 'left') {
- return 'start';
- }
- return attachment;
- } // Private
+ _initializeOnDelegatedTarget(event) {
+ return this.constructor.getOrCreateInstance(event.delegateTarget, this._getDelegateConfig());
+ }
+
+ _isAnimated() {
+ return this._config.animation || this.tip && this.tip.classList.contains(CLASS_NAME_FADE$2);
+ }
+ _isShown() {
+ return this.tip && this.tip.classList.contains(CLASS_NAME_SHOW$2);
+ }
- _initializeOnDelegatedTarget(event, context) {
- return context || this.constructor.getOrCreateInstance(event.delegateTarget, this._getDelegateConfig());
+ _createPopper(tip) {
+ const placement = typeof this._config.placement === 'function' ? this._config.placement.call(this, tip, this._element) : this._config.placement;
+ const attachment = AttachmentMap[placement.toUpperCase()];
+ return Popper.createPopper(this._element, tip, this._getPopperConfig(attachment));
}
_getOffset() {
@@ -3933,7 +4060,7 @@ class Tooltip extends BaseComponent {
} = this._config;
if (typeof offset === 'string') {
- return offset.split(',').map(val => Number.parseInt(val, 10));
+ return offset.split(',').map(value => Number.parseInt(value, 10));
}
if (typeof offset === 'function') {
@@ -3943,8 +4070,8 @@ class Tooltip extends BaseComponent {
return offset;
}
- _resolvePossibleFunction(content) {
- return typeof content === 'function' ? content.call(this._element) : content;
+ _resolvePossibleFunction(arg) {
+ return typeof arg === 'function' ? arg.call(this._element) : arg;
}
_getPopperConfig(attachment) {
@@ -3971,43 +4098,46 @@ class Tooltip extends BaseComponent {
element: `.${this.constructor.NAME}-arrow`
}
}, {
- name: 'onChange',
+ name: 'preSetPlacement',
enabled: true,
- phase: 'afterWrite',
- fn: data => this._handlePopperPlacementChange(data)
- }],
- onFirstUpdate: data => {
- if (data.options.placement !== data.placement) {
- this._handlePopperPlacementChange(data);
+ phase: 'beforeMain',
+ fn: data => {
+ // Pre-set Popper's placement attribute in order to read the arrow sizes properly.
+ // Otherwise, Popper mixes up the width and height dimensions since the initial arrow style is for top placement
+ this._getTipElement().setAttribute('data-popper-placement', data.state.placement);
}
- }
+ }]
};
return { ...defaultBsPopperConfig,
...(typeof this._config.popperConfig === 'function' ? this._config.popperConfig(defaultBsPopperConfig) : this._config.popperConfig)
};
}
- _addAttachmentClass(attachment) {
- this.getTipElement().classList.add(`${this._getBasicClassPrefix()}-${this.updateAttachment(attachment)}`);
- }
-
- _getAttachment(placement) {
- return AttachmentMap[placement.toUpperCase()];
- }
-
_setListeners() {
const triggers = this._config.trigger.split(' ');
- triggers.forEach(trigger => {
+ for (const trigger of triggers) {
if (trigger === 'click') {
- EventHandler.on(this._element, this.constructor.Event.CLICK, this._config.selector, event => this.toggle(event));
+ EventHandler.on(this._element, this.constructor.eventName(EVENT_CLICK$1), this._config.selector, event => this.toggle(event));
} else if (trigger !== TRIGGER_MANUAL) {
- const eventIn = trigger === TRIGGER_HOVER ? this.constructor.Event.MOUSEENTER : this.constructor.Event.FOCUSIN;
- const eventOut = trigger === TRIGGER_HOVER ? this.constructor.Event.MOUSELEAVE : this.constructor.Event.FOCUSOUT;
- EventHandler.on(this._element, eventIn, this._config.selector, event => this._enter(event));
- EventHandler.on(this._element, eventOut, this._config.selector, event => this._leave(event));
+ const eventIn = trigger === TRIGGER_HOVER ? this.constructor.eventName(EVENT_MOUSEENTER) : this.constructor.eventName(EVENT_FOCUSIN$1);
+ const eventOut = trigger === TRIGGER_HOVER ? this.constructor.eventName(EVENT_MOUSELEAVE) : this.constructor.eventName(EVENT_FOCUSOUT$1);
+ EventHandler.on(this._element, eventIn, this._config.selector, event => {
+ const context = this._initializeOnDelegatedTarget(event);
+
+ context._activeTrigger[event.type === 'focusin' ? TRIGGER_FOCUS : TRIGGER_HOVER] = true;
+
+ context._enter();
+ });
+ EventHandler.on(this._element, eventOut, this._config.selector, event => {
+ const context = this._initializeOnDelegatedTarget(event);
+
+ context._activeTrigger[event.type === 'focusout' ? TRIGGER_FOCUS : TRIGGER_HOVER] = context._element.contains(event.relatedTarget);
+
+ context._leave();
+ });
}
- });
+ }
this._hideModalHandler = () => {
if (this._element) {
@@ -4028,95 +4158,78 @@ class Tooltip extends BaseComponent {
}
_fixTitle() {
- const title = this._element.getAttribute('title');
-
- const originalTitleType = typeof this._element.getAttribute('data-bs-original-title');
-
- if (title || originalTitleType !== 'string') {
- this._element.setAttribute('data-bs-original-title', title || '');
-
- if (title && !this._element.getAttribute('aria-label') && !this._element.textContent) {
- this._element.setAttribute('aria-label', title);
- }
-
- this._element.setAttribute('title', '');
- }
- }
+ const title = this._config.originalTitle;
- _enter(event, context) {
- context = this._initializeOnDelegatedTarget(event, context);
-
- if (event) {
- context._activeTrigger[event.type === 'focusin' ? TRIGGER_FOCUS : TRIGGER_HOVER] = true;
+ if (!title) {
+ return;
}
- if (context.getTipElement().classList.contains(CLASS_NAME_SHOW$2) || context._hoverState === HOVER_STATE_SHOW) {
- context._hoverState = HOVER_STATE_SHOW;
- return;
+ if (!this._element.getAttribute('aria-label') && !this._element.textContent.trim()) {
+ this._element.setAttribute('aria-label', title);
}
- clearTimeout(context._timeout);
- context._hoverState = HOVER_STATE_SHOW;
+ this._element.removeAttribute('title');
+ }
- if (!context._config.delay || !context._config.delay.show) {
- context.show();
+ _enter() {
+ if (this._isShown() || this._isHovered) {
+ this._isHovered = true;
return;
}
- context._timeout = setTimeout(() => {
- if (context._hoverState === HOVER_STATE_SHOW) {
- context.show();
+ this._isHovered = true;
+
+ this._setTimeout(() => {
+ if (this._isHovered) {
+ this.show();
}
- }, context._config.delay.show);
+ }, this._config.delay.show);
}
- _leave(event, context) {
- context = this._initializeOnDelegatedTarget(event, context);
-
- if (event) {
- context._activeTrigger[event.type === 'focusout' ? TRIGGER_FOCUS : TRIGGER_HOVER] = context._element.contains(event.relatedTarget);
- }
-
- if (context._isWithActiveTrigger()) {
+ _leave() {
+ if (this._isWithActiveTrigger()) {
return;
}
- clearTimeout(context._timeout);
- context._hoverState = HOVER_STATE_OUT;
-
- if (!context._config.delay || !context._config.delay.hide) {
- context.hide();
- return;
- }
+ this._isHovered = false;
- context._timeout = setTimeout(() => {
- if (context._hoverState === HOVER_STATE_OUT) {
- context.hide();
+ this._setTimeout(() => {
+ if (!this._isHovered) {
+ this.hide();
}
- }, context._config.delay.hide);
+ }, this._config.delay.hide);
}
- _isWithActiveTrigger() {
- for (const trigger in this._activeTrigger) {
- if (this._activeTrigger[trigger]) {
- return true;
- }
- }
+ _setTimeout(handler, timeout) {
+ clearTimeout(this._timeout);
+ this._timeout = setTimeout(handler, timeout);
+ }
- return false;
+ _isWithActiveTrigger() {
+ return Object.values(this._activeTrigger).includes(true);
}
_getConfig(config) {
const dataAttributes = Manipulator.getDataAttributes(this._element);
- Object.keys(dataAttributes).forEach(dataAttr => {
- if (DISALLOWED_ATTRIBUTES.has(dataAttr)) {
- delete dataAttributes[dataAttr];
+
+ for (const dataAttribute of Object.keys(dataAttributes)) {
+ if (DISALLOWED_ATTRIBUTES.has(dataAttribute)) {
+ delete dataAttributes[dataAttribute];
}
- });
- config = { ...this.constructor.Default,
- ...dataAttributes,
+ }
+
+ config = { ...dataAttributes,
...(typeof config === 'object' && config ? config : {})
};
+ config = this._mergeConfigObj(config);
+ config = this._configAfterMerge(config);
+
+ this._typeCheckConfig(config);
+
+ return config;
+ }
+
+ _configAfterMerge(config) {
config.container = config.container === false ? document.body : getElement(config.container);
if (typeof config.delay === 'number') {
@@ -4126,6 +4239,8 @@ class Tooltip extends BaseComponent {
};
}
+ config.originalTitle = this._element.getAttribute('title') || '';
+
if (typeof config.title === 'number') {
config.title = config.title.toString();
}
@@ -4134,12 +4249,6 @@ class Tooltip extends BaseComponent {
config.content = config.content.toString();
}
- typeCheckConfig(NAME$4, config, this.constructor.DefaultType);
-
- if (config.sanitize) {
- config.template = sanitizeHtml(config.template, config.allowList, config.sanitizeFn);
- }
-
return config;
}
@@ -4158,36 +4267,6 @@ class Tooltip extends BaseComponent {
return config;
}
- _cleanTipClass() {
- const tip = this.getTipElement();
- const basicClassPrefixRegex = new RegExp(`(^|\\s)${this._getBasicClassPrefix()}\\S+`, 'g');
- const tabClass = tip.getAttribute('class').match(basicClassPrefixRegex);
-
- if (tabClass !== null && tabClass.length > 0) {
- tabClass.map(token => token.trim()).forEach(tClass => tip.classList.remove(tClass));
- }
- }
-
- _getBasicClassPrefix() {
- return CLASS_PREFIX$1;
- }
-
- _handlePopperPlacementChange(popperData) {
- const {
- state
- } = popperData;
-
- if (!state) {
- return;
- }
-
- this.tip = state.elements.popper;
-
- this._cleanTipClass();
-
- this._addAttachmentClass(this._getAttachment(state.placement));
- }
-
_disposePopper() {
if (this._popper) {
this._popper.destroy();
@@ -4201,22 +4280,21 @@ class Tooltip extends BaseComponent {
return this.each(function () {
const data = Tooltip.getOrCreateInstance(this, config);
- if (typeof config === 'string') {
- if (typeof data[config] === 'undefined') {
- throw new TypeError(`No method named "${config}"`);
- }
+ if (typeof config !== 'string') {
+ return;
+ }
- data[config]();
+ if (typeof data[config] === 'undefined') {
+ throw new TypeError(`No method named "${config}"`);
}
+
+ data[config]();
});
}
}
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Tooltip to jQuery only if jQuery is present
*/
@@ -4224,48 +4302,29 @@ defineJQueryPlugin(Tooltip);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): popover.js
+ * Bootstrap (v5.2.0): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const NAME$3 = 'popover';
-const DATA_KEY$3 = 'bs.popover';
-const EVENT_KEY$3 = `.${DATA_KEY$3}`;
-const CLASS_PREFIX = 'bs-popover';
+const SELECTOR_TITLE = '.popover-header';
+const SELECTOR_CONTENT = '.popover-body';
const Default$2 = { ...Tooltip.Default,
- placement: 'right',
- offset: [0, 8],
- trigger: 'click',
content: '',
- template: '<div class="popover" role="tooltip">' + '<div class="popover-arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div>' + '</div>'
+ offset: [0, 8],
+ placement: 'right',
+ template: '<div class="popover" role="tooltip">' + '<div class="popover-arrow"></div>' + '<h3 class="popover-header"></h3>' + '<div class="popover-body"></div>' + '</div>',
+ trigger: 'click'
};
const DefaultType$2 = { ...Tooltip.DefaultType,
- content: '(string|element|function)'
-};
-const Event$1 = {
- HIDE: `hide${EVENT_KEY$3}`,
- HIDDEN: `hidden${EVENT_KEY$3}`,
- SHOW: `show${EVENT_KEY$3}`,
- SHOWN: `shown${EVENT_KEY$3}`,
- INSERTED: `inserted${EVENT_KEY$3}`,
- CLICK: `click${EVENT_KEY$3}`,
- FOCUSIN: `focusin${EVENT_KEY$3}`,
- FOCUSOUT: `focusout${EVENT_KEY$3}`,
- MOUSEENTER: `mouseenter${EVENT_KEY$3}`,
- MOUSELEAVE: `mouseleave${EVENT_KEY$3}`
+ content: '(null|string|element|function)'
};
-const SELECTOR_TITLE = '.popover-header';
-const SELECTOR_CONTENT = '.popover-body';
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Popover extends Tooltip {
@@ -4274,36 +4333,29 @@ class Popover extends Tooltip {
return Default$2;
}
- static get NAME() {
- return NAME$3;
- }
-
- static get Event() {
- return Event$1;
- }
-
static get DefaultType() {
return DefaultType$2;
- } // Overrides
-
-
- isWithContent() {
- return this.getTitle() || this._getContent();
}
- setContent(tip) {
- this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TITLE);
+ static get NAME() {
+ return NAME$3;
+ } // Overrides
+
- this._sanitizeAndSetContent(tip, this._getContent(), SELECTOR_CONTENT);
+ _isWithContent() {
+ return this._getTitle() || this._getContent();
} // Private
- _getContent() {
- return this._resolvePossibleFunction(this._config.content);
+ _getContentForTemplate() {
+ return {
+ [SELECTOR_TITLE]: this._getTitle(),
+ [SELECTOR_CONTENT]: this._getContent()
+ };
}
- _getBasicClassPrefix() {
- return CLASS_PREFIX;
+ _getContent() {
+ return this._resolvePossibleFunction(this._config.content);
} // Static
@@ -4311,22 +4363,21 @@ class Popover extends Tooltip {
return this.each(function () {
const data = Popover.getOrCreateInstance(this, config);
- if (typeof config === 'string') {
- if (typeof data[config] === 'undefined') {
- throw new TypeError(`No method named "${config}"`);
- }
+ if (typeof config !== 'string') {
+ return;
+ }
- data[config]();
+ if (typeof data[config] === 'undefined') {
+ throw new TypeError(`No method named "${config}"`);
}
+
+ data[config]();
});
}
}
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Popover to jQuery only if jQuery is present
*/
@@ -4334,64 +4385,64 @@ defineJQueryPlugin(Popover);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): scrollspy.js
+ * Bootstrap (v5.2.0): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const NAME$2 = 'scrollspy';
const DATA_KEY$2 = 'bs.scrollspy';
const EVENT_KEY$2 = `.${DATA_KEY$2}`;
-const DATA_API_KEY$1 = '.data-api';
-const Default$1 = {
- offset: 10,
- method: 'auto',
- target: ''
-};
-const DefaultType$1 = {
- offset: 'number',
- method: 'string',
- target: '(string|element)'
-};
+const DATA_API_KEY = '.data-api';
const EVENT_ACTIVATE = `activate${EVENT_KEY$2}`;
-const EVENT_SCROLL = `scroll${EVENT_KEY$2}`;
-const EVENT_LOAD_DATA_API = `load${EVENT_KEY$2}${DATA_API_KEY$1}`;
+const EVENT_CLICK = `click${EVENT_KEY$2}`;
+const EVENT_LOAD_DATA_API$1 = `load${EVENT_KEY$2}${DATA_API_KEY}`;
const CLASS_NAME_DROPDOWN_ITEM = 'dropdown-item';
const CLASS_NAME_ACTIVE$1 = 'active';
const SELECTOR_DATA_SPY = '[data-bs-spy="scroll"]';
-const SELECTOR_NAV_LIST_GROUP$1 = '.nav, .list-group';
+const SELECTOR_TARGET_LINKS = '[href]';
+const SELECTOR_NAV_LIST_GROUP = '.nav, .list-group';
const SELECTOR_NAV_LINKS = '.nav-link';
const SELECTOR_NAV_ITEMS = '.nav-item';
const SELECTOR_LIST_ITEMS = '.list-group-item';
-const SELECTOR_LINK_ITEMS = `${SELECTOR_NAV_LINKS}, ${SELECTOR_LIST_ITEMS}, .${CLASS_NAME_DROPDOWN_ITEM}`;
-const SELECTOR_DROPDOWN$1 = '.dropdown';
+const SELECTOR_LINK_ITEMS = `${SELECTOR_NAV_LINKS}, ${SELECTOR_NAV_ITEMS} > ${SELECTOR_NAV_LINKS}, ${SELECTOR_LIST_ITEMS}`;
+const SELECTOR_DROPDOWN = '.dropdown';
const SELECTOR_DROPDOWN_TOGGLE$1 = '.dropdown-toggle';
-const METHOD_OFFSET = 'offset';
-const METHOD_POSITION = 'position';
+const Default$1 = {
+ offset: null,
+ // TODO: v6 @deprecated, keep it for backwards compatibility reasons
+ rootMargin: '0px 0px -25%',
+ smoothScroll: false,
+ target: null
+};
+const DefaultType$1 = {
+ offset: '(number|null)',
+ // TODO v6 @deprecated, keep it for backwards compatibility reasons
+ rootMargin: 'string',
+ smoothScroll: 'boolean',
+ target: 'element'
+};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class ScrollSpy extends BaseComponent {
constructor(element, config) {
- super(element);
- this._scrollElement = this._element.tagName === 'BODY' ? window : this._element;
- this._config = this._getConfig(config);
- this._offsets = [];
- this._targets = [];
- this._activeTarget = null;
- this._scrollHeight = 0;
- EventHandler.on(this._scrollElement, EVENT_SCROLL, () => this._process());
- this.refresh();
+ super(element, config); // this._element is the observablesContainer and config.target the menu links wrapper
- this._process();
+ this._targetLinks = new Map();
+ this._observableSections = new Map();
+ this._rootElement = getComputedStyle(this._element).overflowY === 'visible' ? null : this._element;
+ this._activeTarget = null;
+ this._observer = null;
+ this._previousScrollData = {
+ visibleEntryTop: 0,
+ parentScrollTop: 0
+ };
+ this.refresh(); // initialize
} // Getters
@@ -4399,135 +4450,190 @@ class ScrollSpy extends BaseComponent {
return Default$1;
}
+ static get DefaultType() {
+ return DefaultType$1;
+ }
+
static get NAME() {
return NAME$2;
} // Public
refresh() {
- const autoMethod = this._scrollElement === this._scrollElement.window ? METHOD_OFFSET : METHOD_POSITION;
- const offsetMethod = this._config.method === 'auto' ? autoMethod : this._config.method;
- const offsetBase = offsetMethod === METHOD_POSITION ? this._getScrollTop() : 0;
- this._offsets = [];
- this._targets = [];
- this._scrollHeight = this._getScrollHeight();
- const targets = SelectorEngine.find(SELECTOR_LINK_ITEMS, this._config.target);
- targets.map(element => {
- const targetSelector = getSelectorFromElement(element);
- const target = targetSelector ? SelectorEngine.findOne(targetSelector) : null;
-
- if (target) {
- const targetBCR = target.getBoundingClientRect();
-
- if (targetBCR.width || targetBCR.height) {
- return [Manipulator[offsetMethod](target).top + offsetBase, targetSelector];
- }
- }
+ this._initializeTargetsAndObservables();
- return null;
- }).filter(item => item).sort((a, b) => a[0] - b[0]).forEach(item => {
- this._offsets.push(item[0]);
+ this._maybeEnableSmoothScroll();
- this._targets.push(item[1]);
- });
+ if (this._observer) {
+ this._observer.disconnect();
+ } else {
+ this._observer = this._getNewObserver();
+ }
+
+ for (const section of this._observableSections.values()) {
+ this._observer.observe(section);
+ }
}
dispose() {
- EventHandler.off(this._scrollElement, EVENT_KEY$2);
+ this._observer.disconnect();
+
super.dispose();
} // Private
- _getConfig(config) {
- config = { ...Default$1,
- ...Manipulator.getDataAttributes(this._element),
- ...(typeof config === 'object' && config ? config : {})
- };
- config.target = getElement(config.target) || document.documentElement;
- typeCheckConfig(NAME$2, config, DefaultType$1);
+ _configAfterMerge(config) {
+ // TODO: on v6 target should be given explicitly & remove the {target: 'ss-target'} case
+ config.target = getElement(config.target) || document.body;
return config;
}
- _getScrollTop() {
- return this._scrollElement === window ? this._scrollElement.pageYOffset : this._scrollElement.scrollTop;
- }
+ _maybeEnableSmoothScroll() {
+ if (!this._config.smoothScroll) {
+ return;
+ } // unregister any previous listeners
- _getScrollHeight() {
- return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
- }
- _getOffsetHeight() {
- return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height;
+ EventHandler.off(this._config.target, EVENT_CLICK);
+ EventHandler.on(this._config.target, EVENT_CLICK, SELECTOR_TARGET_LINKS, event => {
+ const observableSection = this._observableSections.get(event.target.hash);
+
+ if (observableSection) {
+ event.preventDefault();
+ const root = this._rootElement || window;
+ const height = observableSection.offsetTop - this._element.offsetTop;
+
+ if (root.scrollTo) {
+ root.scrollTo({
+ top: height,
+ behavior: 'smooth'
+ });
+ return;
+ } // Chrome 60 doesn't support `scrollTo`
+
+
+ root.scrollTop = height;
+ }
+ });
}
- _process() {
- const scrollTop = this._getScrollTop() + this._config.offset;
+ _getNewObserver() {
+ const options = {
+ root: this._rootElement,
+ threshold: [0.1, 0.5, 1],
+ rootMargin: this._getRootMargin()
+ };
+ return new IntersectionObserver(entries => this._observerCallback(entries), options);
+ } // The logic of selection
+
- const scrollHeight = this._getScrollHeight();
+ _observerCallback(entries) {
+ const targetElement = entry => this._targetLinks.get(`#${entry.target.id}`);
- const maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight();
+ const activate = entry => {
+ this._previousScrollData.visibleEntryTop = entry.target.offsetTop;
- if (this._scrollHeight !== scrollHeight) {
- this.refresh();
- }
+ this._process(targetElement(entry));
+ };
- if (scrollTop >= maxScroll) {
- const target = this._targets[this._targets.length - 1];
+ const parentScrollTop = (this._rootElement || document.documentElement).scrollTop;
+ const userScrollsDown = parentScrollTop >= this._previousScrollData.parentScrollTop;
+ this._previousScrollData.parentScrollTop = parentScrollTop;
- if (this._activeTarget !== target) {
- this._activate(target);
+ for (const entry of entries) {
+ if (!entry.isIntersecting) {
+ this._activeTarget = null;
+
+ this._clearActiveClass(targetElement(entry));
+
+ continue;
}
- return;
- }
+ const entryIsLowerThanPrevious = entry.target.offsetTop >= this._previousScrollData.visibleEntryTop; // if we are scrolling down, pick the bigger offsetTop
- if (this._activeTarget && scrollTop < this._offsets[0] && this._offsets[0] > 0) {
- this._activeTarget = null;
+ if (userScrollsDown && entryIsLowerThanPrevious) {
+ activate(entry); // if parent isn't scrolled, let's keep the first visible item, breaking the iteration
- this._clear();
+ if (!parentScrollTop) {
+ return;
+ }
- return;
- }
+ continue;
+ } // if we are scrolling up, pick the smallest offsetTop
- for (let i = this._offsets.length; i--;) {
- const isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
- if (isActiveTarget) {
- this._activate(this._targets[i]);
+ if (!userScrollsDown && !entryIsLowerThanPrevious) {
+ activate(entry);
}
}
+ } // TODO: v6 Only for backwards compatibility reasons. Use rootMargin only
+
+
+ _getRootMargin() {
+ return this._config.offset ? `${this._config.offset}px 0px -30%` : this._config.rootMargin;
}
- _activate(target) {
- this._activeTarget = target;
+ _initializeTargetsAndObservables() {
+ this._targetLinks = new Map();
+ this._observableSections = new Map();
+ const targetLinks = SelectorEngine.find(SELECTOR_TARGET_LINKS, this._config.target);
- this._clear();
+ for (const anchor of targetLinks) {
+ // ensure that the anchor has an id and is not disabled
+ if (!anchor.hash || isDisabled(anchor)) {
+ continue;
+ }
- const queries = SELECTOR_LINK_ITEMS.split(',').map(selector => `${selector}[data-bs-target="${target}"],${selector}[href="${target}"]`);
- const link = SelectorEngine.findOne(queries.join(','), this._config.target);
- link.classList.add(CLASS_NAME_ACTIVE$1);
+ const observableSection = SelectorEngine.findOne(anchor.hash, this._element); // ensure that the observableSection exists & is visible
- if (link.classList.contains(CLASS_NAME_DROPDOWN_ITEM)) {
- SelectorEngine.findOne(SELECTOR_DROPDOWN_TOGGLE$1, link.closest(SELECTOR_DROPDOWN$1)).classList.add(CLASS_NAME_ACTIVE$1);
- } else {
- SelectorEngine.parents(link, SELECTOR_NAV_LIST_GROUP$1).forEach(listGroup => {
- // Set triggered links parents as active
- // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
- SelectorEngine.prev(listGroup, `${SELECTOR_NAV_LINKS}, ${SELECTOR_LIST_ITEMS}`).forEach(item => item.classList.add(CLASS_NAME_ACTIVE$1)); // Handle special case when .nav-link is inside .nav-item
+ if (isVisible(observableSection)) {
+ this._targetLinks.set(anchor.hash, anchor);
- SelectorEngine.prev(listGroup, SELECTOR_NAV_ITEMS).forEach(navItem => {
- SelectorEngine.children(navItem, SELECTOR_NAV_LINKS).forEach(item => item.classList.add(CLASS_NAME_ACTIVE$1));
- });
- });
+ this._observableSections.set(anchor.hash, observableSection);
+ }
+ }
+ }
+
+ _process(target) {
+ if (this._activeTarget === target) {
+ return;
}
- EventHandler.trigger(this._scrollElement, EVENT_ACTIVATE, {
+ this._clearActiveClass(this._config.target);
+
+ this._activeTarget = target;
+ target.classList.add(CLASS_NAME_ACTIVE$1);
+
+ this._activateParents(target);
+
+ EventHandler.trigger(this._element, EVENT_ACTIVATE, {
relatedTarget: target
});
}
- _clear() {
- SelectorEngine.find(SELECTOR_LINK_ITEMS, this._config.target).filter(node => node.classList.contains(CLASS_NAME_ACTIVE$1)).forEach(node => node.classList.remove(CLASS_NAME_ACTIVE$1));
+ _activateParents(target) {
+ // Activate dropdown parents
+ if (target.classList.contains(CLASS_NAME_DROPDOWN_ITEM)) {
+ SelectorEngine.findOne(SELECTOR_DROPDOWN_TOGGLE$1, target.closest(SELECTOR_DROPDOWN)).classList.add(CLASS_NAME_ACTIVE$1);
+ return;
+ }
+
+ for (const listGroup of SelectorEngine.parents(target, SELECTOR_NAV_LIST_GROUP)) {
+ // Set triggered links parents as active
+ // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
+ for (const item of SelectorEngine.prev(listGroup, SELECTOR_LINK_ITEMS)) {
+ item.classList.add(CLASS_NAME_ACTIVE$1);
+ }
+ }
+ }
+
+ _clearActiveClass(parent) {
+ parent.classList.remove(CLASS_NAME_ACTIVE$1);
+ const activeNodes = SelectorEngine.find(`${SELECTOR_TARGET_LINKS}.${CLASS_NAME_ACTIVE$1}`, parent);
+
+ for (const node of activeNodes) {
+ node.classList.remove(CLASS_NAME_ACTIVE$1);
+ }
} // Static
@@ -4539,7 +4645,7 @@ class ScrollSpy extends BaseComponent {
return;
}
- if (typeof data[config] === 'undefined') {
+ if (data[config] === undefined || config.startsWith('_') || config === 'constructor') {
throw new TypeError(`No method named "${config}"`);
}
@@ -4549,176 +4655,283 @@ class ScrollSpy extends BaseComponent {
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
-EventHandler.on(window, EVENT_LOAD_DATA_API, () => {
- SelectorEngine.find(SELECTOR_DATA_SPY).forEach(spy => new ScrollSpy(spy));
+EventHandler.on(window, EVENT_LOAD_DATA_API$1, () => {
+ for (const spy of SelectorEngine.find(SELECTOR_DATA_SPY)) {
+ ScrollSpy.getOrCreateInstance(spy);
+ }
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .ScrollSpy to jQuery only if jQuery is present
*/
defineJQueryPlugin(ScrollSpy);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): tab.js
+ * Bootstrap (v5.2.0): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const NAME$1 = 'tab';
const DATA_KEY$1 = 'bs.tab';
const EVENT_KEY$1 = `.${DATA_KEY$1}`;
-const DATA_API_KEY = '.data-api';
const EVENT_HIDE$1 = `hide${EVENT_KEY$1}`;
const EVENT_HIDDEN$1 = `hidden${EVENT_KEY$1}`;
const EVENT_SHOW$1 = `show${EVENT_KEY$1}`;
const EVENT_SHOWN$1 = `shown${EVENT_KEY$1}`;
-const EVENT_CLICK_DATA_API = `click${EVENT_KEY$1}${DATA_API_KEY}`;
-const CLASS_NAME_DROPDOWN_MENU = 'dropdown-menu';
+const EVENT_CLICK_DATA_API = `click${EVENT_KEY$1}`;
+const EVENT_KEYDOWN = `keydown${EVENT_KEY$1}`;
+const EVENT_LOAD_DATA_API = `load${EVENT_KEY$1}`;
+const ARROW_LEFT_KEY = 'ArrowLeft';
+const ARROW_RIGHT_KEY = 'ArrowRight';
+const ARROW_UP_KEY = 'ArrowUp';
+const ARROW_DOWN_KEY = 'ArrowDown';
const CLASS_NAME_ACTIVE = 'active';
const CLASS_NAME_FADE$1 = 'fade';
const CLASS_NAME_SHOW$1 = 'show';
-const SELECTOR_DROPDOWN = '.dropdown';
-const SELECTOR_NAV_LIST_GROUP = '.nav, .list-group';
-const SELECTOR_ACTIVE = '.active';
-const SELECTOR_ACTIVE_UL = ':scope > li > .active';
-const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="tab"], [data-bs-toggle="pill"], [data-bs-toggle="list"]';
+const CLASS_DROPDOWN = 'dropdown';
const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
-const SELECTOR_DROPDOWN_ACTIVE_CHILD = ':scope > .dropdown-menu .active';
+const SELECTOR_DROPDOWN_MENU = '.dropdown-menu';
+const SELECTOR_DROPDOWN_ITEM = '.dropdown-item';
+const NOT_SELECTOR_DROPDOWN_TOGGLE = ':not(.dropdown-toggle)';
+const SELECTOR_TAB_PANEL = '.list-group, .nav, [role="tablist"]';
+const SELECTOR_OUTER = '.nav-item, .list-group-item';
+const SELECTOR_INNER = `.nav-link${NOT_SELECTOR_DROPDOWN_TOGGLE}, .list-group-item${NOT_SELECTOR_DROPDOWN_TOGGLE}, [role="tab"]${NOT_SELECTOR_DROPDOWN_TOGGLE}`;
+const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="tab"], [data-bs-toggle="pill"], [data-bs-toggle="list"]'; // todo:v6: could be only `tab`
+
+const SELECTOR_INNER_ELEM = `${SELECTOR_INNER}, ${SELECTOR_DATA_TOGGLE}`;
+const SELECTOR_DATA_TOGGLE_ACTIVE = `.${CLASS_NAME_ACTIVE}[data-bs-toggle="tab"], .${CLASS_NAME_ACTIVE}[data-bs-toggle="pill"], .${CLASS_NAME_ACTIVE}[data-bs-toggle="list"]`;
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Tab extends BaseComponent {
- // Getters
+ constructor(element) {
+ super(element);
+ this._parent = this._element.closest(SELECTOR_TAB_PANEL);
+
+ if (!this._parent) {
+ return; // todo: should Throw exception on v6
+ // throw new TypeError(`${element.outerHTML} has not a valid parent ${SELECTOR_INNER_ELEM}`)
+ } // Set up initial aria attributes
+
+
+ this._setInitialAttributes(this._parent, this._getChildren());
+
+ EventHandler.on(this._element, EVENT_KEYDOWN, event => this._keydown(event));
+ } // Getters
+
+
static get NAME() {
return NAME$1;
} // Public
show() {
- if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && this._element.classList.contains(CLASS_NAME_ACTIVE)) {
+ // Shows this elem and deactivate the active sibling if exists
+ const innerElem = this._element;
+
+ if (this._elemIsActive(innerElem)) {
return;
- }
+ } // Search for active tab on same parent to deactivate it
- let previous;
- const target = getElementFromSelector(this._element);
- const listElement = this._element.closest(SELECTOR_NAV_LIST_GROUP);
+ const active = this._getActiveElem();
- if (listElement) {
- const itemSelector = listElement.nodeName === 'UL' || listElement.nodeName === 'OL' ? SELECTOR_ACTIVE_UL : SELECTOR_ACTIVE;
- previous = SelectorEngine.find(itemSelector, listElement);
- previous = previous[previous.length - 1];
- }
-
- const hideEvent = previous ? EventHandler.trigger(previous, EVENT_HIDE$1, {
- relatedTarget: this._element
+ const hideEvent = active ? EventHandler.trigger(active, EVENT_HIDE$1, {
+ relatedTarget: innerElem
}) : null;
- const showEvent = EventHandler.trigger(this._element, EVENT_SHOW$1, {
- relatedTarget: previous
+ const showEvent = EventHandler.trigger(innerElem, EVENT_SHOW$1, {
+ relatedTarget: active
});
- if (showEvent.defaultPrevented || hideEvent !== null && hideEvent.defaultPrevented) {
+ if (showEvent.defaultPrevented || hideEvent && hideEvent.defaultPrevented) {
return;
}
- this._activate(this._element, listElement);
+ this._deactivate(active, innerElem);
+
+ this._activate(innerElem, active);
+ } // Private
+
+
+ _activate(element, relatedElem) {
+ if (!element) {
+ return;
+ }
+
+ element.classList.add(CLASS_NAME_ACTIVE);
+
+ this._activate(getElementFromSelector(element)); // Search and activate/show the proper section
+
const complete = () => {
- EventHandler.trigger(previous, EVENT_HIDDEN$1, {
- relatedTarget: this._element
+ if (element.getAttribute('role') !== 'tab') {
+ element.classList.add(CLASS_NAME_SHOW$1);
+ return;
+ }
+
+ element.focus();
+ element.removeAttribute('tabindex');
+ element.setAttribute('aria-selected', true);
+
+ this._toggleDropDown(element, true);
+
+ EventHandler.trigger(element, EVENT_SHOWN$1, {
+ relatedTarget: relatedElem
});
- EventHandler.trigger(this._element, EVENT_SHOWN$1, {
- relatedTarget: previous
+ };
+
+ this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE$1));
+ }
+
+ _deactivate(element, relatedElem) {
+ if (!element) {
+ return;
+ }
+
+ element.classList.remove(CLASS_NAME_ACTIVE);
+ element.blur();
+
+ this._deactivate(getElementFromSelector(element)); // Search and deactivate the shown section too
+
+
+ const complete = () => {
+ if (element.getAttribute('role') !== 'tab') {
+ element.classList.remove(CLASS_NAME_SHOW$1);
+ return;
+ }
+
+ element.setAttribute('aria-selected', false);
+ element.setAttribute('tabindex', '-1');
+
+ this._toggleDropDown(element, false);
+
+ EventHandler.trigger(element, EVENT_HIDDEN$1, {
+ relatedTarget: relatedElem
});
};
- if (target) {
- this._activate(target, target.parentNode, complete);
- } else {
- complete();
+ this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE$1));
+ }
+
+ _keydown(event) {
+ if (![ARROW_LEFT_KEY, ARROW_RIGHT_KEY, ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key)) {
+ return;
}
- } // Private
+ event.stopPropagation(); // stopPropagation/preventDefault both added to support up/down keys without scrolling the page
+
+ event.preventDefault();
+ const isNext = [ARROW_RIGHT_KEY, ARROW_DOWN_KEY].includes(event.key);
+ const nextActiveElement = getNextActiveElement(this._getChildren().filter(element => !isDisabled(element)), event.target, isNext, true);
- _activate(element, container, callback) {
- const activeElements = container && (container.nodeName === 'UL' || container.nodeName === 'OL') ? SelectorEngine.find(SELECTOR_ACTIVE_UL, container) : SelectorEngine.children(container, SELECTOR_ACTIVE);
- const active = activeElements[0];
- const isTransitioning = callback && active && active.classList.contains(CLASS_NAME_FADE$1);
+ if (nextActiveElement) {
+ Tab.getOrCreateInstance(nextActiveElement).show();
+ }
+ }
- const complete = () => this._transitionComplete(element, active, callback);
+ _getChildren() {
+ // collection of inner elements
+ return SelectorEngine.find(SELECTOR_INNER_ELEM, this._parent);
+ }
- if (active && isTransitioning) {
- active.classList.remove(CLASS_NAME_SHOW$1);
+ _getActiveElem() {
+ return this._getChildren().find(child => this._elemIsActive(child)) || null;
+ }
- this._queueCallback(complete, element, true);
- } else {
- complete();
+ _setInitialAttributes(parent, children) {
+ this._setAttributeIfNotExists(parent, 'role', 'tablist');
+
+ for (const child of children) {
+ this._setInitialAttributesOnChild(child);
}
}
- _transitionComplete(element, active, callback) {
- if (active) {
- active.classList.remove(CLASS_NAME_ACTIVE);
- const dropdownChild = SelectorEngine.findOne(SELECTOR_DROPDOWN_ACTIVE_CHILD, active.parentNode);
+ _setInitialAttributesOnChild(child) {
+ child = this._getInnerElement(child);
- if (dropdownChild) {
- dropdownChild.classList.remove(CLASS_NAME_ACTIVE);
- }
+ const isActive = this._elemIsActive(child);
- if (active.getAttribute('role') === 'tab') {
- active.setAttribute('aria-selected', false);
- }
+ const outerElem = this._getOuterElement(child);
+
+ child.setAttribute('aria-selected', isActive);
+
+ if (outerElem !== child) {
+ this._setAttributeIfNotExists(outerElem, 'role', 'presentation');
}
- element.classList.add(CLASS_NAME_ACTIVE);
+ if (!isActive) {
+ child.setAttribute('tabindex', '-1');
+ }
- if (element.getAttribute('role') === 'tab') {
- element.setAttribute('aria-selected', true);
+ this._setAttributeIfNotExists(child, 'role', 'tab'); // set attributes to the related panel too
+
+
+ this._setInitialAttributesOnTargetPanel(child);
+ }
+
+ _setInitialAttributesOnTargetPanel(child) {
+ const target = getElementFromSelector(child);
+
+ if (!target) {
+ return;
}
- reflow(element);
+ this._setAttributeIfNotExists(target, 'role', 'tabpanel');
- if (element.classList.contains(CLASS_NAME_FADE$1)) {
- element.classList.add(CLASS_NAME_SHOW$1);
+ if (child.id) {
+ this._setAttributeIfNotExists(target, 'aria-labelledby', `#${child.id}`);
}
+ }
- let parent = element.parentNode;
+ _toggleDropDown(element, open) {
+ const outerElem = this._getOuterElement(element);
- if (parent && parent.nodeName === 'LI') {
- parent = parent.parentNode;
+ if (!outerElem.classList.contains(CLASS_DROPDOWN)) {
+ return;
}
- if (parent && parent.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
- const dropdownElement = element.closest(SELECTOR_DROPDOWN);
+ const toggle = (selector, className) => {
+ const element = SelectorEngine.findOne(selector, outerElem);
- if (dropdownElement) {
- SelectorEngine.find(SELECTOR_DROPDOWN_TOGGLE, dropdownElement).forEach(dropdown => dropdown.classList.add(CLASS_NAME_ACTIVE));
+ if (element) {
+ element.classList.toggle(className, open);
}
+ };
- element.setAttribute('aria-expanded', true);
- }
+ toggle(SELECTOR_DROPDOWN_TOGGLE, CLASS_NAME_ACTIVE);
+ toggle(SELECTOR_DROPDOWN_MENU, CLASS_NAME_SHOW$1);
+ toggle(SELECTOR_DROPDOWN_ITEM, CLASS_NAME_ACTIVE);
+ outerElem.setAttribute('aria-expanded', open);
+ }
- if (callback) {
- callback();
+ _setAttributeIfNotExists(element, attribute, value) {
+ if (!element.hasAttribute(attribute)) {
+ element.setAttribute(attribute, value);
}
+ }
+
+ _elemIsActive(elem) {
+ return elem.classList.contains(CLASS_NAME_ACTIVE);
+ } // Try to get the inner element (usually the .nav-link)
+
+
+ _getInnerElement(elem) {
+ return elem.matches(SELECTOR_INNER_ELEM) ? elem : SelectorEngine.findOne(SELECTOR_INNER_ELEM, elem);
+ } // Try to get the outer element (usually the .nav-item)
+
+
+ _getOuterElement(elem) {
+ return elem.closest(SELECTOR_OUTER) || elem;
} // Static
@@ -4726,21 +4939,21 @@ class Tab extends BaseComponent {
return this.each(function () {
const data = Tab.getOrCreateInstance(this);
- if (typeof config === 'string') {
- if (typeof data[config] === 'undefined') {
- throw new TypeError(`No method named "${config}"`);
- }
+ if (typeof config !== 'string') {
+ return;
+ }
- data[config]();
+ if (data[config] === undefined || config.startsWith('_') || config === 'constructor') {
+ throw new TypeError(`No method named "${config}"`);
}
+
+ data[config]();
});
}
}
/**
- * ------------------------------------------------------------------------
- * Data Api implementation
- * ------------------------------------------------------------------------
+ * Data API implementation
*/
@@ -4753,28 +4966,31 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (
return;
}
- const data = Tab.getOrCreateInstance(this);
- data.show();
+ Tab.getOrCreateInstance(this).show();
+});
+/**
+ * Initialize on focus
+ */
+
+EventHandler.on(window, EVENT_LOAD_DATA_API, () => {
+ for (const element of SelectorEngine.find(SELECTOR_DATA_TOGGLE_ACTIVE)) {
+ Tab.getOrCreateInstance(element);
+ }
});
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Tab to jQuery only if jQuery is present
*/
defineJQueryPlugin(Tab);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.1.3): toast.js
+ * Bootstrap (v5.2.0): toast.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
/**
- * ------------------------------------------------------------------------
* Constants
- * ------------------------------------------------------------------------
*/
const NAME = 'toast';
@@ -4804,15 +5020,12 @@ const Default = {
delay: 5000
};
/**
- * ------------------------------------------------------------------------
- * Class Definition
- * ------------------------------------------------------------------------
+ * Class definition
*/
class Toast extends BaseComponent {
constructor(element, config) {
- super(element);
- this._config = this._getConfig(config);
+ super(element, config);
this._timeout = null;
this._hasMouseInteraction = false;
this._hasKeyboardInteraction = false;
@@ -4821,14 +5034,14 @@ class Toast extends BaseComponent {
} // Getters
- static get DefaultType() {
- return DefaultType;
- }
-
static get Default() {
return Default;
}
+ static get DefaultType() {
+ return DefaultType;
+ }
+
static get NAME() {
return NAME;
} // Public
@@ -4860,15 +5073,13 @@ class Toast extends BaseComponent {
reflow(this._element);
- this._element.classList.add(CLASS_NAME_SHOW);
-
- this._element.classList.add(CLASS_NAME_SHOWING);
+ this._element.classList.add(CLASS_NAME_SHOW, CLASS_NAME_SHOWING);
this._queueCallback(complete, this._element, this._config.animation);
}
hide() {
- if (!this._element.classList.contains(CLASS_NAME_SHOW)) {
+ if (!this.isShown()) {
return;
}
@@ -4882,9 +5093,7 @@ class Toast extends BaseComponent {
this._element.classList.add(CLASS_NAME_HIDE); // @deprecated
- this._element.classList.remove(CLASS_NAME_SHOWING);
-
- this._element.classList.remove(CLASS_NAME_SHOW);
+ this._element.classList.remove(CLASS_NAME_SHOWING, CLASS_NAME_SHOW);
EventHandler.trigger(this._element, EVENT_HIDDEN);
};
@@ -4897,22 +5106,17 @@ class Toast extends BaseComponent {
dispose() {
this._clearTimeout();
- if (this._element.classList.contains(CLASS_NAME_SHOW)) {
+ if (this.isShown()) {
this._element.classList.remove(CLASS_NAME_SHOW);
}
super.dispose();
- } // Private
+ }
+ isShown() {
+ return this._element.classList.contains(CLASS_NAME_SHOW);
+ } // Private
- _getConfig(config) {
- config = { ...Default,
- ...Manipulator.getDataAttributes(this._element),
- ...(typeof config === 'object' && config ? config : {})
- };
- typeCheckConfig(NAME, config, this.constructor.DefaultType);
- return config;
- }
_maybeScheduleHide() {
if (!this._config.autohide) {
@@ -4984,13 +5188,14 @@ class Toast extends BaseComponent {
}
}
+/**
+ * Data API implementation
+ */
+
enableDismissTrigger(Toast);
/**
- * ------------------------------------------------------------------------
* jQuery
- * ------------------------------------------------------------------------
- * add .Toast to jQuery only if jQuery is present
*/
defineJQueryPlugin(Toast);