@azrico/reactgrid 1.1.5 → 1.1.8

package/dist/src/views/DataGrid.js

@@ -10,13 +10,15 @@ require("@inovua/reactdatagrid-enterprise/theme/default-dark.css");
 require("@inovua/reactdatagrid-enterprise/theme/amber-dark.css");
 require("../themes/base_styles.css");
 require("../themes/grid.css");
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _helpers = require("../func/helpers");
 var _controls = require("@azrico/controls");
 var _reactdatagridEnterprise = _interopRequireDefault(require("@inovua/reactdatagrid-enterprise"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _object = require("@azrico/object");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /* -------------------------------------------------------------------------- */
 // const defaultfilterTypes: FilterTypes = {
 // 	string: {
@@ -120,6 +122,30 @@ function DataGrid(props) {
   const gridRef = _react.default.useRef(null);
   const [menuAnchorEl, set_menuAnchorEl] = _react.default.useState(null);
   const [menuRow, set_menuRow] = _react.default.useState(null);
+  /* --------------------------------- events --------------------------------- */
+  const onRowContextMenu = (0, _react.useCallback)((rowProps, event) => {
+    if (_helpers.func_selection.has_selection()) return;
+    update_menuAnchorEl(_helpers.func_selection.getVirtualElement(event.clientX, event.clientY));
+    update_menuRow(rowProps.data);
+    event.preventDefault();
+  }, []);
+  const onRowClick = (0, _react.useCallback)((rowProps, event) => {
+    props.onRowClick && props.onRowClick(rowProps.rowIndex, rowProps.data);
+  }, []);
+  const onRowDoubleClick = _react.default.useCallback((event, rowProps) => {
+    props.onRowDoubleClick && props.onRowDoubleClick(rowProps.rowIndex, rowProps.data);
+  }, []);
+  /* ------------------------------- ContextMenu ------------------------------ */
+  const update_menuAnchorEl = _react.default.useCallback(el => {
+    if (!el) {
+      set_menuAnchorEl(el);
+    } else if (menuAnchorEl) set_menuAnchorEl(null);
+  }, []);
+  const update_menuRow = _react.default.useCallback(r => {
+    if (!r) {
+      set_menuRow(r);
+    } else if (menuRow) set_menuRow(null);
+  }, []);
   /* -------------------------------------------------------------------------- */
   /*                               Create the grid                              */
   /* -------------------------------------------------------------------------- */
@@ -127,8 +153,8 @@ function DataGrid(props) {
     const firstcolumn = columns[0];
     const licenseKey = props.licenseKey || get_default_key();
     const events = {
-      onRowClick: props.onRowClick ? onRowClick : undefined,
-      onRowDoubleClick: props.onRowDoubleClick ? onRowDoubleClick : undefined,
+      onRowClick: onRowClick,
+      onRowDoubleClick: onRowDoubleClick,
       onSkipChange: props.onSkipChange,
       onLimitChange: props.onLimitChange,
       onRowContextMenu: onRowContextMenu
@@ -145,7 +171,7 @@ function DataGrid(props) {
       ...events,
       ...extra_ops
     };
-  }, [props.allowChildRows, columns, props.RowDetail]);
+  }, [columns, props.allowChildRows, props.RowDetail, onRowClick, onRowDoubleClick, onRowContextMenu]);
   const static_gridOptions = _react.default.useMemo(() => {
     return {
       ...base_gridOptions,
@@ -160,31 +186,6 @@ function DataGrid(props) {
     });
     return res;
   }, dynamic_option_names.map(r => props[r]));
-  /* --------------------------------- events --------------------------------- */
-  function onRowContextMenu(row, ev) {
-    if (_helpers.func_selection.has_selection()) return;
-    update_menuAnchorEl(_helpers.func_selection.getVirtualElement(ev.clientX, ev.clientY));
-    update_menuRow(row.data);
-    ev.preventDefault();
-  }
-  function onRowClick(row, event) {
-    props.onRowClick && props.onRowClick(row.rowIndex, row.data);
-  }
-  function onRowDoubleClick(event, row) {
-    props.onRowDoubleClick && props.onRowDoubleClick(row.rowIndex, row.data);
-  }
-  /* ------------------------------- ContextMenu ------------------------------ */
-  function update_menuAnchorEl(el) {
-    if (!el) {
-      set_menuAnchorEl(el);
-    } else if (menuAnchorEl) set_menuAnchorEl(null);
-  }
-  function update_menuRow(r) {
-    if (!r) {
-      set_menuRow(r);
-    } else if (menuRow) set_menuRow(null);
-  }
-  /* -------------------------------------------------------------------------- */
   // const { width, height, ref: resize_ref } = useResizeDetector();
   return _react.default.createElement("div", {
     className: (0, _clsx.default)(props.className, 'azgrid-nooverflow', 'azgrid-filler')
@@ -325,6 +326,7 @@ function ApplyColumnData(props) {
       }
     }
   }
+  if (!Array.isArray(final_columns) || final_columns.length <= 0) return [];
   return final_columns;
 }
 /* -------------------------------------------------------------------------- */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.1.5",
