@etsoo/react 1.7.45 → 1.7.47

package/README.md

@@ -15,7 +15,4 @@ Using yarn:
 $ yarn add @etsoo/react
 ```
 
-## UI Implmentation
-
-- @etsoo/materialui, targeting administration applications
-- @etsoo/bootstrap, targeting websites
+## React UI Implmentation

package/lib/components/ScrollerGrid.d.ts

@@ -21,7 +21,7 @@ export type ScrollerGridItemRendererProps<T> = Omit<GridChildComponentProps<T>,
 /**
  * Scroller vertical grid props
  */
-export interface ScrollerGridProps<T extends object> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight' | 'ref'> {
+export interface ScrollerGridProps<T extends object> extends GridLoader<T>, Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight'> {
     /**
      * Default order by asc
      * @default true

package/lib/components/ScrollerList.d.ts

@@ -6,7 +6,7 @@ import { GridMethodRef } from './GridMethodRef';
 /**
  * Scroller vertical list props
  */
-export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit<ListProps<T>, 'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
+export interface ScrollerListProps<T extends object> extends GridLoader<T>, Omit<ListProps<T>, 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'> {
     /**
      * Default order by asc/desc
      */

package/lib/custom/CustomFieldReact.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+import { CustomFieldData, CustomFieldProps, CustomFieldRef, ICustomField } from '@etsoo/appscript';
+/**
+ * React custom field interface
+ * React自定义字段接口
+ */
+export interface ICustomFieldReact<D extends CustomFieldData = CustomFieldData> extends ICustomField<D, React.JSX.Element> {
+}
+/**
+ * React custom field props
+ * React自定义字段属性
+ */
+export type CustomFieldReactProps<D extends CustomFieldData = CustomFieldData> = CustomFieldProps<D> & {
+    mref: React.Ref<CustomFieldRef>;
+};

package/lib/custom/CustomFieldReact.js

@@ -0,0 +1 @@
+export {};

package/lib/index.d.ts

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

package/lib/index.js

@@ -13,6 +13,8 @@ export * from './components/ListItemReact';
 export * from './components/ScrollerGrid';
 export * from './components/ScrollerList';
 export * from './components/ScrollRestoration';
+// custom
+export * from './custom/CustomFieldReact';
 // notifier
 export * from './notifier/Notifier';
 export * from '@etsoo/notificationbase';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.7.45",
+    "version": "1.7.47",
     "description": "TypeScript ReactJs UI Independent Framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/css": "^11.11.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@etsoo/appscript": "^1.4.90",
+        "@etsoo/appscript": "^1.4.91",
         "@etsoo/notificationbase": "^1.1.42",
         "@etsoo/shared": "^1.2.40",
         "react": "^18.3.1",
@@ -67,12 +67,12 @@
         "@testing-library/jest-dom": "^6.4.5",
         "@testing-library/react": "^15.0.7",
         "@types/jest": "^29.5.12",
-        "@types/react": "^18.3.2",
+        "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
         "@types/react-window": "^1.8.8",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.1.2",
+        "ts-jest": "^29.1.3",
         "typescript": "^5.4.5"
     }
 }

package/src/components/ScrollerGrid.tsx

@@ -46,10 +46,7 @@ export type ScrollerGridItemRendererProps<T> = Omit<
  */
 export interface ScrollerGridProps<T extends object>
     extends GridLoader<T>,
-        Omit<
-            VariableSizeGridProps<T>,
-            'children' | 'rowCount' | 'rowHeight' | 'ref'
-        > {
+        Omit<VariableSizeGridProps<T>, 'children' | 'rowCount' | 'rowHeight'> {
     /**
      * Default order by asc
      * @default true

package/src/components/ScrollerList.tsx

@@ -25,7 +25,7 @@ export interface ScrollerListProps<T extends object>
     extends GridLoader<T>,
         Omit<
             ListProps<T>,
-            'ref' | 'outerRef' | 'height' | 'width' | 'children' | 'itemCount'
+            'outerRef' | 'height' | 'width' | 'children' | 'itemCount' // Exclude these props, shoud be exisited otherwise will be failed
         > {
     /**
      * Default order by asc/desc

package/src/custom/CustomFieldReact.ts

@@ -0,0 +1,22 @@
+import {
+    CustomFieldData,
+    CustomFieldProps,
+    CustomFieldRef,
+    ICustomField
+} from '@etsoo/appscript';
+
+/**
+ * React custom field interface
+ * React自定义字段接口
+ */
+export interface ICustomFieldReact<D extends CustomFieldData = CustomFieldData>
+    extends ICustomField<D, React.JSX.Element> {}
+
+/**
+ * React custom field props
+ * React自定义字段属性
+ */
+export type CustomFieldReactProps<D extends CustomFieldData = CustomFieldData> =
+    CustomFieldProps<D> & {
+        mref: React.Ref<CustomFieldRef>;
+    };

package/src/index.ts

@@ -20,6 +20,9 @@ export type {
     VariableSizeGrid
 } from 'react-window';
 
+// custom
+export * from './custom/CustomFieldReact';
+
 // notifier
 export * from './notifier/Notifier';
 export * from '@etsoo/notificationbase';

package/tsconfig.json

@@ -3,7 +3,7 @@
         /* Visit https://aka.ms/tsconfig.json to read more about this file */
         "target": "ES2020",
         "module": "ESNext",
-        "moduleResolution": "Node10",
+        "moduleResolution": "bundler",
         "allowJs": false,
         "isolatedModules": true,
         "outDir": "./lib",