ghiscoding · ghiscoding · Dec 11, 2023 · Dec 11, 2023 · Dec 11, 2023
diff --git a/packages/common/src/core/slickGrid.ts b/packages/common/src/core/slickGrid.ts
@@ -2,7 +2,7 @@
 import Sortable, { SortableEvent } from 'sortablejs';
 import DOMPurify from 'dompurify';
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { isDefined, isPrimitiveOrHTML } from '@slickgrid-universal/utils';
+import { createDomElement, emptyElement, getInnerSize, getOffset, insertAfterElement, isDefined, isPrimitiveOrHTML } from '@slickgrid-universal/utils';
 
 import {
   type BasePubSub,
@@ -77,7 +77,6 @@ import type {
   SlickPlugin,
   SlickGridEventData,
 } from '../interfaces';
-import { createDomElement, emptyElement, getInnerSize, getOffset, insertAfterElement } from '../services/domUtilities';
 import type { SlickDataView } from './slickDataview';
 
 /**

diff --git a/packages/common/src/core/slickInteractions.ts b/packages/common/src/core/slickInteractions.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
+import { windowScrollPosition } from '@slickgrid-universal/utils';
+
 import type { DragItem, DragPosition, DraggableOption, MouseWheelOption, ResizableOption } from '../interfaces/index';
-import { windowScrollPosition } from '../services/domUtilities';
 
 /***
  * Interactions, add basic behaviors to any element.

diff --git a/packages/common/src/editors/__tests__/longTextEditor.spec.ts b/packages/common/src/editors/__tests__/longTextEditor.spec.ts
@@ -1,6 +1,6 @@
 // mocked modules
-jest.mock('../../services/domUtilities', () => ({
-  ...(jest.requireActual('../../services/domUtilities') as any),
+jest.mock('@slickgrid-universal/utils', () => ({
+  ...(jest.requireActual('@slickgrid-universal/utils') as any),
   getOffset: jest.fn(),
 }));
 
@@ -9,7 +9,7 @@ import { LongTextEditor } from '../longTextEditor';
 import { AutocompleterOption, Column, ColumnEditor, EditorArguments, GridOption } from '../../interfaces/index';
 import { SlickEvent, type SlickDataView, type SlickGrid } from '../../core/index';
 import { TranslateServiceStub } from '../../../../../test/translateServiceStub';
-import { getOffset } from '../../services/domUtilities';
+import { getOffset } from '@slickgrid-universal/utils';
 
 const containerId = 'demo-container';
 

diff --git a/packages/common/src/editors/autocompleterEditor.ts b/packages/common/src/editors/autocompleterEditor.ts
@@ -1,7 +1,7 @@
 import autocompleter from 'autocompleter';
 import type { AutocompleteItem, AutocompleteResult, AutocompleteSettings } from 'autocompleter';
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { isObject, isPrimitiveValue, setDeepValue, toKebabCase } from '@slickgrid-universal/utils';
+import { createDomElement, isObject, isPrimitiveValue, setDeepValue, toKebabCase } from '@slickgrid-universal/utils';
 
 import { Constants } from './../constants';
 import { FieldType } from '../enums/index';
@@ -22,7 +22,7 @@ import type {
 } from '../interfaces/index';
 import { textValidator } from '../editorValidators/textValidator';
 import { addAutocompleteLoadingByOverridingFetch } from '../commonEditorFilter';
-import { createDomElement, sanitizeTextByAvailableSanitizer, } from '../services/domUtilities';
+import { sanitizeTextByAvailableSanitizer, } from '../services/domUtilities';
 import { findOrDefault, getDescendantProperty, } from '../services/utilities';
 import type { TranslaterService } from '../services/translater.service';
 import { SlickEventData, type SlickGrid } from '../core/index';

diff --git a/packages/common/src/editors/checkboxEditor.ts b/packages/common/src/editors/checkboxEditor.ts
@@ -1,9 +1,8 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
 
 import { Constants } from './../constants';
 import type { Column, ColumnEditor, CompositeEditorOption, Editor, EditorArguments, EditorValidator, EditorValidationResult, GridOption } from './../interfaces/index';
-import { createDomElement } from '../services/domUtilities';
 import { getDescendantProperty, } from '../services/utilities';
 import { SlickEventData, type SlickGrid } from '../core/index';
 

diff --git a/packages/common/src/editors/dateEditor.ts b/packages/common/src/editors/dateEditor.ts
@@ -1,5 +1,5 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue } from '@slickgrid-universal/utils';
+import { createDomElement, destroyAllElementProps, emptyElement, setDeepValue } from '@slickgrid-universal/utils';
 import flatpickr from 'flatpickr';
 import type { BaseOptions as FlatpickrBaseOptions } from 'flatpickr/dist/types/options';
 import type { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
@@ -18,7 +18,6 @@ import type {
   FlatpickrOption,
   GridOption,
 } from './../interfaces/index';
-import { createDomElement, destroyAllElementProps, emptyElement, } from '../services/domUtilities';
 import { getDescendantProperty, mapFlatpickrDateFormatWithFieldType, mapMomentDateFormatWithFieldType, } from './../services/utilities';
 import type { TranslaterService } from '../services/translater.service';
 import { SlickEventData, type SlickGrid } from '../core/index';

diff --git a/packages/common/src/editors/dualInputEditor.ts b/packages/common/src/editors/dualInputEditor.ts
@@ -1,5 +1,5 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
 
 import type {
   DOMEvent,
@@ -15,7 +15,6 @@ import type {
 } from '../interfaces/index';
 import { getDescendantProperty } from '../services/utilities';
 import { floatValidator, integerValidator, textValidator } from '../editorValidators';
-import { createDomElement } from '../services/domUtilities';
 import { SlickEventData, SlickEventHandler, type SlickGrid } from '../core';
 
 /*

diff --git a/packages/common/src/editors/floatEditor.ts b/packages/common/src/editors/floatEditor.ts
@@ -1,9 +1,8 @@
-import { toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, toSentenceCase } from '@slickgrid-universal/utils';
 
 import type { EditorArguments, EditorValidationResult } from '../interfaces/index';
 import { floatValidator } from '../editorValidators/floatValidator';
 import { InputEditor } from './inputEditor';
-import { createDomElement } from '../services/domUtilities';
 import { getDescendantProperty } from '../services/utilities';
 
 const DEFAULT_DECIMAL_PLACES = 0;

diff --git a/packages/common/src/editors/inputEditor.ts b/packages/common/src/editors/inputEditor.ts
@@ -1,5 +1,5 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
 
 import type {
   Column,
@@ -13,7 +13,6 @@ import type {
 } from '../interfaces/index';
 import { getDescendantProperty } from '../services/utilities';
 import { textValidator } from '../editorValidators/textValidator';
-import { createDomElement } from '../services/domUtilities';
 import { SlickEventData, type SlickGrid } from '../core/index';
 
 /*

diff --git a/packages/common/src/editors/integerEditor.ts b/packages/common/src/editors/integerEditor.ts
@@ -1,9 +1,8 @@
-import { toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, toSentenceCase } from '@slickgrid-universal/utils';
 
 import type { EditorArguments, EditorValidationResult } from '../interfaces/index';
 import { integerValidator } from '../editorValidators/integerValidator';
 import { InputEditor } from './inputEditor';
-import { createDomElement } from '../services/domUtilities';
 import { getDescendantProperty } from '../services/utilities';
 
 export class IntegerEditor extends InputEditor {

diff --git a/packages/common/src/editors/longTextEditor.ts b/packages/common/src/editors/longTextEditor.ts
@@ -1,5 +1,5 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, getOffset, type HtmlElementPosition, setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
 
 import { Constants } from './../constants';
 import type {
@@ -12,11 +12,9 @@ import type {
   EditorValidationResult,
   ElementPosition,
   GridOption,
-  HtmlElementPosition,
   Locale,
   LongTextEditorOption,
 } from '../interfaces/index';
-import { createDomElement, getOffset, } from '../services/domUtilities';
 import { getDescendantProperty, getTranslationPrefix, } from '../services/utilities';
 import type { TranslaterService } from '../services/translater.service';
 import { textValidator } from '../editorValidators/textValidator';

diff --git a/packages/common/src/editors/selectEditor.ts b/packages/common/src/editors/selectEditor.ts
@@ -1,4 +1,4 @@
-import { setDeepValue } from '@slickgrid-universal/utils';
+import { emptyElement, setDeepValue } from '@slickgrid-universal/utils';
 import { dequal } from 'dequal/lite';
 import { multipleSelect, MultipleSelectInstance, MultipleSelectOption, OptionRowData } from 'multiple-select-vanilla';
 
@@ -19,7 +19,7 @@ import type {
   Locale,
   SelectOption,
 } from './../interfaces/index';
-import { buildMsSelectCollectionList, CollectionService, emptyElement, findOrDefault, sanitizeTextByAvailableSanitizer, type TranslaterService } from '../services/index';
+import { buildMsSelectCollectionList, CollectionService, findOrDefault, sanitizeTextByAvailableSanitizer, type TranslaterService } from '../services/index';
 import { getDescendantProperty, getTranslationPrefix, } from '../services/utilities';
 import { SlickEventData, type SlickGrid } from '../core/index';
 

diff --git a/packages/common/src/editors/sliderEditor.ts b/packages/common/src/editors/sliderEditor.ts
@@ -1,5 +1,5 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
-import { setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
+import { createDomElement, setDeepValue, toSentenceCase } from '@slickgrid-universal/utils';
 
 import { Constants } from '../constants';
 import type {
@@ -16,7 +16,6 @@ import type {
 } from '../interfaces/index';
 import { getDescendantProperty } from '../services/utilities';
 import { sliderValidator } from '../editorValidators/sliderValidator';
-import { createDomElement } from '../services/domUtilities';
 import { SlickEventData, type SlickGrid } from '../core/index';
 
 /*

diff --git a/packages/common/src/enums/infer.type.ts b/packages/common/src/enums/infer.type.ts
@@ -1,11 +1,5 @@
 export type InferType<T> = T extends infer R ? R : any;
 
-/* eslint-disable @typescript-eslint/indent */
-export type InferDOMType<T> =
-  T extends CSSStyleDeclaration ? Partial<CSSStyleDeclaration> :
-  T extends infer R ? R : any;
-/* eslint-enable @typescript-eslint/indent */
-
 export type MergeTypes<A, B> = {
   [key in keyof A]: key extends keyof B ? B[key] : A[key];
 } & B;
diff --git a/packages/common/src/extensions/__tests__/slickDraggableGrouping.spec.ts b/packages/common/src/extensions/__tests__/slickDraggableGrouping.spec.ts
@@ -28,13 +28,13 @@ jest.mock('sortablejs', () => sortableMock);
 import 'jest-extended';
 import { SortableOptions } from 'sortablejs';
 import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
-import { deepCopy } from '@slickgrid-universal/utils';
+import { createDomElement, deepCopy } from '@slickgrid-universal/utils';
 
 import { Aggregators } from '../../aggregators/aggregators.index';
 import { SlickDraggableGrouping } from '../slickDraggableGrouping';
 import { ExtensionUtility } from '../../extensions/extensionUtility';
 import type { Column, DraggableGroupingOption, GridOption } from '../../interfaces/index';
-import { BackendUtilityService, createDomElement, } from '../../services';
+import { BackendUtilityService, } from '../../services';
 import { SharedService } from '../../services/shared.service';
 import { TranslateServiceStub } from '../../../../../test/translateServiceStub';
 import { SortDirectionNumber } from '../../enums/index';
@@ -268,18 +268,10 @@ describe('Draggable Grouping Plugin', () => {
       gridContainerDiv.appendChild(mockDivPaneContainerElm);
       gridContainerDiv.appendChild(mockDivPaneContainerElm2);
       dropEvent = new Event('mouseup');
-      headerColumnDiv1 = createDomElement('div', {
-        className: 'slick-header-column', id: `${GRID_UID}firstName`, dataset: { id: 'firstName' },
-      }, preHeaderDiv);
-      headerColumnDiv2 = createDomElement('div', {
-        className: 'slick-header-column', id: `${GRID_UID}lastName`, dataset: { id: 'lastName' },
-      }, preHeaderDiv);
-      headerColumnDiv3 = createDomElement('div', {
-        className: 'slick-header-column', id: `${GRID_UID}age`, dataset: { id: 'age' },
-      }, preHeaderDiv);
-      headerColumnDiv4 = createDomElement('div', {
-        className: 'slick-header-column', id: `${GRID_UID}medals`, dataset: { id: 'medals' },
-      }, preHeaderDiv);
+      headerColumnDiv1 = createDomElement('div', { className: 'slick-header-column', id: `${GRID_UID}firstName`, dataset: { id: 'firstName' } }, preHeaderDiv);
+      headerColumnDiv2 = createDomElement('div', { className: 'slick-header-column', id: `${GRID_UID}lastName`, dataset: { id: 'lastName' } }, preHeaderDiv);
+      headerColumnDiv3 = createDomElement('div', { className: 'slick-header-column', id: `${GRID_UID}age`, dataset: { id: 'age' } }, preHeaderDiv);
+      headerColumnDiv4 = createDomElement('div', { className: 'slick-header-column', id: `${GRID_UID}medals`, dataset: { id: 'medals' } }, preHeaderDiv);
       headerColumnDiv1.appendChild(createDomElement('span', { className: 'slick-column-name', textContent: 'First Name' }));
       headerColumnDiv2.appendChild(createDomElement('span', { className: 'slick-column-name', textContent: 'Last Name' }));
       headerColumnDiv3.appendChild(createDomElement('span', { className: 'slick-column-name', textContent: 'Age' }));

diff --git a/packages/common/src/extensions/extensionCommonUtils.ts b/packages/common/src/extensions/extensionCommonUtils.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
-import { titleCase } from '@slickgrid-universal/utils';
+import { createDomElement, titleCase } from '@slickgrid-universal/utils';
 
 import type { Column, ColumnPickerOption, DOMEvent, GridMenuOption } from '../interfaces/index';
-import { createDomElement } from '../services/domUtilities';
 import { SlickColumnPicker } from './slickColumnPicker';
 import { SlickGridMenu } from './slickGridMenu';
 

diff --git a/packages/common/src/extensions/menuBaseClass.ts b/packages/common/src/extensions/menuBaseClass.ts
@@ -1,6 +1,6 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
 import type { BasePubSubService } from '@slickgrid-universal/event-pub-sub';
-import { hasData } from '@slickgrid-universal/utils';
+import { createDomElement, emptyElement, hasData } from '@slickgrid-universal/utils';
 
 import type {
   CellMenu,
@@ -18,7 +18,6 @@ import type {
 } from '../interfaces/index';
 import type { ExtensionUtility } from '../extensions/extensionUtility';
 import type { SharedService } from '../services/shared.service';
-import { createDomElement, emptyElement } from '../services/domUtilities';
 import { SlickEventHandler, type SlickGrid } from '../core/index';
 
 export type MenuType = 'command' | 'option';

diff --git a/packages/common/src/extensions/menuFromCellBaseClass.ts b/packages/common/src/extensions/menuFromCellBaseClass.ts
@@ -1,5 +1,5 @@
 import type { BasePubSubService } from '@slickgrid-universal/event-pub-sub';
-import { titleCase } from '@slickgrid-universal/utils';
+import { calculateAvailableSpace, createDomElement, findWidthOrDefault, getOffset, titleCase } from '@slickgrid-universal/utils';
 
 import type {
   CellMenu,
@@ -13,7 +13,6 @@ import type {
   MenuOptionItemCallbackArgs,
 } from '../interfaces/index';
 import type { ExtensionUtility } from '../extensions/extensionUtility';
-import { calculateAvailableSpace, createDomElement, findWidthOrDefault, getOffset, } from '../services/domUtilities';
 import { type ExtendableItemTypes, type ExtractMenuType, MenuBaseClass, type MenuType } from './menuBaseClass';
 import type { SharedService } from '../services/shared.service';
 

diff --git a/packages/common/src/extensions/slickCellExternalCopyManager.ts b/packages/common/src/extensions/slickCellExternalCopyManager.ts
@@ -1,7 +1,6 @@
-import { stripTags } from '@slickgrid-universal/utils';
+import { createDomElement, stripTags } from '@slickgrid-universal/utils';
 
 import type { Column, ExcelCopyBufferOption, ExternalCopyClipCommand } from '../interfaces/index';
-import { createDomElement } from '../services/domUtilities';
 import { SlickEvent, SlickEventData, SlickEventHandler, type SlickGrid, SlickRange } from '../core/index';
 
 // using external SlickGrid JS libraries

diff --git a/packages/common/src/extensions/slickCellRangeDecorator.ts b/packages/common/src/extensions/slickCellRangeDecorator.ts
@@ -1,6 +1,5 @@
-import { deepMerge } from '@slickgrid-universal/utils';
+import { createDomElement, deepMerge } from '@slickgrid-universal/utils';
 
-import { createDomElement } from '../services/domUtilities';
 import type { CellRangeDecoratorOption, CSSStyleDeclarationWritable } from '../interfaces/index';
 import type { SlickGrid, SlickRange } from '../core/index';
 

diff --git a/packages/common/src/extensions/slickCellRangeSelector.ts b/packages/common/src/extensions/slickCellRangeSelector.ts
@@ -1,4 +1,4 @@
-import { deepMerge } from '@slickgrid-universal/utils';
+import { deepMerge, emptyElement, getOffset, } from '@slickgrid-universal/utils';
 
 import type {
   CellRangeSelectorOption,
@@ -10,7 +10,6 @@ import type {
   MouseOffsetViewport,
   OnScrollEventArgs,
 } from '../interfaces/index';
-import { emptyElement, getOffset, } from '../services/domUtilities';
 import { SlickCellRangeDecorator } from './index';
 import { SlickEvent, SlickEventData, SlickEventHandler, type SlickGrid, SlickRange } from '../core/index';
 

diff --git a/packages/common/src/extensions/slickCheckboxSelectColumn.ts b/packages/common/src/extensions/slickCheckboxSelectColumn.ts
@@ -1,10 +1,10 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
 import type { BasePubSubService } from '@slickgrid-universal/event-pub-sub';
+import { createDomElement, emptyElement } from '@slickgrid-universal/utils';
 
 import { type SlickDataView, SlickEventHandler, type SlickGrid } from '../core/index';
 import type { CheckboxSelectorOption, Column, DOMMouseOrTouchEvent, GridOption, OnHeaderClickEventArgs, SelectableOverrideCallback } from '../interfaces/index';
 import { SlickRowSelectionModel } from './slickRowSelectionModel';
-import { createDomElement, emptyElement } from '../services/domUtilities';
 import { SelectionModel } from '../enums/index';
 
 export class SlickCheckboxSelectColumn<T = any> {

diff --git a/packages/common/src/extensions/slickColumnPicker.ts b/packages/common/src/extensions/slickColumnPicker.ts
@@ -1,10 +1,10 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
 import type { BasePubSubService } from '@slickgrid-universal/event-pub-sub';
+import { createDomElement, emptyElement, findWidthOrDefault } from '@slickgrid-universal/utils';
 
 import type { Column, ColumnPickerOption, DOMMouseOrTouchEvent, GridOption, OnColumnsChangedArgs } from '../interfaces/index';
 import type { ExtensionUtility } from '../extensions/extensionUtility';
 import type { SharedService } from '../services/shared.service';
-import { createDomElement, emptyElement, findWidthOrDefault } from '../services/domUtilities';
 import {
   addColumnTitleElementWhenDefined,
   addCloseButtomElement,

diff --git a/packages/common/src/extensions/slickDraggableGrouping.ts b/packages/common/src/extensions/slickDraggableGrouping.ts
@@ -1,6 +1,6 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
 import type { BasePubSubService, EventSubscription } from '@slickgrid-universal/event-pub-sub';
-import { isEmptyObject } from '@slickgrid-universal/utils';
+import { createDomElement, emptyElement, isEmptyObject } from '@slickgrid-universal/utils';
 import Sortable, { type Options as SortableOptions, type SortableEvent } from 'sortablejs';
 
 import type { ExtensionUtility } from '../extensions/extensionUtility';
@@ -15,7 +15,6 @@ import type {
   GroupingGetterFunction,
 } from '../interfaces/index';
 import type { SharedService } from '../services/shared.service';
-import { createDomElement, emptyElement } from '../services/domUtilities';
 import { sortByFieldType } from '../sortComparers';
 import { type SlickDataView, SlickEvent, SlickEventData, SlickEventHandler, type SlickGrid } from '../core/index';
 

diff --git a/packages/common/src/extensions/slickGridMenu.ts b/packages/common/src/extensions/slickGridMenu.ts
@@ -1,4 +1,5 @@
 import type { BasePubSubService } from '@slickgrid-universal/event-pub-sub';
+import { calculateAvailableSpace, createDomElement, emptyElement, findWidthOrDefault, getOffset, } from '@slickgrid-universal/utils';
 
 import type {
   Column,
@@ -14,7 +15,7 @@ import type {
 } from '../interfaces/index';
 import { DelimiterType, FileType } from '../enums/index';
 import type { ExtensionUtility } from '../extensions/extensionUtility';
-import { calculateAvailableSpace, createDomElement, emptyElement, findWidthOrDefault, getOffset, getTranslationPrefix, } from '../services/index';
+import { getTranslationPrefix, } from '../services/index';
 import type { ExcelExportService } from '../services/excelExport.service';
 import type { FilterService } from '../services/filter.service';
 import type { SharedService } from '../services/shared.service';

diff --git a/packages/common/src/extensions/slickGroupItemMetadataProvider.ts b/packages/common/src/extensions/slickGroupItemMetadataProvider.ts
@@ -1,3 +1,5 @@
+import { createDomElement } from '@slickgrid-universal/utils';
+
 import { SlickEventHandler, Utils as SlickUtils, type SlickDataView, SlickGroup, type SlickGrid } from '../core/index';
 import type {
   Column,
@@ -8,7 +10,6 @@ import type {
   ItemMetadata,
   OnClickEventArgs,
 } from '../interfaces/index';
-import { createDomElement } from '../services/domUtilities';
 
 /**
  * Provides item metadata for group (SlickGroup) and totals (SlickTotals) rows produced by the DataView.