datastake-daf 0.6.680 → 0.6.682

package/dist/layouts/index.js

@@ -5890,7 +5890,8 @@ function MobileDrawer({
   appName = 'app',
   userHelpers = {},
   isDev = false,
-  selectedProject
+  selectedProject,
+  theme = {}
 }) {
   const items = o.useMemo(() => sidenavConfig[mod] || [], [sidenavConfig, mod]);
   const canViewPartners = o.useMemo(() => mod === 'tazama', [mod]);
@@ -5988,7 +5989,7 @@ function MobileDrawer({
     children: /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "drawer",
       children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: formatClassname(['sidenav-sider sidenav-sider-opened flex-1', appName]),
+        className: formatClassname(['sidenav-sider sidenav-sider-opened flex-1', appName, theme.customHeaderColor && 'custom']),
         style: {
           width: '250px',
           minWidth: '250px'
@@ -6050,7 +6051,8 @@ const UserDropdownMenu = ({
   checkPermission = () => false,
   appName = 'app',
   userHelpers = {},
-  isDev = false
+  isDev = false,
+  theme = {}
 }) => {
   const resizeContext = useResizeContext();
   const {
@@ -6115,13 +6117,14 @@ const UserDropdownMenu = ({
       checkPermission: checkPermission,
       logOut: logOut,
       changeNotificationState: changeNotificationState,
-      appName: appName
+      appName: appName,
+      theme: theme
     })]
   }) : /*#__PURE__*/jsxRuntime.jsx(antd.Dropdown, {
     open: true,
     trigger: "click",
     placement: "bottomLeft",
-    rootClassName: formatClassname(['user-dropdown-layout', appName]),
+    rootClassName: formatClassname(['user-dropdown-layout', appName, theme.customHeaderColor && 'custom']),
     menu: {
       items: [{
         label: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -8262,7 +8265,6 @@ function AppLayout({
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
             className: "flex flex-column",
             children: /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
-              open: true,
               className: "ln-22 dark-select language-select",
               style: {
                 color: 'white',
@@ -8311,7 +8313,8 @@ function AppLayout({
               checkPermission: checkPermission,
               appName: appName,
               userHelpers: userHelpers,
-              isDev: isDev
+              isDev: isDev,
+              theme: theme
             })
           })]
         })]

package/dist/style/datastake/datastake.css

@@ -1927,6 +1927,20 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   background-color: var(--base-gray-30) !important;
 }
 
+.ant-dropdown.user-dropdown-layout.custom
+.ant-dropdown-menu-ant-dropdown-menu-vertical.ant-dropdown-menu-light 
+.ant-dropdown-menu-item
+.ant-dropdown-menu-title-content
+.drop-header h4,
+.ant-dropdown.user-dropdown-layout.custom
+.ant-dropdown-menu-ant-dropdown-menu-vertical.ant-dropdown-menu-light 
+.ant-dropdown-menu-item
+.ant-dropdown-menu-title-content
+.list .list-item
+{
+  color: var(--header-text-color, white) !important;
+}
+
 .ant-menu.ant-menu-sub.ant-menu-inline {
   background-color: var(--base-gray-110) !important;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.680",
+	"version": "0.6.682",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/layouts/AppLayout/components/MobileDrawer/index.js

@@ -27,6 +27,7 @@ export default function MobileDrawer({
   userHelpers = {},
   isDev = false,
   selectedProject,
+  theme = {},
 }) {
   const items = useMemo(() => sidenavConfig[mod] || [], [sidenavConfig, mod]);
   
@@ -158,7 +159,8 @@ export default function MobileDrawer({
         <div
           className={formatClassname([
             isCollapsed ? 'sidenav-sider-collapsed sidenav-sider flex-1' : 'sidenav-sider sidenav-sider-opened flex-1', 
-            appName
+            appName,
+            theme.customHeaderColor && 'custom'
           ])}
           style={{ width: isCollapsed ? '70px' : '250px', minWidth: isCollapsed ? 'auto' : '250px' }}
         >

package/src/@daf/layouts/AppLayout/components/UserDropdown/index.js

@@ -22,6 +22,7 @@ export const UserDropdownMenu = ({
   appName = 'app',
   userHelpers = {},
   isDev = false,
+  theme = {},
 }) => {
   const resizeContext = useResizeContext();
   const { windowWidth } = resizeContext || {};
@@ -83,6 +84,7 @@ export const UserDropdownMenu = ({
         logOut={logOut}
         changeNotificationState={changeNotificationState}
         appName={appName}
+        theme={theme}
       />
     </div>
   ) : (
@@ -90,7 +92,7 @@ export const UserDropdownMenu = ({
       open={true}
       trigger="click"
       placement="bottomLeft"
-      rootClassName={formatClassname(['user-dropdown-layout', appName])}
+      rootClassName={formatClassname(['user-dropdown-layout', appName, theme.customHeaderColor && 'custom'])}
       menu={{
         items: [
           {

package/src/@daf/layouts/AppLayout/index.jsx

@@ -362,7 +362,6 @@ function AppLayout({
             
             <div className="flex flex-column">
               <Select
-                open={true}
                 className="ln-22 dark-select language-select"
                 style={{ color: 'white', height: '30px' }}
                 defaultValue={StorageManager.get('datastakeLng') || 'en'}
@@ -407,6 +406,7 @@ function AppLayout({
                 appName={appName}
                 userHelpers={userHelpers}
                 isDev={isDev}
+                theme={theme}
               />
             </div>
           </div>

package/src/styles/datastake/datastake.css

@@ -1927,6 +1927,20 @@ ul.ant-menu.ant-menu-dark.ant-menu-root.ant-menu-vertical::-webkit-scrollbar-thu
   background-color: var(--base-gray-30) !important;
 }
 
+.ant-dropdown.user-dropdown-layout.custom
+.ant-dropdown-menu-ant-dropdown-menu-vertical.ant-dropdown-menu-light 
+.ant-dropdown-menu-item
+.ant-dropdown-menu-title-content
+.drop-header h4,
+.ant-dropdown.user-dropdown-layout.custom
+.ant-dropdown-menu-ant-dropdown-menu-vertical.ant-dropdown-menu-light 
+.ant-dropdown-menu-item
+.ant-dropdown-menu-title-content
+.list .list-item
+{
+  color: var(--header-text-color, white) !important;
+}
+
 .ant-menu.ant-menu-sub.ant-menu-inline {
   background-color: var(--base-gray-110) !important;
 }