@etsoo/react 1.8.8 → 1.8.10

package/lib/components/GridLoader.d.ts

@@ -14,18 +14,28 @@ export declare const GridSizeGet: (size: GridSize, input: number) => number;
  * Grid data type
  */
 export type GridData = FormData | DataTypes.StringRecord;
+/**
+ * Grid template type
+ */
+export type GridTemplateType<o extends object> = DataTypes.BasicTemplateType<{
+    [k in keyof o]: k extends "date" ? "date" | "string" : k extends DataTypes.BasicNames ? DataTypes.BasicNames : never;
+}>;
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: GridLoadDataProps, template?: F): GridJsonData & DataTypes.BasicTemplateType<F>;
+export declare function GridDataGet(props: GridLoadDataProps, template?: object, keepSource?: boolean): GridJsonData & GridTemplateType<typeof template>;
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export declare function GridDataGetData<F extends DataTypes.BasicTemplate>(data?: GridData, template?: F): DataTypes.BasicTemplateType<F>;
+export declare function GridDataGetData(data?: GridData, template?: object, keepSource?: boolean): GridTemplateType<typeof template>;
 /**
  * Grid Json data
  */

package/lib/components/GridLoader.js

@@ -12,25 +12,32 @@ export const GridSizeGet = (size, input) => {
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGet(props, template) {
+export function GridDataGet(props, template = {}, keepSource = true) {
     // Destruct
     const { data, ...rest } = props;
     // DomUtils.dataAs(data, template);
-    return { ...GridDataGetData(data, template), ...rest };
+    return { ...GridDataGetData(data, template, keepSource), ...rest };
 }
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGetData(data, template) {
+export function GridDataGetData(data, template = {}, keepSource = true) {
     // Clear form empty value
     if (data instanceof FormData) {
         DomUtils.clearFormData(data);
     }
     // Conditions
-    const conditions = data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
+    // Set keepSource to true to hold form data, even they are invisible from the conditions
+    const conditions = data == null
+        ? {}
+        : DomUtils.dataAs(data, template, keepSource);
     return conditions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.8",
+  "version": "1.8.10",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -43,8 +43,8 @@
   },
   "homepage": "https://github.com/ETSOO/AppReact#readme",
   "dependencies": {
-    "@dnd-kit/core": "^6.2.0",
-    "@dnd-kit/sortable": "^9.0.0",
+    "@dnd-kit/core": "^6.3.0",
+    "@dnd-kit/sortable": "^10.0.0",
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.13.5",
     "@emotion/styled": "^11.13.5",
@@ -65,7 +65,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.1",
     "@types/jest": "^29.5.14",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.13",
     "@types/react-dom": "^18.3.1",
     "@types/react-window": "^1.8.8",
     "jest": "^29.7.0",

package/src/components/GridLoader.ts

@@ -21,39 +21,59 @@ export const GridSizeGet = (size: GridSize, input: number) => {
  */
 export type GridData = FormData | DataTypes.StringRecord;
 
+/**
+ * Grid template type
+ */
+export type GridTemplateType<o extends object> = DataTypes.BasicTemplateType<{
+  [k in keyof o]: k extends "date"
+    ? "date" | "string"
+    : k extends DataTypes.BasicNames
+    ? DataTypes.BasicNames
+    : never;
+}>;
+
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGet<F extends DataTypes.BasicTemplate>(
+export function GridDataGet(
   props: GridLoadDataProps,
-  template?: F
-): GridJsonData & DataTypes.BasicTemplateType<F> {
+  template: object = {} satisfies DataTypes.BasicTemplate,
+  keepSource: boolean = true
+): GridJsonData & GridTemplateType<typeof template> {
   // Destruct
   const { data, ...rest } = props;
 
   // DomUtils.dataAs(data, template);
-  return { ...GridDataGetData(data, template), ...rest };
+  return { ...GridDataGetData(data, template, keepSource), ...rest };
 }
 
 /**
  * Grid data get with format
  * @param data Data
+ * @param template Template
+ * @param keepSource Keep source data
  * @returns Json data
  */
-export function GridDataGetData<F extends DataTypes.BasicTemplate>(
+export function GridDataGetData(
   data?: GridData,
-  template?: F
-): DataTypes.BasicTemplateType<F> {
+  template: object = {} satisfies DataTypes.BasicTemplate,
+  keepSource: boolean = true
+): GridTemplateType<typeof template> {
   // Clear form empty value
   if (data instanceof FormData) {
     DomUtils.clearFormData(data);
   }
 
   // Conditions
-  const conditions: DataTypes.BasicTemplateType<F> =
-    data == null ? {} : DomUtils.dataAs(data, template ?? {}, true); // Set keepSource to true to hold form data, even they are invisible from the conditions
+  // Set keepSource to true to hold form data, even they are invisible from the conditions
+  const conditions: GridTemplateType<typeof template> =
+    data == null
+      ? {}
+      : DomUtils.dataAs(data, template as DataTypes.BasicTemplate, keepSource);
 
   return conditions;
 }