@adaptabletools/adaptable-cjs 21.2.2-canary.0 → 22.0.0-canary.0

package/src/layout-manager/src/simplifyLayoutModel.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simplifyLayoutModel = exports.simplifyPivotLayoutModel = exports.simplifyTableLayoutModel = void 0;
+exports.simplifyTableLayoutModel = simplifyTableLayoutModel;
+exports.simplifyPivotLayoutModel = simplifyPivotLayoutModel;
+exports.simplifyLayoutModel = simplifyLayoutModel;
 const isPivotLayoutModel_1 = require("./isPivotLayoutModel");
 const normalizeLayoutModel_1 = require("./normalizeLayoutModel");
 function simplifyTableLayoutModel(layout) {
@@ -70,7 +72,6 @@ function simplifyTableLayoutModel(layout) {
     }
     return layout;
 }
-exports.simplifyTableLayoutModel = simplifyTableLayoutModel;
 function simplifyPivotLayoutModel(layout) {
     layout = structuredClone(layout);
     if (layout.ColumnSizing && !Object.keys(layout.ColumnSizing).length) {
@@ -102,11 +103,9 @@ function simplifyPivotLayoutModel(layout) {
     }
     return layout;
 }
-exports.simplifyPivotLayoutModel = simplifyPivotLayoutModel;
 function simplifyLayoutModel(layout) {
     if ((0, isPivotLayoutModel_1.isPivotLayoutModel)(layout)) {
         return simplifyPivotLayoutModel(layout);
     }
     return simplifyTableLayoutModel(layout);
 }
-exports.simplifyLayoutModel = simplifyLayoutModel;

package/src/layout-manager/src/sortColumnIdsByOrder.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortToIndexes = exports.sortColumnIdsByOrder = void 0;
+exports.sortColumnIdsByOrder = sortColumnIdsByOrder;
+exports.sortToIndexes = sortToIndexes;
 function insertAtCorrectIndex(result, colId, visibleColumnsIndexes, hiddenColIds, offset = 0, lastVisibleOffset = 0) {
     const prevColId = result[result.length - 1 - offset];
     if (!prevColId) {
@@ -79,11 +80,9 @@ function sortColumnIdsByOrder(columnIds, desiredColumnOrder) {
     }
     return result;
 }
-exports.sortColumnIdsByOrder = sortColumnIdsByOrder;
 function sortToIndexes(x, sortIndexes) {
     if (x.length !== sortIndexes.length) {
         throw new Error('x and sortIndexes must be the same length');
     }
     return sortIndexes.map((index) => x[index]);
 }
-exports.sortToIndexes = sortToIndexes;

package/src/migration/VersionUpgrade20.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionUpgrade20 = exports.mapOldTypeToDataType = void 0;
+exports.VersionUpgrade20 = void 0;
+exports.mapOldTypeToDataType = mapOldTypeToDataType;
 const VersionUpgrade_1 = require("./VersionUpgrade");
 const agGridDataTypeDefinitions_1 = require("../agGrid/agGridDataTypeDefinitions");
 function transition_pre_20(layout) {
@@ -135,7 +136,6 @@ function mapOldTypeToDataType(previousType) {
             return 'unknown';
     }
 }
-exports.mapOldTypeToDataType = mapOldTypeToDataType;
 class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
     migrateState(state) {
         this.migrateLayoutState(state);
@@ -224,16 +224,17 @@ class VersionUpgrade20 extends VersionUpgrade_1.VersionUpgrade {
                     styledColumn.SparklineStyle?.options?.axis?.type == undefined) {
                     styledColumn.SparklineStyle.options.axis.type = 'category';
                 }
-                if (styledColumn.SparklineStyle?.options?.highlightStyle) {
+                const obsoleteHighlightStyle = styledColumn.SparklineStyle?.options
+                    ?.highlightStyle;
+                if (obsoleteHighlightStyle) {
                     const obsoleteKeys = ['fill', 'stroke', 'strokeWidth'];
                     obsoleteKeys.forEach((obsoleteKey) => {
                         if (
                         // @ts-ignore
-                        styledColumn.SparklineStyle?.options?.highlightStyle?.[obsoleteKey] != undefined) {
-                            const itemHighlightStyle = styledColumn.SparklineStyle.options.highlightStyle.item ?? {};
+                        obsoleteHighlightStyle?.[obsoleteKey] != undefined) {
+                            const itemHighlightStyle = obsoleteHighlightStyle.item ?? {};
                             // @ts-ignore
-                            itemHighlightStyle[obsoleteKey] = styledColumn.SparklineStyle?.options
-                                ?.highlightStyle?.[obsoleteKey];
+                            itemHighlightStyle[obsoleteKey] = obsoleteHighlightStyle?.[obsoleteKey];
                             // @ts-ignore
                             delete styledColumn.SparklineStyle.options.highlightStyle[obsoleteKey];
                         }

package/src/parser/src/evaluator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateNode = void 0;
+exports.evaluateNode = evaluateNode;
 const ExpressionEvaluationError_1 = require("./ExpressionEvaluationError");
 function evaluateNode(node, context) {
     if (typeof node === 'boolean' ||
@@ -25,4 +25,3 @@ function evaluateNode(node, context) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('', `Function is not available in this context: "${node.type}"`);
     }
 }
-exports.evaluateNode = evaluateNode;

package/src/parser/src/index.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbstractSyntaxTree = exports.evaluate = exports.getAST = exports.parse = exports.findPathTo = void 0;
+exports.findPathTo = void 0;
+exports.parse = parse;
+exports.getAST = getAST;
+exports.evaluate = evaluate;
+exports.getAbstractSyntaxTree = getAbstractSyntaxTree;
 const tslib_1 = require("tslib");
 const evaluator_1 = require("./evaluator");
 // @ts-ignore
@@ -19,20 +23,16 @@ function parse(input) {
     };
     return { ast, evaluate };
 }
-exports.parse = parse;
 function getAST(input) {
     const { ast } = parse(input);
     return ast;
 }
-exports.getAST = getAST;
 const cache = {};
 function evaluate(input, context) {
     cache[input] = cache[input] || parse(input);
     return cache[input].evaluate(context);
 }
-exports.evaluate = evaluate;
 function getAbstractSyntaxTree(expression) {
     const { ast } = parse(expression);
     return ast;
 }
-exports.getAbstractSyntaxTree = getAbstractSyntaxTree;

package/src/parser/src/predicate/mapExpressionToQlPredicate.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapExpressionToQlPredicate = exports.isArgumentColumnOrField = void 0;
+exports.isArgumentColumnOrField = void 0;
+exports.mapExpressionToQlPredicate = mapExpressionToQlPredicate;
 const booleanExpressionFunctions_1 = require("../../../Utilities/ExpressionFunctions/booleanExpressionFunctions");
 const index_1 = require("../index");
 const types_1 = require("../types");
@@ -96,7 +97,6 @@ function mapExpressionToQlPredicate(expression) {
         };
     }
 }
-exports.mapExpressionToQlPredicate = mapExpressionToQlPredicate;
 function getOperatorFromAST(astRootNode) {
     if (!['INFIX', 'FUNCTION', 'VALUE_REF'].includes(astRootNode.metaInfo)) {
         return undefined;

package/src/parser/src/predicate/mapQlPredicateToExpression.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQlPredicateSymbol = exports.mapQlPredicateToExpression = void 0;
+exports.mapQlPredicateToExpression = mapQlPredicateToExpression;
+exports.getQlPredicateSymbol = getQlPredicateSymbol;
 const types_1 = require("./types");
 function mapQlPredicateToExpression(predicate, symbolMapper = getQlPredicateSymbol) {
     if (!predicate) {
@@ -72,7 +73,6 @@ function mapQlPredicateToExpression(predicate, symbolMapper = getQlPredicateSymb
     }
     return `${operatorSymbol}(${mappedArgs.join(', ')})`;
 }
-exports.mapQlPredicateToExpression = mapQlPredicateToExpression;
 function getQlPredicateSymbol(predicateName) {
     switch (predicateName) {
         case 'NOT':
@@ -93,7 +93,6 @@ function getQlPredicateSymbol(predicateName) {
             return predicateName;
     }
 }
-exports.getQlPredicateSymbol = getQlPredicateSymbol;
 function getPredicateType(predicateName) {
     switch (predicateName) {
         case 'COL':

package/src/parser/src/tokenizer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokens = void 0;
+exports.getTokens = getTokens;
 const tslib_1 = require("tslib");
 // @ts-ignore
 const parser_1 = tslib_1.__importDefault(require("./parser"));
@@ -29,4 +29,3 @@ function getTokens(expression) {
     cache[expression] = tokens;
     return tokens;
 }
-exports.getTokens = getTokens;

package/src/parser/src/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findPathTo = exports.walker = exports.getCurrentToken = void 0;
+exports.getCurrentToken = getCurrentToken;
+exports.walker = walker;
+exports.findPathTo = findPathTo;
 function getCurrentToken(tokens, offset) {
     return (tokens.find(({ range }) => range[0] <= offset && range[1] > offset) ||
         tokens.find(({ range }) => range[1] == offset));
 }
-exports.getCurrentToken = getCurrentToken;
 function walker(node, callback) {
     if (node == undefined ||
         typeof node === 'boolean' ||
@@ -22,7 +23,6 @@ function walker(node, callback) {
         callback(node);
     }
 }
-exports.walker = walker;
 function findPathTo(node, offset) {
     const path = [];
     if (offset === null)
@@ -34,4 +34,3 @@ function findPathTo(node, offset) {
     });
     return path;
 }
-exports.findPathTo = findPathTo;

package/src/twMerge.d.ts

@@ -0,0 +1 @@
+export declare const twMerge: (...classLists: import("tailwind-merge").ClassNameValue[]) => string;

package/src/twMerge.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.twMerge = void 0;
+const tailwind_merge_1 = require("tailwind-merge");
+exports.twMerge = (0, tailwind_merge_1.extendTailwindMerge)({
+    prefix: 'twa',
+    extend: {
+        theme: {
+            // ↓ `text` is the key of the namespace `--text-*`
+            text: ['0', '1', '2', '3', '4', '5', '6', '7'],
+            radius: ['none', 'standard', 'xs', 'sm', 'md', 'lg', 'xl', '2xl', '3xl', '4xl', 'full'],
+        },
+    },
+});

package/themes/dark.css

@@ -1,22 +1,48 @@
 .ab--theme-dark {
-  font-family: Helvetica, Arial, sans-serif;
   --ab-theme-loaded: dark;
-  --ab-cmp-input--disabled__background: #232323;
+
+  --ab-cmp-input--disabled__background: #232323; /* #b6b7b8 */
+
   --ab-color-defaultbackground: #3e444c;
   --ab-color-text-on-defaultbackground: #e2e2e2;
+
   --ab-color-primary: #262d2f;
-  --ab-color-primarylight: #2d3537;
+  --ab-color-primarylight: #3d3e3f;
   --ab-color-primarydark: #1c2021;
-  --ab-color-text-on-primary: #e2e2e2;
+  --ab-color-text-on-primary: #e2e2e2; /* F2F2F2 */
+
+  --ab-color-shadow: rgb(255 255 255 / 0.45);
+  --ab-cmp-modal-backdrop__background: rgba(255, 255, 255, 0.2);
+
   --ab-dashboard__border: #555;
   --ab-cmp-dropdownbutton-list-separator__border: 1px solid #555;
+
   --ab-gridheader--filtered__background: var(--ab-color-defaultbackground);
+
   --ab-cmp-checkbox__border-color: var(--ab-color-text-on-primary);
   --ab-cmp-checkbox--checked__border-color: var(--ab-color-accent);
+
+  input[type='number'].ab-Input::-webkit-outer-spin-button,
+  input[type='number'].ab-Input::-webkit-inner-spin-button {
+    background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>')
+      no-repeat center center;
+  }
 }
-.ab--theme-dark input[type=number].ab-Input::-webkit-outer-spin-button,
-.ab--theme-dark input[type=number].ab-Input::-webkit-inner-spin-button {
-  background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" viewBox="4 0 18 18" version="1.1"><path fill="%23f7f7f7" d="M7 10l5 5 5-5z" transform="translate(0, 2)"/><path fill="%23f7f7f7" d="M7 14l5-5 5 5z" transform="translate(0, -6)"/></svg>') no-repeat center center;
-}
 
-/*# sourceMappingURL=dark.css.map */
+/*
+The following are only redefined here so that the DARK theme in Storybook
+can be previewed correctly as that relies on an element (not the document element)
+to have the class ab--theme-dark.
+
+For our production release those are not needed and could be removed
+as our dark theme is anyways applied on the document element.
+
+*/
+.ab--theme-dark {
+  --ab-color-inputcolor: var(--ab-color-text-on-primary);
+  --ab-cmp-input__color: var(--ab-color-inputcolor);
+  --ab-cmp-input__background: var(--ab-color-defaultbackground);
+  --ab-cmp-input--disabled__background: var(--ab-color-primarylight);
+  --ab-cmp-field-wrap__background: var(--ab-color-defaultbackground);
+  --ab-cmp-simple-button--outlined__background: var(--ab-color-defaultbackground);
+}

package/themes/light.css

@@ -1,5 +1,3 @@
 html.ab--theme-light {
   --ab-theme-loaded: light;
 }
-
-/*# sourceMappingURL=light.css.map */