@salesforcedevs/docs-components 1.2.22-alpha → 1.3.5-lightdom-1

package/lwc.config.json

@@ -1,7 +1,8 @@
 {
     "modules": [
         { "dir": "src/modules" },
-        { "npm": "@salesforcedevs/dx-components" }
+        { "npm": "@salesforcedevs/dx-components" },
+        { "npm": "@salesforcedevs/dw-components" }
     ],
     "expose": [
         "doc/amfReference",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/docs-components",
-    "version": "1.2.22-alpha",
+    "version": "1.3.5-lightdom-1",
     "description": "Docs Lightning web components for DSC",
     "license": "MIT",
     "main": "index.js",

package/src/modules/doc/header/header.css

@@ -43,7 +43,7 @@ header:not(.has-brand) > .header_l2 {
     --button-primary-color-hover: var(--dx-g-blue-vibrant-40);
 }
 
-.header_lang-dropdown > dx-button {
+.header_lang-dropdown dx-button {
     --dx-c-button-primary-color: var(--button-primary-color);
     --dx-c-button-primary-color-hover: var(--button-primary-color-hover);
     --dx-c-slot-empty-width: min-content;
@@ -52,7 +52,7 @@ header:not(.has-brand) > .header_l2 {
     border-bottom: 1px dashed var(--border-color);
 }
 
-.header_lang-dropdown > dx-button:hover {
+.header_lang-dropdown dx-button:hover {
     --border-color: var(--button-primary-color-hover);
 }
 
@@ -89,7 +89,7 @@ header:not(.has-brand) > .header_l2 {
         margin-left: auto;
     }
 
-    .header_lang-dropdown > dx-button {
+    .header_lang-dropdown dx-button {
         padding: var(--dx-g-spacing-2xs) 0;
     }
 

package/src/modules/doc/header/header.html

@@ -37,6 +37,13 @@
                         onstatechange={handleStateChange}
                     ></dx-header-search>
                 </div>
+                <div
+                    if:true={showTbidLogin}
+                    class="header-tbid-login"
+                    onclick={closeMobileNavMenu}
+                >
+                    <dw-tbid-login-menu></dw-tbid-login-menu>
+                </div>
                 <div if:true={showSignup} class="header-login-signup">
                     <dx-button
                         aria-label="Sign Up For Salesforce Developer Edition"

package/src/modules/doc/header/header.ts

@@ -62,6 +62,10 @@ export default class Header extends HeaderBase {
         return !this.mobile && this.hasNavItems;
     }
 
+    private get showTbidLogin(): boolean {
+        return this.showSignup;
+    }
+
     private get showSignup(): boolean {
         return this.signupLink
             ? (this.tablet && !this.isSearchOpen) || !this.tablet

package/src/modules/doc/xmlContent/xmlContent.html

@@ -1,4 +1,4 @@
-<template>
+<template lwc:render-mode="light">
     <doc-content-layout
         if:true={loaded}
         coveo-organization-id={coveoOrganizationId}

package/src/modules/doc/xmlContent/{xmlContent.css → xmlContent.scoped.css}

@@ -3,6 +3,18 @@
     --button-primary-color-hover: var(--dx-g-blue-vibrant-40);
 }
 
+dx-dropdown dx-button {
+    --dx-c-button-primary-color: var(--button-primary-color);
+    --dx-c-button-primary-color-hover: var(--button-primary-color-hover);
+    --border-color: var(--button-primary-color);
+
+    border-bottom: 1px dashed var(--border-color);
+}
+
+dx-dropdown dx-button:hover {
+    --border-color: var(--button-primary-color-hover);
+}
+
 doc-breadcrumbs {
     --dx-c-popover-z-index: 5;
 
@@ -14,18 +26,6 @@ dx-dropdown {
     --dx-c-dropdown-option-font-size: var(--dx-g-text-sm);
 }
 
-dx-dropdown > dx-button {
-    --dx-c-button-primary-color: var(--button-primary-color);
-    --dx-c-button-primary-color-hover: var(--button-primary-color-hover);
-    --border-color: var(--button-primary-color);
-
-    border-bottom: 1px dashed var(--border-color);
-}
-
-dx-dropdown > dx-button:hover {
-    --border-color: var(--button-primary-color-hover);
-}
-
 .document-pickers {
     margin-left: auto;
     margin-right: var(--dx-g-spacing-sm);

package/src/modules/doc/xmlContent/xmlContent.ts

@@ -28,6 +28,8 @@ export default class DocXmlContent extends LightningElementWithState<{
     isFetchingContent: boolean;
     lastHighlightedSearch: string;
 }> {
+    static renderMode = "light";
+
     @api apiDomain = "https://developer.salesforce.com";
     @api coveoOrganizationId!: string;
     @api coveoPublicAccessToken!: string;
@@ -146,7 +148,7 @@ export default class DocXmlContent extends LightningElementWithState<{
                 ? this.pageReference.hash.split("#")[1]
                 : this.pageReference?.hash;
 
-        const contentEl = this.template.querySelector("doc-content");
+        const contentEl = this.querySelector("doc-content");
         const anchorEl =
             urlSectionLink &&
             (contentEl?.shadowRoot?.querySelector(`[id='${urlSectionLink}']`) ||
@@ -511,9 +513,9 @@ export default class DocXmlContent extends LightningElementWithState<{
     }
 
     private updateSearchInput(searchParam: string): void {
-        this.template
-            .querySelector("doc-content-layout")
-            ?.setSidebarInputValue(searchParam);
+        this.querySelector("doc-content-layout")?.setSidebarInputValue(
+            searchParam
+        );
     }
 
     private pageReferenceToString(reference: PageReference): string {
@@ -615,12 +617,6 @@ export default class DocXmlContent extends LightningElementWithState<{
         return [item];
     }
 
-    dropVersionFromDocId(docId: string): string {
-        const curVersion = this.version.id + ".";
-        const filteredDocId = docId.replace(curVersion, "");
-        return filteredDocId;
-    }
-
     addMetatags(): void {
         const div = document.createElement("div");
         div.innerHTML = this.docContent;
@@ -652,16 +648,12 @@ export default class DocXmlContent extends LightningElementWithState<{
                 'link[rel="canonical"]'
             );
             if (metadescription) {
-                const copyPageReference = { ...this.pageReference };
-                copyPageReference.docId = copyPageReference.docId
-                    ? this.dropVersionFromDocId(copyPageReference.docId)
-                    : copyPageReference.docId;
                 metadescription.setAttribute(
                     "href",
                     window.location.protocol +
                         "//" +
                         window.location.host +
-                        this.pageReferenceToString(copyPageReference)
+                        this.pageReferenceToString(this.pageReference)
                 );
             }
         }