Allow to open the custom object editor from objects drop-down menu (#7039)

Author: D8H

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -808,6 +808,24 @@ gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
   return extensionName + separator + objectName;
 }
 
+gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return "";
+  }
+  return type.substr(0, separatorIndex);
+}
+
+gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
+  const auto separatorIndex =
+      type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return "";
+  }
+  return type.substr(separatorIndex + 2);
+}
+
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}
 

Core/GDCore/Extensions/PlatformExtension.h

@@ -653,6 +653,11 @@ class GD_CORE_API PlatformExtension {
   static gd::String GetObjectFullType(const gd::String &extensionName,
                                       const gd::String &objectName);
 
+
+  static gd::String GetExtensionFromFullObjectType(const gd::String& type);
+
+  static gd::String GetObjectNameFromFullObjectType(const gd::String& type);
+
 private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start

GDevelop.js/Bindings/Bindings.idl

@@ -2211,6 +2211,8 @@ interface PlatformExtension {
         [Const] DOMString extensionName, [Const] DOMString behaviorName);
     [Const, Value] DOMString STATIC_GetObjectFullType(
         [Const] DOMString extensionName, [Const] DOMString objectName);
+    [Const, Value] DOMString STATIC_GetExtensionFromFullObjectType([Const] DOMString type);
+    [Const, Value] DOMString STATIC_GetObjectNameFromFullObjectType([Const] DOMString type);
 };
 
 interface EventsList {

GDevelop.js/Bindings/Wrapper.cpp

@@ -707,6 +707,8 @@ typedef ExtensionAndMetadata<ExpressionMetadata> ExtensionAndExpressionMetadata;
 #define STATIC_GetNamespaceSeparator GetNamespaceSeparator
 #define STATIC_GetBehaviorFullType GetBehaviorFullType
 #define STATIC_GetObjectFullType GetObjectFullType
+#define STATIC_GetExtensionFromFullObjectType GetExtensionFromFullObjectType
+#define STATIC_GetObjectNameFromFullObjectType GetObjectNameFromFullObjectType
 #define STATIC_ApplyRefactoringForVariablesContainer \
   ApplyRefactoringForVariablesContainer
 #define STATIC_ApplyRefactoringForGroupVariablesContainer \

GDevelop.js/types.d.ts

@@ -1672,6 +1672,8 @@ export class PlatformExtension extends EmscriptenObject {
   static getNamespaceSeparator(): string;
   static getBehaviorFullType(extensionName: string, behaviorName: string): string;
   static getObjectFullType(extensionName: string, objectName: string): string;
+  static getExtensionFromFullObjectType(type: string): string;
+  static getObjectNameFromFullObjectType(type: string): string;
 }
 
 export class EventsList extends EmscriptenObject {

GDevelop.js/types/gdplatformextension.js

@@ -58,6 +58,8 @@ declare class gdPlatformExtension {
   static getNamespaceSeparator(): string;
   static getBehaviorFullType(extensionName: string, behaviorName: string): string;
   static getObjectFullType(extensionName: string, objectName: string): string;
+  static getExtensionFromFullObjectType(type: string): string;
+  static getObjectNameFromFullObjectType(type: string): string;
   delete(): void;
   ptr: number;
 };

newIDE/app/src/MainFrame/EditorContainers/BaseEditor.js

@@ -131,6 +131,10 @@ export type RenderEditorContainerProps = {|
     extensionName: string,
     eventsBasedObjectName: string
   ) => void,
+  onOpenEventBasedObjectEditor: (
+    extensionName: string,
+    eventsBasedObjectName: string
+  ) => void,
 |};
 
 export type RenderEditorContainerPropsWithRef = {|

newIDE/app/src/MainFrame/EditorContainers/CustomObjectEditorContainer.js

@@ -196,6 +196,7 @@ export class CustomObjectEditorContainer extends React.Component<RenderEditorCon
             this.props.onEventsBasedObjectChildrenEdited
           }
           onExtractAsEventBasedObject={this.props.onExtractAsEventBasedObject}
+          onOpenEventBasedObjectEditor={this.props.onOpenEventBasedObjectEditor}
         />
       </div>
     );

newIDE/app/src/MainFrame/EditorContainers/ExternalLayoutEditorContainer.js

@@ -256,6 +256,9 @@ export class ExternalLayoutEditorContainer extends React.Component<
             openBehaviorEvents={this.props.openBehaviorEvents}
             onExtractAsExternalLayout={this.props.onExtractAsExternalLayout}
             onExtractAsEventBasedObject={this.props.onExtractAsEventBasedObject}
+            onOpenEventBasedObjectEditor={
+              this.props.onOpenEventBasedObjectEditor
+            }
             onObjectEdited={objectWithContext =>
               this.props.onSceneObjectEdited(layout, objectWithContext)
             }

newIDE/app/src/MainFrame/EditorContainers/SceneEditorContainer.js

@@ -148,6 +148,7 @@ export class SceneEditorContainer extends React.Component<RenderEditorContainerP
         openBehaviorEvents={this.props.openBehaviorEvents}
         onExtractAsExternalLayout={this.props.onExtractAsExternalLayout}
         onExtractAsEventBasedObject={this.props.onExtractAsEventBasedObject}
+        onOpenEventBasedObjectEditor={this.props.onOpenEventBasedObjectEditor}
         onObjectEdited={objectWithContext =>
           this.props.onSceneObjectEdited(layout, objectWithContext)
         }