@etsoo/react 1.2.35 → 1.2.36

package/lib/components/GridLoader.d.ts

@@ -18,7 +18,7 @@ export declare type GridData = FormData | DataTypes.StringRecord;
  * @param data Data
  * @returns Json data
  */
-export declare function GridDataGet<F extends {}>(props: GridLoadDataProps, template?: F): GridJsonData & Partial<F>;
+export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: GridLoadDataProps, template?: F): GridJsonData & DataTypes.BasicTemplateType<F>;
 /**
  * Grid Json data
  */

package/lib/components/GridLoader.js

@@ -25,7 +25,8 @@ export function GridDataGet(props, template) {
             // Clear empty value
             DomUtils.clearFormData(data);
         }
-        conditions = DomUtils.dataAs(data, template);
+        // Set keepSource to true to hold form data, even they are invisible from the conditions
+        conditions = DomUtils.dataAs(data, template, true);
     }
     // DomUtils.dataAs(data, template);
     return { ...conditions, ...rest };

package/lib/mu/pages/DataGridPage.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { DataGridPageProps } from './DataGridPageProps';
 /**
  * DataGrid page
  * @param props Props
  * @returns Component
  */
-export declare function DataGridPage<T, F extends {}>(props: DataGridPageProps<T, F>): JSX.Element;
+export declare function DataGridPage<T, F extends DataTypes.BasicTemplate>(props: DataGridPageProps<T, F>): JSX.Element;

package/lib/mu/pages/DataGridPageProps.d.ts

@@ -1,9 +1,10 @@
+import { DataTypes } from '@etsoo/shared';
 import { DataGridExProps } from '../DataGridEx';
 import { SearchPageProps } from './SearchPageProps';
 /**
  * DataGrid page props
  */
