Merge pull request #1144 from merico-dev/1142-cant-change-a-variables…

…-color-type-from-continuous-to-static 1142 cant change a variables color type from continuous to static
merico-dev · Aug 23, 2023 · 7b76466 · 7b76466
2 parents 7cb105f + 65a4781
commit 7b76466
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.23.0",
+  "version": "10.23.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.23.0",
+  "version": "10.23.1",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/dashboard/src/utils/template/editor/variable-style.tsx b/dashboard/src/utils/template/editor/variable-style.tsx
@@ -25,6 +25,27 @@ export const TemplateVariableStyleField = React.forwardRef(function _TemplateVar
     onChange(v);
   };
 
+  const changeColor = (c: 'static' | 'continuous') => {
+    if (c === 'static') {
+      onChange({
+        ...value,
+        color: {
+          type: 'static',
+          staticColor: '#25262B',
+        },
+      });
+      return;
+    }
+    onChange({
+      ...value,
+      color: {
+        type: 'continuous',
+        colorRange: [],
+        valueRange: [],
+      },
+    });
+  };
+
   return (
     <>
       <Divider my="xs" label="Typography" labelPosition="center" />
@@ -51,7 +72,7 @@ export const TemplateVariableStyleField = React.forwardRef(function _TemplateVar
             { label: 'Continuous Color', value: 'continuous' },
           ]}
           value={value.color.type}
-          onChange={(v) => handleChange('color.type', v)}
+          onChange={changeColor}
         />
         {colorType === 'static' && (
           <MantineColorSelector

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.23.0",
+  "version": "10.23.1",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.23.0",
+  "version": "10.23.1",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.23.0",
+  "version": "10.23.1",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"