@coreui/react-pro 5.7.0 → 5.9.0

package/src/components/range-slider/utils.ts

@@ -0,0 +1,243 @@
+import React from 'react'
+import type { Label, ThumbSize } from './types'
+
+export const calculateClickValue = (
+  event: React.MouseEvent,
+  container: HTMLDivElement,
+  min: number,
+  max: number,
+  step: number,
+  vertical: boolean,
+  rtl: boolean,
+) => {
+  const clickPosition = getClickPosition(event, container, vertical, rtl)
+  const value = min + clickPosition * (max - min)
+  return roundToStep(value, step)
+}
+
+export const calculateMoveValue = (
+  event: MouseEvent,
+  container: HTMLDivElement,
+  min: number,
+  max: number,
+  step: number,
+  vertical: boolean,
+  rtl: boolean,
+) => {
+  const rect = container.getBoundingClientRect()
+  const position = vertical
+    ? calculateVerticalPosition(event.clientY, rect)
+    : calculateHorizontalPosition(event.clientX, rect, rtl)
+
+  if (typeof position === 'string') {
+    return position === 'max' ? max : min
+  }
+
+  const value = min + position * (max - min)
+
+  return roundToStep(value, step)
+}
+
+export const calculateVerticalPosition = (mouseY: number, rect: DOMRect) => {
+  if (mouseY < rect.top) {
+    return 'max'
+  }
+
+  if (mouseY > rect.bottom) {
+    return 'min'
+  }
+
+  return Math.min(Math.max((rect.bottom - mouseY) / rect.height, 0), 1)
+}
+
+export const calculateHorizontalPosition = (mouseX: number, rect: DOMRect, rtl: boolean) => {
+  if (mouseX < rect.left) {
+    return rtl ? 'max' : 'min'
+  }
+
+  if (mouseX > rect.right) {
+    return rtl ? 'min' : 'max'
+  }
+
+  const relativeX = rtl ? rect.right - mouseX : mouseX - rect.left
+  return Math.min(Math.max(relativeX / rect.width, 0), 1)
+}
+
+export const calculateLabelPosition = (
+  min: number,
+  max: number,
+  labels: Label[],
+  label: Label,
+  index: number,
+) => {
+  if (typeof label === 'object' && 'value' in label) {
+    return `${((label.value - min) / (max - min)) * 100}%`
+  }
+
+  return `${(index / (labels.length - 1)) * 100}%`
+}
+
+export const calculateTooltipPosition = (
+  min: number,
+  max: number,
+  value: number,
+  thumbSize: ThumbSize,
+  vertical: boolean,
+  rtl: boolean,
+) => {
+  const percent = (value - min) / (max - min)
+  const margin =
+    percent > 0.5
+      ? `-${(percent - 0.5) * thumbSize.value}${thumbSize.unit}`
+      : `${(0.5 - percent) * thumbSize.value}${thumbSize.unit}`
+
+  if (vertical) {
+    return {
+      bottom: `${percent * 100}%`,
+      marginBottom: margin,
+    }
+  }
+
+  return rtl
+    ? { right: `${percent * 100}%`, marginRight: margin }
+    : { left: `${percent * 100}%`, marginLeft: margin }
+}
+
+export const getClickPosition = (
+  event: React.MouseEvent,
+  container: HTMLDivElement,
+  vertical: boolean,
+  rtl: boolean,
+) => {
+  // MouseEvent doesn't have `offsetX`/`offsetY`, so we need to use `event.nativeEvent` instead
+  const { offsetX, offsetY } = event.nativeEvent
+  const { offsetWidth, offsetHeight } = container
+
+  if (vertical) {
+    return 1 - offsetY / offsetHeight
+  }
+
+  return rtl ? 1 - offsetX / offsetWidth : offsetX / offsetWidth
+}
+
+export const getLabelValue = (
+  min: number,
+  max: number,
+  labels: Label[],
+  label: Label,
+  index: number,
+) =>
+  typeof label === 'object' && 'value' in label
+    ? label.value
+    : min + (index / (labels.length - 1)) * (max - min)
+
+export const getNearestValueIndex = (value: number, values: number[]) => {
+  const valuesLength = values.length
+
+  if (value < values[0]) {
+    return 0
+  }
+
+  if (value > values[valuesLength - 1]) {
+    return valuesLength - 1
+  }
+
+  const distances = values.map((v) => Math.abs(v - value))
+  const min = Math.min(...distances)
+  const firstIndex = distances.indexOf(min)
+
+  return value < values[firstIndex] ? firstIndex : distances.lastIndexOf(min)
+}
+
+export const getThumbSize = (element: HTMLDivElement, vertical: boolean): ThumbSize | null => {
+  const value = globalThis
+    .getComputedStyle(element, null)
+    .getPropertyValue(
+      vertical ? '--cui-range-slider-thumb-height' : '--cui-range-slider-thumb-width',
+    )
+
+  const regex = /^(\d+\.?\d*)([%a-z]*)$/i
+  const match = value.match(regex)
+
+  if (match) {
+    return {
+      value: Number.parseFloat(match[1]),
+      unit: match[2] || null,
+    }
+  }
+
+  return null
+}
+
+export const roundToStep = (number: number, step: number) => {
+  const _step = step === 0 ? 1 : step
+  return Math.round(number / _step) * _step
+}
+
+export const updateGradient = (min: number, max: number, values: number[], vertical: boolean) => {
+  const minVal = Math.min(...values)
+  const maxVal = Math.max(...values)
+
+  const from = ((minVal - min) / (max - min)) * 100
+  const to = ((maxVal - min) / (max - min)) * 100
+
+  const direction = vertical ? 'to top' : 'to right'
+
+  return {
+    backgroundImage:
+      values.length === 1
+        ? `linear-gradient(
+    ${direction},
+    var(--cui-range-slider-track-in-range-bg) 0%,
+    var(--cui-range-slider-track-in-range-bg) ${to}%,
+    transparent ${to}%,
+    transparent 100%
+  )`
+        : `linear-gradient(
+    ${direction},
+    transparent 0%,
+    transparent ${from}%,
+    var(--cui-range-slider-track-in-range-bg) ${from}%,
+    var(--cui-range-slider-track-in-range-bg) ${to}%,
+    transparent ${to}%,
+    transparent 100%
+  )`,
+  }
+}
+
+export const updateValue = (value: number, values: number[], distance: number, index: number) => {
+  const newValue = [...values]
+  newValue[index] = validateValue(value, values, distance, index)
+  return newValue
+}
+
+export const validateValue = (value: number, values: number[], distance: number, index: number) => {
+  // If there's only one value, return it as is
+  if (values.length === 1) {
+    return value
+  }
+
+  // Determine previous and next values if they exist
+  const prevValue: number | undefined = index > 0 ? values[index - 1] : undefined
+  const nextValue: number | undefined = index < values.length - 1 ? values[index + 1] : undefined
+
+  // If it's the first element, ensure it's not too close to the next value
+  if (index === 0 && nextValue !== undefined) {
+    return Math.min(value, nextValue - distance)
+  }
+
+  // If it's the last element, ensure it's not too close to the previous value
+  if (index === values.length - 1 && prevValue !== undefined) {
+    return Math.max(value, prevValue + distance)
+  }
+
+  // For middle elements, ensure the value is within the allowed distance from both neighbors
+  if (prevValue !== undefined && nextValue !== undefined) {
+    const minVal = prevValue + distance
+    const maxVal = nextValue - distance
+    return Math.min(Math.max(value, minVal), maxVal)
+  }
+
+  // Fallback: If for some reason prevValue or nextValue is undefined, return the original value
+  return value
+}

