amis-core 2.8.0 → 3.0.0

package/esm/Root.d.ts

@@ -21,7 +21,7 @@ export interface RootProps {
 }
 export interface RootWrapperProps {
     env: RendererEnv;
-    children: React.ReactNode;
+    children: React.ReactNode | Array<React.ReactNode>;
     schema: SchemaNode;
     rootStore: IRendererStore;
     theme: string;

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/RootRenderer.d.ts

@@ -23,5 +23,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     handleDrawerClose(): void;
     openFeedback(dialog: any, ctx: any): Promise<unknown>;
     reloadTarget(scoped: IScopedContext, target: string, data?: any): void;
-    render(): React.ReactNode;
+    render(): string | number | boolean | JSX.Element | React.ReactFragment | null | undefined;
 }

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -111,11 +111,11 @@ var RootRenderer = /** @class */ (function (_super) {
         }
         else if (action.actionType === 'dialog') {
             store.setCurrentAction(action);
-            store.openDialog(ctx);
+            store.openDialog(ctx, undefined, undefined, delegate);
         }
         else if (action.actionType === 'drawer') {
             store.setCurrentAction(action);
-            store.openDrawer(ctx);
+            store.openDrawer(ctx, undefined, undefined, delegate);
         }
         else if (action.actionType === 'toast') {
             (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
@@ -149,7 +149,7 @@ var RootRenderer = /** @class */ (function (_super) {
                             redirect = action.redirect && filter(action.redirect, store.data);
                             redirect && env.jumpTo(redirect, action);
                             action.reload &&
-                                this.reloadTarget(delegate || this.context, action.reload, store.data);
+                                this.reloadTarget(delegate || this.context, filter(action.reload, ctx), store.data);
                             return [2 /*return*/];
                     }
                 });
@@ -181,6 +181,7 @@ var RootRenderer = /** @class */ (function (_super) {
         }
     };
     RootRenderer.prototype.handleDialogConfirm = function (values, action) {
+        var _a;
         var args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             args[_i - 2] = arguments[_i];
@@ -195,7 +196,13 @@ var RootRenderer = /** @class */ (function (_super) {
             dialog.onConfirm.apply(dialog, __spreadArray([values, action], __read(args), false)) === false) {
             return;
         }
+        var dialogAction = store.action;
+        var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : dialogAction.reload;
+        var scoped = store.getDialogScoped() || this.context;
         store.closeDialog(true);
+        if (reload) {
+            scoped.reload(reload, store.data);
+        }
     };
     RootRenderer.prototype.handleDialogClose = function (confirmed) {
         if (confirmed === void 0) { confirmed = false; }
@@ -203,6 +210,7 @@ var RootRenderer = /** @class */ (function (_super) {
         store.closeDialog(confirmed);
     };
     RootRenderer.prototype.handleDrawerConfirm = function (values, action) {
+        var _a;
         var args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             args[_i - 2] = arguments[_i];
@@ -217,7 +225,16 @@ var RootRenderer = /** @class */ (function (_super) {
             drawer.onConfirm.apply(drawer, __spreadArray([values, action], __read(args), false)) === false) {
             return;
         }
+        var drawerAction = store.action;
+        var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : drawerAction.reload;
+        var scoped = store.getDrawerScoped() || this.context;
         store.closeDrawer();
+        // 稍等会，等动画结束。
+        setTimeout(function () {
+            if (reload) {
+                scoped.reload(reload, store.data);
+            }
+        }, 300);
     };
     RootRenderer.prototype.handleDrawerClose = function () {
         var store = this.store;

package/esm/SchemaRenderer.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { RendererConfig, RendererEnv, RendererProps } from './factory';
+import { IScopedContext } from './Scoped';
 import { Schema, SchemaNode } from './types';
 import { RendererEvent } from './utils/renderer-event';
 interface SchemaRendererProps extends Partial<RendererProps> {
@@ -7,9 +8,10 @@ interface SchemaRendererProps extends Partial<RendererProps> {
     $path: string;
     env: RendererEnv;
 }
+export declare const RENDERER_TRANSMISSION_OMIT_PROPS: string[];
 export declare class SchemaRenderer extends React.Component<SchemaRendererProps, any> {
     static displayName: string;
-    static contextType: React.Context<import("./Scoped").IScopedContext>;
+    static contextType: React.Context<IScopedContext>;
     rendererKey: string;
     renderer: RendererConfig | null;
     ref: any;

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -25,7 +25,7 @@ import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
 import './utils/filter.js';
 import { buildStyle } from './utils/style.js';
 
-var defaultOmitList = [
+var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'type',
     'name',
     '$ref',
@@ -50,7 +50,9 @@ var defaultOmitList = [
     'mode',
     'body',
     'id',
-    'inputOnly'
+    'inputOnly',
+    'label',
+    'renderLabel'
 ];
 var componentCache = new SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -168,7 +170,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (subProps === void 0) { subProps = {}; }
         var _a = this.props; _a.schema; _a.$path; var env = _a.env, render = _a.render, rest = __rest(_a, ["schema", "$path", "env", "render"]);
         var $path = this.resolveRenderer(this.props).path;
-        var omitList = defaultOmitList.concat();
+        var omitList = RENDERER_TRANSMISSION_OMIT_PROPS.concat();
         if (this.renderer) {
             var Component = this.renderer.component;
             Component.propsList &&
@@ -341,4 +343,4 @@ var PlaceholderComponent = /** @class */ (function (_super) {
     return PlaceholderComponent;
 }(React.Component));
 
-export { SchemaRenderer };
+export { RENDERER_TRANSMISSION_OMIT_PROPS, SchemaRenderer };

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,6 +16,33 @@ import { isPureVariable } from './utils/isPureVariable.js';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { findTree, eachTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';
+import './utils/api.js';
+import './utils/ColorScale.js';
+import 'lodash/chunk';
+import './utils/DataSchema.js';
+import './utils/DataScope.js';
+import './utils/debug.js';
+import 'react-dom';
+import './utils/errors.js';
+import { filter } from './utils/tpl.js';
+import 'classnames';
+import 'lodash/isObject';
+import 'lodash/isString';
+import 'lodash/isBoolean';
+import 'lodash';
+import './utils/image.js';
+import './actions/Action.js';
+import 'lodash/debounce';
+import 'lodash/cloneDeep';
+import './utils/resize-sensor.js';
+import 'react-overlays/useRootClose';
+import './utils/SimpleMap.js';
+import 'lodash/mapValues';
+import 'lodash/camelCase';
+import 'uncontrollable';
+import './utils/validations.js';
+import './utils/resolveCondition.js';
+import './utils/Animation.js';
 
 /**
  * @file 用来创建一个域，在这个域里面会把里面的运行时实例注册进来，方便组件之间的通信。
@@ -58,7 +85,8 @@ function createScopedTools(path, parent, env) {
                 }, this);
             }
             var resolved = find(components, function (component) {
-                return component.props.name === name || component.props.id === name;
+                return filter(component.props.name, component.props.data) === name ||
+                    component.props.id === name;
             });
             return resolved || (parent && parent.getComponentByName(name));
         },

package/esm/WithRootStore.d.ts

@@ -335,12 +335,10 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
 }>>(ComposedComponent: T): {
     new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">> | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -360,12 +358,10 @@ export declare function withRootStore<T extends React.ComponentType<React.Compon
     };
     new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>, context: any): {
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "rootStore">>>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/Action.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { RendererProps } from '../factory';
+import { ConditionGroupValue } from '../types';
 import { RendererEvent } from '../utils/renderer-event';
 import { IBreakAction } from './BreakAction';
 import { IContinueAction } from './ContinueAction';
@@ -21,7 +22,7 @@ export interface ListenerAction {
     outputVar?: string;
     preventDefault?: boolean;
     stopPropagation?: boolean;
-    expression?: string;
+    expression?: string | ConditionGroupValue;
     execOn?: string;
 }
 export interface ILogicAction extends ListenerAction {

package/esm/actions/Action.js

@@ -1,12 +1,12 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator, __values, __assign } from 'tslib';
 import omit from 'lodash/omit';
 import '../utils/helper.js';
-import { evalExpression } from '../utils/tpl.js';
+import { evalExpressionWithConditionBuilder } from '../utils/tpl.js';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
@@ -154,7 +154,7 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
 }); };
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return __awaiter(void 0, void 0, void 0, function () {
-    var additional, mergeData, expression, preventDefault, stopPropagation, args, afterMappingData, actionData, data;
+    var additional, mergeData, expression, isStop, preventDefault, stopPropagation, args, afterMappingData, actionData, data, stoped, actionResult;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -173,15 +173,38 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                     ? createObject(renderer.props.data.__super, additional)
                     : additional, renderer.props.data), event.data);
                 expression = (_a = actionConfig.expression) !== null && _a !== void 0 ? _a : actionConfig.execOn;
-                if (expression && !evalExpression(expression, mergeData)) {
+                isStop = false;
+                if (!expression) return [3 /*break*/, 2];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(expression, mergeData, true)];
+            case 1:
+                isStop = !(_d.sent());
+                _d.label = 2;
+            case 2:
+                if (isStop) {
                     return [2 /*return*/];
                 }
-                preventDefault = actionConfig.preventDefault &&
-                    evalExpression(String(actionConfig.preventDefault), mergeData);
-                stopPropagation = actionConfig.stopPropagation &&
-                    evalExpression(String(actionConfig.stopPropagation), mergeData);
+                preventDefault = false;
+                if (!actionConfig.preventDefault) return [3 /*break*/, 4];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.preventDefault, mergeData, false)];
+            case 3:
+                preventDefault = _d.sent();
+                _d.label = 4;
+            case 4:
+                stopPropagation = false;
+                if (!actionConfig.stopPropagation) return [3 /*break*/, 6];
+                return [4 /*yield*/, evalExpressionWithConditionBuilder(actionConfig.stopPropagation, mergeData, false)];
+            case 5:
+                stopPropagation = _d.sent();
+                _d.label = 6;
+            case 6:
                 args = dataMapping(actionConfig.args, mergeData, function (key) {
-                    return ['adaptor', 'responseAdaptor', 'requestAdaptor', 'responseData'].includes(key);
+                    return [
+                        'adaptor',
+                        'responseAdaptor',
+                        'requestAdaptor',
+                        'responseData',
+                        'condition'
+                    ].includes(key);
                 });
                 afterMappingData = dataMapping(actionConfig.data, mergeData);
                 actionData = args && Object.keys(args).length
@@ -194,15 +217,20 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         : event.data;
                 (_b = console.group) === null || _b === void 0 ? void 0 : _b.call(console, "run action ".concat(actionConfig.actionType));
                 console.debug("[".concat(actionConfig.actionType, "] action args, data"), args, data);
+                stoped = false;
                 return [4 /*yield*/, actionInstrance.run(__assign(__assign({}, actionConfig), { args: args, data: data }), renderer, event, mergeData)];
-            case 1:
-                _d.sent();
+            case 7:
+                actionResult = _d.sent();
+                // 二次确认弹窗如果取消，则终止后续动作
+                if ((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'confirmDialog' && !actionResult) {
+                    stoped = true;
+                }
                 console.debug("[".concat(actionConfig.actionType, "] action end event"), event);
                 (_c = console.groupEnd) === null || _c === void 0 ? void 0 : _c.call(console);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行
-                stopPropagation && event.stopPropagation();
+                (stopPropagation || stoped) && event.stopPropagation();
                 return [2 /*return*/];
         }
     });

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -36,6 +36,7 @@ import 'lodash/camelCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';
+import '../utils/resolveCondition.js';
 import '../utils/Animation.js';
 
 /**

package/esm/actions/DialogAction.d.ts

@@ -56,5 +56,5 @@ export declare class AlertAction implements RendererAction {
  * confirm确认提示动作
  */
 export declare class ConfirmAction implements RendererAction {
-    run(action: IConfirmAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+    run(action: IConfirmAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<any>;
 }

package/esm/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,6 +20,10 @@ var DialogAction = /** @class */ (function () {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_d) {
+                // 防止editor preview模式下执行
+                if (action.$$id !== undefined) {
+                    return [2 /*return*/];
+                }
                 (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
                     actionType: 'dialog',
                     dialog: ((_c = action.args) === null || _c === void 0 ? void 0 : _c.dialog) || action.dialog,
@@ -85,9 +89,14 @@ var ConfirmAction = /** @class */ (function () {
     ConfirmAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
+            var confirmed;
             return __generator(this, function (_e) {
-                (_b = (_a = event.context.env).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg, (_d = action.args) === null || _d === void 0 ? void 0 : _d.title);
-                return [2 /*return*/];
+                switch (_e.label) {
+                    case 0: return [4 /*yield*/, ((_b = (_a = event.context.env).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg, (_d = action.args) === null || _d === void 0 ? void 0 : _d.title))];
+                    case 1:
+                        confirmed = _e.sent();
+                        return [2 /*return*/, confirmed];
+                }
             });
         });
     };

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/actions/SwitchAction.js

@@ -1,10 +1,10 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 
 import { __awaiter, __generator, __values } from 'tslib';
-import { evalExpression } from '../utils/tpl.js';
+import { evalExpressionWithConditionBuilder } from '../utils/tpl.js';
 import { registerAction, runActions } from './Action.js';
 
 /**
@@ -15,41 +15,44 @@ var SwitchAction = /** @class */ (function () {
     }
     SwitchAction.prototype.run = function (action, renderer, event, mergeData) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, branch, e_1_1;
+            var _a, _b, branch, isPass, e_1_1;
             var e_1, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _d.trys.push([0, 5, 6, 7]);
+                        _d.trys.push([0, 6, 7, 8]);
                         _a = __values(action.children || []), _b = _a.next();
                         _d.label = 1;
                     case 1:
-                        if (!!_b.done) return [3 /*break*/, 4];
+                        if (!!_b.done) return [3 /*break*/, 5];
                         branch = _b.value;
                         if (!branch.expression) {
-                            return [3 /*break*/, 3];
+                            return [3 /*break*/, 4];
                         }
-                        if (!evalExpression(branch.expression, mergeData)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, runActions(branch, renderer, event)];
+                        return [4 /*yield*/, evalExpressionWithConditionBuilder(branch.expression, mergeData)];
                     case 2:
+                        isPass = _d.sent();
+                        if (!isPass) return [3 /*break*/, 4];
+                        return [4 /*yield*/, runActions(branch, renderer, event)];
+                    case 3:
                         _d.sent();
                         // 去掉runAllMatch，这里只做排他，多个可以直接通过expression
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         _b = _a.next();
                         return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 7];
-                    case 5:
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
                         e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 8];
+                    case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 7: return [2 /*return*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/LazyComponent.d.ts

@@ -5,8 +5,8 @@
  */
 import React from 'react';
 export interface LazyComponentProps {
-    component?: React.ReactType;
-    getComponent?: () => Promise<React.ReactType>;
+    component?: React.ElementType;
+    getComponent?: () => Promise<React.ElementType>;
     placeholder?: React.ReactNode;
     unMountOnHidden?: boolean;
     childProps?: object;
@@ -15,7 +15,7 @@ export interface LazyComponentProps {
 }
 export interface LazyComponentState {
     visible: boolean;
-    component?: React.ReactType;
+    component?: React.ElementType;
 }
 export default class LazyComponent extends React.Component<LazyComponentProps, LazyComponentState> {
     static defaultProps: {

package/esm/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.8.0
+ * amis-core v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Overlay.d.ts

@@ -13,9 +13,9 @@ interface OverlayProps {
     shouldUpdatePosition?: boolean;
     rootClose?: boolean;
     onHide?(props: any, ...args: any[]): any;
-    container?: React.ReactNode | Function;
+    container?: HTMLElement | React.ReactNode | (() => HTMLElement | React.ReactNode | null | undefined);
     containerSelector?: string;
-    target?: React.ReactNode | Function;
+    target?: React.ReactNode | HTMLElement | Function;
     watchTargetSizeChange?: boolean;
     offset?: [number, number];
     onEnter?(node: HTMLElement): any;