cleanup

Author: gnawjaren

components/lib/datatable/BodyCell.js

@@ -8,7 +8,6 @@ import { ChevronDownIcon } from '../icons/chevrondown';
 import { ChevronRightIcon } from '../icons/chevronright';
 import { PencilIcon } from '../icons/pencil';
 import { TimesIcon } from '../icons/times';
-import { OverlayService } from '../overlayservice/OverlayService';
 import { Ripple } from '../ripple/Ripple';
 import { DomHandler, IconUtils, ObjectUtils, classNames } from '../utils/Utils';
 import { RowCheckbox } from './RowCheckbox';
@@ -21,8 +20,6 @@ export const Cell = (props) => {
     const [styleObjectState, setStyleObjectState] = React.useState({});
     const elementRef = React.useRef(null);
     const keyHelperRef = React.useRef(null);
-    const overlayEventListener = React.useRef(null);
-    const selfClick = React.useRef(false);
     const focusTimeout = React.useRef(null);
     const initFocusTimeout = React.useRef(null);
     const editingRowDataStateRef = React.useRef(null);
@@ -58,9 +55,9 @@ export const Cell = (props) => {
     };
 
     const isIgnoredElement = (element) => {
-        const isCellEditor = (el) => el.getAttribute && el.getAttribute('data-pr-is-overlay');
+        const isOverlay = (el) => el.getAttribute && el.getAttribute('data-pr-is-overlay');
 
-        return isCellEditor(element) || DomHandler.getParents(element).find((el) => isCellEditor(el));
+        return isOverlay(element) || DomHandler.getParents(element).find((el) => isOverlay(el));
     };
 
     const [bindDocumentClickListener, unbindDocumentClickListener] = useEventListener({
@@ -69,8 +66,6 @@ export const Cell = (props) => {
             if (!isIgnoredElement(e.target) && isOutsideClicked(e.target)) {
                 switchCellToViewMode(e, true);
             }
-
-            selfClick.current = false;
         },
         options: true,
         when: isEditable()
@@ -121,10 +116,7 @@ export const Cell = (props) => {
         setTimeout(() => {
             setEditingState(false);
             unbindDocumentClickListener();
-            OverlayService.off('overlay-click', overlayEventListener.current);
-            overlayEventListener.current = null;
             editingRowDataStateRef.current = null;
-            selfClick.current = false;
         }, 1);
     };
 
@@ -177,7 +169,7 @@ export const Cell = (props) => {
     };
 
     const onClick = (event) => {
-        props.onClick(event, getCellCallbackParams(event), isEditable(), editingState, setEditingState, selfClick, props.column, bindDocumentClickListener, overlayEventListener, isOutsideClicked);
+        props.onClick(event, getCellCallbackParams(event), isEditable(), editingState, setEditingState, props.column, bindDocumentClickListener);
     };
 
     const onMouseDown = (event) => {
@@ -278,8 +270,6 @@ export const Cell = (props) => {
     };
 
     const onBlur = (event) => {
-        selfClick.current = false;
-
         if (props.editMode !== 'row' && editingState && getColumnProp('cellEditValidatorEvent') === 'blur') {
             switchCellToViewMode(event, true);
         }
@@ -364,13 +354,6 @@ export const Cell = (props) => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [editingState]);
 
-    useUnmountEffect(() => {
-        if (overlayEventListener.current) {
-            OverlayService.off('overlay-click', overlayEventListener.current);
-            overlayEventListener.current = null;
-        }
-    });
-
     const createLoading = () => {
         const options = props.getVirtualScrollerOption('getLoaderOptions')(props.rowIndex, {
             cellIndex: props.index,

components/lib/datatable/BodyRow.js

@@ -3,7 +3,6 @@ import { ColumnBase } from '../column/ColumnBase';
 import { useMergeProps } from '../hooks/Hooks';
 import { classNames, DomHandler, ObjectUtils } from '../utils/Utils';
 import { BodyCell, RadioCheckCell } from './BodyCell';
-import { OverlayService } from '../overlayservice/OverlayService';
 import { Fragment } from 'react';
 
 export const BodyRow = React.memo((props) => {
@@ -534,10 +533,8 @@ export const BodyRow = React.memo((props) => {
         }
     }, []);
 
-    const onCellClick = (event, params, isEditable, editingState, setEditingState, selfClick, column, bindDocumentClickListener, overlayEventListener, isOutsideClicked) => {
+    const onCellClick = (event, params, isEditable, editingState, setEditingState, column, bindDocumentClickListener) => {
         if (props.editMode !== 'row' && isEditable && !editingState && (props.selectOnEdit || (!props.selectOnEdit && props.isRowSelected))) {
-            selfClick.current = true;
-
             const onBeforeCellEditShow = getColumnProp(column, 'onBeforeCellEditShow');
             const onCellEditInit = getColumnProp(column, 'onCellEditInit');
             const cellEditValidatorEvent = getColumnProp(column, 'cellEditValidatorEvent');
@@ -571,14 +568,6 @@ export const BodyRow = React.memo((props) => {
 
                 if (cellEditValidatorEvent === 'click') {
                     bindDocumentClickListener();
-
-                    overlayEventListener.current = (e) => {
-                        if (!isOutsideClicked(e.target)) {
-                            selfClick.current = true;
-                        }
-                    };
-
-                    OverlayService.on('overlay-click', overlayEventListener.current);
                 }
             }, 1);
         }