fix: minor fixes

near · Oct 11, 2023 · fc59b1a · fc59b1a
1 parent 78c6dea
commit fc59b1a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packages/application/src/monitor.tsx b/packages/application/src/monitor.tsx
@@ -1,9 +1,6 @@
 import type { EventType, MessagePayload } from '@bos-web-engine/container';
 
-import type {
-  ComponentInstance,
-  ComponentMetrics,
-} from './types';
+import type { ComponentInstance, ComponentMetrics } from './types';
 import { BWEMessage } from './types';
 
 interface ComponentId {
@@ -139,7 +136,7 @@ export function ComponentMonitor({
     switch (message.type) {
       case 'component.render': {
         const { type, props } = message.node;
-        const formattedChildren = message.childComponents.length
+        const formattedChildren = message.childComponents?.length
           ? `with children ${message.childComponents
               .map(({ componentId }) =>
                 formatComponentId(parseComponentId(componentId))

diff --git a/packages/application/src/react.ts b/packages/application/src/react.ts
@@ -7,6 +7,10 @@ import type {
   ComponentDOMElement,
 } from './types';
 
+function isChildrenAllowed(elementType: string) {
+  return !(elementType in ['img']);
+}
+
 export function createElement({
   children,
   id,
@@ -17,7 +21,7 @@ export function createElement({
   return React.createElement(
     type,
     deserializeProps({ id, props, onMessageSent }),
-    children
+    isChildrenAllowed(type) ? children : undefined
   );
 }
 

diff --git a/packages/iframe/src/SandboxedIframe.tsx b/packages/iframe/src/SandboxedIframe.tsx
@@ -115,6 +115,10 @@ function buildSandboxedComponent({
               parentId: componentId,
             });
 
+            if (!serializedNode?.type) {
+              return;
+            }
+
             function stringify(value) {
               if (!value) {
                 return '';