amis-core 6.0.0 → 6.1.0

package/esm/Root.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';

package/esm/RootRenderer.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __awaiter, __generator, __spreadArray, __read, __rest, __decorate, __metadata } from 'tslib';
@@ -56,12 +56,13 @@ var RootRenderer = /** @class */ (function (_super) {
         }
     };
     RootRenderer.prototype.componentDidUpdate = function (prevProps) {
+        var _a;
         var props = this.props;
         if (props.data !== prevProps.data) {
             this.store.initData(props.data);
         }
         if (props.location !== prevProps.location) {
-            this.store.updateLocation(props.location);
+            this.store.updateLocation(props.location, (_a = this.props.env) === null || _a === void 0 ? void 0 : _a.parseLocation);
         }
         if (props.context !== prevProps.context) {
             this.store.updateContext(props.context);

package/esm/SchemaRenderer.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __awaiter, __generator, __rest, __values, __decorate, __metadata } from 'tslib';
@@ -314,6 +314,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (isStatic !== undefined) {
             props.static = isStatic;
         }
+        if (rest.env.enableTestid && props.id && !props.testid) {
+            props.testid = props.id;
+        }
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {
             try {

package/esm/Scoped.d.ts

@@ -14,6 +14,12 @@ import { ListenerAction } from './actions';
  * @returns
  */
 export declare function filterTarget(target: string, data: Record<string, any>): string;
+/**
+ * 分割目标，如果里面有表达式，不要跟表达式里面的逗号冲突。
+ * @param target
+ * @returns
+ */
+export declare function splitTarget(target: string): Array<string>;
 export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
     doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean) => void;

package/esm/Scoped.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __values, __assign, __awaiter, __generator, __extends, __rest, __decorate, __metadata } from 'tslib';
@@ -11,6 +11,7 @@ import hoistNonReactStatic from 'hoist-non-react-statics';
 import { registerFunction } from 'amis-formula';
 import 'moment';
 import { createObject } from './utils/object.js';
+import { memoParse } from './utils/tokenize.js';
 import { isPureVariable } from './utils/isPureVariable.js';
 import { getVariable } from './utils/getVariable.js';
 import { dataMapping } from './utils/dataMapping.js';
@@ -33,12 +34,12 @@ import 'lodash/isBoolean';
 import './utils/image.js';
 import 'lodash/isEqual';
 import { createRendererEvent } from './utils/renderer-event.js';
-import 'lodash/cloneDeep';
 import './utils/resize-sensor.js';
 import 'react-overlays/useRootClose';
 import './utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -84,6 +85,43 @@ function filterTarget(target, data) {
     }
     return filter(target, data, '| raw');
 }
