Add new patches

infor-design · Oct 30, 2023 · d54016d · d54016d
1 parent 88b64f2
commit d54016d
Show file tree

Hide file tree

Showing 7 changed files with 478 additions and 12 deletions.
diff --git a/app/views/components/module-nav/test-css-inherit.html b/app/views/components/module-nav/test-css-inherit.html
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # What's New with Enterprise
 
+## v4.88.2
+
+## v4.88.2 Features
+
+- `[Module Nav]` Fixed a bug where the css conflicted with accordion. ([#8117](https://github.com/infor-design/enterprise/issues/8063))
+- `[Context Menu]` Fixed that context menu stopped working in safari (detection issues). ([#8037](https://github.com/infor-design/enterprise/issues/8037))
+
 ## v4.88.1
 
 ## v4.88.1 Features

diff --git a/src/components/accordion/_accordion-new.scss b/src/components/accordion/_accordion-new.scss
@@ -46,6 +46,11 @@
     color: inherit;
     top: -2px;
   }
+
+  &.is-selected .btn,
+  &.is-selected .btn:hover {
+    color: $accordion-selected-icon-color;
+  }
 }
 
 html {
@@ -69,3 +74,7 @@ html {
     }
   }
 }
+
+.accordion.panel .accordion-header.is-selected [class^='btn']:focus:not(.hide-focus) {
+  border: 1px solid $accordion-selected-border-color !important;
+}
diff --git a/src/components/module-nav/module-nav.accordion.scss b/src/components/module-nav/module-nav.accordion.scss
@@ -3,7 +3,7 @@
 // Module Nav Accordion Component
 //================================================== //
 
-.module-nav-accordion {
+.module-nav .module-nav-accordion {
   display: flex;
   flex-direction: column;
   height: 100%;
@@ -18,7 +18,7 @@
 }
 
 // IDS Accordion Style Overrides
-.accordion.panel.module-nav-accordion {
+.module-nav .accordion.panel.module-nav-accordion {
   background-color: transparent;
   border: 0;
 
@@ -211,7 +211,7 @@
 //================================================== //
 
 .module-nav-container {
-  &.mode-collapsed {
+  &.mode-collapsed > .module-nav {
     .accordion-header {
       display: flex;
       align-items: center;
@@ -276,7 +276,7 @@
 //================================================== //
 
 .module-nav-container {
-  &.mode-expanded {
+  &.mode-expanded > .module-nav {
     .accordion {
       // Module Nav Accordion Alignment-only rules
       // These rules apply to both "collapsed" and "expanded" display modes

diff --git a/src/components/popupmenu/popupmenu.js b/src/components/popupmenu/popupmenu.js
@@ -989,8 +989,7 @@ PopupMenu.prototype = {
       if (!leftClick) {
         this.menu.parent().on('contextmenu.popupmenu', disableBrowserContextMenu);
 
-        const disallowedOS = ['android', 'ios'];
-        if (disallowedOS.indexOf(env.os.name) === -1) {
+        if (!env.features.touch) {
           // Normal desktop operation
           this.element
             .on('contextmenu.popupmenu', (e) => {

diff --git a/src/core/_config.scss b/src/core/_config.scss
@@ -714,6 +714,8 @@ $accordion-focused-text-color: $ids-color-brand-primary-base;
 $accordion-selected-bg-color: $ids-color-brand-primary-base;
 $accordion-selected-text-color: $ids-color-palette-slate-90;
 $accordion-panel-selected-text-color: $ids-color-palette-white;
+$accordion-selected-icon-color: $ids-color-palette-white;
+$accordion-selected-border-color: $ids-color-palette-white;
 
 $accordion-highcontrast-text-decoration: none;
 

diff --git a/src/utils/environment.js b/src/utils/environment.js
@@ -87,12 +87,6 @@ const Environment = {
       this.browser.name = 'chrome';
     }
 
-    const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
-    if (macosPlatforms.indexOf(platform) > -1 && !/Linux/.test(platform)) {
-      cssClasses += 'is-mac ';
-      this.os.name = 'mac';
-    }
-
     if (ua.indexOf('Firefox') > 0) {
       cssClasses += 'is-firefox ';
       this.browser.name = 'firefox';
@@ -142,6 +136,13 @@ const Environment = {
       }
     }
 
+    const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
+    if (macosPlatforms.indexOf(platform) > -1 && !/Linux/.test(platform)) {
+      cssClasses = cssClasses.replace('ios ', '');
+      cssClasses += 'is-mac ';
+      this.os.name = 'mac';
+    }
+
     if ((/Android/.test(ua))) {
       cssClasses += 'android ';
       this.os.name = 'android';