Update

Author: torkelo

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.22 ()
+
+* Removal of isEditing from SceneComponentProps (also $editor from SceneObjectState, and sceneGraph.getSceneEditor)
+
 # 0.21 (2023-03-17)
 
 **SceneObject subscribeToState parameter change**

packages/scenes/src/core/SceneComponentWrapper.tsx

@@ -1,11 +1,9 @@
 import React, { useEffect } from 'react';
 
-import { SceneComponentCustomWrapper, SceneComponentProps, SceneObject } from './types';
+import { SceneComponentProps, SceneObject } from './types';
 
 function SceneComponentWrapperWithoutMemo<T extends SceneObject>({ model, ...otherProps }: SceneComponentProps<T>) {
   const Component = (model as any).constructor['Component'] ?? EmptyRenderer;
-  const inner = <Component {...otherProps} model={model} />;
-  const CustomWrapper = getComponentWrapper(model);
 
   // Handle component activation state state
   useEffect(() => {
@@ -19,30 +17,11 @@ function SceneComponentWrapperWithoutMemo<T extends SceneObject>({ model, ...oth
     };
   }, [model]);
 
-  if (CustomWrapper) {
-    return <CustomWrapper model={model}>{inner}</CustomWrapper>;
-  }
-
-  return inner;
+  return <Component {...otherProps} model={model} />;
 }
 
 export const SceneComponentWrapper = React.memo(SceneComponentWrapperWithoutMemo);
 
 function EmptyRenderer<T>(_: SceneComponentProps<T>): React.ReactElement | null {
   return null;
 }
-
-/**
- * If this or any parent has componentWrapper then return and use that
- */
-function getComponentWrapper(sceneObject: SceneObject): SceneComponentCustomWrapper | undefined {
-  if (sceneObject.componentWrapper) {
-    return sceneObject.componentWrapper;
-  }
-
-  if (sceneObject.parent) {
-    return getComponentWrapper(sceneObject.parent);
-  }
-
-  return undefined;
-}

packages/scenes/src/core/types.ts

@@ -72,12 +72,6 @@ export interface SceneObject<TState extends SceneObjectState = SceneObjectState>
   /** This abstraction declares URL sync dependencies of a scene object. **/
   readonly urlSync?: SceneObjectUrlSyncHandler<TState>;
 
-  /**
-   * Component wrapper, can be used to for edit modes, to wrap objects in an edit wrappers. This component wrapper will
-   * be used for all children of this object (unless they specify their own wrapper).
-   **/
-  readonly componentWrapper?: SceneComponentCustomWrapper;
-
   /** Subscribe to state changes */
   subscribeToState(handler: SceneStateChangedHandler<TState>): Unsubscribable;