package/src/components/time-picker/CTimePicker.tsx

@@ -188,6 +188,7 @@ export const CTimePicker = forwardRef<HTMLDivElement | HTMLLIElement, CTimePicke
       onHide,
       onShow,
       placeholder = 'Select time',
+      portal = false,
       required,
       seconds = true,
       size,
@@ -328,7 +329,22 @@ export const CTimePicker = forwardRef<HTMLDivElement | HTMLLIElement, CTimePicke
           ref={inputRef}
         />
         {indicator &&
-          (typeof indicator === 'boolean' ? <div className="time-picker-indicator" /> : indicator)}
+          (typeof indicator === 'boolean' ? (
+            <div
+              className="time-picker-indicator"
+              {...(disabled !== false && {
+                onClick: () => setVisible(!_visible),
+                onKeyDown: (event) => {
+                  if (event.key === 'Enter') {
+                    setVisible(!_visible)
+                  }
+                },
+                tabIndex: 0,
+              })}
+            />
+          ) : (
+            indicator
+          ))}
         {cleaner &&
           date &&
           (typeof cleaner === 'boolean' ? (
@@ -484,6 +500,7 @@ export const CTimePicker = forwardRef<HTMLDivElement | HTMLLIElement, CTimePicke
             setVisible(true)
             onShow && onShow()
           }}
+          portal={portal}
           toggler={InputGroup()}
           visible={_visible}
           {...rest}

package/src/components/tooltip/CTooltip.tsx

@@ -1,4 +1,12 @@
-import React, { forwardRef, HTMLAttributes, ReactNode, useRef, useEffect, useState } from 'react'
+import React, {
+  forwardRef,
+  HTMLAttributes,
+  ReactNode,
+  useEffect,
+  useId,
+  useRef,
+  useState,
+} from 'react'
 import classNames from 'classnames'
 import PropTypes from 'prop-types'
 
@@ -92,12 +100,13 @@ export const CTooltip = forwardRef<HTMLDivElement, CTooltipProps>(
     const tooltipRef = useRef<HTMLDivElement>(null)
     const togglerRef = useRef(null)
     const forkedRef = useForkedRef(ref, tooltipRef)
-    const uID = useRef(`tooltip${Math.floor(Math.random() * 1_000_000)}`)
 
-    const { initPopper, destroyPopper, updatePopper } = usePopper()
+    const id = `tooltip${useId()}`
     const [mounted, setMounted] = useState(false)
     const [_visible, setVisible] = useState(visible)
 
+    const { initPopper, destroyPopper, updatePopper } = usePopper()
+
     const _delay = typeof delay === 'number' ? { show: delay, hide: delay } : delay
 
     const popperConfig = {
@@ -125,48 +134,53 @@ export const CTooltip = forwardRef<HTMLDivElement, CTooltipProps>(
     }
 
     useEffect(() => {
-      setVisible(visible)
+      if (visible) {
+        handleShow()
+        return
+      }
+
+      handleHide()
     }, [visible])
 
     useEffect(() => {
-      if (_visible) {
-        setMounted(true)
-
-        if (tooltipRef.current) {
-          tooltipRef.current.classList.remove('fade', 'show')
-          destroyPopper()
-        }
-
+      if (mounted && togglerRef.current && tooltipRef.current) {
+        initPopper(togglerRef.current, tooltipRef.current, popperConfig)
         setTimeout(() => {
-          if (togglerRef.current && tooltipRef.current) {
-            if (animation) {
-              tooltipRef.current.classList.add('fade')
-            }
-
-            initPopper(togglerRef.current, tooltipRef.current, popperConfig)
-            tooltipRef.current.style.removeProperty('display')
-            tooltipRef.current.classList.add('show')
-            onShow && onShow()
-          }
+          setVisible(true)
         }, _delay.show)
+
+        return
       }
 
-      return () => {
-        if (tooltipRef.current) {
-          tooltipRef.current.classList.remove('show')
-          onHide && onHide()
-          executeAfterTransition(() => {
-            if (tooltipRef.current) {
-              tooltipRef.current.style.display = 'none'
-            }
-
-            destroyPopper()
-            setMounted(false)
-          }, tooltipRef.current)
-        }
+      if (!mounted && togglerRef.current && tooltipRef.current) {
+        destroyPopper()
+      }
+    }, [mounted])
+
+    useEffect(() => {
+      if (!_visible && togglerRef.current && tooltipRef.current) {
+        executeAfterTransition(() => {
+          setMounted(false)
+        }, tooltipRef.current)
       }
     }, [_visible])
 
+    const handleShow = () => {
+      setMounted(true)
+      if (onShow) {
+        onShow()
+      }
+    }
+
+    const handleHide = () => {
+      setTimeout(() => {
+        setVisible(false)
+        if (onHide) {
+          onHide()
+        }
+      }, _delay.hide)
+    }
+
     useEffect(() => {
       updatePopper()
     }, [content])
@@ -175,31 +189,36 @@ export const CTooltip = forwardRef<HTMLDivElement, CTooltipProps>(
       <>
         {React.cloneElement(children as React.ReactElement<any>, {
           ...(_visible && {
-            'aria-describedby': uID.current,
+            'aria-describedby': id,
           }),
           ref: togglerRef,
           ...((trigger === 'click' || trigger.includes('click')) && {
-            onClick: () => setVisible(!_visible),
+            onClick: () => (_visible ? handleHide() : handleShow()),
           }),
           ...((trigger === 'focus' || trigger.includes('focus')) && {
-            onFocus: () => setVisible(true),
-            onBlur: () => setVisible(false),
+            onFocus: () => handleShow(),
+            onBlur: () => handleHide(),
           }),
           ...((trigger === 'hover' || trigger.includes('hover')) && {
-            onMouseEnter: () => setVisible(true),
-            onMouseLeave: () => setVisible(false),
+            onMouseEnter: () => handleShow(),
+            onMouseLeave: () => handleHide(),
           }),
         })}
         <CConditionalPortal container={container} portal={true}>
           {mounted && (
             <div
-              className={classNames('tooltip', 'bs-tooltip-auto', className)}
-              id={uID.current}
+              className={classNames(
+                'tooltip',
+                'bs-tooltip-auto',
+                {
+                  fade: animation,
+                  show: _visible,
+                },
+                className,
+              )}
+              id={id}
               ref={forkedRef}
               role="tooltip"
-              style={{
-                display: 'none',
-              }}
               {...rest}
             >
               <div className="tooltip-arrow"></div>

package/src/components/virtual-scroller/CVirtualScroller.tsx

@@ -20,7 +20,7 @@ export interface CVirtualScrollerProps extends Omit<HTMLAttributes<HTMLDivElemen
 }
 
 export const CVirtualScroller = forwardRef<HTMLDivElement, CVirtualScrollerProps>(
-  ({ children, className, visibleItems, onScroll }, ref) => {
+  ({ children, className, visibleItems, onScroll, ...rest }, ref) => {
     const virtualScrollRef = useRef<HTMLDivElement>(null)
     const virtualScrollContentRef = useRef<HTMLDivElement>(null)
     const forkedRef = useForkedRef(ref, virtualScrollRef)
@@ -71,11 +71,12 @@ export const CVirtualScroller = forwardRef<HTMLDivElement, CVirtualScrollerProps
         onScroll={(event: UIEvent<HTMLDivElement>) =>
           handleScroll((event.target as HTMLDivElement).scrollTop)
         }
-        ref={forkedRef}
         style={{
           height: viewportHeight,
           overflowY: 'auto',
         }}
+        ref={forkedRef}
+        {...rest}
       >
         <div
           className="virtual-scroller-content"

package/src/hooks/index.ts

@@ -1,6 +1,7 @@
 import { useColorModes } from './useColorModes'
 import { useDebounce } from './useDebounce'
 import { useDebouncedCallback } from './useDebouncedCallback'
+import { useDropdownWithPopper } from './useDropdownWithPopper'
 import { useForkedRef } from './useForkedRef'
 import { useIsVisible } from './useIsVisible'
 import { usePopper } from './usePopper'
@@ -10,6 +11,7 @@ export {
   useColorModes,
   useDebounce,
   useDebouncedCallback,
+  useDropdownWithPopper,
   useForkedRef,
   useIsVisible,
   usePopper,

package/src/hooks/useDropdownWithPopper.ts

@@ -0,0 +1,123 @@
+import { useEffect, useRef, useState } from 'react'
+import { type Options, type Placement } from '@popperjs/core'
+
+import { usePopper } from './usePopper'
+import { isRTL } from '../utils'
+
+export const useDropdownWithPopper = <T extends HTMLElement = never>(
+  popperConfig?: Partial<Options>,
+) => {
+  const dropdownRefElement = useRef<T>(null)
+  const dropdownMenuElement = useRef<HTMLDivElement | null>(null)
+  const [isOpen, setIsOpen] = useState<boolean>(false)
+
+  const { popper, initPopper, destroyPopper } = usePopper()
+
+  const _popperConfig = {
+    placement: (isRTL(dropdownRefElement.current) ? 'bottom-end' : 'bottom-start') as Placement,
+    modifiers: [
+      {
+        name: 'preventOverflow',
+        options: {
+          boundary: 'clippingParents',
+        },
+      },
+      {
+        name: 'offset',
+        options: {
+          offset: [0, 2],
+        },
+      },
+    ],
+    ...popperConfig,
+  }
+
+  const closeDropdown = () => {
+    setIsOpen(false)
+  }
+
+  const openDropdown = () => {
+    setIsOpen(true)
+  }
+
+  const toggleDropdown = () => {
+    setIsOpen((prev) => !prev)
+  }
+
+  const updatePopper = () => {
+    if (popper) {
+      popper.update()
+    }
+  }
+
+  const handleKeyUp = (event: KeyboardEvent) => {
+    if (event.key === 'Escape') {
+      setIsOpen(false)
+      return
+    }
+
+    if (event.key === 'Tab') {
+      if (
+        dropdownRefElement.current &&
+        dropdownRefElement.current.contains(document.activeElement as HTMLElement)
+      ) {
+        return
+      }
+
+      if (
+        dropdownMenuElement.current &&
+        dropdownMenuElement.current.contains(document.activeElement as HTMLElement)
+      ) {
+        return
+      }
+
+      setIsOpen(false)
+    }
+  }
+
+  const handleMouseUp = (event: Event) => {
+    if (
+      (dropdownMenuElement.current &&
+        dropdownMenuElement.current.contains(event.target as HTMLElement)) ||
+      (dropdownRefElement.current &&
+        dropdownRefElement.current.contains(event.target as HTMLElement))
+    ) {
+      return
+    }
+
+    setIsOpen(false)
+  }
+
+  useEffect(() => {
+    if (isOpen) {
+      window.addEventListener('mouseup', handleMouseUp)
+      window.addEventListener('keyup', handleKeyUp)
+
+      if (dropdownRefElement.current && dropdownMenuElement.current) {
+        initPopper(dropdownRefElement.current, dropdownMenuElement.current, _popperConfig)
+      }
+    } else {
+      window.removeEventListener('mouseup', handleMouseUp)
+      window.removeEventListener('keyup', handleKeyUp)
+
+      destroyPopper()
+    }
+
+    return () => {
+      window.removeEventListener('mouseup', handleMouseUp)
+      window.removeEventListener('keyup', handleKeyUp)
+
+      destroyPopper()
+    }
+  }, [isOpen])
+
+  return {
+    dropdownMenuElement,
+    dropdownRefElement,
+    isOpen,
+    closeDropdown,
+    openDropdown,
+    toggleDropdown,
+    updatePopper,
+  }
+}