@azrico/reactgrid 1.3.26 → 1.3.27

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.
Files changed (3) hide show
  1. package/dist/src/views/DataGrid.js +4 -1
  2. package/package.json +1 -1
  3. package/src/views/DataGrid.tsx +11 -1
package/dist/src/views/DataGrid.js CHANGED
@@ -86,11 +86,14 @@ function AzGrid(props) {
86
86
  };
87
87
  }, [cached_columns, props.allowChildRows, props.editable, props.RowDetail, props.onEditComplete]);
88
88
  const static_gridOptions = _react.default.useMemo(() => {
89
- return {
89
+ const finalres = {
90
90
  ...base_gridOptions,
91
91
  ...props.gridOptions,
92
92
  ...forcedOptions
93
93
  };
94
+ //append filter types instead of replacing it
95
+ if (finalres.filterTypes) finalres.filterTypes = Object.assign({}, _reactdatagridEnterprise.default.defaultProps.filterTypes, finalres.filterTypes);
96
+ return finalres;
94
97
  }, [props.gridOptions, base_gridOptions, forcedOptions]);
95
98
  const dynamic_gridOptions = _react.default.useMemo(() => {
96
99
  const res = {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azrico/reactgrid",
3
- "version": "1.3.26",
3
+ "version": "1.3.27",
4
4
  "main": "dist/index.js",
5
5
  "description": "React Datagrid",
6
6
  "author": "Azrideus <MehrdadTavangar@gmail.com>",
package/src/views/DataGrid.tsx CHANGED
@@ -223,7 +223,17 @@ export function AzGrid(props: AzGridProps) {
223
223
  ]);
224
224
 
225
225
  const static_gridOptions = React.useMemo<AzGridOptions>(() => {
226
- return { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
226
+ const finalres = { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
227
+
228
+ //append filter types instead of replacing it
229
+ if (finalres.filterTypes)
230
+ finalres.filterTypes = Object.assign(
231
+ {},
232
+ ReactDataGrid.defaultProps.filterTypes,
233
+ finalres.filterTypes
234
+ );
235
+
236
+ return finalres;
227
237
  }, [props.gridOptions, base_gridOptions, forcedOptions]);
228
238
 
229
239
  const dynamic_gridOptions = React.useMemo<AzGridOptions>(