From 2599688eb32268b0c8ed6d496815acfb0b6966b3 Mon Sep 17 00:00:00 2001 From: Vlad Rusu Date: Mon, 20 Jan 2025 09:28:29 +0200 Subject: [PATCH] Bootstrap fixes 1. "preventAssignment: true" broke Bootstrap version (Uncaught ReferenceError: bsKeys is not defined) 2. Fix for hardcoded "cui" prefix in _dropdown.scss (broked Boostrap version) --- build/rollup.config.mjs | 6 ++---- scss/_dropdown.scss | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/rollup.config.mjs b/build/rollup.config.mjs index b1c026826..201ab3773 100644 --- a/build/rollup.config.mjs +++ b/build/rollup.config.mjs @@ -22,12 +22,10 @@ const plugins = [ babelHelpers: 'bundled' }), BOOTSTRAP && replace({ - preventAssignment: true, + preventAssignment: false, delimiters: ['', ''], '/coreui': '/coreui', // prevents changes in URLs - coreui: 'bs', - '-coreui': '-bs', - 'coreui=': 'bs=', // [data-coreui="navigation"] => [data-bs="navigation"] (workaround for `preventAssignment` being true), + 'coreui': 'bs', '--cui-': '--bs-' }) ] diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 7fa25c3bb..139c98b86 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -91,7 +91,7 @@ $infix: breakpoint-infix($breakpoint, $grid-breakpoints); .dropdown-menu#{$infix}-start { - --cui-position: start; + --#{$prefix}position: start; &[data-coreui-popper] { @include ltr-rtl("right", auto); @@ -100,7 +100,7 @@ } .dropdown-menu#{$infix}-end { - --cui-position: end; + --#{$prefix}position: end; &[data-coreui-popper] { @include ltr-rtl("right", 0);