@salesforcedevs/dx-components 1.3.382 → 1.3.384-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.3.382",
+    "version": "1.3.384-alpha",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -45,6 +45,5 @@
     },
     "volta": {
         "node": "18.18.0"
-    },
-    "gitHead": "f0e4ba75f394f5f423187aee45026c53e41ede87"
+    }
 }

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

@@ -31,11 +31,6 @@ pre {
     background-color: var(--dx-g-gray-90);
 }
 
-div.dx-theme-dark {
-    border: var(--dx-g-dark-mode-toggle-button-border);
-    border-radius: var(--dx-code-block-toolbar-border-radius, 0.3em);
-}
-
 .dx-theme-dark .toolbar {
     background-color: var(--dx-g-blue-natural-20);
 }
@@ -45,7 +40,6 @@ div.dx-theme-dark {
     border-left-width: 1px;
     height: var(--dx-g-spacing-md);
     margin-right: var(--dx-g-spacing-xs);
-    margin-top: 6px;
     width: 0;
 }
 
@@ -133,7 +127,3 @@ pre[class*="language-"].line-numbers {
         display: none;
     }
 }
-
-dx-button {
-    --dx-g-button-icon-color: var(--dx-g-cloud-blue-vibrant-50);
-}

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

@@ -4,6 +4,13 @@ import cx from "classnames";
 import { track as gtmTrack } from "dxUtils/analytics";
 import prism from "dxUtils/prismjs";
 import { ampscript, sqlDocsTemplate } from "./customLanguages";
+import {
+    DARK_MODE_THEMES,
+    DARKMODE_TOGGLE_EVENT_NAME,
+    dispatchDarkModeToggleEvent,
+    getLocalStorageDarkModeSetting,
+    setLocalStorageDarkModeSetting
+} from "dx/darkModeManager";
 
 /*
     Here we create custom syntax highlighting rules for proprietary languages
@@ -37,8 +44,6 @@ const preTagRegexp: RegExp = /^<pre.*?>(.*)<\/pre>$/is;
 
 export const LIGHT = "light";
 export const DARK = "dark";
-export const EVENT_NAME = "dx-codeblock-theme";
-const THEMES = [LIGHT, DARK];
 
 export default class CodeBlock extends LightningElement {
     @api defaultTheme: CodeBlockTheme = LIGHT;
@@ -94,18 +99,18 @@ export default class CodeBlock extends LightningElement {
     ];
 
     private initializeDarkMode() {
-        window.addEventListener(EVENT_NAME, this.toggleTheme);
-        const darkModeSetting = localStorage.getItem(
-            EVENT_NAME
-        ) as CodeBlockTheme;
-        if (THEMES.includes(darkModeSetting)) {
+        window.addEventListener(DARKMODE_TOGGLE_EVENT_NAME, this.toggleTheme);
+        const darkModeSetting =
+            getLocalStorageDarkModeSetting() as CodeBlockTheme;
+        if (DARK_MODE_THEMES.includes(darkModeSetting)) {
             this.theme = darkModeSetting;
-        } else {
-            this.theme = this.defaultTheme;
         }
     }
 
     connectedCallback() {
+        if (!this.theme) {
+            this.theme = this.defaultTheme;
+        }
         this.initializeDarkMode();
     }
 
@@ -273,12 +278,12 @@ export default class CodeBlock extends LightningElement {
             element_title: this.updateThemeBtnText,
             content_category: "code block"
         });
-        window.dispatchEvent(new Event(EVENT_NAME));
+        dispatchDarkModeToggleEvent();
     }
 
     private toggleTheme = () => {
         this.theme = this.theme === DARK ? LIGHT : DARK;
-        localStorage.setItem(EVENT_NAME, this.theme);
+        setLocalStorageDarkModeSetting(this.theme);
     };
 
     renderedCallback() {
@@ -296,6 +301,9 @@ export default class CodeBlock extends LightningElement {
     }
 
     disconnectedCallback(): void {
-        window.removeEventListener(EVENT_NAME, this.toggleTheme);
+        window.removeEventListener(
+            DARKMODE_TOGGLE_EVENT_NAME,
+            this.toggleTheme
+        );
     }
 }

package/src/modules/dx/featureFlag/featureFlag.ts

@@ -3,7 +3,8 @@ import optimizelySdk from "@optimizely/optimizely-sdk";
 
 // This is needed to specify user context (such as logged in, admin, ...etc).
 // leave this as hard-coded for now until we create audiences in Optimizely.
-const userId = "user123";
+const userId = "salesforce-sf";
+const LOCAL_ENVIRONMENT_SDK_KEY = "Nnshyv1nTg7DWexu5rEeT";
 
 export default class FeatureFlag extends LightningElement {
     @api flag!: string;
@@ -15,8 +16,19 @@ export default class FeatureFlag extends LightningElement {
     }
 
     connectedCallback(): void {
+        const sdkKey = process.env.OPTIMIZELY_SDK_KEY;
+        const datafileAccessToken =
+            process.env.OPTIMIZELY_DATAFILE_ACCESS_TOKEN;
+        const datafileOptions =
+            sdkKey && datafileAccessToken
+                ? {
+                      urlTemplate: `https://config.optimizely.com/datafiles/auth/${sdkKey}.json`,
+                      datafileAccessToken: datafileAccessToken
+                  }
+                : undefined;
         this.optimizelyInstance = optimizelySdk.createInstance({
-            sdkKey: process.env.OPTIMIZELY_SDK_KEY
+            sdkKey: process.env.OPTIMIZELY_SDK_KEY || LOCAL_ENVIRONMENT_SDK_KEY,
+            datafileOptions
         });
     }
 

package/src/modules/dx/featuredContentHeader/featuredContentHeader.css

@@ -46,7 +46,7 @@
 
 @media screen and (max-width: 500px) {
     .title-bar {
-        padding: 0 30px;
+        padding: 0 40px;
         height: 125px;
         display: block;
         align-items: center;

package/src/modules/dx/featuredContentHeader/featuredContentHeader.html

@@ -13,14 +13,14 @@
                 <div>
                     <slot name="language-selector"></slot>
                 </div>
-                <template lwc:if={isDarkModeEnabled}>
+                <dx-feature-flag flag="dark-mode">
                     <div
                         class="dark-mode-button"
                         onclick={onDarkModeButtonClick}
                     >
                         <div class="dark-mode-icon"></div>
                     </div>
-                </template>
+                </dx-feature-flag>
             </div>
         </div>
         <div class="container-layout">

package/LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.