From eee28d74ab703c30bf49d4aa15395de30a068ab8 Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Thu, 25 Jun 2026 15:51:54 +0200
Subject: [PATCH 01/11] fix: dark canvas background color table

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/resources/less/colors-table-night.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less
index e821f4fff5..db0070f44f 100644
--- a/apps/common/main/resources/less/colors-table-night.less
+++ b/apps/common/main/resources/less/colors-table-night.less
@@ -87,7 +87,7 @@
         // Canvas
 
         --canvas-background: #222222;
-        --canvas-content-background: #fff;
+        --canvas-content-background: red;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #222;

From d9909bead63733614e7129759c05f003e93b9bad Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Fri, 3 Jul 2026 18:10:26 +0200
Subject: [PATCH 02/11] revert debug value: --canvas-content-background back to
 #fff

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/resources/less/colors-table-night.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less
index db0070f44f..e821f4fff5 100644
--- a/apps/common/main/resources/less/colors-table-night.less
+++ b/apps/common/main/resources/less/colors-table-night.less
@@ -87,7 +87,7 @@
         // Canvas
 
         --canvas-background: #222222;
-        --canvas-content-background: red;
+        --canvas-content-background: #fff;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #222;

From 150eac46d63eb9f317e36b3e37ff92a438523b4d Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Fri, 3 Jul 2026 18:10:50 +0200
Subject: [PATCH 03/11] task5: add canvas-cell-background/grid/text theme
 tokens

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/lib/controller/Themes.js                      | 3 +++
 apps/common/main/resources/less/colors-table-classic.less      | 2 ++
 .../common/main/resources/less/colors-table-dark-contrast.less | 3 +++
 apps/common/main/resources/less/colors-table-dark.less         | 3 +++
 apps/common/main/resources/less/colors-table-gray.less         | 2 ++
 apps/common/main/resources/less/colors-table-night.less        | 3 +++
 apps/common/main/resources/less/colors-table-white.less        | 2 ++
 7 files changed, 18 insertions(+)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 1341a07438..11c9fec88f 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -727,6 +727,9 @@ define([
 
         "canvas-background",
         "canvas-content-background",
+        "canvas-cell-background",
+        "canvas-cell-grid",
+        "canvas-cell-text",
         "canvas-page-border",
 
         "canvas-ruler-background",
diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less
index e39ddef82b..5d15d0ca79 100644
--- a/apps/common/main/resources/less/colors-table-classic.less
+++ b/apps/common/main/resources/less/colors-table-classic.less
@@ -85,6 +85,8 @@
 
         --canvas-background: #e2e2e2;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #ffffff;
+        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #bbbec2;
 
         --canvas-ruler-background: #fff;
diff --git a/apps/common/main/resources/less/colors-table-dark-contrast.less b/apps/common/main/resources/less/colors-table-dark-contrast.less
index 53ce7dda99..3e5f2c4284 100644
--- a/apps/common/main/resources/less/colors-table-dark-contrast.less
+++ b/apps/common/main/resources/less/colors-table-dark-contrast.less
@@ -88,6 +88,9 @@
 
         --canvas-background: #121212;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #1e1e1e;
+        --canvas-cell-grid: #444444;
+        --canvas-cell-text: #ffffff;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #414141;
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index 134847b3ec..63018de996 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -89,6 +89,9 @@
 
         --canvas-background: #555;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #3a3a3a;
+        --canvas-cell-grid: #555555;
+        --canvas-cell-text: #e8e8e8;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #555;
diff --git a/apps/common/main/resources/less/colors-table-gray.less b/apps/common/main/resources/less/colors-table-gray.less
index c0c8c3d54e..9c53608593 100644
--- a/apps/common/main/resources/less/colors-table-gray.less
+++ b/apps/common/main/resources/less/colors-table-gray.less
@@ -88,6 +88,8 @@
 
         --canvas-background: #eee;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #ffffff;
+        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #fff;
diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less
index e821f4fff5..afdab8bad4 100644
--- a/apps/common/main/resources/less/colors-table-night.less
+++ b/apps/common/main/resources/less/colors-table-night.less
@@ -88,6 +88,9 @@
 
         --canvas-background: #222222;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #3a3a3a;
+        --canvas-cell-grid: #555555;
+        --canvas-cell-text: #e8e8e8;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #222;
diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less
index 691a5dc203..c76bddabd5 100644
--- a/apps/common/main/resources/less/colors-table-white.less
+++ b/apps/common/main/resources/less/colors-table-white.less
@@ -88,6 +88,8 @@
 
         --canvas-background: #f3f3f3;
         --canvas-content-background: #fff;
+        --canvas-cell-background: #ffffff;
+        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #fff;

From 0fb30af8e0f6255dae13f01f0c71bb99a3645f48 Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Wed, 8 Jul 2026 18:26:32 +0200
Subject: [PATCH 04/11] add darkMode to spreadsheeteditor (web-apps/issues/117)
 need related sdkjs commit too

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 .../main/resources/img/toolbar/icons.svg      |  4 +++
 .../main/app/controller/ViewTab.js            | 19 +++++++++++++-
 .../main/app/view/Toolbar.js                  |  1 +
 .../main/app/view/ViewTab.js                  | 26 +++++++++++++++++++
 .../main/resources/img/toolbar/icons.svg      |  4 +++
 .../img/toolbar/v2/2.5x/big/btn-dark-mode.svg |  5 ++++
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-dark-mode.svg

diff --git a/apps/common/main/resources/img/toolbar/icons.svg b/apps/common/main/resources/img/toolbar/icons.svg
index 62825da5b9..0f81bf1b5c 100644
--- a/apps/common/main/resources/img/toolbar/icons.svg
+++ b/apps/common/main/resources/img/toolbar/icons.svg
@@ -1177,6 +1177,10 @@
 </symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-custom-sort">
     <path d="M5.5 8.5v13a1 1 0 0 0 1 1h15a1 1 0 0 0 1-1v-13m-17 0v-2a1 1 0 0 1 1-1h15a1 1 0 0 1 1 1v2m-17 0h17" class="icon-stroke-gray-primary"/>
     <path d="M10.5 19.5v-8m0 0-2.121 2.121M10.5 11.5l2.121 2.121M17.5 11.5v8m0 0-2.121-2.121M17.5 19.5l2.121-2.121" class="icon-stroke-blue-primary"/>
+</symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-dark-mode">
+      <path d="M20.5 23.5h-13a1 1 0 0 1-1-1v-17a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v17a1 1 0 0 1-1 1Z" class="icon-stroke-gray-primary"/>
+      <path d="M18 15a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" class="icon-stroke-gray-primary"/>
+    <path d="M14 19a4 4 0 0 0 0-8v8Z" fill="currentColor" class="icon-fill-gray-primary"/>
 </symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-data-validation">
     <path d="M15.5 8.5h-10a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h10m0 4h-10a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h10" class="icon-stroke-gray-primary"/>
     <path d="m18.5 17 4 3m1-1.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" class="icon-stroke-red"/>
diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
index 311ebb29da..eb84908afa 100644
--- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
@@ -99,7 +99,8 @@ define([
                     'viewtab:viewmode': this.onPreviewMode,
                     'macros:click':  this.onClickMacros,
                     'macros:record':  _.bind(this.onClickMacrosRec, this),
-                    'macros:pause':  _.bind(this.onClickMacrosPause, this)
+                    'macros:pause':  _.bind(this.onClickMacrosPause, this),
+                    'darkmode:change': _.bind(this.onChangeDarkMode, this)
                 },
                 'Statusbar': {
                     'sheet:changed': this.onApiSheetChanged.bind(this),
@@ -296,9 +297,25 @@ define([
                     this.view.btnInterfaceTheme.menu.clearAll(true);
                     menu_item.setChecked(true, true);
                 }
+                Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [this.view.btnDarkDocument]});
             }
         },
 
+        onChangeDarkMode: function (isdarkmode) {
+            if (!this._darkModeTimer) {
+                var me = this;
+                me._darkModeTimer = setTimeout(function() {
+                    me._darkModeTimer = undefined;
+                }, 500);
+                Common.UI.Themes.setContentTheme(isdarkmode ? 'dark' : 'light');
+            } else
+                this.onContentThemeChangedToDark(Common.UI.Themes.isContentThemeDark());
+        },
+
+        onContentThemeChangedToDark: function (isdark) {
+            this.view && this.view.btnDarkDocument.toggle(isdark, true);
+        },
+
         onTabStyleChange: function () {
             if (this.view && this.view.menuTabStyle) {
                 _.each(this.view.menuTabStyle.items, function(item){
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index bcddadf432..c73105543f 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -108,6 +108,7 @@ define([
         userProtected: 'cell-user-protected',
         pageBreakLock: 'page-break-lock',
         externalChartProtected: 'external-chart-protected',
+        inLightTheme:   'light-theme',
         fileMenuOpened: 'file-menu-opened',
         cantMergeShape: 'merge-shape-lock',
         cantSave: 'cant-save',
diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js
index e73cb8b6fa..f3dbb55574 100644
--- a/apps/spreadsheeteditor/main/app/view/ViewTab.js
+++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js
@@ -66,6 +66,7 @@ define([
             '<div class="separator long"></div>' +
             '<div class="group">' +
                 '<span class="btn-slot text x-huge" id="slot-btn-interface-theme"></span>' +
+                '<span class="btn-slot text x-huge" id="slot-btn-dark-document"></span>' +
             '</div>' +
             '<div class="separator long separator-theme"></div>' +
             '<div class="group sheet-freeze">' +
@@ -171,6 +172,9 @@ define([
             me.chRightMenu.on('change', _.bind(function (checkbox, state) {
                 me.fireEvent('rightmenu:hide', [me.chRightMenu, state === 'checked']);
             }, me));
+            me.btnDarkDocument.on('click', _.bind(function (e) {
+                me.fireEvent('darkmode:change', [e.pressed]);
+            }, me));
             me.btnMacros && me.btnMacros.on('click', function () {
                 me.fireEvent('macros:click');
             });
@@ -384,6 +388,18 @@ define([
                 });
                 this.lockedControls.push(this.btnInterfaceTheme);
 
+                this.btnDarkDocument = new Common.UI.Button({
+                    cls: 'btn-toolbar x-huge icon-top',
+                    iconCls: 'toolbar__icon btn-dark-mode',
+                    lock: [_set.inLightTheme],
+                    caption: this.textDarkDocument,
+                    enableToggle: true,
+                    dataHint: '1',
+                    dataHintDirection: 'bottom',
+                    dataHintOffset: 'small'
+                });
+                this.lockedControls.push(this.btnDarkDocument);
+
                 this.chFormula = new Common.UI.CheckBox({
                     labelText: this.textFormula,
                     value: !Common.localStorage.getBool('sse-hidden-formula'),
@@ -454,6 +470,7 @@ define([
                 this.cmbZoom.setValue(100);
                 $host.find('#slot-lbl-zoom').text(this.textZoom);
                 this.btnInterfaceTheme.render($host.find('#slot-btn-interface-theme'));
+                this.btnDarkDocument.render($host.find('#slot-btn-dark-document'));
                 this.chFormula.render($host.find('#slot-chk-formula'));
                 this.chStatusbar.render($host.find('#slot-chk-statusbar'));
                 this.chToolbar.render($host.find('#slot-chk-toolbar'));
@@ -490,6 +507,7 @@ define([
                     }
                     me.btnMacros && me.btnMacros.updateHint(me.tipMacros);
                     me.btnInterfaceTheme.updateHint(me.tipInterfaceTheme);
+                    me.btnDarkDocument.updateHint(me.tipDarkDocument);
                     me.btnRecMacro && me.btnRecMacro.updateHint(me.tipRecMacro);
                     me.btnPauseMacro && me.btnPauseMacro.updateHint(me.tipPauseMacro);
 
@@ -618,7 +636,13 @@ define([
                             me.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
                                 var value = item.value;
                                 Common.UI.Themes.setTheme(value);
+                                Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [me.btnDarkDocument]});
                             }, me));
+
+                            setTimeout(function () {
+                                me.btnDarkDocument.toggle(Common.UI.Themes.isContentThemeDark(), true);
+                                Common.Utils.lockControls(Common.enumLock.inLightTheme, !Common.UI.Themes.isDarkTheme(), {array: [me.btnDarkDocument]});
+                            }, 0);
                         }
                     }
 
@@ -736,6 +760,8 @@ define([
             textInterfaceTheme: 'Interface theme',
             textShowFrozenPanesShadow: 'Show frozen panes shadow',
             tipInterfaceTheme: 'Interface theme',
+            textDarkDocument: 'Dark document',
+            tipDarkDocument: 'Dark document',
             textLeftMenu: 'Left panel',
             textRightMenu: 'Right panel',
             txtViewNormal: 'Normal',
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/icons.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/icons.svg
index aa0c3e139d..67e880a550 100644
--- a/apps/spreadsheeteditor/main/resources/img/toolbar/icons.svg
+++ b/apps/spreadsheeteditor/main/resources/img/toolbar/icons.svg
@@ -832,6 +832,10 @@
 </symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-custom-sort">
     <path d="M5.5 8.5v13a1 1 0 0 0 1 1h15a1 1 0 0 0 1-1v-13m-17 0v-2a1 1 0 0 1 1-1h15a1 1 0 0 1 1 1v2m-17 0h17" class="icon-stroke-gray-primary"/>
     <path d="M10.5 19.5v-8m0 0-2.121 2.121M10.5 11.5l2.121 2.121M17.5 11.5v8m0 0-2.121-2.121M17.5 19.5l2.121-2.121" class="icon-stroke-blue-primary"/>
+</symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-dark-mode">
+      <path d="M20.5 23.5h-13a1 1 0 0 1-1-1v-17a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v17a1 1 0 0 1-1 1Z" class="icon-stroke-gray-primary"/>
+      <path d="M18 15a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" class="icon-stroke-gray-primary"/>
+    <path d="M14 19a4 4 0 0 0 0-8v8Z" fill="currentColor" class="icon-fill-gray-primary"/>
 </symbol><symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none" id="btn-data-validation">
     <path d="M15.5 8.5h-10a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h10m0 4h-10a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h10" class="icon-stroke-gray-primary"/>
     <path d="m18.5 17 4 3m1-1.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" class="icon-stroke-red"/>
diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-dark-mode.svg b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-dark-mode.svg
new file mode 100644
index 0000000000..885cbad213
--- /dev/null
+++ b/apps/spreadsheeteditor/main/resources/img/toolbar/v2/2.5x/big/btn-dark-mode.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none">
+      <path d="M20.5 23.5h-13a1 1 0 0 1-1-1v-17a1 1 0 0 1 1-1h13a1 1 0 0 1 1 1v17a1 1 0 0 1-1 1Z" class="icon-stroke-gray-primary"/>
+      <path d="M18 15a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" class="icon-stroke-gray-primary"/>
+    <path d="M14 19a4 4 0 0 0 0-8v8Z" fill="currentColor" class="icon-fill-gray-primary"/>
+</svg>

From 4f6d7d27e42ec57b9e0b6a47f32b6f068190c748 Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Thu, 9 Jul 2026 18:48:53 +0200
Subject: [PATCH 05/11] Remove unused canvas-cell-text theme token (superseded
 by per-color dark-mode correction)

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/lib/controller/Themes.js                       | 1 -
 apps/common/main/resources/less/colors-table-dark-contrast.less | 1 -
 apps/common/main/resources/less/colors-table-dark.less          | 1 -
 apps/common/main/resources/less/colors-table-night.less         | 1 -
 4 files changed, 4 deletions(-)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 11c9fec88f..f892954cf1 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -729,7 +729,6 @@ define([
         "canvas-content-background",
         "canvas-cell-background",
         "canvas-cell-grid",
-        "canvas-cell-text",
         "canvas-page-border",
 
         "canvas-ruler-background",
diff --git a/apps/common/main/resources/less/colors-table-dark-contrast.less b/apps/common/main/resources/less/colors-table-dark-contrast.less
index 3e5f2c4284..4a560f8c1f 100644
--- a/apps/common/main/resources/less/colors-table-dark-contrast.less
+++ b/apps/common/main/resources/less/colors-table-dark-contrast.less
@@ -90,7 +90,6 @@
         --canvas-content-background: #fff;
         --canvas-cell-background: #1e1e1e;
         --canvas-cell-grid: #444444;
-        --canvas-cell-text: #ffffff;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #414141;
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index 63018de996..fe81d9b826 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -91,7 +91,6 @@
         --canvas-content-background: #fff;
         --canvas-cell-background: #3a3a3a;
         --canvas-cell-grid: #555555;
-        --canvas-cell-text: #e8e8e8;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #555;
diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less
index afdab8bad4..fffa30ec9f 100644
--- a/apps/common/main/resources/less/colors-table-night.less
+++ b/apps/common/main/resources/less/colors-table-night.less
@@ -90,7 +90,6 @@
         --canvas-content-background: #fff;
         --canvas-cell-background: #3a3a3a;
         --canvas-cell-grid: #555555;
-        --canvas-cell-text: #e8e8e8;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #222;

From 6c410ef58edf7394d9fd67ca63c839c8f30a03fc Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Thu, 9 Jul 2026 18:49:40 +0200
Subject: [PATCH 06/11] follow documenteditor logic for
 onLaunch/NotificationCenter

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/spreadsheeteditor/main/app/controller/ViewTab.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
index eb84908afa..f6677f736a 100644
--- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
@@ -50,6 +50,7 @@ define([
         onLaunch: function () {
             this._state = {};
             Common.NotificationCenter.on('uitheme:changed', this.onThemeChanged.bind(this));
+            Common.NotificationCenter.on('contenttheme:dark', this.onContentThemeChangedToDark.bind(this));
             Common.NotificationCenter.on('tabstyle:changed', this.onTabStyleChange.bind(this));
         },
 

From 0cdb2398e5c3952d84ef58bb53381edd1604e093 Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Wed, 15 Jul 2026 17:14:43 +0200
Subject: [PATCH 07/11] Document dark-mode toggle debounce matches
 documenteditor

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/spreadsheeteditor/main/app/controller/ViewTab.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
index f6677f736a..ee630cb65e 100644
--- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
@@ -303,6 +303,9 @@ define([
         },
 
         onChangeDarkMode: function (isdarkmode) {
+            // Same timer method/500ms duration guard as documenteditor's ViewTab.js (kept consistent with it on purpose).
+            // using setTimeout look hacky, but not blocking for the UX. 
+            // TODO: see how this can be improved in both editors
             if (!this._darkModeTimer) {
                 var me = this;
                 me._darkModeTimer = setTimeout(function() {

From ec7aad3ad1cf4af832ab492c4e00f801a22250f7 Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Thu, 30 Jul 2026 17:17:20 +0200
Subject: [PATCH 08/11] End session custom transversal re-review : Clean up
 dark-mode toggle debounce comment in ViewTab.js

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/spreadsheeteditor/main/app/controller/ViewTab.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
index ee630cb65e..86dbc2abf0 100644
--- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js
+++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js
@@ -303,9 +303,8 @@ define([
         },
 
         onChangeDarkMode: function (isdarkmode) {
-            // Same timer method/500ms duration guard as documenteditor's ViewTab.js (kept consistent with it on purpose).
-            // using setTimeout look hacky, but not blocking for the UX. 
-            // TODO: see how this can be improved in both editors
+            // same 500ms debounce as documenteditor's ViewTab.js already had
+            // TODO: look if is not a better solution
             if (!this._darkModeTimer) {
                 var me = this;
                 me._darkModeTimer = setTimeout(function() {

From b9def6b8d9aa7c5acbb9d2dd82e4070f2cdce00d Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Thu, 30 Jul 2026 19:01:50 +0200
Subject: [PATCH 09/11] Guard asc_setContentDarkMode calls against a sdkjs PR
 not landed yet

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/lib/controller/Themes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index f892954cf1..f4e9f40736 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -570,7 +570,7 @@ define([
                 if ( set_dark != window.uitheme.iscontentdark || force ) {
                     window.uitheme.iscontentdark = set_dark;
 
-                    if ( this.isDarkTheme() )
+                    if ( this.isDarkTheme() && this.api.asc_setContentDarkMode )
                         this.api.asc_setContentDarkMode(set_dark);
 
                     if ( !(keep === false) && Common.localStorage.getItem('content-theme') != mode )
@@ -584,7 +584,7 @@ define([
                 window.uitheme.iscontentdark = !window.uitheme.iscontentdark;
                 Common.localStorage.setItem('content-theme', window.uitheme.iscontentdark ? 'dark' : 'light');
 
-                if ( this.isDarkTheme() )
+                if ( this.isDarkTheme() && this.api.asc_setContentDarkMode )
                     this.api.asc_setContentDarkMode(window.uitheme.iscontentdark);
 
                 Common.NotificationCenter.trigger('contenttheme:dark', window.uitheme.iscontentdark);

From 6847fa8f2a1fcc3cfaeb29705dd8ce259898856a Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Fri, 31 Jul 2026 15:05:24 +0200
Subject: [PATCH 10/11] Remove dead --canvas-cell-background/--canvas-cell-grid
 CSS tokens

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/lib/controller/Themes.js                       | 2 --
 apps/common/main/resources/less/colors-table-classic.less       | 2 --
 apps/common/main/resources/less/colors-table-dark-contrast.less | 2 --
 apps/common/main/resources/less/colors-table-dark.less          | 2 --
 apps/common/main/resources/less/colors-table-gray.less          | 2 --
 apps/common/main/resources/less/colors-table-night.less         | 2 --
 apps/common/main/resources/less/colors-table-white.less         | 2 --
 7 files changed, 14 deletions(-)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index f4e9f40736..605ff93ce6 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -727,8 +727,6 @@ define([
 
         "canvas-background",
         "canvas-content-background",
-        "canvas-cell-background",
-        "canvas-cell-grid",
         "canvas-page-border",
 
         "canvas-ruler-background",
diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less
index 5d15d0ca79..e39ddef82b 100644
--- a/apps/common/main/resources/less/colors-table-classic.less
+++ b/apps/common/main/resources/less/colors-table-classic.less
@@ -85,8 +85,6 @@
 
         --canvas-background: #e2e2e2;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #ffffff;
-        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #bbbec2;
 
         --canvas-ruler-background: #fff;
diff --git a/apps/common/main/resources/less/colors-table-dark-contrast.less b/apps/common/main/resources/less/colors-table-dark-contrast.less
index 4a560f8c1f..53ce7dda99 100644
--- a/apps/common/main/resources/less/colors-table-dark-contrast.less
+++ b/apps/common/main/resources/less/colors-table-dark-contrast.less
@@ -88,8 +88,6 @@
 
         --canvas-background: #121212;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #1e1e1e;
-        --canvas-cell-grid: #444444;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #414141;
diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less
index fe81d9b826..134847b3ec 100644
--- a/apps/common/main/resources/less/colors-table-dark.less
+++ b/apps/common/main/resources/less/colors-table-dark.less
@@ -89,8 +89,6 @@
 
         --canvas-background: #555;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #3a3a3a;
-        --canvas-cell-grid: #555555;
         --canvas-page-border: #616161;
 
         --canvas-ruler-background: #555;
diff --git a/apps/common/main/resources/less/colors-table-gray.less b/apps/common/main/resources/less/colors-table-gray.less
index 9c53608593..c0c8c3d54e 100644
--- a/apps/common/main/resources/less/colors-table-gray.less
+++ b/apps/common/main/resources/less/colors-table-gray.less
@@ -88,8 +88,6 @@
 
         --canvas-background: #eee;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #ffffff;
-        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #fff;
diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less
index fffa30ec9f..e821f4fff5 100644
--- a/apps/common/main/resources/less/colors-table-night.less
+++ b/apps/common/main/resources/less/colors-table-night.less
@@ -88,8 +88,6 @@
 
         --canvas-background: #222222;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #3a3a3a;
-        --canvas-cell-grid: #555555;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #222;
diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less
index c76bddabd5..691a5dc203 100644
--- a/apps/common/main/resources/less/colors-table-white.less
+++ b/apps/common/main/resources/less/colors-table-white.less
@@ -88,8 +88,6 @@
 
         --canvas-background: #f3f3f3;
         --canvas-content-background: #fff;
-        --canvas-cell-background: #ffffff;
-        --canvas-cell-grid: #cacaca;
         --canvas-page-border: #ccc;
 
         --canvas-ruler-background: #fff;

From 80f258e469d16eadfefc4cd0328ef9cafc5ae2fa Mon Sep 17 00:00:00 2001
From: j-base64 <jcentenero@arsys.es>
Date: Fri, 31 Jul 2026 15:23:54 +0200
Subject: [PATCH 11/11] Re-enforce dark-document button state changing method
 when interface theme switches

Signed-off-by: j-base64 <jcentenero@arsys.es>
Assisted-by: ClaudeCode:claude-sonnet-5
---
 apps/common/main/lib/controller/Themes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 605ff93ce6..d8b2a398c0 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -410,6 +410,7 @@ define([
                     Common.NotificationCenter.trigger('contenttheme:dark', this.isContentThemeDark());
                 } else {
                     this.api.asc_setContentDarkMode(false);
+                    Common.NotificationCenter.trigger('contenttheme:dark', false);
                 }
 
             const colors_obj = get_current_theme_colors();