Merge pull request #1972 from kayla-glick/fix-import-export-dropdown

change dropdown menu offset to prevent closing on hover
wowsims · Nov 29, 2022 · 0a474ae · 0a474ae
2 parents 5ef5341 + 0168f6f
commit 0a474ae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/ui/core/components/sim_title_dropdown.ts b/ui/core/components/sim_title_dropdown.ts
@@ -151,7 +151,7 @@ export class SimTitleDropdown extends Component {
 
  let fragment = document.createElement('fragment');
  fragment.innerHTML = `
- <a href="javascript:void(0)" class="sim-link ${textKlass}" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link ${textKlass}" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="${iconPath}" class="sim-link-icon">
  <div class="d-flex flex-column">
@@ -195,7 +195,7 @@ export class SimTitleDropdown extends Component {
 
  let fragment = document.createElement('fragment');
  fragment.innerHTML = `
- <a href="${href}" class="sim-link ${textKlass}" ${specIndexes.length > 1 ? 'role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false"' : ''}>
+ <a href="${href}" class="sim-link ${textKlass}" ${specIndexes.length > 1 ? 'role="button" data-bs-toggle="dropdown" aria-expanded="false"' : ''}>
  <div class="sim-link-content">
  <img src="${iconPath}" class="sim-link-icon">
  <div class="d-flex flex-column">

diff --git a/ui/index.html b/ui/index.html
@@ -64,7 +64,7 @@ <h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
 
  <div class="sim-links">
  <div class="dropend sim-link-dropdown">
- <a href="javascript:void(0)" class="sim-link text-warrior" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link text-warrior" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="/wotlk/assets/img/warrior_icon.png" class="sim-link-icon">
  <span class="sim-link-label">Warrior</span>
@@ -96,7 +96,7 @@ <h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
  </ul>
  </div>
  <div class="dropend sim-link-dropdown">
- <a href="javascript:void(0)" class="sim-link text-paladin" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link text-paladin" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="/wotlk/assets/img/paladin_icon.png" class="sim-link-icon">
  <span class="sim-link-label">Paladin</span>
@@ -140,7 +140,7 @@ <h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
  </div>
  </a>
  <div class="dropend sim-link-dropdown">
- <a href="javascript:void(0)" class="sim-link text-priest" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link text-priest" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="/wotlk/assets/img/priest_icon.png" class="sim-link-icon">
  <span class="sim-link-label">Priest</span>
@@ -180,7 +180,7 @@ <h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
  </a>
 
  <div class="dropend sim-link-dropdown">
- <a href="javascript:void(0)" class="sim-link text-shaman" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link text-shaman" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="/wotlk/assets/img/shaman_icon.png" class="sim-link-icon">
  <span class="sim-link-label">Shaman</span>
@@ -227,7 +227,7 @@ <h2 class="wrath-title w-100 order-1 order-md-2">Wrath of the Lich King</h2>
  </a>
 
  <div class="dropend sim-link-dropdown">
- <a href="javascript:void(0)" class="sim-link text-druid" role="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
+ <a href="javascript:void(0)" class="sim-link text-druid" role="button" data-bs-toggle="dropdown" aria-expanded="false">
  <div class="sim-link-content">
  <img src="/wotlk/assets/img/druid_icon.png" class="sim-link-icon">
  <div>

diff --git a/ui/scss/core/sim_ui/_shared.scss b/ui/scss/core/sim_ui/_shared.scss
@@ -105,7 +105,6 @@ td, th {
  text-align: right;
  min-width: auto;
  font-weight: bold;
- top: 120%;
 }
 .sim-dropdown-menu .dropdown-item {
  display: block;

diff --git a/ui/shared/bootstrap_overrides.ts b/ui/shared/bootstrap_overrides.ts
@@ -1,6 +1,8 @@
 import * as bootstrap from 'bootstrap';
 import { isDescendant } from './utils';
 
+bootstrap.Dropdown.Default.offset = [0,0];
+
 let body = document.querySelector('body') as HTMLElement;
 
 // Custom dropdown event handlers for mouseover dropdowns