@etsoo/react 1.6.83 → 1.6.85

package/lib/components/GridLoader.d.ts

@@ -19,6 +19,12 @@ export type GridData = FormData | DataTypes.StringRecord;
  * @returns Json data
  */
 export declare function GridDataGet<F extends DataTypes.BasicTemplate>(props: GridLoadDataProps, template?: F): GridJsonData & DataTypes.BasicTemplateType<F>;
+/**
+ * Grid data get with format
+ * @param data Data
+ * @returns Json data
+ */
+export declare function GridDataGetData<F extends DataTypes.BasicTemplate>(data?: GridData, template?: F): DataTypes.BasicTemplateType<F>;
 /**
  * Grid Json data
  */

package/lib/components/GridLoader.js

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

package/lib/components/ScrollerList.d.ts

@@ -40,7 +40,10 @@ export interface ScrollerListProps<T extends object, D extends DataTypes.Keys<T>
      */
     itemSize: ((index: number) => number) | number;
 }
-interface ScrollerListRef {
+/**
+ * Scroller list ref
+ */
+export interface ScrollerListRef {
     /**
      * Scroll to the specified offset (scrollTop or scrollLeft, depending on the direction prop).
      */
@@ -65,4 +68,3 @@ export interface ScrollerListForwardRef<T> extends GridMethodRef<T>, ScrollerLis
  * @returns Component
  */
 export declare const ScrollerList: <T extends object, D extends DataTypes.Keys<T, string | number> = IdDefaultType<T>>(props: ScrollerListProps<T, D>) => React.JSX.Element;
-export {};

package/lib/index.d.ts

@@ -11,7 +11,7 @@ export * from './components/ListItemReact';
 export * from './components/ScrollerGrid';
 export * from './components/ScrollerList';
 export * from './components/ScrollRestoration';
-export type { ListOnScrollProps, GridOnScrollProps } from 'react-window';
+export type { ListOnScrollProps, GridOnScrollProps, VariableSizeGrid } from 'react-window';
 export * from './notifier/Notifier';
 export * from '@etsoo/notificationbase';
 export * from './states/CultureState';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.6.83",
+    "version": "1.6.85",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/components/GridLoader.ts

@@ -32,6 +32,19 @@ export function GridDataGet<F extends DataTypes.BasicTemplate>(
     // Destruct
     const { data, ...rest } = props;
 
+    // DomUtils.dataAs(data, template);
+    return { ...GridDataGetData(data, template), ...rest };
+}
+
+/**
+ * Grid data get with format
+ * @param data Data
+ * @returns Json data
+ */
+export function GridDataGetData<F extends DataTypes.BasicTemplate>(
+    data?: GridData,
+    template?: F
+): DataTypes.BasicTemplateType<F> {
     // Clear form empty value
     if (data instanceof FormData) {
         DomUtils.clearFormData(data);
@@ -41,8 +54,7 @@ export function GridDataGet<F extends DataTypes.BasicTemplate>(
     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
 
-    // DomUtils.dataAs(data, template);
-    return { ...conditions, ...rest };
+    return conditions;
 }
 
 /**

package/src/components/ScrollerList.tsx

@@ -69,7 +69,10 @@ export interface ScrollerListProps<
     itemSize: ((index: number) => number) | number;
 }
 
-interface ScrollerListRef {
+/**
+ * Scroller list ref
+ */
+export interface ScrollerListRef {
     /**
      * Scroll to the specified offset (scrollTop or scrollLeft, depending on the direction prop).
      */

package/src/index.ts

@@ -14,7 +14,11 @@ export * from './components/ListItemReact';
 export * from './components/ScrollerGrid';
 export * from './components/ScrollerList';
 export * from './components/ScrollRestoration';
-export type { ListOnScrollProps, GridOnScrollProps } from 'react-window';
+export type {
+    ListOnScrollProps,
+    GridOnScrollProps,
+    VariableSizeGrid
+} from 'react-window';
 
 // notifier
 export * from './notifier/Notifier';