+/**
+ * 分割目标，如果里面有表达式，不要跟表达式里面的逗号冲突。
+ * @param target
+ * @returns
+ */
+function splitTarget(target) {
+    try {
+        var ast = memoParse(target);
+        var pos_1 = [];
+        ast.body.forEach(function (item) {
+            // 不要处理表达式里面的东西。
+            if (item.type === 'raw') {
+                var parts = item.value.split(',');
+                if (parts.length > 1) {
+                    parts.pop();
+                    var start_1 = item.start.index;
+                    parts.forEach(function (part) {
+                        pos_1.push(start_1 + part.length);
+                        start_1 += part.length + 1;
+                    });
+                }
+            }
+        });
+        if (pos_1.length) {
+            var parts = [];
+            pos_1.reduceRight(function (arr, index) {
+                arr.unshift(target.slice(index + 1));
+                target = target.slice(0, index);
+                return arr;
+            }, parts);
+            parts.unshift(target);
+            return parts;
+        }
+    }
+    catch (e) { }
+    return [target];
+}
 var rootScopedContext = createScopedTools('');
 var ScopedContext = React.createContext(rootScopedContext);
 function createScopedTools(path, parent, env, rendererType) {
@@ -228,7 +266,7 @@ function createScopedTools(path, parent, env, rendererType) {
         },
         reload: function (target, ctx) {
             var scoped = this;
-            var targets = typeof target === 'string' ? target.split(/\s*,\s*/) : target;
+            var targets = typeof target === 'string' ? splitTarget(target) : target;
             targets.forEach(function (name) {
                 var idx2 = name.indexOf('?');
                 var query = null;
@@ -264,7 +302,7 @@ function createScopedTools(path, parent, env, rendererType) {
         },
         send: function (receive, values) {
             var scoped = this;
-            var receives = typeof receive === 'string' ? receive.split(/\s*,\s*/) : receive;
+            var receives = typeof receive === 'string' ? splitTarget(receive) : receive;
             // todo 没找到做提示！
             receives.forEach(function (name) {
                 var askIdx = name.indexOf('?');
@@ -300,8 +338,7 @@ function createScopedTools(path, parent, env, rendererType) {
             var scoped = this;
             if (typeof target === 'string') {
                 // 过滤已经关掉的，当用户 close 配置多个弹框 name 时会出现这种情况
-                target
-                    .split(/\s*,\s*/)
+                splitTarget(target)
                     .map(function (name) { return scoped.getComponentByName(name); })
                     .filter(function (component) { return component && component.props.show; })
                     .forEach(closeDialog);
@@ -427,4 +464,4 @@ function HocScoped(ComposedComponent, rendererType) {
     return ScopedComponent;
 }
 
-export { HocScoped, ScopedContext, HocScoped as default, filterTarget };
+export { HocScoped, ScopedContext, HocScoped as default, filterTarget, splitTarget };

package/esm/StatusScoped.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/WithRootStore.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/WithStore.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
@@ -96,9 +96,7 @@ function HocStoreFactory(renderer) {
                     isObjectShallowModified(state, this.state) && this.setState(state);
                     // 需要重新监听
                     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
-                    this.unReaction = reaction(function () { return JSON.stringify(getExprProperties(props, store.data)); }, function () {
-                        return _this.setState(__assign({}, getExprProperties(_this.props, store.data)));
-                    });
+                    this.unReaction = reaction(function () { return getExprProperties(_this.props, store.data); }, function (exprProps) { return _this.setState(exprProps); });
                 }
                 var shouldSync = (_b = renderer.shouldSyncSuperStore) === null || _b === void 0 ? void 0 : _b.call(renderer, store, props, prevProps);
                 if (shouldSync === false) {
@@ -143,7 +141,7 @@ function HocStoreFactory(renderer) {
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_c = props.store) === null || _c === void 0 ? void 0 : _c.storeType) === 'ComboStore'
                                 ? undefined
-                                : syncDataFromSuper(props.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
+                                : syncDataFromSuper(store.data, props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
                     }
                     else {
                         store.initData(createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);

package/esm/actions/Action.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __values, __assign, __spreadArray, __read } from 'tslib';

package/esm/actions/AjaxAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';

package/esm/actions/BreakAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/BroadcastAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/CmptAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/ContinueAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/CopyAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/CustomAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';
@@ -27,12 +27,12 @@ import '../utils/image.js';
 import 'lodash/isEqual';
 import { registerAction, runActions } from './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 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';

package/esm/actions/DialogAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';

package/esm/actions/DrawerAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';

package/esm/actions/EmailAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/LinkAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __assign } from 'tslib';
@@ -20,15 +20,20 @@ var LinkAction = /** @class */ (function () {
     LinkAction.prototype.run = function (action, renderer, event) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function () {
-            var urlObj;
+            var apiParams, urlObj;
             return __generator(this, function (_j) {
                 if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.jumpTo)) {
                     throw new Error('env.jumpTo is required!');
                 }
+                apiParams = __assign(__assign({}, ((_c = (_b = action.args) === null || _b === void 0 ? void 0 : _b.params) !== null && _c !== void 0 ? _c : {})), ((_d = action.data) !== null && _d !== void 0 ? _d : {}));
+                if ((action === null || action === void 0 ? void 0 : action.actionType) === 'link' && (apiParams === null || apiParams === void 0 ? void 0 : apiParams.targetType)) {
+                    // link动作新增打开方式targetType，buildApi不需要该参数
+                    delete apiParams.targetType;
+                }
                 urlObj = buildApi({
-                    url: (((_b = action.args) === null || _b === void 0 ? void 0 : _b.url) || ((_c = action.args) === null || _c === void 0 ? void 0 : _c.link)),
+                    url: (((_e = action.args) === null || _e === void 0 ? void 0 : _e.url) || ((_f = action.args) === null || _f === void 0 ? void 0 : _f.link)),
                     method: 'get'
-                }, __assign(__assign({}, ((_e = (_d = action.args) === null || _d === void 0 ? void 0 : _d.params) !== null && _e !== void 0 ? _e : {})), ((_f = action.data) !== null && _f !== void 0 ? _f : {})), {
+                }, apiParams, {
                     autoAppend: true
                 });
                 (_g = event.context.env) === null || _g === void 0 ? void 0 : _g.jumpTo(urlObj.url, __assign({ actionType: action.actionType, type: 'button' }, action.args), (_h = action.data) !== null && _h !== void 0 ? _h : {});

package/esm/actions/LoopAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __values } from 'tslib';

package/esm/actions/PageAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/ParallelAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/StatusAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/actions/SwitchAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator, __values } from 'tslib';

package/esm/actions/ToastAction.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __awaiter, __generator } from 'tslib';

package/esm/components/CustomStyle.d.ts

@@ -1,11 +1,10 @@
-import type { RendererEnv } from '../env';
 import { type InsertCustomStyle } from '../utils/style-helper';
 interface CustomStyleProps {
     config: {
         wrapperCustomStyle?: any;
         componentId?: string;
     } & InsertCustomStyle;
-    env: RendererEnv;
+    [propName: string]: any;
 }
 export declare const styleIdCount: Map<any, any>;
 export default function (props: CustomStyleProps): null;

package/esm/components/CustomStyle.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { useEffect } from 'react';
@@ -8,7 +8,7 @@ import { insertCustomStyle, removeCustomStyle, insertEditCustomStyle } from '../
 
 var styleIdCount = new Map();
 function CustomStyle (props) {
-    var config = props.config, env = props.env;
+    var config = props.config, env = props.env, data = props.data;
     var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
     if (!themeCss && !wrapperCustomStyle) {
         return null;
@@ -32,24 +32,37 @@ function CustomStyle (props) {
     useEffect(function () {
         var _a, _b;
         if (themeCss && id) {
-            insertCustomStyle(themeCss, classNames, id, defaultData, env === null || env === void 0 ? void 0 : env.customStyleClassPrefix, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+            insertCustomStyle({
+                themeCss: themeCss,
+                classNames: classNames,
+                id: id,
+                defaultData: defaultData,
+                customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
+                doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
+                data: data
+            });
         }
         return function () {
             var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                removeCustomStyle('', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+                removeCustomStyle('', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
             }
         };
     }, [themeCss, id]);
     useEffect(function () {
         var _a, _b;
         if (wrapperCustomStyle && id) {
-            insertEditCustomStyle(wrapperCustomStyle, id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+            insertEditCustomStyle({
+                customStyle: wrapperCustomStyle,
+                id: id,
+                doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
+                data: data
+            });
         }
         return function () {
             var _a, _b;
             if (id && !styleIdCount.get(id)) {
-                removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument);
+                removeCustomStyle('wrapperCustomStyle', id, (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument, data);
             }
         };
     }, [wrapperCustomStyle, id]);

package/esm/components/ErrorBoundary.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends } from 'tslib';

package/esm/components/LazyComponent.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __rest, __assign } from 'tslib';

package/esm/components/Overlay.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
@@ -21,7 +21,7 @@ import '../utils/debug.js';
 import { getContainer, ownerDocument, calculatePosition } from '../utils/dom.js';
 import '../utils/errors.js';
 import '../utils/tpl.js';
-import { noop, getScrollParent, autobind } from '../utils/helper.js';
+import { uuid, noop, getScrollParent, autobind } from '../utils/helper.js';
 import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
@@ -30,12 +30,12 @@ import '../utils/image.js';
 import 'lodash/isEqual';
 import '../actions/Action.js';
 import 'lodash/debounce';
-import 'lodash/cloneDeep';
 import { getComputedStyle, resizeSensor } from '../utils/resize-sensor.js';
 import { RootClose } from '../utils/RootClose.js';
 import '../utils/SimpleMap.js';
 import 'lodash/mapValues';
 import 'lodash/camelCase';
+import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
@@ -86,6 +86,7 @@ var Position = /** @class */ (function (_super) {
             arrowOffsetTop: null
         };
         _this._lastTarget = null;
+        _this.componentId = uuid();
         return _this;
     }
     Position.prototype.updatePosition = function (target) {
@@ -97,7 +98,7 @@ var Position = /** @class */ (function (_super) {
             var parentPopover = (_a = target === null || target === void 0 ? void 0 : target.closest) === null || _a === void 0 ? void 0 : _a.call(target, '[role=popover]');
             if (!this.parentPopover && parentPopover) {
                 this.parentPopover = parentPopover;
-                this.parentPopover.setAttribute(SubPopoverDisplayedID, true);
+                this.parentPopover.setAttribute(SubPopoverDisplayedID + '-' + this.componentId, true);
             }
         }
         if (!target) {
@@ -138,9 +139,11 @@ var Position = /** @class */ (function (_super) {
     };
     Position.prototype.componentWillUnmount = function () {
         var _a;
+        // 一个 PopOver 关闭时，需把挂载父 PopOver 的标记去掉
+        // 这里可能会存在多个子 PopOver 的情况，所以需要加上 componentId
         if (this.parentPopover &&
-            this.parentPopover.getAttribute(SubPopoverDisplayedID)) {
-            this.parentPopover.removeAttribute(SubPopoverDisplayedID);
+            this.parentPopover.getAttribute(SubPopoverDisplayedID + '-' + this.componentId)) {
+            this.parentPopover.removeAttribute(SubPopoverDisplayedID + '-' + this.componentId);
             this.parentPopover = null;
         }
         (_a = this.resizeDispose) === null || _a === void 0 ? void 0 : _a.forEach(function (fn) { return fn(); });
@@ -157,9 +160,8 @@ var Position = /** @class */ (function (_super) {
         return cloneElement(child, __assign(__assign(__assign(__assign({}, props), arrowPosition), (child.props.offset ? { offset: child.props.offset } : {})), { 
             // FIXME: Don't forward `positionLeft` and `positionTop` via both props
             // and `props.style`.
-            positionLeft: positionLeft, positionTop: positionTop, className: cx(className, child.props.className), style: __assign(__assign({}, child.props.style), { left: positionLeft, top: positionTop }) }));
+            positionLeft: positionLeft, positionTop: positionTop, className: cx(className, child.props.className), style: __assign(__assign({}, child.props.style), { left: positionLeft, top: positionTop }), componentId: this.componentId }));
     };
-    // setState: (state: any) => void;
     Position.defaultProps = {
         containerPadding: 0,
         placement: 'right',