@salesforcedevs/dx-components 1.3.42 → 1.3.44

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.42",
+    "version": "1.3.44",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -40,5 +40,5 @@
         "eventsourcemock": "^2.0.0",
         "luxon": "^3.1.0"
     },
-    "gitHead": "a5ddc2bf9e25ef6d9c937086335387a23f647e91"
+    "gitHead": "6fd47c4a90b3238225555542a33e2f10246cbc5b"
 }

package/src/modules/dx/cardTrial/cardTrial.html

@@ -69,6 +69,7 @@
             size="large"
             href={buttonOneHref}
             variant="primary"
+            target={buttonOneTarget}
             font="sans"
             icon-symbol={buttonOneIcon}
             icon-size={buttonOneIconSize}
@@ -82,6 +83,7 @@
                 href={buttonOneHref}
                 variant="primary"
                 font="sans"
+                target={buttonOneTarget}
                 icon-symbol={buttonOneIcon}
                 icon-size={buttonOneIconSize}
             >

package/src/modules/dx/cardTrial/cardTrial.ts

@@ -71,6 +71,10 @@ export default class CardTrial extends LightningElement {
         return this.hasButtons ? "menu" : "link";
     }
 
+    get buttonOneTarget() {
+        return this.isExternalURL(this.buttonOneHref) ? "_blank" : null;
+    }
+
     private _details!: string[];
     private _modalDetails!: [{ title: string; subtitle: string }];
     private _modalOpen = false;
@@ -99,4 +103,17 @@ export default class CardTrial extends LightningElement {
             window.location.assign(this.href);
         }
     }
+
+    private isExternalURL(url: string | undefined): boolean {
+        if (!url) {
+            return false;
+        }
+
+        try {
+            const value = new URL(url);
+            return value.host !== window.location.host;
+        } catch (e) {
+            return false;
+        }
+    }
 }

package/src/modules/dx/scrollManager/scrollManager.ts

@@ -9,7 +9,13 @@ declare module globalThis {
     let singletonScrollManagerConnected: boolean;
 }
 // mostly components shouldn't be using this, but there are a few exceptions such as amfReference
+
+let scrollUnlocked: boolean = false;
+
 export const restoreScroll = () => {
+    if (scrollUnlocked) {
+        return;
+    }
     document.body.scrollTop = document.documentElement.scrollTop =
         window.history.state?.scroll.value;
 };
@@ -33,10 +39,10 @@ export default class ScrollManager extends LightningElement {
     */
 
     protected scrollCount = 0; // this is for dark magic, basically we lock the user out of scrolling in the first quarter second, unless they really mean it. We do this because load timings mean that the scroll can get messed up in that period
-    protected scrollUnlocked = false;
 
     renderedCallback() {
-        if (!globalThis.singletonScrollManagerRendered) {
+        scrollUnlocked = window.location.hash !== ""; // if we have anchor links, skip the entire scroll restore
+        if (!globalThis.singletonScrollManagerRendered && !scrollUnlocked) {
             globalThis.singletonScrollManagerRendered = true;
             if (
                 window.history.state?.scroll?.docSize ===
@@ -50,10 +56,8 @@ export default class ScrollManager extends LightningElement {
                     // sometimes loading is slow, so we may want to reset the scroll to
                     // the correct position after loading is complete, to avoid weird behavior
                     // but only if the user hasn't scrolled around in the meantime
-                    if (!this.scrollUnlocked) {
-                        restoreScroll();
-                        this.scrollUnlocked = true;
-                    }
+                    restoreScroll();
+                    scrollUnlocked = true;
                 }, LOAD_TIME_SCROLL_RESTORE_DELAY);
             }
         } else {