@omegagrid/grid-core 0.3.57 → 0.3.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,12 +1,6 @@
1
- import { FormulaString } from "../calculations";
2
1
  import { GridModel } from "./gridModel";
3
- import { Style } from "./style";
4
- export type ThemeItem = {
5
- /** style */
6
- style: Style;
7
- /** style will apply on cells passing the condition */
8
- condition?: FormulaString;
9
- };
2
+ import { ConditionalFormatItemSource } from "./conditionalFormats";
3
+ export type ThemeItem = Omit<ConditionalFormatItemSource, 'ranges'>;
10
4
  export type ThemeAxisItem = ThemeItem & {
11
5
  /** style will apply on cells with specific row/column index */
12
6
  index?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"tableTheme.d.ts","sourceRoot":"","sources":["../../src/model/tableTheme.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAI/B,MAAM,MAAM,SAAS,GAAG;IACvB,YAAY;IACZ,KAAK,EAAE,KAAK,CAAC;IACb,sDAAsD;IACtD,SAAS,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACvC,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,GAAC,MAAM,CAAC;CACrB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,yBAAyB;IACzB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,sBAAsB;IACtB,IAAI,CAAC,EAAE,aAAa,EAAE,CAAC;CACvB,CAAA;AA+DD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,QAI7D"}
1
+ {"version":3,"file":"tableTheme.d.ts","sourceRoot":"","sources":["../../src/model/tableTheme.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAA;AAEnE,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACvC,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,GAAC,MAAM,CAAC;CACrB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACxB,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,yBAAyB;IACzB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,sBAAsB;IACtB,IAAI,CAAC,EAAE,aAAa,EAAE,CAAC;CACvB,CAAA;AA4DD,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,QAI7D"}
@@ -30,15 +30,15 @@ function applyAxisTheme(themeItems, model, type) {
30
30
  effectiveNodes = effectiveNodes.filter(node => nameRegExp.test(node.name));
31
31
  }
32
32
  effectiveNodes.forEach(node => {
33
- if (item.condition) {
33
+ if (item.type) { // conditional format
34
34
  model.conditionalFormats.add({
35
35
  ranges: `${node.address}:${node.address}`,
36
- type: 'formula',
36
+ type: item.type,
37
37
  style: item.style,
38
38
  condition: item.condition
39
39
  });
40
40
  }
41
- else {
41
+ else { // static format
42
42
  node.style = model.styles.add(item.style).id;
43
43
  }
44
44
  });
@@ -46,15 +46,12 @@ function applyAxisTheme(themeItems, model, type) {
46
46
  }
47
47
  function applyCellTheme(themeItems, model) {
48
48
  for (const item of themeItems) {
49
- if (item.condition) {
50
- model.conditionalFormats.add({
51
- ranges: 'A:' + model.columns[model.columns.length - 1].address,
52
- type: 'formula',
53
- style: item.style,
54
- condition: item.condition
55
- });
49
+ if (item.type) { // conditional format
50
+ model.conditionalFormats.add(Object.assign({
51
+ ranges: 'A:' + model.columns[model.columns.length - 1].address
52
+ }, item));
56
53
  }
57
- else {
54
+ else { // static format
58
55
  for (const column of model.columns) {
59
56
  if (column.style != null)
60
57
  continue;
@@ -1 +1 @@
1
- {"version":3,"file":"tableTheme.js","sourceRoot":"","sources":["../../src/model/tableTheme.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tableTheme.js","sourceRoot":"","sources":["../../src/model/tableTheme.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@omegagrid/grid-core",
3
- "version": "0.3.57",
3
+ "version": "0.3.59",
4
4
  "license": "UNLICENSED",
5
5
  "description": "Grid model, no ui components",
6
6
  "main": "./dist/index.js",
@@ -28,8 +28,8 @@
28
28
  "generate-functions-docs": "node ./scripts/generate-functions-docs.cjs"
29
29
  },
30
30
  "dependencies": {
31
- "@omegagrid/core": "^0.3.57",
32
- "@omegagrid/localize": "^0.3.57",
31
+ "@omegagrid/core": "^0.3.59",
32
+ "@omegagrid/localize": "^0.3.59",
33
33
  "@stdlib/stats": "^0.0.13",
34
34
  "color": "^4.2.3",
35
35
  "date-fns": "^3.2.0",