@deephaven/iris-grid 0.11.3-beta.7 → 0.11.4-beta.1
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IrisGridMetricCalculator.d.ts","sourceRoot":"","sources":["../src/IrisGridMetricCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,OAAO,aAAa,GAAG,OAAO,SAAS,CAAC;IAC/C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CACrD,CAAC;IACF,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC5E,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;;GAGG;AACH,cAAM,wBAAyB,SAAQ,oBAAoB;IACzD,qBAAqB,CACnB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,mBAAmB,EAC1B,WAAW,GAAE,YAAyC,EACtD,YAAY,SAAoC,GAC/C,MAAM;
|
|
1
|
+
{"version":3,"file":"IrisGridMetricCalculator.d.ts","sourceRoot":"","sources":["../src/IrisGridMetricCalculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,aAAa,MAAM,iBAAiB,CAAC;AAEjD,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,OAAO,aAAa,GAAG,OAAO,SAAS,CAAC;IAC/C,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CACrD,CAAC;IACF,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;IAC5E,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;;GAGG;AACH,cAAM,wBAAyB,SAAQ,oBAAoB;IACzD,qBAAqB,CACnB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,mBAAmB,EAC1B,WAAW,GAAE,YAAyC,EACtD,YAAY,SAAoC,GAC/C,MAAM;IAsBT,QAAQ,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM;CAwB7C;AAED,eAAe,wBAAwB,CAAC"}
|
|
@@ -19,18 +19,16 @@ class IrisGridMetricCalculator extends GridMetricCalculator {
|
|
|
19
19
|
model
|
|
20
20
|
} = state;
|
|
21
21
|
var hiddenColumns = (_model$layoutHints$hi = (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.hiddenColumns) !== null && _model$layoutHints$hi !== void 0 ? _model$layoutHints$hi : [];
|
|
22
|
-
var modelColumn = this.getModelColumn(column, state);
|
|
23
|
-
var existingWidth = this.userColumnWidths.get(modelColumn);
|
|
22
|
+
var modelColumn = this.getModelColumn(column, state); // Need to make sure super is called so column width is always re-calculated correctly
|
|
24
23
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
24
|
+
var columnWidth = super.getVisibleColumnWidth(column, state, firstColumn, treePaddingX);
|
|
25
|
+
var hasUserSetWidth = this.userColumnWidths.has(modelColumn);
|
|
28
26
|
|
|
29
|
-
if (hiddenColumns.includes(model.columns[modelColumn].name)) {
|
|
27
|
+
if (!hasUserSetWidth && hiddenColumns.includes(model.columns[modelColumn].name)) {
|
|
30
28
|
return 0;
|
|
31
29
|
}
|
|
32
30
|
|
|
33
|
-
return
|
|
31
|
+
return columnWidth;
|
|
34
32
|
}
|
|
35
33
|
|
|
36
34
|
getGridY(state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/IrisGridMetricCalculator.ts"],"names":["GridMetricCalculator","TableUtils","IrisGridMetricCalculator","getVisibleColumnWidth","column","state","firstColumn","getFirstColumn","treePaddingX","calculateTreePaddingX","model","hiddenColumns","layoutHints","modelColumn","getModelColumn","
|
|
1
|
+
{"version":3,"sources":["../src/IrisGridMetricCalculator.ts"],"names":["GridMetricCalculator","TableUtils","IrisGridMetricCalculator","getVisibleColumnWidth","column","state","firstColumn","getFirstColumn","treePaddingX","calculateTreePaddingX","model","hiddenColumns","layoutHints","modelColumn","getModelColumn","columnWidth","hasUserSetWidth","userColumnWidths","has","includes","columns","name","getGridY","gridY","isFilterBarShown","theme","advancedFilters","quickFilters","sorts","reverseType","filterBarHeight","size","filterBarCollapsedHeight","REVERSE_TYPE","NONE","length","reverseHeaderBarHeight"],"mappings":"AAAA,SAASA,oBAAT,QAAqC,iBAArC;OAGOC,U;;AAiBP;;AACA;;AACA;AACA;AACA;AACA;AACA,MAAMC,wBAAN,SAAuCF,oBAAvC,CAA4D;AAC1DG,EAAAA,qBAAqB,CACnBC,MADmB,EAEnBC,KAFmB,EAKX;AAAA;;AAAA,QAFRC,WAEQ,uEAFoB,KAAKC,cAAL,CAAoBF,KAApB,CAEpB;AAAA,QADRG,YACQ,uEADO,KAAKC,qBAAL,CAA2BJ,KAA3B,CACP;AACR,QAAM;AAAEK,MAAAA;AAAF,QAAYL,KAAlB;AACA,QAAMM,aAAa,kDAAGD,KAAK,CAACE,WAAT,uDAAG,mBAAmBD,aAAtB,yEAAuC,EAA1D;AACA,QAAME,WAAW,GAAG,KAAKC,cAAL,CAAoBV,MAApB,EAA4BC,KAA5B,CAApB,CAHQ,CAKR;;AACA,QAAMU,WAAW,GAAG,MAAMZ,qBAAN,CAClBC,MADkB,EAElBC,KAFkB,EAGlBC,WAHkB,EAIlBE,YAJkB,CAApB;AAMA,QAAMQ,eAAe,GAAG,KAAKC,gBAAL,CAAsBC,GAAtB,CAA0BL,WAA1B,CAAxB;;AACA,QACE,CAACG,eAAD,IACAL,aAAa,CAACQ,QAAd,CAAuBT,KAAK,CAACU,OAAN,CAAcP,WAAd,EAA2BQ,IAAlD,CAFF,EAGE;AACA,aAAO,CAAP;AACD;;AACD,WAAON,WAAP;AACD;;AAEDO,EAAAA,QAAQ,CAACjB,KAAD,EAAqC;AAC3C,QAAIkB,KAAK,GAAG,MAAMD,QAAN,CAAejB,KAAf,CAAZ;AACA,QAAM;AACJmB,MAAAA,gBADI;AAEJC,MAAAA,KAFI;AAGJC,MAAAA,eAHI;AAIJC,MAAAA,YAJI;AAKJC,MAAAA,KALI;AAMJC,MAAAA;AANI,QAOFxB,KAPJ;;AAQA,QAAImB,gBAAJ,EAAsB;AACpBD,MAAAA,KAAK,IAAIE,KAAK,CAACK,eAAf;AACD,KAFD,MAEO,IACJH,YAAY,IAAIA,YAAY,CAACI,IAAb,GAAoB,CAArC,IACCL,eAAe,IAAIA,eAAe,CAACK,IAAhB,GAAuB,CAFtC,EAGL;AACAR,MAAAA,KAAK,IAAIE,KAAK,CAACO,wBAAf;AACD;;AACD,QAAIH,WAAW,KAAK5B,UAAU,CAACgC,YAAX,CAAwBC,IAAxC,IAAgDN,KAAK,CAACO,MAAN,GAAe,CAAnE,EAAsE;AACpEZ,MAAAA,KAAK,IAAIE,KAAK,CAACW,sBAAf;AACD;;AAED,WAAOb,KAAP;AACD;;AAnDyD;;AAsD5D,eAAerB,wBAAf","sourcesContent":["import { GridMetricCalculator } from '@deephaven/grid';\nimport type { VisibleIndex, GridMetricState, GridTheme } from '@deephaven/grid';\nimport type { FilterCondition, Sort } from '@deephaven/jsapi-shim';\nimport TableUtils from './TableUtils';\nimport type IrisGridModel from './IrisGridModel';\nimport type IrisGridTheme from './IrisGridTheme';\n\nexport interface IrisGridMetricState extends GridMetricState {\n model: IrisGridModel;\n theme: typeof IrisGridTheme & typeof GridTheme;\n isFilterBarShown: boolean;\n advancedFilters: Map<\n string,\n { options: unknown; filter: FilterCondition | null }\n >;\n quickFilters: Map<string, { text: string; filter: FilterCondition | null }>;\n sorts: Sort[];\n reverseType: string;\n}\n\n/* eslint class-methods-use-this: \"off\" */\n/* eslint react/destructuring-assignment: \"off\" */\n/**\n * Class to calculate all the metrics for a grid.\n * Call getMetrics() with the state to get metrics\n */\nclass IrisGridMetricCalculator extends GridMetricCalculator {\n getVisibleColumnWidth(\n column: VisibleIndex,\n state: IrisGridMetricState,\n firstColumn: VisibleIndex = this.getFirstColumn(state),\n treePaddingX = this.calculateTreePaddingX(state)\n ): number {\n const { model } = state;\n const hiddenColumns = model.layoutHints?.hiddenColumns ?? [];\n const modelColumn = this.getModelColumn(column, state);\n\n // Need to make sure super is called so column width is always re-calculated correctly\n const columnWidth = super.getVisibleColumnWidth(\n column,\n state,\n firstColumn,\n treePaddingX\n );\n const hasUserSetWidth = this.userColumnWidths.has(modelColumn);\n if (\n !hasUserSetWidth &&\n hiddenColumns.includes(model.columns[modelColumn].name)\n ) {\n return 0;\n }\n return columnWidth;\n }\n\n getGridY(state: IrisGridMetricState): number {\n let gridY = super.getGridY(state);\n const {\n isFilterBarShown,\n theme,\n advancedFilters,\n quickFilters,\n sorts,\n reverseType,\n } = state;\n if (isFilterBarShown) {\n gridY += theme.filterBarHeight;\n } else if (\n (quickFilters && quickFilters.size > 0) ||\n (advancedFilters && advancedFilters.size > 0)\n ) {\n gridY += theme.filterBarCollapsedHeight;\n }\n if (reverseType !== TableUtils.REVERSE_TYPE.NONE && sorts.length > 0) {\n gridY += theme.reverseHeaderBarHeight;\n }\n\n return gridY;\n }\n}\n\nexport default IrisGridMetricCalculator;\n"],"file":"IrisGridMetricCalculator.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deephaven/iris-grid",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.4-beta.1+7cd1bed",
|
|
4
4
|
"description": "Deephaven Iris Grid",
|
|
5
5
|
"author": "Deephaven Data Labs LLC",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -30,13 +30,13 @@
|
|
|
30
30
|
"start": "cross-env NODE_ENV=development npm run watch"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@deephaven/console": "^0.11.
|
|
34
|
-
"@deephaven/grid": "^0.11.
|
|
35
|
-
"@deephaven/icons": "^0.11.
|
|
36
|
-
"@deephaven/jsapi-shim": "^0.11.
|
|
37
|
-
"@deephaven/react-hooks": "^0.11.
|
|
38
|
-
"@deephaven/storage": "^0.11.
|
|
39
|
-
"@deephaven/utils": "^0.11.
|
|
33
|
+
"@deephaven/console": "^0.11.4-beta.1+7cd1bed",
|
|
34
|
+
"@deephaven/grid": "^0.11.4-beta.1+7cd1bed",
|
|
35
|
+
"@deephaven/icons": "^0.11.4-beta.1+7cd1bed",
|
|
36
|
+
"@deephaven/jsapi-shim": "^0.11.4-beta.1+7cd1bed",
|
|
37
|
+
"@deephaven/react-hooks": "^0.11.4-beta.1+7cd1bed",
|
|
38
|
+
"@deephaven/storage": "^0.11.4-beta.1+7cd1bed",
|
|
39
|
+
"@deephaven/utils": "^0.11.4-beta.1+7cd1bed",
|
|
40
40
|
"@fortawesome/react-fontawesome": "^0.1.15",
|
|
41
41
|
"classnames": "^2.3.1",
|
|
42
42
|
"deep-equal": "^2.0.5",
|
|
@@ -54,26 +54,14 @@
|
|
|
54
54
|
"web-streams-polyfill": "^2.1.0"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"@deephaven/components": "^0.
|
|
58
|
-
"@deephaven/log": "^0.
|
|
57
|
+
"@deephaven/components": "^0.11.2",
|
|
58
|
+
"@deephaven/log": "^0.11.2",
|
|
59
59
|
"react": "^17.x"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
|
-
"@
|
|
63
|
-
"@deephaven/
|
|
64
|
-
"@deephaven/
|
|
65
|
-
"@deephaven/mocks": "^0.11.3-beta.7+7aa0f11",
|
|
66
|
-
"@deephaven/tsconfig": "^0.11.3-beta.7+7aa0f11",
|
|
67
|
-
"@svgr/cli": "^5.5.0",
|
|
68
|
-
"@types/react": "^17.0.2",
|
|
69
|
-
"@types/react-dom": "^17.0.9",
|
|
70
|
-
"@types/react-transition-group": "^4.4.0",
|
|
71
|
-
"cross-env": "^7.0.2",
|
|
72
|
-
"mini-css-extract-plugin": "^1.6.0",
|
|
73
|
-
"npm-run-all": "^4.1.5",
|
|
74
|
-
"react": "^17.0.2",
|
|
75
|
-
"rimraf": "^3.0.2",
|
|
76
|
-
"sass": "^1.39.0"
|
|
62
|
+
"@deephaven/log": "^0.11.4-beta.1+7cd1bed",
|
|
63
|
+
"@deephaven/mocks": "^0.11.4-beta.1+7cd1bed",
|
|
64
|
+
"@deephaven/tsconfig": "^0.11.4-beta.1+7cd1bed"
|
|
77
65
|
},
|
|
78
66
|
"files": [
|
|
79
67
|
"dist"
|
|
@@ -84,5 +72,5 @@
|
|
|
84
72
|
"publishConfig": {
|
|
85
73
|
"access": "public"
|
|
86
74
|
},
|
|
87
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "7cd1bed83d9a67297f6f2b85b2d90eba8cc1b96a"
|
|
88
76
|
}
|