Merge pull request #205 from axonivy/disable-theme

Use disable theme for neo
axonivy · Dec 4, 2024 · 18e193d · 18e193d
2 parents 3286e13 + 612a996
commit 18e193d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/integrations/standalone/package.json b/integrations/standalone/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "@axonivy/variable-editor": "*",
     "@axonivy/variable-editor-protocol": "*",
-    "@axonivy/ui-components": "~12.0.1-next.384",
-    "@axonivy/ui-icons": "~12.0.1-next.384",
+    "@axonivy/ui-components": "~12.0.1-next.390",
+    "@axonivy/ui-icons": "~12.0.1-next.390",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/variable-editor/package.json b/packages/variable-editor/package.json
@@ -17,10 +17,10 @@
   "types": "lib/index.d.ts",
   "main": "lib/editor.js",
   "dependencies": {
-    "@axonivy/jsonrpc": "~12.0.1-next.384",
-    "@axonivy/ui-components": "~12.0.1-next.384",
-    "@axonivy/ui-icons": "~12.0.1-next.384",
-    "@axonivy/variable-editor-protocol": "~12.0.1-next",
+    "@axonivy/jsonrpc": "~12.0.1-next.390",
+    "@axonivy/ui-components": "~12.0.1-next.390",
+    "@axonivy/ui-icons": "~12.0.1-next.390",
+    "@axonivy/variable-editor-protocol": "12.0.1-next",
     "@tanstack/react-query": "5.32.1",
     "@tanstack/react-query-devtools": "5.32.1",
     "react": "^18.3.1",

diff --git a/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx b/packages/variable-editor/src/components/variables/master/VariablesMasterToolbar.tsx
@@ -23,13 +23,13 @@ type VariablesMasterToolbarProps = {
 
 export const VariablesMasterToolbar = ({ title }: VariablesMasterToolbarProps) => {
   const { detail, setDetail } = useAppContext();
-  const { theme, setTheme } = useTheme();
+  const { theme, setTheme, disabled } = useTheme();
 
   return (
     <Toolbar className='master-toolbar'>
       <ToolbarTitle>{title}</ToolbarTitle>
       <Flex gap={1}>
-        {theme !== 'system' && (
+        {!disabled && (
           <Popover>
             <PopoverTrigger asChild>
               <Button icon={IvyIcons.Settings} size='large' title='Settings' aria-label='Settings' />