@adaptabletools/adaptable 16.0.0-canary.5 → 16.0.0-canary.7
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.
- package/bundle.cjs.js +3 -3
- package/package.json +2 -2
- package/publishTimestamp.d.ts +1 -1
- package/publishTimestamp.js +1 -1
- package/src/agGrid/Adaptable.js +2 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptabletools/adaptable",
|
|
3
|
-
"version": "16.0.0-canary.
|
|
3
|
+
"version": "16.0.0-canary.7",
|
|
4
4
|
"description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"web-components",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"lodash": "^4.17.15",
|
|
47
47
|
"normalize.css": "^8.0.1",
|
|
48
48
|
"prop-types": "^15.6.2",
|
|
49
|
-
"re-resizable": "
|
|
49
|
+
"re-resizable": "6.9.9",
|
|
50
50
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
|
|
51
51
|
"react-beautiful-dnd": "13.1.1",
|
|
52
52
|
"react-day-picker": "8.0.6",
|
package/publishTimestamp.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default:
|
|
1
|
+
declare const _default: 1691663860297;
|
|
2
2
|
export default _default;
|
package/publishTimestamp.js
CHANGED
package/src/agGrid/Adaptable.js
CHANGED
|
@@ -3366,7 +3366,8 @@ class Adaptable {
|
|
|
3366
3366
|
const hasQuickSearchStyle = quickSearchStyle != undefined;
|
|
3367
3367
|
const cellStyle = (params) => {
|
|
3368
3368
|
const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(abColumn, params);
|
|
3369
|
-
const
|
|
3369
|
+
const userDefined = typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle;
|
|
3370
|
+
const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, userDefined), this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), this.getFormatColumnAndStyledColumnCellStyle(abColumn, colId, params)), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
|
|
3370
3371
|
return (0, StyleHelper_1.normalizeStyleForAgGrid)(result);
|
|
3371
3372
|
};
|
|
3372
3373
|
return cellStyle;
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "16.0.0-canary.
|
|
1
|
+
declare const _default: "16.0.0-canary.7";
|
|
2
2
|
export default _default;
|
package/version.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.default = '16.0.0-canary.
|
|
3
|
+
exports.default = '16.0.0-canary.7'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
|