@azrico/reactgrid 1.2.29 → 1.2.32

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.2.32](https://github.com/Azrideus/azrico-reactgrid/compare/v1.2.31...v1.2.32) (2023-04-11)
+
+### [1.2.31](https://github.com/Azrideus/azrico-reactgrid/compare/v1.2.30...v1.2.31) (2023-04-03)
+
+### [1.2.30](https://github.com/Azrideus/azrico-reactgrid/compare/v1.2.29...v1.2.30) (2023-04-03)
+
 ### [1.2.29](https://github.com/Azrideus/azrico-reactgrid/compare/v1.2.28...v1.2.29) (2023-04-03)
 
 ### [1.2.28](https://github.com/Azrideus/azrico-reactgrid/compare/v1.2.27...v1.2.28) (2023-04-03)

package/dist/src/func/func_child.d.ts

@@ -5,7 +5,7 @@ type mrow = {
 };
 export declare function fix_parent_child_relations<T extends mrow>(rows: T[]): T[];
 export declare class func_selection {
-    static getVirtualElement(x?: number, y?: number): () => {
+    static getVirtualElement(x?: number, y?: number): {
         getBoundingClientRect: () => {
             width: number;
             height: number;

package/dist/src/func/func_child.js

@@ -48,9 +48,10 @@ function assign_children(row, all_rows) {
 }
 class func_selection {
   static getVirtualElement(x = 0, y = 0) {
-    return () => ({
-      getBoundingClientRect: func_selection.generateGetBoundingClientRect(x, y)
-    });
+    const boundsRect = func_selection.generateGetBoundingClientRect(x, y);
+    return {
+      getBoundingClientRect: boundsRect
+    };
   }
   static generateGetBoundingClientRect(x = 0, y = 0) {
     return () => ({

package/dist/src/func/func_grid.js

@@ -260,12 +260,13 @@ function get_col_header(obj) {
  * @returns
  */
 function get_row_id(obj) {
-  if (!obj) return '-1';
+  if (!obj) return undefined;
   if (typeof obj == 'string') return obj;
-  if (typeof obj != 'object') return '-1';
-  return obj.__table_id || obj.id || '-1';
+  if (typeof obj != 'object') return undefined;
+  return obj.__table_id || obj.id || undefined;
 }
 function set_row_id(obj, val) {
+  if (typeof obj != 'object') return false;
   if (val === undefined) delete obj.__table_id;else obj.__table_id = val;
   return obj.__table_id;
 }

package/dist/src/index.js

@@ -47,13 +47,18 @@ Object.keys(_DataGrid).forEach(function (key) {
   });
 });
 var _func_grid = require("./func/func_grid");
+var _example = _interopRequireDefault(require("./example"));
+var _react = _interopRequireDefault(require("react"));
+var _client = _interopRequireDefault(require("react-dom/client"));
+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; }
 /* -------------------------------------------------------------------------- */
 //
-var _default = _DataGrid.default; // const testroot = document.getElementById('testroot');
-// if (testroot) {
-// // const root = ReactDOM.createRoot(document.getElementById('testroot') as HTMLElement);
-// // root.render(<ExampleGrid />);
-// }
-exports.default = _default;
+var _default = _DataGrid.default;
+exports.default = _default;
+const testroot = document.getElementById('testroot');
+if (testroot) {
+  const root = _client.default.createRoot(document.getElementById('testroot'));
+  root.render(_react.default.createElement(_example.default, null));
+}

package/dist/src/views/DataGrid.js

@@ -14,6 +14,7 @@ var _func_grid = require("../func/func_grid");
 var _controls = require("@azrico/controls");
 var _react = _interopRequireDefault(require("react"));
 var _func_child = require("../func/func_child");
+var _object = require("@azrico/object");
 var _reactdatagridEnterprise = _interopRequireDefault(require("@inovua/reactdatagrid-enterprise"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _reactUseSize = require("react-use-size");
@@ -119,8 +120,9 @@ function DataGridEventsWrapper(props) {
   /* --------------------------------- events --------------------------------- */
   const onRowContextMenu = _react.default.useCallback((rowProps, event) => {
     if (!rowProps || !rowProps.data || _func_child.func_selection.has_selection()) return;
+    const anEl = _func_child.func_selection.getVirtualElement(event.clientX, event.clientY);
     update_menuRow(rowProps.data);
-    update_menuAnchorEl(_func_child.func_selection.getVirtualElement(event.clientX, event.clientY));
+    update_menuAnchorEl(anEl);
     event.preventDefault();
   }, []);
   const onRowClick = _react.default.useCallback((rowProps, event) => {
@@ -163,12 +165,15 @@ function DataGridEventsWrapper(props) {
       ...events
     };
   }, [props.static_gridOptions, onRowClick]);
-  const contextMenu = _react.default.createElement(_controls.ContextMenu, {
-    menuAnchorEl: menuAnchorEl,
-    set_menuAnchorEl: update_menuAnchorEl,
-    menuRow: menuRow,
-    menu_items: props.contextMenuItems
-  });
+  const contextMenu = _react.default.useMemo(() => {
+    console.log('menuAnchorEl:', menuAnchorEl, (0, _object.fn_eval)(menuAnchorEl));
+    return _react.default.createElement(_controls.ContextMenu, {
+      menuAnchorEl: menuAnchorEl,
+      set_menuAnchorEl: update_menuAnchorEl,
+      menuRow: menuRow,
+      menu_items: props.contextMenuItems
+    });
+  }, [menuAnchorEl, menuRow, props.contextMenuItems]);
   if (props.details_dataSource) {
     return _react.default.createElement(DataGridDetailsWrapper, {
       ...props,
@@ -194,7 +199,6 @@ function DataGridDetailsWrapper(props) {
       cached_data: cached_data,
       last_cache_info: last_cache_info
     });
-    console.log('ds', res);
     return res;
   }, [props.dataSource]);
   const renderDetailsGrid = ({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@azrico/reactgrid",
-	"version": "1.2.29",
+	"version": "1.2.32",
 	"main": "dist/index.js",
 	"description": "React Datagrid",
 	"author": "Azrideus <MehrdadTavangar@gmail.com>",
@@ -29,8 +29,8 @@
 		"typescript": "^4.8.4"
 	},
 	"dependencies": {
-		"@azrico/controls": "1.4.27",
-		"@azrico/object": "^1.3.1",
+		"@azrico/controls": "1.5.12",
+		"@azrico/object": "^1.4.12",
 		"@emotion/react": "^11.9.3",
 		"@emotion/styled": "^11.9.3",
 		"@inovua/reactdatagrid-enterprise": "^5.8.5",
@@ -39,7 +39,8 @@
 		"react-use-size": "^3.0.1"
 	},
 	"peerDependencies": {
-		"@azrico/controls": ">=1.4.27",
+		"@azrico/controls": ">=1.5.12",
+		"@azrico/object": "^>=1.4.12",
 		"@emotion/react": ">=11.9.3",
 		"@emotion/styled": ">=11.9.3",
 		"@inovua/reactdatagrid-enterprise": ">=5.8.5",

package/src/func/func_child.ts

@@ -46,9 +46,10 @@ function assign_children(row: converted_row, all_rows: converted_row[]) {
 }
 export class func_selection {
 	static getVirtualElement(x = 0, y = 0) {
-		return () => ({
-			getBoundingClientRect: func_selection.generateGetBoundingClientRect(x, y),
-		});
+		const boundsRect = func_selection.generateGetBoundingClientRect(x, y); 
+		return {
+			getBoundingClientRect: boundsRect,
+		};
 	}
 	static generateGetBoundingClientRect(x = 0, y = 0) {
 		return () => ({

package/src/func/func_grid.ts

@@ -264,12 +264,13 @@ export function get_col_header(obj: any): string {
  * @returns
  */
 export function get_row_id(obj: any): any {
-	if (!obj) return '-1';
+	if (!obj) return undefined;
 	if (typeof obj == 'string') return obj;
-	if (typeof obj != 'object') return '-1';
-	return obj.__table_id || obj.id || '-1';
+	if (typeof obj != 'object') return undefined;
+	return obj.__table_id || obj.id || undefined;
 }
 export function set_row_id(obj: any, val: undefined | string): any {
+	if (typeof obj != 'object') return false;
 	if (val === undefined) delete obj.__table_id;
 	else obj.__table_id = val;
 	return obj.__table_id;

package/src/index.tsx

@@ -10,9 +10,8 @@ import ReactDOM from 'react-dom/client';
 //
 export default AzGrid;
 
-// const testroot = document.getElementById('testroot');
-// if (testroot) {
-// // const root = ReactDOM.createRoot(document.getElementById('testroot') as HTMLElement);
-// // root.render(<ExampleGrid />);
-
-// }
+ const testroot = document.getElementById('testroot');
+ if (testroot) {
+   const root = ReactDOM.createRoot(document.getElementById('testroot') as HTMLElement);
+   root.render(<ExampleGrid />);
+ }

package/src/views/DataGrid.tsx

@@ -27,11 +27,11 @@ import {
 	TypeRowSelection,
 } from '@inovua/reactdatagrid-community/types';
 import { fix_parent_child_relations, func_selection } from '../func/func_child';
+import { fn_eval, object_equals } from '@azrico/object';
 
 import ReactDataGrid from '@inovua/reactdatagrid-enterprise';
 import { TypeOnSelectionChangeArg } from '@inovua/reactdatagrid-community/types/TypeDataGridProps';
 import clsx from 'clsx';
-import { object_equals } from '@azrico/object';
 import { useComponentSize } from 'react-use-size';
 
 /* -------------------------------------------------------------------------- */
@@ -265,8 +265,10 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 
 	const onRowContextMenu = React.useCallback((rowProps, event) => {
 		if (!rowProps || !rowProps.data || func_selection.has_selection()) return;
+
+		const anEl = func_selection.getVirtualElement(event.clientX, event.clientY);
 		update_menuRow(rowProps.data);
-		update_menuAnchorEl(func_selection.getVirtualElement(event.clientX, event.clientY));
+		update_menuAnchorEl(anEl);
 		event.preventDefault();
 	}, []);
 	const onRowClick = React.useCallback(
@@ -318,14 +320,17 @@ function DataGridEventsWrapper(props: DataGridWrapperProps) {
 		return { ...props.static_gridOptions, ...events };
 	}, [props.static_gridOptions, onRowClick]);
 
-	const contextMenu = (
-		<ContextMenu
-			menuAnchorEl={menuAnchorEl}
-			set_menuAnchorEl={update_menuAnchorEl}
-			menuRow={menuRow}
-			menu_items={props.contextMenuItems as any}
-		/>
-	);
+	const contextMenu = React.useMemo(() => {
+		console.log('menuAnchorEl:', menuAnchorEl, fn_eval(menuAnchorEl));
+		return (
+			<ContextMenu
+				menuAnchorEl={menuAnchorEl}
+				set_menuAnchorEl={update_menuAnchorEl}
+				menuRow={menuRow}
+				menu_items={props.contextMenuItems as any}
+			/>
+		);
+	}, [menuAnchorEl, menuRow, props.contextMenuItems]);
 
 	if (props.details_dataSource) {
 		return (
@@ -358,7 +363,6 @@ function DataGridDetailsWrapper(props: DataGridWrapperProps) {
 				cached_data: cached_data,
 				last_cache_info: last_cache_info,
 			});
-			console.log('ds', res);
 			return res;
 		},
 		[props.dataSource]
@@ -369,7 +373,7 @@ function DataGridDetailsWrapper(props: DataGridWrapperProps) {
 				defaultFilterValue={props.details_filter}
 				dataSource={dataSource}
 				columns={cached_details_columns}
-			/>
+			></ReactDataGrid>
 		);
 	};
 
@@ -382,12 +386,7 @@ function DataGridDetailsWrapper(props: DataGridWrapperProps) {
 		return finalresult;
 	}, [props.static_gridOptions]);
 
-	return (
-		<DataGridSizeWrapper
-			{...props}
-			static_gridOptions={static_gridOptions}
-		></DataGridSizeWrapper>
-	);
+	return <DataGridSizeWrapper {...props} static_gridOptions={static_gridOptions} />;
 }
 
 function DataGridSizeWrapper(props: DataGridWrapperProps) {