@salesforcedevs/dx-components 0.10.1-alpha.9 → 0.10.1-alpha.93

package/src/modules/dx/codeBlock/codeBlock.stories.ts

@@ -16,7 +16,7 @@ const styles = `
   }
 </style>`;
 
-export const DarkTheme = (args: any) => `${styles}
+export const Base = (args: any) => `${styles}
 
 <span class="dx-text-heading-7 dx-code-block-heading">XML Example - Dark Theme</span>
 <dx-code-block
@@ -98,74 +98,7 @@ export const DarkTheme = (args: any) => `${styles}
       language="php"
       default-theme="dark"
   ></dx-code-block>`;
-DarkTheme.args = mockProps;
-
-export const LightTheme = (args: any) => `${styles}
-
-<span class="dx-text-heading-7 dx-code-block-heading">XML Example - Light Theme</span>
-<dx-code-block
-    title="XML example"
-    code-block="${args.xml}"
-    language="xml
-></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Visualforce Example - Light Theme</span>
-  <dx-code-block
-      title="Visualforce example"
-      code-block="${args.visualforce}"
-      language="visualforce"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Java Example - Light Theme</span>
-  <dx-code-block
-      title="Java example"
-      code-block="${args.java}"
-      language="java"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Light Theme</span>
-  <dx-code-block
-      title="HTML Example"
-      code-block="${args.html}"
-      source-link="http://www.salesforce.com"
-      language="html"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">TypeScript Example - Light Theme</span>
-  <dx-code-block
-      title="TypeScript example"
-      code-block="${args.TypeScript}"
-      language="TypeScript"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Light Theme</span>
-  <dx-code-block
-      title="CSS example"
-      code-block="${args.css}"
-      language="css"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Apex Example - Light Theme</span>
-  <dx-code-block
-      title="Apex example"
-      code-block="${args.apex}"
-      language="apex"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">No Language Example - Light Theme</span>
-  <dx-code-block
-      title="No Language"
-      code-block="${args.apex}"
-  ></dx-code-block>
-
-  <span class="dx-text-heading-7 dx-code-block-heading">Light Theme</span>
-  <dx-code-block
-      title="PHP Example"
-      code-block="${args.php}"
-      language="php"
-  ></dx-code-block>`;
-
-LightTheme.args = mockProps;
+Base.args = mockProps;
 
 export const PreTag = (args: any) => `${styles}
     <span class="dx-text-heading-7 dx-code-block-heading">Dark Theme</span>

package/src/modules/dx/codeBlock/codeBlock.ts

@@ -106,7 +106,11 @@ export default class CodeBlock extends LightningElement {
             )} --></pre>`;
         } else {
             // eslint-disable-next-line
-            templateEl.innerHTML = `<pre class='codeblock'>${this.codeBlock}</pre>`;
+            const innerHtml = this.isEncoded
+                ? this.codeBlock
+                : this.codeBlock.replace(/</g, "&lt").replace(/>/g, "&gt");
+
+            templateEl.innerHTML = `<pre class='codeblock'>${innerHtml}</pre>`;
         }
         const codeBlockEls = templateEl.content.querySelectorAll("pre");
         codeBlockEls.forEach((codeBlockEl) => {

package/src/modules/dx/codeBlock/darkTheme.css

@@ -19,7 +19,6 @@
 }
 
 .dx-theme-dark .token.operator {
-    background-color: var(--dx-g-blue-vibrant-20);
     color: var(--dx-g-pink-vibrant-65);
 }
 

package/src/modules/dx/codeBlock/lightTheme.css

@@ -16,7 +16,6 @@
 
 .dx-theme-light .token.operator {
     color: var(--dx-g-green-vibrant-50);
-    background-color: #fff;
 }
 
 .dx-theme-light .token.property {

package/src/modules/dx/footer/links.ts

@@ -45,7 +45,7 @@ export const generalLinksRaw = [
         label: "Community",
         options: [
             {
-                href: "https://trailblazers.salesforce.com/",
+                href: "https://trailhead.salesforce.com/trailblazer-community/feed",
                 label: "Trailblazer Community"
             },
             {
@@ -90,13 +90,11 @@ export const intellectualHref =
 export const termsLinks = [
     { href: privacyHref, label: "Privacy Statement" },
     {
-        href:
-            "https://trailblazer.me/resource/documents/documents/pdf/TermsOfUse_en_US.pdf",
+        href: "https://trailblazer.me/resource/documents/documents/pdf/TermsOfUse_en_US.pdf",
         label: "Terms of Use"
     },
     {
-        href:
-            "https://www.salesforce.com/company/privacy/full_privacy/#nav_info",
+        href: "https://www.salesforce.com/company/privacy/full_privacy/#nav_info",
         label: "Use of Cookies"
     },
     { href: "https://trust.salesforce.com/en/", label: "Trust" }