From ba72cf7dc83cfe8d81c417f5c3786857e170ed7f Mon Sep 17 00:00:00 2001
From: dm <dm@arillo.net>
Date: Thu, 21 Jan 2021 08:54:29 +0100
Subject: [PATCH] use configurable default colors on reset

---
 README.md                                | 46 ++++++++++++++----------
 public/javascripts/spacedeck_sections.js | 12 ++++---
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 8184ff8..4fbf0ce 100644
--- a/README.md
+++ b/README.md
@@ -47,29 +47,37 @@ See [config/default.json](config/default.json). Set `storage_local_path` for a l
 
 ## Configure color swatches
 
-Add a custom array of swatches to your config/default.json. 
-**You need to include black (#000000) and transparent (rgba(0,0,0,0)) in your custom swatches palette.**
+Add a custom array of swatches to your config/default.json.
+
+**You should include the swatch transparent (rgba(0,0,0,0)) so users can remove the color applied.**
+
+## Configure default colors
+You can define text, stroke and fill color in your config/default.json. 
+
+**You also should include the default colors in your custom swatches palette.**
 
 ```json
 ...
 "spacedeck": {
-    "swatches": [
-      {"id":8, "hex":"#000000"},
-      {"id":30, "hex":"rgba(0,0,0,0)"},
-      {"id":31, "hex": "#E11F26"},
-      {"id":32, "hex": "#9E0F13"},
-      {"id":33, "hex": "#64BCCA"},
-      {"id":34, "hex": "#40808A"},
-      {"id":35, "hex": "#036492"},
-      {"id":36, "hex": "#005179"},
-      {"id":37, "hex": "#84427E"},
-      {"id":38, "hex": "#6C3468"},
-      {"id":39, "hex": "#F79B84"},
-      {"id":40, "hex": "#B57362"},
-      {"id":41, "hex": "#E7D45A"},
-      {"id":42, "hex": "#ACA044"}
-    ]
-  }
+  "default_text_color": "#E11F26",
+  "default_stroke_color": "#9E0F13",
+  "default_fill_color": "#64BCCA",
+  "swatches": [
+    {"id":8, "hex":"#000000"},
+    {"id":30, "hex":"rgba(0,0,0,0)"},
+    {"id":31, "hex": "#E11F26"},
+    {"id":32, "hex": "#9E0F13"},
+    {"id":33, "hex": "#64BCCA"},
+    {"id":34, "hex": "#40808A"},
+    {"id":35, "hex": "#036492"},
+    {"id":36, "hex": "#005179"},
+    {"id":37, "hex": "#84427E"},
+    {"id":38, "hex": "#6C3468"},
+    {"id":39, "hex": "#F79B84"},
+    {"id":40, "hex": "#B57362"},
+    {"id":41, "hex": "#E7D45A"},
+    {"id":42, "hex": "#ACA044"}
+  ]
 }
 ...
 ```
diff --git a/public/javascripts/spacedeck_sections.js b/public/javascripts/spacedeck_sections.js
index da1ba50..b21b601 100644
--- a/public/javascripts/spacedeck_sections.js
+++ b/public/javascripts/spacedeck_sections.js
@@ -109,6 +109,10 @@ var SpacedeckSections = {
     color_picker_hue: 127,
     color_picker_opacity: 255,
 
+    default_text_color: ENV.options.default_text_color ? ENV.options.default_text_color : "#000000",
+    default_stroke_color: ENV.options.default_stroke_color ? ENV.options.default_stroke_color : "#000000",
+    default_fill_color: ENV.options.default_fill_color ? ENV.options.default_fill_color : "#000000",
+
     swatches: ENV.options.swatches ? ENV.options.swatches : [
       {id:1, hex:"#ff00ff"},
       {id:2, hex:"#ffff00"},
@@ -922,10 +926,10 @@ var SpacedeckSections = {
       }
 
       this.hide_toolbar_props();
-      // reset active_style to black for new creation of artifacts
-      this.active_style.text_color = "#000000";
-      this.active_style.stroke_color = "#000000";
-      this.active_style.fill_color = "#000000";
+      // reset active_style to defaults for new creation of artifacts
+      this.active_style.text_color = this.default_text_color;
+      this.active_style.stroke_color = this.default_stroke_color;
+      this.active_style.fill_color = this.default_fill_color;
 
       document.getSelection().removeAllRanges();