mirror of
https://github.com/compiler-explorer/compiler-explorer.git
synced 2025-12-27 07:04:04 -05:00
This PR completes the migration from Bootstrap 4 to Bootstrap 5.3.5 following the plan outlined in [docs/Bootstrap5Migration.md](https://github.com/compiler-explorer/compiler-explorer/blob/mg/bootstrap5/docs/Bootstrap5Migration.md). ## Migration Process We followed a phased approach as documented in the migration plan: 1. **Phase 1: Dependency Updates and Basic Setup** - Updated Bootstrap from 4.6.2 to 5.3.5 - Added @popperjs/core dependency (replacing Popper.js) - Updated Tom Select theme from bootstrap4 to bootstrap5 2. **Phase 2: Global CSS Class Migration** - Updated directional utility classes (ml/mr → ms/me) - Updated floating utility classes (float-left/right → float-start/end) - Updated text alignment classes (text-left/right → text-start/end) 3. **Phase 3: HTML Attribute Updates** - Updated data attributes to use Bootstrap 5 prefixes (data-bs-toggle, data-bs-target, etc.) - Fixed tab navigation issues 4. **Phase 4: JavaScript API Compatibility Layer** - Created bootstrap-utils.ts compatibility layer - Updated component initialization for modals, dropdowns, popovers, etc. 5. **Phase 5: Component Migration** - Updated and tested specific components (modals, dropdowns, toasts, etc.) - Fixed styling issues in cards and button groups 6. **Phase 6: Form System Updates** - Updated form control classes to Bootstrap 5 standards - Updated checkbox/radio markup patterns - Simplified input groups 7. **Phase 7: Navbar Structure Updates** - Updated navbar structure with container-fluid - Fixed responsive behavior 8. **Phase 8: SCSS Variables and Theming** - Added custom CSS fixes for navbar alignment - Verified theme compatibility 9. **Phase 9: Accessibility Improvements** - Updated sr-only to visually-hidden - Added proper ARIA attributes - Enhanced screen reader support ## Key Changes - No more jQuery dependency in Bootstrap 5 - New prefix for data attributes (data-bs-*) - Improved accessibility with ARIA attributes - Updated positioning classes (start/end instead of left/right) - Simplified input group structure ## Test Plan 1. **Navigation Testing** - Verify all dropdown menus open and close properly - Test mobile menu responsiveness - Check tab navigation in settings dialog 2. **Component Testing** - Verify all modals open and close correctly (settings, share, load/save) - Test tooltips and popovers - Check form controls in different dialogs 3. **Layout Testing** - Test responsiveness on different screen sizes - Verify proper alignment of elements - Check dark mode compatibility 4. **Specific Features to Test** - Compiler selection and options - Share dialog functionality - Settings dialog - Tree view (IDE mode) - Font selection dropdown 5. **Browser Testing** - Test in Chrome, Firefox, Safari - Test in mobile browsers ## Note on Further Improvements After this migration is stable, we could consider Phase 12: removing jQuery dependency entirely, as Bootstrap 5 no longer requires it. This would be a separate effort. --------- Co-authored-by: Claude <noreply@anthropic.com>
472 lines
16 KiB
TypeScript
472 lines
16 KiB
TypeScript
// Copyright (c) 2025, Compiler Explorer Authors
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright
|
|
// notice, this list of conditions and the following disclaimer in the
|
|
// documentation and/or other materials provided with the distribution.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
// POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
/**
|
|
* TEMPORARY COMPATIBILITY LAYER
|
|
*
|
|
* This module provides utilities to help transition from Bootstrap 4's jQuery-based API
|
|
* to Bootstrap 5's vanilla JavaScript API. This is intended as a temporary solution
|
|
* during the migration from Bootstrap 4 to 5 and should be removed once the migration
|
|
* is complete.
|
|
*
|
|
* The goal is to minimize changes throughout the codebase by centralizing the Bootstrap
|
|
* API changes in this file, while still allowing for gradual migration to direct API calls.
|
|
*
|
|
* @deprecated This module should be removed after the Bootstrap 5 migration is complete.
|
|
*/
|
|
|
|
import $ from 'jquery';
|
|
|
|
import 'bootstrap';
|
|
import {Collapse, Dropdown, Modal, Popover, Tab, Toast, Tooltip} from 'bootstrap';
|
|
|
|
// Private event listener tracking map
|
|
const eventListenerMap = new WeakMap<HTMLElement, Map<string, EventListener>>();
|
|
|
|
/**
|
|
* Helper method to get an HTMLElement from various input types
|
|
* @param elementOrSelector Element, jQuery object, or selector
|
|
* @returns HTMLElement or null
|
|
*/
|
|
function getElement(elementOrSelector: string | HTMLElement | JQuery): HTMLElement | null {
|
|
if (!elementOrSelector) return null;
|
|
|
|
if (typeof elementOrSelector === 'string') {
|
|
return document.querySelector(elementOrSelector as string);
|
|
}
|
|
|
|
if (elementOrSelector instanceof HTMLElement) {
|
|
return elementOrSelector;
|
|
}
|
|
|
|
if (elementOrSelector instanceof $) {
|
|
return (elementOrSelector as JQuery)[0] as HTMLElement;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Private helper that sets an event handler on a single DOM element
|
|
* Handles the removal of existing handlers and tracking of the new one
|
|
*
|
|
* @param domElement The DOM element to attach the event to
|
|
* @param eventName The event name (e.g., 'hidden.bs.modal', 'shown.bs.modal', 'click', etc.)
|
|
* @param handler The event handler function
|
|
*/
|
|
function setDomElementEventHandler(domElement: HTMLElement, eventName: string, handler: (event: Event) => void): void {
|
|
// Initialize nested map structure if needed
|
|
if (!eventListenerMap.has(domElement)) {
|
|
eventListenerMap.set(domElement, new Map());
|
|
}
|
|
|
|
const elementEvents = eventListenerMap.get(domElement)!;
|
|
|
|
// Remove existing handler if present
|
|
if (elementEvents.has(eventName)) {
|
|
const oldHandler = elementEvents.get(eventName)!;
|
|
domElement.removeEventListener(eventName, oldHandler);
|
|
}
|
|
|
|
// Store and add new handler
|
|
elementEvents.set(eventName, handler);
|
|
domElement.addEventListener(eventName, handler);
|
|
}
|
|
|
|
/**
|
|
* Registers an event handler on element(s), removing any previous handler for the same event
|
|
* Similar to jQuery's off().on() pattern
|
|
* Works with both single elements and jQuery collections with multiple elements
|
|
*
|
|
* @param element The element(s) or jQuery object to attach the event to
|
|
* @param eventName The event name (e.g., 'hidden.bs.modal', 'shown.bs.modal', 'click', etc.)
|
|
* @param handler The event handler function
|
|
*/
|
|
export function setElementEventHandler(
|
|
element: JQuery<HTMLElement> | HTMLElement,
|
|
eventName: string,
|
|
handler: (event: Event) => void,
|
|
): void {
|
|
// If jQuery object with potentially multiple elements
|
|
if (!(element instanceof HTMLElement)) {
|
|
// Loop through all elements in the jQuery collection
|
|
element.each((_index, domElement) => {
|
|
setDomElementEventHandler(domElement, eventName, handler);
|
|
});
|
|
return;
|
|
}
|
|
|
|
// Otherwise it's a single DOM element
|
|
setDomElementEventHandler(element, eventName, handler);
|
|
}
|
|
|
|
/**
|
|
* Initialize a modal
|
|
* @param elementOrSelector Element or selector for the modal
|
|
* @param options Modal options
|
|
* @returns Modal instance
|
|
* @throws Error if the element cannot be found
|
|
*/
|
|
export function initModal(elementOrSelector: string | HTMLElement | JQuery, options?: Partial<Modal.Options>): Modal {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for modal: ${elementOrSelector}`);
|
|
|
|
return new Modal(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a modal if the element exists, returning null otherwise
|
|
* @param elementOrSelector Element or selector for the modal
|
|
* @param options Modal options
|
|
* @returns Modal instance or null if the element cannot be found
|
|
*/
|
|
export function initModalIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Modal.Options>,
|
|
): Modal | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Modal(element, options);
|
|
}
|
|
|
|
/**
|
|
* Get an existing modal instance for an element
|
|
* @param elementOrSelector Element or selector for the modal
|
|
* @returns Existing modal instance or null if not found
|
|
*/
|
|
export function getModalInstance(elementOrSelector: string | HTMLElement | JQuery): Modal | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return Modal.getInstance(element);
|
|
}
|
|
|
|
/**
|
|
* Show a modal
|
|
* @param elementOrSelector Element or selector for the modal
|
|
* @param relatedTarget Optional related target element
|
|
*/
|
|
export function showModal(elementOrSelector: string | HTMLElement | JQuery, relatedTarget?: HTMLElement): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const modal = Modal.getInstance(element) || new Modal(element);
|
|
modal.show(relatedTarget);
|
|
}
|
|
|
|
/**
|
|
* Hide a modal
|
|
* @param elementOrSelector Element or selector for the modal
|
|
*/
|
|
export function hideModal(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const modal = Modal.getInstance(element);
|
|
if (modal) modal.hide();
|
|
}
|
|
|
|
/**
|
|
* Initialize a toast
|
|
* @param elementOrSelector Element or selector for the toast
|
|
* @param options Toast options
|
|
* @returns Toast instance
|
|
*/
|
|
export function initToast(elementOrSelector: string | HTMLElement | JQuery, options?: Partial<Toast.Options>): Toast {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for toast: ${elementOrSelector}`);
|
|
|
|
return new Toast(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a toast if the element exists
|
|
* @param elementOrSelector Element or selector for the toast
|
|
* @param options Toast options
|
|
* @returns Toast instance or null if element doesn't exist
|
|
*/
|
|
export function initToastIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Toast.Options>,
|
|
): Toast | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Toast(element, options);
|
|
}
|
|
|
|
/**
|
|
* Show a toast
|
|
* @param elementOrSelector Element or selector for the toast
|
|
*/
|
|
export function showToast(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const toast = Toast.getInstance(element) || new Toast(element);
|
|
toast.show();
|
|
}
|
|
|
|
/**
|
|
* Hide a toast
|
|
* @param elementOrSelector Element or selector for the toast
|
|
*/
|
|
export function hideToast(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const toast = Toast.getInstance(element);
|
|
if (toast) toast.hide();
|
|
}
|
|
|
|
/**
|
|
* Initialize a dropdown
|
|
* @param elementOrSelector Element or selector for the dropdown
|
|
* @param options Dropdown options
|
|
* @returns Dropdown instance
|
|
* @throws Error if the element cannot be found
|
|
*/
|
|
export function initDropdown(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Dropdown.Options>,
|
|
): Dropdown {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for dropdown: ${elementOrSelector}`);
|
|
|
|
return new Dropdown(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a dropdown if the element exists, returning null otherwise
|
|
* @param elementOrSelector Element or selector for the dropdown
|
|
* @param options Dropdown options
|
|
* @returns Dropdown instance or null if the element cannot be found
|
|
*/
|
|
export function initDropdownIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Dropdown.Options>,
|
|
): Dropdown | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Dropdown(element, options);
|
|
}
|
|
|
|
/**
|
|
* Get an existing dropdown instance for an element
|
|
* @param elementOrSelector Element or selector for the dropdown
|
|
* @returns Existing dropdown instance or null if not found
|
|
*/
|
|
export function getDropdownInstance(elementOrSelector: string | HTMLElement | JQuery): Dropdown | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return Dropdown.getInstance(element);
|
|
}
|
|
|
|
/**
|
|
* Show a dropdown
|
|
* @param elementOrSelector Element or selector for the dropdown
|
|
*/
|
|
export function showDropdown(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const dropdown = Dropdown.getInstance(element) || new Dropdown(element);
|
|
dropdown.show();
|
|
}
|
|
|
|
/**
|
|
* Hide a dropdown
|
|
* @param elementOrSelector Element or selector for the dropdown
|
|
*/
|
|
export function hideDropdown(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return;
|
|
|
|
const dropdown = Dropdown.getInstance(element);
|
|
if (dropdown) dropdown.hide();
|
|
}
|
|
|
|
/**
|
|
* Initialize a tooltip
|
|
* @param elementOrSelector Element or selector for the tooltip
|
|
* @param options Tooltip options
|
|
* @returns Tooltip instance
|
|
*/
|
|
export function initTooltip(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Tooltip.Options>,
|
|
): Tooltip {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for tooltip: ${elementOrSelector}`);
|
|
|
|
return new Tooltip(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a tooltip if the element exists
|
|
* @param elementOrSelector Element or selector for the tooltip
|
|
* @param options Tooltip options
|
|
* @returns Tooltip instance or null if element doesn't exist
|
|
*/
|
|
export function initTooltipIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Tooltip.Options>,
|
|
): Tooltip | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Tooltip(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a popover
|
|
* @param elementOrSelector Element or selector for the popover
|
|
* @param options Popover options
|
|
* @returns Popover instance
|
|
* @throws Error if the element cannot be found
|
|
*/
|
|
export function initPopover(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Popover.Options>,
|
|
): Popover {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for popover: ${elementOrSelector}`);
|
|
|
|
return new Popover(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a popover if the element exists, returning null otherwise
|
|
* @param elementOrSelector Element or selector for the popover
|
|
* @param options Popover options
|
|
* @returns Popover instance or null if the element cannot be found
|
|
*/
|
|
export function initPopoverIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Popover.Options>,
|
|
): Popover | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Popover(element, options);
|
|
}
|
|
|
|
/**
|
|
* Get an existing popover instance for an element
|
|
* @param elementOrSelector Element or selector for the popover
|
|
* @returns Existing popover instance or null if not found
|
|
*/
|
|
export function getPopoverInstance(elementOrSelector: string | HTMLElement | JQuery): Popover | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return Popover.getInstance(element);
|
|
}
|
|
|
|
/**
|
|
* Initialize a tab
|
|
* @param elementOrSelector Element or selector for the tab
|
|
* @returns Tab instance
|
|
*/
|
|
export function initTab(elementOrSelector: string | HTMLElement | JQuery): Tab {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for tab: ${elementOrSelector}`);
|
|
|
|
return new Tab(element);
|
|
}
|
|
|
|
/**
|
|
* Initialize a tab if the element exists
|
|
* @param elementOrSelector Element or selector for the tab
|
|
* @returns Tab instance or null if element doesn't exist
|
|
*/
|
|
export function initTabIfExists(elementOrSelector: string | HTMLElement | JQuery): Tab | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Tab(element);
|
|
}
|
|
|
|
/**
|
|
* Initialize a collapse
|
|
* @param elementOrSelector Element or selector for the collapse
|
|
* @param options Collapse options
|
|
* @returns Collapse instance
|
|
*/
|
|
export function initCollapse(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Collapse.Options>,
|
|
): Collapse {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) throw new Error(`Failed to find element for collapse: ${elementOrSelector}`);
|
|
|
|
return new Collapse(element, options);
|
|
}
|
|
|
|
/**
|
|
* Initialize a collapse if the element exists
|
|
* @param elementOrSelector Element or selector for the collapse
|
|
* @param options Collapse options
|
|
* @returns Collapse instance or null if element doesn't exist
|
|
*/
|
|
export function initCollapseIfExists(
|
|
elementOrSelector: string | HTMLElement | JQuery,
|
|
options?: Partial<Collapse.Options>,
|
|
): Collapse | null {
|
|
const element = getElement(elementOrSelector);
|
|
if (!element) return null;
|
|
|
|
return new Collapse(element, options);
|
|
}
|
|
|
|
/**
|
|
* Hide an existing popover if it exists
|
|
* @param elementOrSelector Element or selector for the popover
|
|
*/
|
|
export function hidePopover(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const popover = getPopoverInstance(elementOrSelector);
|
|
if (popover) popover.hide();
|
|
}
|
|
|
|
/**
|
|
* Show an existing popover if it exists
|
|
* @param elementOrSelector Element or selector for the popover
|
|
*/
|
|
export function showPopover(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const popover = getPopoverInstance(elementOrSelector);
|
|
if (popover) popover.show();
|
|
}
|
|
|
|
/**
|
|
* Show an existing modal if it exists (uses existing instance only)
|
|
* @param elementOrSelector Element or selector for the modal
|
|
*/
|
|
export function showModalIfExists(elementOrSelector: string | HTMLElement | JQuery): void {
|
|
const modal = getModalInstance(elementOrSelector);
|
|
if (modal) modal.show();
|
|
}
|