+	"version": "1.1.8",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",

package/src/views/DataGrid.tsx

@@ -203,6 +203,7 @@ export function AzGrid(props: AzGridProps) {
 		},
 		[props.dataSource]
 	);
+
 	return (
 		<DataGrid
 			{...props}
@@ -223,6 +224,33 @@ function DataGrid(props: DataGridProps) {
 	const [menuAnchorEl, set_menuAnchorEl] = React.useState<any>(null);
 	const [menuRow, set_menuRow] = React.useState<any>(null);
 
+	/* --------------------------------- events --------------------------------- */
+
+	const onRowContextMenu = useCallback((rowProps, event) => {
+		if (func_selection.has_selection()) return;
+		update_menuAnchorEl(func_selection.getVirtualElement(event.clientX, event.clientY));
+		update_menuRow(rowProps.data);
+		event.preventDefault();
+	}, []);
+	const onRowClick = useCallback((rowProps, event) => {
+		props.onRowClick && props.onRowClick(rowProps.rowIndex, rowProps.data);
+	}, []);
+	const onRowDoubleClick = React.useCallback((event, rowProps) => {
+		props.onRowDoubleClick && props.onRowDoubleClick(rowProps.rowIndex, rowProps.data);
+	}, []);
+
+	/* ------------------------------- ContextMenu ------------------------------ */
+	const update_menuAnchorEl = React.useCallback((el) => {
+		if (!el) {
+			set_menuAnchorEl(el);
+		} else if (menuAnchorEl) set_menuAnchorEl(null);
+	}, []);
+	const update_menuRow = React.useCallback((r) => {
+		if (!r) {
+			set_menuRow(r);
+		} else if (menuRow) set_menuRow(null);
+	}, []);
+
 	/* -------------------------------------------------------------------------- */
 	/*                               Create the grid                              */
 	/* -------------------------------------------------------------------------- */
@@ -231,8 +259,8 @@ function DataGrid(props: DataGridProps) {
 		const firstcolumn = columns[0];
 		const licenseKey = props.licenseKey || get_default_key();
 		const events: GridOptions = {
-			onRowClick: props.onRowClick ? onRowClick : undefined,
-			onRowDoubleClick: props.onRowDoubleClick ? onRowDoubleClick : undefined,
+			onRowClick: onRowClick,
+			onRowDoubleClick: onRowDoubleClick,
 			onSkipChange: props.onSkipChange,
 			onLimitChange: props.onLimitChange,
 			onRowContextMenu: onRowContextMenu,
@@ -245,7 +273,14 @@ function DataGrid(props: DataGridProps) {
 			theme: dark ? 'amber-dark' : 'default-light',
 		};
 		return { ...defaultOptions, ...events, ...extra_ops };
-	}, [props.allowChildRows, columns, props.RowDetail]);
+	}, [
+		columns,
+		props.allowChildRows,
+		props.RowDetail,
+		onRowClick,
+		onRowDoubleClick,
+		onRowContextMenu,
+	]);
 
 	const static_gridOptions = React.useMemo<GridOptions>(() => {
 		return { ...base_gridOptions, ...props.gridOptions, ...forcedOptions };
@@ -262,34 +297,6 @@ function DataGrid(props: DataGridProps) {
 		dynamic_option_names.map((r) => props[r])
 	);
 
-	/* --------------------------------- events --------------------------------- */
-	function onRowContextMenu(row: TypeRowProps, ev: any) {
-		if (func_selection.has_selection()) return;
-		update_menuAnchorEl(func_selection.getVirtualElement(ev.clientX, ev.clientY));
-		update_menuRow(row.data);
-		ev.preventDefault();
-	}
-	function onRowClick(row: RowProps, event) {
-		props.onRowClick && props.onRowClick(row.rowIndex, row.data);
-	}
-	function onRowDoubleClick(event: MouseEvent, row: RowProps) {
-		props.onRowDoubleClick && props.onRowDoubleClick(row.rowIndex, row.data);
-	}
-
-	/* ------------------------------- ContextMenu ------------------------------ */
-
-	function update_menuAnchorEl(el) {
-		if (!el) {
-			set_menuAnchorEl(el);
-		} else if (menuAnchorEl) set_menuAnchorEl(null);
-	}
-	function update_menuRow(r) {
-		if (!r) {
-			set_menuRow(r);
-		} else if (menuRow) set_menuRow(null);
-	}
-
-	/* -------------------------------------------------------------------------- */
 	// const { width, height, ref: resize_ref } = useResizeDetector();
 
 	return (
@@ -444,7 +451,7 @@ function ApplyColumnData(props: any) {
 			}
 		}
 	}
-
+	if (!Array.isArray(final_columns) || final_columns.length <= 0) return [];
 	return final_columns;
 }