Merge branch 'dev'

Author: mrholek

.storybook/addons.js

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const { babel } = require('@rollup/plugin-babel')
-const resolve = require('@rollup/plugin-node-resolve')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
 const banner = require('./banner.js')
 const replace = require('@rollup/plugin-replace')
 
@@ -29,12 +29,12 @@ const globals = {
 
 if (BUNDLE) {
   fileDest += '.bundle'
-  // Remove last entry in external array to bundle Popper and Perfect Scrollbar
+  // Remove entries to bundle Popper and Perfect Scrollbar
   external.pop()
   external.pop()
   delete globals['@popperjs/core']
   delete globals['perfect-scrollbar']
-  plugins.push(resolve())
+  plugins.push(nodeResolve())
 }
 
 const rollupConfig = {

.storybook/main.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): index.esm.js
+ * CoreUI (v3.3.0): index.esm.js
  * Licensed under MIT (https://coreui.io/license)
  * --------------------------------------------------------------------------
  */

.storybook/preview-head.html

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): index.umd.js
+ * CoreUI (v3.3.0): index.umd.js
  * Licensed under MIT (https://coreui.io/license)
  * --------------------------------------------------------------------------
  */

.storybook/preview.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): alert.js
+ * CoreUI (v3.3.0): alert.js
  * Licensed under MIT (https://coreui.io/license)
  *
  * This component is a modified version of the Bootstrap's alert.js
@@ -65,10 +65,7 @@ class Alert {
   // Public
 
   close(element) {
-    let rootElement = this._element
-    if (element) {
-      rootElement = this._getRootElement(element)
-    }
+    const rootElement = element ? this._getRootElement(element) : this._element
 
     const customEvent = this._triggerCloseEvent(rootElement)
 
@@ -104,8 +101,7 @@ class Alert {
 
     const transitionDuration = getTransitionDurationFromElement(element)
 
-    EventHandler
-      .one(element, TRANSITION_END, () => this._destroyElement(element))
+    EventHandler.one(element, TRANSITION_END, () => this._destroyElement(element))
     emulateTransitionEnd(element, transitionDuration)
   }
 
@@ -153,8 +149,7 @@ class Alert {
  * Data Api implementation
  * ------------------------------------------------------------------------
  */
-EventHandler
-  .on(document, EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert.handleDismiss(new Alert()))
+EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DISMISS, Alert.handleDismiss(new Alert()))
 
 const $ = getjQuery()
 

build/rollup.config.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): asyn-load.js
+ * CoreUI (v3.3.0): asyn-load.js
  * Licensed under MIT (https://coreui.io/license)
  * --------------------------------------------------------------------------
  */

js/index.esm.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): button.js
+ * CoreUI (v3.3.0): button.js
  * Licensed under MIT (https://coreui.io/license)
  *
  * This component is a modified version of the Bootstrap's buttons.js

js/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): carousel.js
+ * CoreUI (v3.3.0): carousel.js
  * Licensed under MIT (https://coreui.io/license)
  *
  * This component is a modified version of the Bootstrap's carousel.js
@@ -267,15 +267,12 @@ class Carousel {
 
   _addEventListeners() {
     if (this._config.keyboard) {
-      EventHandler
-        .on(this._element, EVENT_KEYDOWN, event => this._keydown(event))
+      EventHandler.on(this._element, EVENT_KEYDOWN, 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, event => this.pause(event))
+      EventHandler.on(this._element, EVENT_MOUSELEAVE, event => this.cycle(event))
     }
 
     if (this._config.touch && this._touchSupported) {
@@ -480,24 +477,23 @@ class Carousel {
 
       const transitionDuration = getTransitionDurationFromElement(activeElement)
 
-      EventHandler
-        .one(activeElement, TRANSITION_END, () => {
-          nextElement.classList.remove(directionalClassName, orderClassName)
-          nextElement.classList.add(CLASS_NAME_ACTIVE)
+      EventHandler.one(activeElement, TRANSITION_END, () => {
+        nextElement.classList.remove(directionalClassName, orderClassName)
+        nextElement.classList.add(CLASS_NAME_ACTIVE)
 
-          activeElement.classList.remove(CLASS_NAME_ACTIVE, orderClassName, directionalClassName)
+        activeElement.classList.remove(CLASS_NAME_ACTIVE, orderClassName, directionalClassName)
 
-          this._isSliding = false
+        this._isSliding = false
 
-          setTimeout(() => {
-            EventHandler.trigger(this._element, EVENT_SLID, {
-              relatedTarget: nextElement,
-              direction: eventDirectionName,
-              from: activeElementIndex,
-              to: nextElementIndex
-            })
-          }, 0)
-        })
+        setTimeout(() => {
+          EventHandler.trigger(this._element, EVENT_SLID, {
+            relatedTarget: nextElement,
+            direction: eventDirectionName,
+            from: activeElementIndex,
+            to: nextElementIndex
+          })
+        }, 0)
+      })
 
       emulateTransitionEnd(activeElement, transitionDuration)
     } else {
@@ -597,8 +593,7 @@ class Carousel {
  * ------------------------------------------------------------------------
  */
 
-EventHandler
-  .on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_SLIDE, Carousel.dataApiClickHandler)
+EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_SLIDE, Carousel.dataApiClickHandler)
 
 EventHandler.on(window, EVENT_LOAD_DATA_API, () => {
   const carousels = SelectorEngine.find(SELECTOR_DATA_RIDE)

js/src/alert.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): class-toggler.js
+ * CoreUI (v3.3.0): class-toggler.js
  * Licensed under MIT (https://coreui.io/license)
  * --------------------------------------------------------------------------
  */

js/src/async-load.js

@@ -1,6 +1,6 @@
 /**
  * --------------------------------------------------------------------------
- * CoreUI (v3.2.2): collapse.js
+ * CoreUI (v3.3.0): collapse.js
  * Licensed under MIT (https://coreui.io/license)
  *
  * This component is a modified version of the Bootstrap's collapse.js
@@ -291,8 +291,7 @@ class Collapse {
   }
 
   _getDimension() {
-    const hasWidth = this._element.classList.contains(WIDTH)
-    return hasWidth ? WIDTH : HEIGHT
+    return this._element.classList.contains(WIDTH) ? WIDTH : HEIGHT
   }
 
   _getParent() {
@@ -323,21 +322,21 @@ class Collapse {
   }
 
   _addAriaAndCollapsedClass(element, triggerArray) {
-    if (element) {
-      const isOpen = element.classList.contains(CLASS_NAME_SHOW)
-
-      if (triggerArray.length) {
-        triggerArray.forEach(elem => {
-          if (isOpen) {
-            elem.classList.remove(CLASS_NAME_COLLAPSED)
-          } else {
-            elem.classList.add(CLASS_NAME_COLLAPSED)
-          }
+    if (!element || !triggerArray.length) {
+      return
+    }
 
-          elem.setAttribute('aria-expanded', isOpen)
-        })
+    const isOpen = element.classList.contains(CLASS_NAME_SHOW)
+
+    triggerArray.forEach(elem => {
+      if (isOpen) {
+        elem.classList.remove(CLASS_NAME_COLLAPSED)
+      } else {
+        elem.classList.add(CLASS_NAME_COLLAPSED)
       }
-    }
+
+      elem.setAttribute('aria-expanded', isOpen)
+    })
   }
 
   // Static
@@ -347,7 +346,7 @@ class Collapse {
     const _config = {
       ...Default,
       ...Manipulator.getDataAttributes(element),
-      ...typeof config === 'object' && config ? config : {}
+      ...(typeof config === 'object' && config ? config : {})
     }
 
     if (!data && _config.toggle && typeof config === 'string' && /show|hide/.test(config)) {

js/src/button.js

@@ -1,7 +1,7 @@
 /**
  * --------------------------------------------------------------------------
  * Bootstrap (v5.0.0-alpha1): dom/event-handler.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  * --------------------------------------------------------------------------
  */
 
@@ -94,6 +94,8 @@ function getEvent(element) {
 
 function bootstrapHandler(element, fn) {
   return function handler(event) {
+    event.delegateTarget = element
+
     if (handler.oneOff) {
       EventHandler.off(element, event.type, fn)
     }
@@ -109,6 +111,8 @@ 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
+
           if (handler.oneOff) {
             EventHandler.off(element, event.type, fn)
           }
@@ -207,14 +211,13 @@ function removeHandler(element, events, typeEvent, handler, delegationSelector)
 function removeNamespacedHandlers(element, events, typeEvent, namespace) {
   const storeElementEvent = events[typeEvent] || {}
 
-  Object.keys(storeElementEvent)
-    .forEach(handlerKey => {
-      if (handlerKey.indexOf(namespace) > -1) {
-        const event = storeElementEvent[handlerKey]
+  Object.keys(storeElementEvent).forEach(handlerKey => {
+    if (handlerKey.indexOf(namespace) > -1) {
+      const event = storeElementEvent[handlerKey]
 
-        removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
-      }
-    })
+      removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
+    }
+  })
 }
 
 const EventHandler = {
@@ -247,23 +250,21 @@ const EventHandler = {
     }
 
     if (isNamespace) {
-      Object.keys(events)
-        .forEach(elementEvent => {
-          removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1))
-        })
+      Object.keys(events).forEach(elementEvent => {
+        removeNamespacedHandlers(element, events, elementEvent, originalTypeEvent.slice(1))
+      })
     }
 
     const storeElementEvent = events[typeEvent] || {}
-    Object.keys(storeElementEvent)
-      .forEach(keyHandlers => {
-        const handlerKey = keyHandlers.replace(stripUidRegex, '')
+    Object.keys(storeElementEvent).forEach(keyHandlers => {
+      const handlerKey = keyHandlers.replace(stripUidRegex, '')
 
-        if (!inNamespace || originalTypeEvent.indexOf(handlerKey) > -1) {
-          const event = storeElementEvent[keyHandlers]
+      if (!inNamespace || originalTypeEvent.indexOf(handlerKey) > -1) {
+        const event = storeElementEvent[keyHandlers]
 
-          removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
-        }
-      })
+        removeHandler(element, events, typeEvent, event.originalHandler, event.delegationSelector)
+      }
+    })
   },
 
   trigger(element, event, args) {
@@ -300,16 +301,15 @@ const EventHandler = {
       })
     }
 
-    // merge custom informations in our event
+    // merge custom information in our event
     if (typeof args !== 'undefined') {
-      Object.keys(args)
-        .forEach(key => {
-          Object.defineProperty(evt, key, {
-            get() {
-              return args[key]
-            }
-          })
+      Object.keys(args).forEach(key => {
+        Object.defineProperty(evt, key, {
+          get() {
+            return args[key]
+          }
         })
+      })
     }
 
     if (defaultPrevented) {