Merge pull request #637 from revolist/minor-refactor

Sorting extracted outside

src/components.d.ts

@@ -846,6 +846,7 @@ declare global {
         "aftergridinit": any;
         "additionaldatachanged": any;
         "afterthemechanged": Theme;
+        "created": any;
     }
     /**
      * Revogrid - High-performance, customizable grid library for managing large datasets.
@@ -1497,6 +1498,10 @@ declare namespace LocalJSX {
           * New content size has been applied. The size excludes the header. Currently, the event responsible for applying the new content size does not provide the actual size. To retrieve the actual content size, you can utilize the `getContentSize` function after the event has been triggered.
          */
         "onContentsizechanged"?: (event: RevoGridCustomEvent<MultiDimensionType>) => void;
+        /**
+          * Emmited after grid created
+         */
+        "onCreated"?: (event: RevoGridCustomEvent<any>) => void;
         /**
           * Emitted when the filter configuration is changed
          */

src/components/revoGrid/revo-grid.tsx

@@ -561,7 +561,13 @@ export class RevoGridComponent {
   /**
    * Emmited after the theme is changed
    */
-  @Event() afterthemechanged: EventEmitter<Theme>
+  @Event() afterthemechanged: EventEmitter<Theme>;
+
+
+  /**
+   * Emmited after grid created
+   */
+  @Event() created: EventEmitter;
 
   // #endregion
 
@@ -1409,6 +1415,7 @@ export class RevoGridComponent {
     if (this.isInited) {
       this.setPlugins();
     }
+    this.created.emit();
   }
 
   /**

src/plugins/sorting/sorting.func.ts

@@ -0,0 +1,35 @@
+import type { DataType } from '@type';
+import type { SortingOrderFunction } from './sorting.types';
+
+export function sortIndexByItems(
+  indexes: number[],
+  source: DataType[],
+  sortingFunc: SortingOrderFunction = {},
+): number[] {
+  // if no sorting - return unsorted indexes
+  if (Object.entries(sortingFunc).length === 0) {
+    // Unsorted indexes
+    return [...Array(indexes.length).keys()];
+  }
+  //
+  /**
+   * go through all indexes and align in new order
+   * performs a multi-level sorting by applying multiple comparison functions to determine the order of the items based on different properties.
+   */
+  return indexes.sort((a, b) => {
+    for (const [prop, cmp] of Object.entries(sortingFunc)) {
+      const itemA = source[a];
+      const itemB = source[b];
+
+      /**
+       * If the comparison function returns a non-zero value (sorted), it means that the items should be sorted based on the given property. In such a case, the function immediately returns the sorted value, indicating the order in which the items should be arranged.
+       * If none of the comparison functions result in a non-zero value, indicating that the items are equal or should remain in the same order, the function eventually returns 0.
+       */
+      const sorted = cmp?.(prop, itemA, itemB);
+      if (sorted) {
+        return sorted;
+      }
+    }
+    return 0;
+  });
+}

src/plugins/sorting/sorting.plugin.ts

@@ -12,14 +12,10 @@ import type {
   DimensionRows,
   PluginProviders,
 } from '@type';
+import type { SortingOrder, SortingOrderFunction, ColumnSetEvent } from './sorting.types';
 import { getCellRaw, getColumnByProp } from '../../utils/column.utils';
 import { rowTypes } from '@store';
-
-export type SortingOrder = Record<ColumnProp, Order>;
-type SortingOrderFunction = Record<ColumnProp, CellCompareFunc | undefined>;
-type ColumnSetEvent = {
-  order: SortingOrder;
-};
+import { sortIndexByItems } from './sorting.func';
 
 /**
  * Lifecycle
@@ -239,7 +235,7 @@ export class SortingPlugin extends BasePlugin {
         // row indexes
         const proxyItems = storeService.store.get('proxyItems');
 
-        const newItemsOrder = this.sortIndexByItems(
+        const newItemsOrder = sortIndexByItems(
           [...proxyItems],
           source,
           sortingFunc,
@@ -274,39 +270,6 @@ export class SortingPlugin extends BasePlugin {
     };
   }
 
-  sortIndexByItems(
-    indexes: number[],
-    source: DataType[],
-    sortingFunc: SortingOrderFunction = {},
-  ): number[] {
-    // if no sorting - return unsorted indexes
-    if (Object.entries(sortingFunc).length === 0) {
-      // Unsorted indexes
-      return [...Array(indexes.length).keys()];
-    }
-    //
-    /**
-     * go through all indexes and align in new order
-     * performs a multi-level sorting by applying multiple comparison functions to determine the order of the items based on different properties.
-     */
-    return indexes.sort((a, b) => {
-      for (const [prop, cmp] of Object.entries(sortingFunc)) {
-        const itemA = source[a];
-        const itemB = source[b];
-
-        /**
-         * If the comparison function returns a non-zero value (sorted), it means that the items should be sorted based on the given property. In such a case, the function immediately returns the sorted value, indicating the order in which the items should be arranged.
-         * If none of the comparison functions result in a non-zero value, indicating that the items are equal or should remain in the same order, the function eventually returns 0.
-         */
-        const sorted = cmp?.(prop, itemA, itemB);
-        if (sorted) {
-          return sorted;
-        }
-      }
-      return 0;
-    });
-  }
-
   getNextOrder(currentOrder: Order): Order {
     switch (currentOrder) {
       case undefined:

src/plugins/sorting/sorting.types.ts

@@ -0,0 +1,10 @@
+import type { CellCompareFunc, ColumnProp, Order } from '@type';
+
+export type SortingOrder = Record<ColumnProp, Order>;
+export type SortingOrderFunction = Record<
+  ColumnProp,
+  CellCompareFunc | undefined
+>;
+export type ColumnSetEvent = {
+  order: SortingOrder;
+};

src/types/events.ts

@@ -36,6 +36,7 @@ export type RevogridEvents = 'contentsizechanged'|
   'aftergridinit'|
   'additionaldatachanged'|
   'afterthemechanged'|
+  'created'|
   'beforepaste'|
   'beforepasteapply'|
   'pasteregion'|
@@ -140,6 +141,7 @@ export const REVOGRID_EVENTS = new Map<RevogridEvents, RevogridEvents>([
   ['aftergridinit', 'aftergridinit'],
   ['additionaldatachanged', 'additionaldatachanged'],
   ['afterthemechanged', 'afterthemechanged'],
+  ['created', 'created'],
   ['beforepaste', 'beforepaste'],
   ['beforepasteapply', 'beforepasteapply'],
   ['pasteregion', 'pasteregion'],