-export interface DataGridPageProps<T, F extends {}> extends SearchPageProps<T, F>, Omit<DataGridExProps<T>, 'loadData' | 'height'> {
+export interface DataGridPageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<DataGridExProps<T>, 'loadData' | 'height'> {
     /**
      * Height will be deducted
      * @param height Current calcuated height

package/lib/mu/pages/FixedListPage.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { ListPageProps } from './ListPageProps';
 /**
  * Fixed height list page
  * @param props Props
  * @returns Component
  */
-export declare function FixedListPage<T, F extends {}>(props: ListPageProps<T, F> & {
+export declare function FixedListPage<T, F extends DataTypes.BasicTemplate>(props: ListPageProps<T, F> & {
     /**
      * Height will be deducted
      * @param height Current calcuated height

package/lib/mu/pages/ListPage.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { ListPageProps } from './ListPageProps';
 /**
  * List page
  * @param props Props
  * @returns Component
  */
-export declare function ListPage<T, F extends {}>(props: ListPageProps<T, F>): JSX.Element;
+export declare function ListPage<T, F extends DataTypes.BasicTemplate>(props: ListPageProps<T, F>): JSX.Element;

package/lib/mu/pages/ListPageProps.d.ts

@@ -1,7 +1,8 @@
+import { DataTypes } from '@etsoo/shared';
 import { ScrollerListExProps } from '../ScrollerListEx';
 import { SearchPageProps } from './SearchPageProps';
 /**
  * List page props
  */
-export interface ListPageProps<T, F extends {}> extends SearchPageProps<T, F>, Omit<ScrollerListExProps<T>, 'loadData'> {
+export interface ListPageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<ScrollerListExProps<T>, 'loadData'> {
 }

package/lib/mu/pages/ResponsivePage.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { ResponsePageProps } from './ResponsivePageProps';
 /**
  * Fixed height list page
  * @param props Props
  * @returns Component
  */
-export declare function ResponsivePage<T, F extends {}>(props: ResponsePageProps<T, F>): JSX.Element;
+export declare function ResponsivePage<T, F extends DataTypes.BasicTemplate>(props: ResponsePageProps<T, F>): JSX.Element;

package/lib/mu/pages/ResponsivePageProps.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { ListChildComponentProps } from 'react-window';
 import { GridMethodRef } from '../GridMethodRef';
 import { ScrollerListExInnerItemRendererProps } from '../ScrollerListEx';
@@ -6,7 +7,7 @@ import { DataGridPageProps } from './DataGridPageProps';
 /**
  * Response page props
  */
-export interface ResponsePageProps<T, F extends {}> extends Omit<DataGridPageProps<T, F>, 'mRef' | 'itemKey' | 'onScroll' | 'onItemsRendered'> {
+export interface ResponsePageProps<T, F extends DataTypes.BasicTemplate> extends Omit<DataGridPageProps<T, F>, 'mRef' | 'itemKey' | 'onScroll' | 'onItemsRendered'> {
     /**
      * Min width to show Datagrid
      */

package/lib/mu/pages/SearchPageProps.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { GridJsonData, GridLoader } from '../../components/GridLoader';
 import { CommonPageProps } from './CommonPageProps';
 /**
  * Search page props
  */
-export interface SearchPageProps<T, F extends {}> extends Omit<GridLoader<T>, 'loadData'> {
+export interface SearchPageProps<T, F extends DataTypes.BasicTemplate> extends Omit<GridLoader<T>, 'loadData'> {
     /**
      * Search fields
      */
@@ -16,7 +17,7 @@ export interface SearchPageProps<T, F extends {}> extends Omit<GridLoader<T>, 'l
     /**
      * Load data callback
      */
-    loadData: (data: GridJsonData & Partial<F>) => PromiseLike<T[] | null | undefined>;
+    loadData: (data: GridJsonData & DataTypes.BasicTemplateType<F>) => PromiseLike<T[] | null | undefined>;
     /**
      * Page props
      */

package/lib/mu/pages/TablePage.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { DataTypes } from '@etsoo/shared';
 import { TablePageProps } from './TablePageProps';
 /**
  * Table page
  * @param props Props
  * @returns Component
  */
-export declare function TablePage<T, F extends {}>(props: TablePageProps<T, F>): JSX.Element;
+export declare function TablePage<T, F extends DataTypes.BasicTemplate>(props: TablePageProps<T, F>): JSX.Element;

package/lib/mu/pages/TablePageProps.d.ts

@@ -1,7 +1,8 @@
+import { DataTypes } from '@etsoo/shared';
 import { TableExProps } from '../TableEx';
 import { SearchPageProps } from './SearchPageProps';
 /**
  * Table page props
  */
-export interface TablePageProps<T, F extends {}> extends SearchPageProps<T, F>, Omit<TableExProps<T>, 'loadData'> {
+export interface TablePageProps<T, F extends DataTypes.BasicTemplate> extends SearchPageProps<T, F>, Omit<TableExProps<T>, 'loadData'> {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.2.35",
+    "version": "1.2.36",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -44,9 +44,9 @@
         "@emotion/react": "^11.4.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.3.0",
-        "@etsoo/appscript": "^1.1.8",
-        "@etsoo/notificationbase": "^1.0.83",
-        "@etsoo/shared": "^1.0.50",
+        "@etsoo/appscript": "^1.1.9",
+        "@etsoo/notificationbase": "^1.0.84",
+        "@etsoo/shared": "^1.0.51",
         "@mui/icons-material": "^5.0.4",
         "@mui/material": "^5.0.4",
         "@reach/router": "^1.3.4",

package/src/components/GridLoader.ts

@@ -25,15 +25,15 @@ export type GridData = FormData | DataTypes.StringRecord;
  * @param data Data
  * @returns Json data
  */
-export function GridDataGet<F extends {}>(
+export function GridDataGet<F extends DataTypes.BasicTemplate>(
     props: GridLoadDataProps,
     template?: F
-): GridJsonData & Partial<F> {
+): GridJsonData & DataTypes.BasicTemplateType<F> {
     // Destruct
     const { data, ...rest } = props;
 
     // Conditions
-    let conditions: Partial<F> = {};
+    let conditions: DataTypes.BasicTemplateType<F> = {};
 
     // Cast data
     if (data != null && template != null) {
@@ -41,7 +41,9 @@ export function GridDataGet<F extends {}>(
             // Clear empty value
             DomUtils.clearFormData(data);
         }
-        conditions = DomUtils.dataAs(data, template);
+
+        // Set keepSource to true to hold form data, even they are invisible from the conditions
+        conditions = DomUtils.dataAs(data, template, true);
     }
 
     // DomUtils.dataAs(data, template);

package/src/mu/pages/DataGridPage.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { GridDataGet, GridLoadDataProps } from '../../components/GridLoader';
@@ -22,7 +23,9 @@ interface LocalStates {
  * @param props Props
  * @returns Component
  */
-export function DataGridPage<T, F extends {}>(props: DataGridPageProps<T, F>) {
+export function DataGridPage<T, F extends DataTypes.BasicTemplate>(
+    props: DataGridPageProps<T, F>
+) {
     // Destruct
     const {
         adjustHeight,

package/src/mu/pages/DataGridPageProps.ts

@@ -1,10 +1,11 @@
+import { DataTypes } from '@etsoo/shared';
 import { DataGridExProps } from '../DataGridEx';
 import { SearchPageProps } from './SearchPageProps';
 
 /**
  * DataGrid page props
  */
-export interface DataGridPageProps<T, F extends {}>
+export interface DataGridPageProps<T, F extends DataTypes.BasicTemplate>
     extends SearchPageProps<T, F>,
         Omit<DataGridExProps<T>, 'loadData' | 'height'> {
     /**

package/src/mu/pages/FixedListPage.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { GridDataGet, GridLoadDataProps } from '../../components/GridLoader';
@@ -15,7 +16,7 @@ import { ListPageProps } from './ListPageProps';
  * @param props Props
  * @returns Component
  */
-export function FixedListPage<T, F extends {}>(
+export function FixedListPage<T, F extends DataTypes.BasicTemplate>(
     props: ListPageProps<T, F> & {
         /**
          * Height will be deducted

package/src/mu/pages/ListPage.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { GridDataGet, GridLoadDataProps } from '../../components/GridLoader';
@@ -18,7 +19,9 @@ import { ListPageProps } from './ListPageProps';
  * @param props Props
  * @returns Component
  */
-export function ListPage<T, F extends {}>(props: ListPageProps<T, F>) {
+export function ListPage<T, F extends DataTypes.BasicTemplate>(
+    props: ListPageProps<T, F>
+) {
     // Destruct
     const {
         fields,

package/src/mu/pages/ListPageProps.ts

@@ -1,9 +1,10 @@
+import { DataTypes } from '@etsoo/shared';
 import { ScrollerListExProps } from '../ScrollerListEx';
 import { SearchPageProps } from './SearchPageProps';
 
 /**
  * List page props
  */
-export interface ListPageProps<T, F extends {}>
+export interface ListPageProps<T, F extends DataTypes.BasicTemplate>
     extends SearchPageProps<T, F>,
         Omit<ScrollerListExProps<T>, 'loadData'> {}

package/src/mu/pages/ResponsivePage.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { GridDataGet, GridLoadDataProps } from '../../components/GridLoader';
@@ -23,7 +24,7 @@ interface LocalStates {
  * @param props Props
  * @returns Component
  */
-export function ResponsivePage<T, F extends {}>(
+export function ResponsivePage<T, F extends DataTypes.BasicTemplate>(
     props: ResponsePageProps<T, F>
 ) {
     // Destruct

package/src/mu/pages/ResponsivePageProps.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { ListChildComponentProps } from 'react-window';
 import { GridMethodRef } from '../GridMethodRef';
 import { ScrollerListExInnerItemRendererProps } from '../ScrollerListEx';
@@ -6,7 +7,7 @@ import { DataGridPageProps } from './DataGridPageProps';
 /**
  * Response page props
  */
-export interface ResponsePageProps<T, F extends {}>
+export interface ResponsePageProps<T, F extends DataTypes.BasicTemplate>
     extends Omit<
         DataGridPageProps<T, F>,
         'mRef' | 'itemKey' | 'onScroll' | 'onItemsRendered'

package/src/mu/pages/SearchPageProps.ts

@@ -1,10 +1,11 @@
+import { DataTypes } from '@etsoo/shared';
 import { GridJsonData, GridLoader } from '../../components/GridLoader';
 import { CommonPageProps } from './CommonPageProps';
 
 /**
  * Search page props
  */
-export interface SearchPageProps<T, F extends {}>
+export interface SearchPageProps<T, F extends DataTypes.BasicTemplate>
     extends Omit<GridLoader<T>, 'loadData'> {
     /**
      * Search fields
@@ -20,7 +21,7 @@ export interface SearchPageProps<T, F extends {}>
      * Load data callback
      */
     loadData: (
-        data: GridJsonData & Partial<F>
+        data: GridJsonData & DataTypes.BasicTemplateType<F>
     ) => PromiseLike<T[] | null | undefined>;
 
     /**

package/src/mu/pages/TablePage.tsx

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { GridDataGet, GridLoadDataProps } from '../../components/GridLoader';
@@ -18,7 +19,9 @@ import { TablePageProps } from './TablePageProps';
  * @param props Props
  * @returns Component
  */
-export function TablePage<T, F extends {}>(props: TablePageProps<T, F>) {
+export function TablePage<T, F extends DataTypes.BasicTemplate>(
+    props: TablePageProps<T, F>
+) {
     // Destruct
     const {
         columns,

package/src/mu/pages/TablePageProps.ts

@@ -1,9 +1,10 @@
+import { DataTypes } from '@etsoo/shared';
 import { TableExProps } from '../TableEx';
 import { SearchPageProps } from './SearchPageProps';
 
 /**
  * Table page props
  */
-export interface TablePageProps<T, F extends {}>
+export interface TablePageProps<T, F extends DataTypes.BasicTemplate>
     extends SearchPageProps<T, F>,
         Omit<TableExProps<T>, 'loadData'> {}