Merge branch 'drag-drop-new-objects' into last-Almost-stable

Author: NBForgeLab

.codex/environments/environment.toml

@@ -0,0 +1,15 @@
+# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
+version = 1
+name = "GDevelop"
+
+[setup]
+script = ""
+
+[[actions]]
+name = "Run"
+icon = "run"
+command = '''
+cd "C:\Users\batah\OneDrive\المستندات\GitHub\GDevelop\newIDE\app"
+npm run build
+npm start
+'''

newIDE/app/src/ObjectsList/DroppedFileObjectSelectorUtils.js

@@ -1,11 +1,10 @@
 // @flow
 
 const imageExtensions = ['png', 'jpg', 'jpeg', 'webp'];
-const modelExtensions = ['glb'];
 
 export type DroppedSupportedFile = {|
   file: ?File,
-  resourceKind: 'image' | 'model3D',
+  resourceKind: 'image',
 |};
 
 export const getFileExtension = (filename: string): string => {
@@ -14,28 +13,18 @@ export const getFileExtension = (filename: string): string => {
   return filename.substring(dotIndex + 1).toLowerCase();
 };
 
-export const getResourceKindFromExtension = (
-  extension: string
-): ?('image' | 'model3D') => {
+export const getResourceKindFromExtension = (extension: string): ?'image' => {
   if (imageExtensions.includes(extension)) {
     return 'image';
   }
-  if (modelExtensions.includes(extension)) {
-    return 'model3D';
-  }
   return null;
 };
 
-export const getResourceKindFromMimeType = (
-  mimeType: string
-): ?('image' | 'model3D') => {
+export const getResourceKindFromMimeType = (mimeType: string): ?'image' => {
   const normalizedMimeType = mimeType.toLowerCase();
   if (normalizedMimeType.startsWith('image/')) {
     return 'image';
   }
-  if (normalizedMimeType === 'model/gltf-binary') {
-    return 'model3D';
-  }
   return null;
 };
 

newIDE/app/src/ObjectsList/ObjectTypeDefaultName.js

@@ -0,0 +1,27 @@
+// @flow
+
+const objectTypeToDefaultName = {
+  Sprite: 'NewSprite',
+  'TiledSpriteObject::TiledSprite': 'NewTiledSprite',
+  'ParticleSystem::ParticleEmitter': 'NewParticlesEmitter',
+  'PanelSpriteObject::PanelSprite': 'NewPanelSprite',
+  'PrimitiveDrawing::Drawer': 'NewShapePainter',
+  'TextObject::Text': 'NewText',
+  'BBText::BBText': 'NewBBText',
+  'BitmapText::BitmapTextObject': 'NewBitmapText',
+  'TextEntryObject::TextEntry': 'NewTextEntry',
+  'TileMap::SimpleTileMap': 'NewTileMap',
+  'TileMap::TileMap': 'NewExternalTileMap',
+  'TileMap::CollisionMask': 'NewExternalTileMapMask',
+  'MyDummyExtension::DummyObject': 'NewDummyObject',
+  'Lighting::LightObject': 'NewLight',
+  'TextInput::TextInputObject': 'NewTextInput',
+  'Scene3D::Model3DObject': 'New3DModel',
+  'Scene3D::Cube3DObject': 'New3DBox',
+  'SpineObject::SpineObject': 'NewSpine',
+  'Video::VideoObject': 'NewVideo',
+};
+
+export const getDefaultObjectNameForType = (objectType: string): string =>
+  // $FlowFixMe[invalid-computed-prop]
+  objectTypeToDefaultName[objectType] || 'NewObject';

newIDE/app/src/ObjectsList/ObjectTypeDefaultName.spec.js

@@ -0,0 +1,15 @@
+// @flow
+import { getDefaultObjectNameForType } from './ObjectTypeDefaultName';
+
+describe('ObjectTypeDefaultName', () => {
+  it('returns the editor-style default object name for known object types', () => {
+    expect(getDefaultObjectNameForType('Sprite')).toBe('NewSprite');
+    expect(getDefaultObjectNameForType('PanelSpriteObject::PanelSprite')).toBe(
+      'NewPanelSprite'
+    );
+  });
+
+  it('falls back to NewObject for unknown object types', () => {
+    expect(getDefaultObjectNameForType('Unknown::Object')).toBe('NewObject');
+  });
+});

newIDE/app/src/ObjectsList/ObjectsListDragAndDrop.spec.js

@@ -43,13 +43,13 @@ describe('ObjectsList drag and drop helpers', () => {
 
   test('detects supported resource kinds from extension', () => {
     expect(getResourceKindFromExtension('png')).toBe('image');
-    expect(getResourceKindFromExtension('glb')).toBe('model3D');
+    expect(getResourceKindFromExtension('glb')).toBe(null);
     expect(getResourceKindFromExtension('wav')).toBe(null);
   });
 
   test('detects supported resource kinds from mime type', () => {
     expect(getResourceKindFromMimeType('image/webp')).toBe('image');
-    expect(getResourceKindFromMimeType('model/gltf-binary')).toBe('model3D');
+    expect(getResourceKindFromMimeType('model/gltf-binary')).toBe(null);
     expect(getResourceKindFromMimeType('audio/wav')).toBe(null);
   });
 
@@ -94,7 +94,7 @@ describe('ObjectsList drag and drop helpers', () => {
     });
   });
 
-  test('detects a supported dropped file from mime type before the file is available', () => {
+  test('returns null for unsupported dropped mime types before the file is available', () => {
     const droppedFile = getDroppedSupportedFile({
       0: {
         kind: 'file',
@@ -104,10 +104,7 @@ describe('ObjectsList drag and drop helpers', () => {
       length: 1,
     });
 
-    expect(droppedFile).toEqual({
-      file: null,
-      resourceKind: 'model3D',
-    });
+    expect(droppedFile).toBe(null);
   });
 
   test('returns null for unsupported dropped entries', () => {

newIDE/app/src/ObjectsList/index.js

@@ -78,6 +78,7 @@ import {
   getDroppedSupportedFile,
   type DroppedSupportedFile,
 } from './DroppedFileObjectSelectorUtils';
+import { getDefaultObjectNameForType } from './ObjectTypeDefaultName';
 
 const gd: libGDevelop = global.gd;
 const nodePath = optionalRequire('path');
@@ -438,28 +439,6 @@ const getTreeViewItemRightButton = (i18n: I18nType) => (item: TreeViewItem) =>
 
 export const objectWithContextReactDndType = 'GD_OBJECT_WITH_CONTEXT';
 
-const objectTypeToDefaultName = {
-  Sprite: 'NewSprite',
-  'TiledSpriteObject::TiledSprite': 'NewTiledSprite',
-  'ParticleSystem::ParticleEmitter': 'NewParticlesEmitter',
-  'PanelSpriteObject::PanelSprite': 'NewPanelSprite',
-  'PrimitiveDrawing::Drawer': 'NewShapePainter',
-  'TextObject::Text': 'NewText',
-  'BBText::BBText': 'NewBBText',
-  'BitmapText::BitmapTextObject': 'NewBitmapText',
-  'TextEntryObject::TextEntry': 'NewTextEntry',
-  'TileMap::SimpleTileMap': 'NewTileMap',
-  'TileMap::TileMap': 'NewExternalTileMap',
-  'TileMap::CollisionMask': 'NewExternalTileMapMask',
-  'MyDummyExtension::DummyObject': 'NewDummyObject',
-  'Lighting::LightObject': 'NewLight',
-  'TextInput::TextInputObject': 'NewTextInput',
-  'Scene3D::Model3DObject': 'New3DModel',
-  'Scene3D::Cube3DObject': 'New3DBox',
-  'SpineObject::SpineObject': 'NewSpine',
-  'Video::VideoObject': 'NewVideo',
-};
-
 export type ObjectsListInterface = {|
   forceUpdateList: () => void,
   openNewObjectDialog: () => void,
@@ -712,21 +691,12 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
       ({
         objectType,
         resourceName,
-        sourceFileName,
       }: {|
         objectType: string,
         resourceName: string,
-        sourceFileName: string,
       |}) => {
-        const sourceBaseName = nodePath
-          ? nodePath.basename(sourceFileName, nodePath.extname(sourceFileName))
-          : sourceFileName.replace(/\.[^/.]+$/, '');
-        const fallbackName =
-          // $FlowFixMe[invalid-computed-prop]
-          objectTypeToDefaultName[objectType] || 'NewObject';
-        const defaultObjectName = sourceBaseName || fallbackName;
         const objectName = newNameGenerator(
-          defaultObjectName,
+          getDefaultObjectNameForType(objectType),
           candidateName =>
             objectsContainer.hasObjectNamed(candidateName) ||
             (!!globalObjectsContainer &&
@@ -841,10 +811,7 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
         if (!droppedFile.file) return null;
         const storageProvider = resourceManagementProps.getStorageProvider();
         const resourcesManager = project.getResourcesManager();
-        const newResource =
-          droppedFile.resourceKind === 'image'
-            ? new gd.ImageResource()
-            : new gd.Model3DResource();
+        const newResource = new gd.ImageResource();
         if (storageProvider.internalName === 'Cloud') {
           if (!fileMetadata || !authenticatedUser.authenticated) {
             newResource.delete();
@@ -915,8 +882,7 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
           ? 'New' +
             (project.getEventsBasedObject(objectType).getDefaultName() ||
               project.getEventsBasedObject(objectType).getName())
-          : // $FlowFixMe[invalid-computed-prop]
-            objectTypeToDefaultName[objectType] || 'NewObject';
+          : getDefaultObjectNameForType(objectType);
         const name = newNameGenerator(
           defaultName,
           name =>
@@ -1968,17 +1934,13 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
           return;
         }
         let objectTypeToCreate = null;
-        if (droppedFile.resourceKind === 'image') {
-          objectTypeToCreate = getObjectTypeForDroppedImagePosition(
-            event.clientX,
-            event.clientY
-          );
-          if (!objectTypeToCreate) {
-            resetDroppedFileState();
-            return;
-          }
-        } else {
-          objectTypeToCreate = 'Scene3D::Model3DObject';
+        objectTypeToCreate = getObjectTypeForDroppedImagePosition(
+          event.clientX,
+          event.clientY
+        );
+        if (!objectTypeToCreate) {
+          resetDroppedFileState();
+          return;
         }
         if (
           storageProvider.internalName === 'Cloud' &&
@@ -2006,7 +1968,6 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
           insertObjectFromDroppedResource({
             objectType: objectTypeToCreate,
             resourceName,
-            sourceFileName: droppedFile.file.name,
           });
         } catch (error) {
           await showAlert({