diff --git a/packages/designer/src/builtin-simulator/host-view.tsx b/packages/designer/src/builtin-simulator/host-view.tsx
index 23a5895ec..8a5def39c 100644
--- a/packages/designer/src/builtin-simulator/host-view.tsx
+++ b/packages/designer/src/builtin-simulator/host-view.tsx
@@ -38,7 +38,6 @@ export class BuiltinSimulatorHostView extends Component<SimulatorHostProps> {
     }
   }
   render() {
-    const { Provider } = SimulatorContext;
     return (
       <div className="lc-simulator">
         {/*progressing.visible ? <PreLoaderView /> : null*/}
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 6e0e4433b..79ee42a42 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -322,7 +322,9 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
       'click',
       (e) => {
         // fix for popups close logic
-        document.dispatchEvent(new Event('click'));
+        const x = new Event('click');
+        x.initEvent('click', true);
+        this._iframe?.dispatchEvent(x);
         const target = e.target as HTMLElement;
         if (isFormEvent(e) || target?.closest('.next-input-group,.next-checkbox-group,.next-date-picker,.next-input,.next-month-picker,.next-number-picker,.next-radio-group,.next-range,.next-range-picker,.next-rating,.next-select,.next-switch,.next-time-picker,.next-upload,.next-year-picker,.next-breadcrumb-item,.next-calendar-header,.next-calendar-table')) {
           e.preventDefault();
diff --git a/packages/editor-skeleton/src/components/field/fields.tsx b/packages/editor-skeleton/src/components/field/fields.tsx
index d039b9597..9e1a673e3 100644
--- a/packages/editor-skeleton/src/components/field/fields.tsx
+++ b/packages/editor-skeleton/src/components/field/fields.tsx
@@ -163,6 +163,7 @@ export class Field extends Component<FieldProps> {
  */
 function createValueState(valueState?: number, onClear?: (e: React.MouseEvent) => void) {
   return null;
+  /*
   let tip: any = null;
   let className = 'lc-valuestate';
   let icon: any = null;
@@ -194,6 +195,7 @@ function createValueState(valueState?: number, onClear?: (e: React.MouseEvent) =
       {tip && <Tip>{tip}</Tip>}
     </i>
   );
+  */
 }
 
 export interface PopupFieldProps extends FieldProps {
diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx
index a7c400dbd..9ab55d0ee 100644
--- a/packages/react-simulator-renderer/src/renderer-view.tsx
+++ b/packages/react-simulator-renderer/src/renderer-view.tsx
@@ -107,6 +107,7 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> {
           viewProps.componentId = __id;
           const leaf = host.document.getNode(__id);
           viewProps._leaf = leaf;
+          viewProps._componentName = leaf?.componentName;
 
           return createElement(
             getDeviceView(Component, device, designMode),