merge dev

microsoft · Oct 1, 2024 · 37da9be · 37da9be
2 parents 2353277 + ed98138
commit 37da9be
Show file tree

Hide file tree

Showing 13 changed files with 577 additions and 342 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,6 @@ webpack.statistics.prod.html
 
 ## JetBrains
 .idea/
+
+## VSCode
+.vscode/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 2.5.11
+* Change the default color for "unselected cells" to transparent
+
+## 2.5.10
+* Fix the bug with scroll area being too big
+* Update packages
+
+## 2.5.9
+* Fix the bug with header not moving on scrolling horizontally
+* Fix npm vulnerabilities
+
 ## 2.5.8
 * Fix the bug with dragging cursors
 

diff --git a/capabilities.json b/capabilities.json
@@ -45,24 +45,6 @@
                 }
             }
         },
-        "cursor": {
-            "properties": {
-                "show": {
-                    "type": {
-                        "bool": true
-                    }
-                },
-                "color": {
-                    "type": {
-                        "fill": {
-                            "solid": {
-                                "color": true
-                            }
-                        }
-                    }
-                }
-            }
-        },
         "forceSelection": {
             "properties": {
                 "currentPeriod": {
@@ -316,6 +298,20 @@
                     "type": {
                         "numeric": true
                     }
+                },
+                "showEdges": {
+                    "type": {
+                        "bool": true
+                    }
+                },
+                "edgeColor": {
+                    "type": {
+                        "fill": {
+                            "solid": {
+                                "color": true
+                            }
+                        }
+                    }
                 }
             }
         },

diff --git a/karma.conf.ts b/karma.conf.ts
@@ -59,7 +59,7 @@ module.exports = (config) => {
         files: [
             testRecursivePath,
         ],
-        frameworks: ["jasmine"],
+        frameworks: ["jasmine", "webpack"],
         junitReporter: {
             outputDir: path.join(__dirname, coverageFolder),
             outputFile: "TESTS-report.xml",