Merge pull request #65 from adobecom/MWPW-129766

fix(paginator): handles AEM and Milo markup discrepancies [MWPW-129766]
adobecom · Apr 27, 2023 · 57cd1bc · 57cd1bc
2 parents 3cc11cd + 85ccbec
commit 57cd1bc
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/dist/app.css b/dist/app.css
diff --git a/dist/main.js b/dist/main.js
@@ -1,5 +1,5 @@
 /*!
- * Chimera UI Libraries - Build 4/24/2023, 07:22:01
+ * Chimera UI Libraries - Build 4/26/2023, 18:21:30
  *         
  */
 /******/ (function(modules) { // webpackBootstrap
@@ -875,7 +875,9 @@ var getGlobalNavHeight = exports.getGlobalNavHeight = function getGlobalNavHeigh
     if (!header) return offSet;
 
     var isBacom = header.getAttribute('daa-lh') && header.getAttribute('daa-lh').includes('bacom');
-    return isBacom || header.classList.contains('feds-header-wrapper--sticky') ? header.offsetHeight + offSet : offSet;
+    var headerWrapper = isBacom ? header : document.querySelector('.feds-header-wrapper');
+
+    return isBacom || headerWrapper.classList.contains('feds-header-wrapper--sticky') ? header.offsetHeight + offSet : offSet;
 };
 
 /***/ }),
@@ -53600,7 +53602,7 @@ var Paginator = function Paginator(props) {
         } else {
             nextPage = parseInt(target.firstChild.nodeValue, BASE_10);
         }
-        var caasWrapper = target.closest('.consonant-Wrapper');
+        var caasWrapper = target.closest('.section') || target.closest('.consonant-Wrapper');
         if (caasWrapper && caasWrapper.getBoundingClientRect().y < 0 && typeof caasWrapper.scrollIntoView === 'function') {
             window.scrollTo({ left: 0, top: caasWrapper.offsetTop - globalNavHeight, behavior: 'smooth' });
         }

diff --git a/dist/main.min.js b/dist/main.min.js
diff --git a/dist/main.source.js b/dist/main.source.js
diff --git a/html/MWPW-129766.html b/html/MWPW-129766.html
@@ -69,7 +69,8 @@
 
 <body class="page basicpage spectrum spectrum--lightest">
     <!-- Custom fake global nav -->
-    <header class="feds-header-wrapper feds-header-wrapper--sticky">
+    <div class="feds-header-wrapper feds-header-wrapper--sticky">
+        <header>
             <div class="feds-navBar">
                 <ul>
                     <li>Adobe</li>
@@ -90,7 +91,8 @@
                     <li>Customer Success Stories</li>
                 </ul>
             </div>
-    </header>
+        </header>
+    </div>  
 
     <div class="page-heading">
         <h2>CaaS Test Page</h2>

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "build": "webpack",
     "postbuild": "minify dist/main.js > dist/main.min.js",
     "lint": "eslint react/src/js/components/Consonant --fix",
-    "release": "HUSKY_SKIP_HOOKS=1 release-it --ci",
+    "release": "release-it --ci",
     "test:coverage": "jest --coverage",
     "test:unit": "jest",
     "test:e2e-local": "wdio run wdio.conf.js env=LOCAL",
@@ -98,7 +98,6 @@
     "eslint-plugin-react": "^7.18.3",
     "eslint-plugin-react-hooks": "^4.1.2",
     "extract-text-webpack-plugin": "^3.0.1",
-    "husky": "^4.3.8",
     "ignore-loader": "^0.1.2",
     "inject-loader": "^3.0.1",
     "jest": "^24.0.0",
@@ -126,13 +125,6 @@
     "wdio-chromedriver-service": "^8.0.1",
     "webpack": "^3.9.1"
   },
-  "husky": {
-    "hooks": {
-      "prepare-commit-msg": "exec < /dev/tty && npx cz --hook || true",
-      "pre-commit": "npm run build && git add . && enforce-branch-name '.*'",
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
-    }
-  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"

diff --git a/react/src/js/components/Consonant/Helpers/general.js b/react/src/js/components/Consonant/Helpers/general.js
@@ -531,7 +531,9 @@ export const getGlobalNavHeight = () => {
     if (!header) return offSet;
 
     const isBacom = header.getAttribute('daa-lh') && header.getAttribute('daa-lh').includes('bacom');
-    return isBacom || header.classList.contains('feds-header-wrapper--sticky')
+    const headerWrapper = isBacom ? header : document.querySelector('.feds-header-wrapper');
+
+    return isBacom || headerWrapper.classList.contains('feds-header-wrapper--sticky')
         ? header.offsetHeight + offSet
         : offSet;
 };
diff --git a/react/src/js/components/Consonant/Pagination/Paginator.jsx b/react/src/js/components/Consonant/Pagination/Paginator.jsx
@@ -111,7 +111,7 @@ const Paginator = (props) => {
         } else {
             nextPage = parseInt(target.firstChild.nodeValue, BASE_10);
         }
-        const caasWrapper = target.closest('.consonant-Wrapper');
+        const caasWrapper = target.closest('.section') || target.closest('.consonant-Wrapper');
         if (caasWrapper
             && caasWrapper.getBoundingClientRect().y < 0
             && typeof caasWrapper.scrollIntoView === 'function') {