@adaptabletools/adaptable-vue3-aggrid 18.1.4 → 18.1.5

package/lib/AdaptableAgGridVue.js

@@ -1,7 +1,8 @@
-import { defineComponent, h, inject, isProxy, isReactive, isRef, toRaw } from 'vue';
+import { defineComponent, h, inject, toRaw } from 'vue';
 import { AdaptableAgGridStateTransitions, AdaptableProviderContextKey, } from './AdaptableProviderContext';
 import { AgGridVue } from '@ag-grid-community/vue3';
 import { ComponentUtil } from '@ag-grid-community/core';
+import { deepToRaw } from './utils';
 const agGridPropertySet = new Set(ComponentUtil.ALL_PROPERTIES);
 const PASS_THROUGH_PROPS = [
     'modelValue',
@@ -10,24 +11,6 @@ const PASS_THROUGH_PROPS = [
     'componentDependencies',
     'plugins',
 ];
-function deepToRaw(sourceObj) {
-    const objectIterator = (input) => {
-        if (Array.isArray(input)) {
-            return input.map((item) => objectIterator(item));
-        }
-        if (isRef(input) || isReactive(input) || isProxy(input)) {
-            return objectIterator(toRaw(input));
-        }
-        if (input && typeof input === 'object') {
-            return Object.keys(input).reduce((acc, key) => {
-                acc[key] = objectIterator(input[key]);
-                return acc;
-            }, {});
-        }
-        return input;
-    };
-    return objectIterator(sourceObj);
-}
 const watch = ComponentUtil.ALL_PROPERTIES.reduce((acc, key) => {
     acc[key] = function (newValue) {
         /**

package/lib/AdaptableUI.js

@@ -2,6 +2,7 @@ import { _AdaptableAgGrid } from '@adaptabletools/adaptable/agGrid';
 import { defineComponent, h, inject, toRaw } from 'vue';
 import { AdaptableAgGridStateTransitions, AdaptableProviderContextKey, } from './AdaptableProviderContext';
 import { setupFrameworkComponents } from './setupFrameworkComponents';
+import { deepToRaw, deleteUndefinedShallow } from './utils';
 /**
  * This component handles the logic of initializing the Adaptable.
  * It always renders a div, which is the container for the Adaptable.
@@ -54,10 +55,11 @@ export const AdaptableUI = defineComponent({
             if (transition === AdaptableAgGridStateTransitions.INITIALIZE_ADAPTABLE) {
                 this.adaptableInitialized = true;
                 const el = this.$el;
+                const gridOptions = Object.assign(Object.assign({}, deepToRaw(this.gridOptions)), deleteUndefinedShallow(rawAgGridProps));
                 const adaptableApi = await _AdaptableAgGrid._initInternal({
                     modules: this.modules,
                     adaptableOptions: Object.assign(Object.assign({}, this.adaptableOptions), { containerOptions: Object.assign(Object.assign({}, (_a = this.adaptableOptions) === null || _a === void 0 ? void 0 : _a.containerOptions), { adaptableContainer: el }) }),
-                    gridOptions: Object.assign(Object.assign({}, toRaw(this.gridOptions)), rawAgGridProps),
+                    gridOptions,
                     variant: 'vue',
                     renderAgGridFrameworkComponent: this.renderAgGridFrameworkComponent,
                 });

package/lib/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function deepToRaw<T extends Record<string, any>>(sourceObj: T): T;
+export declare function deleteUndefinedShallow<T extends Record<string, unknown>>(sourceObj: T): T;

package/lib/utils.js

@@ -0,0 +1,28 @@
+import { isProxy, isReactive, isRef, toRaw } from 'vue';
+export function deepToRaw(sourceObj) {
+    const objectIterator = (input) => {
+        if (Array.isArray(input)) {
+            return input.map((item) => objectIterator(item));
+        }
+        if (isRef(input) || isReactive(input) || isProxy(input)) {
+            return objectIterator(toRaw(input));
+        }
+        if (input && typeof input === 'object') {
+            return Object.keys(input).reduce((acc, key) => {
+                acc[key] = objectIterator(input[key]);
+                return acc;
+            }, {});
+        }
+        return input;
+    };
+    return objectIterator(sourceObj);
+}
+export function deleteUndefinedShallow(sourceObj) {
+    return Object.keys(sourceObj).reduce((acc, key) => {
+        if (sourceObj[key] !== undefined) {
+            // @ts-ignore
+            acc[key] = sourceObj[key];
+        }
+        return acc;
+    }, {});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-vue3-aggrid",
-  "version": "18.1.4",
+  "version": "18.1.5",
   "type": "module",
   "typings": "lib/index.d.ts",
   "peerDependencies": {
@@ -9,7 +9,7 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@adaptabletools/adaptable": "18.1.4"
+    "@adaptabletools/adaptable": "18.1.5"
   },
   "module": "lib/index.js"
 }