diff --git a/Core/GDCore/IDE/WholeProjectRefactorer.cpp b/Core/GDCore/IDE/WholeProjectRefactorer.cpp index 6647ae5921..c2463ee981 100644 --- a/Core/GDCore/IDE/WholeProjectRefactorer.cpp +++ b/Core/GDCore/IDE/WholeProjectRefactorer.cpp @@ -16,8 +16,8 @@ #include "GDCore/IDE/Events/BehaviorTypeRenamer.h" #include "GDCore/IDE/Events/CustomObjectTypeRenamer.h" #include "GDCore/IDE/Events/EventsBehaviorRenamer.h" -#include "GDCore/IDE/Events/EventsRefactorer.h" #include "GDCore/IDE/Events/EventsPropertyReplacer.h" +#include "GDCore/IDE/Events/EventsRefactorer.h" #include "GDCore/IDE/Events/EventsVariableReplacer.h" #include "GDCore/IDE/Events/ExpressionsParameterMover.h" #include "GDCore/IDE/Events/ExpressionsRenamer.h" @@ -138,7 +138,8 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters( } } -VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer( +VariablesChangeset +WholeProjectRefactorer::ComputeChangesetForVariablesContainer( gd::Project &project, const gd::SerializerElement &oldSerializedVariablesContainer, const gd::VariablesContainer &newVariablesContainer) { @@ -149,9 +150,9 @@ VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer if (oldVariablesContainer.GetPersistentUuid() != newVariablesContainer.GetPersistentUuid()) { - gd::LogWarning( - _("Called ComputeChangesetForVariablesContainer on variables containers " - "that are different - they can't be compared.")); + gd::LogWarning(_( + "Called ComputeChangesetForVariablesContainer on variables containers " + "that are different - they can't be compared.")); return changeset; } @@ -192,14 +193,11 @@ VariablesChangeset WholeProjectRefactorer::ComputeChangesetForVariablesContainer } void WholeProjectRefactorer::ApplyRefactoringForVariablesContainer( - gd::Project &project, - const gd::VariablesContainer &newVariablesContainer, - const gd::VariablesChangeset& changeset) { + gd::Project &project, const gd::VariablesContainer &newVariablesContainer, + const gd::VariablesChangeset &changeset) { gd::EventsVariableReplacer eventsVariableReplacer( - project.GetCurrentPlatform(), - newVariablesContainer, - changeset.oldToNewVariableNames, - changeset.removedVariableNames); + project.GetCurrentPlatform(), newVariablesContainer, + changeset.oldToNewVariableNames, changeset.removedVariableNames); gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsVariableReplacer); } @@ -743,14 +741,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty( EventsBasedBehavior::GetPropertyExpressionName(newPropertyName)); gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer); - std::unordered_map oldToNewPropertyNames = {{oldPropertyName, newPropertyName}}; + std::unordered_map oldToNewPropertyNames = { + {oldPropertyName, newPropertyName}}; std::unordered_set removedPropertyNames; gd::EventsPropertyReplacer eventsPropertyReplacer( - project.GetCurrentPlatform(), - properties, - oldToNewPropertyNames, - removedPropertyNames); - gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer); + project.GetCurrentPlatform(), properties, oldToNewPropertyNames, + removedPropertyNames); + gd::ProjectBrowserHelper::ExposeProjectEvents(project, + eventsPropertyReplacer); gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer( project, @@ -813,14 +811,14 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty( EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName)); gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer); - std::unordered_map oldToNewPropertyNames = {{oldPropertyName, newPropertyName}}; + std::unordered_map oldToNewPropertyNames = { + {oldPropertyName, newPropertyName}}; std::unordered_set removedPropertyNames; gd::EventsPropertyReplacer eventsPropertyReplacer( - project.GetCurrentPlatform(), - properties, - oldToNewPropertyNames, - removedPropertyNames); - gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer); + project.GetCurrentPlatform(), properties, oldToNewPropertyNames, + removedPropertyNames); + gd::ProjectBrowserHelper::ExposeProjectEvents(project, + eventsPropertyReplacer); gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer( project, @@ -870,14 +868,14 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty( EventsBasedObject::GetPropertyExpressionName(newPropertyName)); gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer); - std::unordered_map oldToNewPropertyNames = {{oldPropertyName, newPropertyName}}; + std::unordered_map oldToNewPropertyNames = { + {oldPropertyName, newPropertyName}}; std::unordered_set removedPropertyNames; gd::EventsPropertyReplacer eventsPropertyReplacer( - project.GetCurrentPlatform(), - properties, - oldToNewPropertyNames, - removedPropertyNames); - gd::ProjectBrowserHelper::ExposeProjectEvents(project, eventsPropertyReplacer); + project.GetCurrentPlatform(), properties, oldToNewPropertyNames, + removedPropertyNames); + gd::ProjectBrowserHelper::ExposeProjectEvents(project, + eventsPropertyReplacer); gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer( project, @@ -1351,7 +1349,6 @@ void WholeProjectRefactorer::DoRenameBehavior( gd::Project &project, const gd::String &oldBehaviorType, const gd::String &newBehaviorType, const gd::ProjectBrowser &projectBrowser) { - // Rename behavior in required behavior properties auto requiredBehaviorRenamer = gd::RequiredBehaviorRenamer(oldBehaviorType, newBehaviorType); @@ -1378,7 +1375,6 @@ void WholeProjectRefactorer::DoRenameBehavior( void WholeProjectRefactorer::DoRenameObject( gd::Project &project, const gd::String &oldObjectType, const gd::String &newObjectType, const gd::ProjectBrowser &projectBrowser) { - // Rename object type in objects lists. auto customObjectTypeRenamer = gd::CustomObjectTypeRenamer(oldObjectType, newObjectType); @@ -1398,7 +1394,8 @@ void WholeProjectRefactorer::DoRenameObject( void WholeProjectRefactorer::ObjectOrGroupRemovedInLayout( gd::Project &project, gd::Layout &layout, const gd::String &objectName, bool isObjectGroup, bool removeEventsAndGroups) { - auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout); + auto projectScopedContainers = gd::ProjectScopedContainers:: + MakeNewProjectScopedContainersForProjectAndLayout(project, layout); // Remove object in the current layout if (removeEventsAndGroups) { @@ -1447,7 +1444,8 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInLayout( if (oldName == newName || newName.empty() || oldName.empty()) return; - auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersForProjectAndLayout(project, layout); + auto projectScopedContainers = gd::ProjectScopedContainers:: + MakeNewProjectScopedContainersForProjectAndLayout(project, layout); // Rename object in the current layout gd::EventsRefactorer::RenameObjectInEvents( @@ -1536,10 +1534,19 @@ void WholeProjectRefactorer::RenameLayer(gd::Project &project, const gd::String &newName) { if (oldName == newName || newName.empty() || oldName.empty()) return; + gd::ProjectElementRenamer projectElementRenamer(project.GetCurrentPlatform(), "layer", oldName, newName); - gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout, - projectElementRenamer); + gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents( + project, layout, projectElementRenamer); + layout.GetInitialInstances().MoveInstancesToLayer(oldName, newName); + + std::vector externalLayoutsNames = + GetAssociatedExternalLayouts(project, layout); + for (gd::String name : externalLayoutsNames) { + auto &externalLayout = project.GetExternalLayout(name); + externalLayout.GetInitialInstances().MoveInstancesToLayer(oldName, newName); + } } void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project, @@ -1552,8 +1559,8 @@ void WholeProjectRefactorer::RenameLayerEffect(gd::Project &project, gd::ProjectElementRenamer projectElementRenamer( project.GetCurrentPlatform(), "layerEffectName", oldName, newName); projectElementRenamer.SetLayerConstraint(layer.GetName()); - gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout, - projectElementRenamer); + gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents( + project, layout, projectElementRenamer); } void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project, @@ -1566,8 +1573,8 @@ void WholeProjectRefactorer::RenameObjectAnimation(gd::Project &project, gd::ProjectElementRenamer projectElementRenamer( project.GetCurrentPlatform(), "objectAnimationName", oldName, newName); projectElementRenamer.SetObjectConstraint(object.GetName()); - gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout, - projectElementRenamer); + gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents( + project, layout, projectElementRenamer); } void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project, @@ -1580,8 +1587,8 @@ void WholeProjectRefactorer::RenameObjectPoint(gd::Project &project, gd::ProjectElementRenamer projectElementRenamer( project.GetCurrentPlatform(), "objectPointName", oldName, newName); projectElementRenamer.SetObjectConstraint(object.GetName()); - gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout, - projectElementRenamer); + gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents( + project, layout, projectElementRenamer); } void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project, @@ -1594,8 +1601,8 @@ void WholeProjectRefactorer::RenameObjectEffect(gd::Project &project, gd::ProjectElementRenamer projectElementRenamer( project.GetCurrentPlatform(), "objectEffectName", oldName, newName); projectElementRenamer.SetObjectConstraint(object.GetName()); - gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents(project, layout, - projectElementRenamer); + gd::ProjectBrowserHelper::ExposeLayoutEventsAndExternalEvents( + project, layout, projectElementRenamer); } void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsBasedObject( @@ -1617,9 +1624,12 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction( gd::ObjectsContainer &globalObjectsContainer, gd::ObjectsContainer &objectsContainer, const gd::String &objectName, bool isObjectGroup, bool removeEventsAndGroups) { - // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one. - // In practice, this is ok because we only deal with objects. - auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer); + // In theory we should pass a ProjectScopedContainers to this function so it + // does not have to construct one. In practice, this is ok because we only + // deal with objects. + auto projectScopedContainers = + gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor( + globalObjectsContainer, objectsContainer); if (removeEventsAndGroups) { gd::EventsRefactorer::RemoveObjectInEvents( @@ -1655,9 +1665,12 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction( gd::ObjectsContainer &globalObjectsContainer, gd::ObjectsContainer &objectsContainer, const gd::String &oldName, const gd::String &newName, bool isObjectGroup) { - // In theory we should pass a ProjectScopedContainers to this function so it does not have to construct one. - // In practice, this is ok because we only deal with objects. - auto projectScopedContainers = gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsContainer, objectsContainer); + // In theory we should pass a ProjectScopedContainers to this function so it + // does not have to construct one. In practice, this is ok because we only + // deal with objects. + auto projectScopedContainers = + gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor( + globalObjectsContainer, objectsContainer); gd::EventsRefactorer::RenameObjectInEvents( project.GetCurrentPlatform(), projectScopedContainers, @@ -1705,7 +1718,7 @@ void WholeProjectRefactorer::GlobalObjectOrGroupRemoved( if (layout.HasObjectNamed(objectName)) continue; - ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup, + ObjectOrGroupRemovedInLayout(project, layout, objectName, isObjectGroup, removeEventsAndGroups); } } @@ -1753,7 +1766,8 @@ size_t WholeProjectRefactorer::GetLayoutAndExternalLayoutLayerInstancesCount( GetAssociatedExternalLayouts(project, layout); for (gd::String name : externalLayoutsNames) { auto &externalLayout = project.GetExternalLayout(name); - count += externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName); + count += + externalLayout.GetInitialInstances().GetLayerInstancesCount(layerName); } return count; } diff --git a/Core/tests/WholeProjectRefactorer.cpp b/Core/tests/WholeProjectRefactorer.cpp index 7f76ca896d..456306ecf9 100644 --- a/Core/tests/WholeProjectRefactorer.cpp +++ b/Core/tests/WholeProjectRefactorer.cpp @@ -3474,6 +3474,72 @@ TEST_CASE("RenameLayer", "[common]") { "MyExtension::CameraCenterX(\"layerA\")"); } + SECTION("Renaming a layer also moves the instances on this layer and of the associated external layouts") { + gd::Project project; + gd::Platform platform; + SetupProjectWithDummyPlatform(project, platform); + + auto &layout = project.InsertNewLayout("My layout", 0); + auto &otherLayout = project.InsertNewLayout("My other layout", 1); + + layout.InsertNewLayer("My layer", 0); + otherLayout.InsertNewLayer("My layer", 0); + + auto &externalLayout = + project.InsertNewExternalLayout("My external layout", 0); + auto &otherExternalLayout = + project.InsertNewExternalLayout("My other external layout", 0); + externalLayout.SetAssociatedLayout("My layout"); + otherExternalLayout.SetAssociatedLayout("My other layout"); + + auto &initialInstances = layout.GetInitialInstances(); + auto &initialInstance1 = initialInstances.InsertNewInitialInstance(); + initialInstance1.SetLayer("My layer"); + auto &initialInstance2 = initialInstances.InsertNewInitialInstance(); + initialInstance2.SetLayer("My layer"); + auto &initialInstance3 = initialInstances.InsertNewInitialInstance(); + initialInstance3.SetLayer(""); + + auto &externalInitialInstances = externalLayout.GetInitialInstances(); + auto &externalInitialInstance1 = externalInitialInstances.InsertNewInitialInstance(); + externalInitialInstance1.SetLayer("My layer"); + auto &externalInitialInstance2 = externalInitialInstances.InsertNewInitialInstance(); + externalInitialInstance2.SetLayer("My layer"); + auto &externalInitialInstance3 = externalInitialInstances.InsertNewInitialInstance(); + externalInitialInstance3.SetLayer(""); + + auto &otherInitialInstances = otherLayout.GetInitialInstances(); + auto &otherInitialInstance1 = otherInitialInstances.InsertNewInitialInstance(); + otherInitialInstance1.SetLayer("My layer"); + + auto &otherExternalInitialInstances = otherExternalLayout.GetInitialInstances(); + auto &otherExternalInitialInstance1 = otherExternalInitialInstances.InsertNewInitialInstance(); + otherExternalInitialInstance1.SetLayer("My layer"); + + REQUIRE(initialInstance1.GetLayer() == "My layer"); + REQUIRE(initialInstance2.GetLayer() == "My layer"); + REQUIRE(initialInstance3.GetLayer() == ""); + REQUIRE(externalInitialInstance1.GetLayer() == "My layer"); + REQUIRE(externalInitialInstance2.GetLayer() == "My layer"); + REQUIRE(externalInitialInstance3.GetLayer() == ""); + REQUIRE(otherInitialInstance1.GetLayer() == "My layer"); + REQUIRE(otherExternalInitialInstance1.GetLayer() == "My layer"); + + gd::WholeProjectRefactorer::RenameLayer(project, layout, "My layer", "My new layer"); + + // Instances on the renamed layer are moved to the new layer. + REQUIRE(initialInstance1.GetLayer() == "My new layer"); + REQUIRE(initialInstance2.GetLayer() == "My new layer"); + REQUIRE(initialInstance3.GetLayer() == ""); + // Instances on the renamed layer of external layouts are moved to the new layer. + REQUIRE(externalInitialInstance1.GetLayer() == "My new layer"); + REQUIRE(externalInitialInstance2.GetLayer() == "My new layer"); + REQUIRE(externalInitialInstance3.GetLayer() == ""); + // Instances on the renamed layer of other layouts & external layouts are not moved. + REQUIRE(otherInitialInstance1.GetLayer() == "My layer"); + REQUIRE(otherExternalInitialInstance1.GetLayer() == "My layer"); + } + SECTION("Can rename a layer when a layer parameter is empty") { gd::Project project; gd::Platform platform; diff --git a/newIDE/app/src/LayersList/index.js b/newIDE/app/src/LayersList/index.js index b7e180bcfd..41656aac19 100644 --- a/newIDE/app/src/LayersList/index.js +++ b/newIDE/app/src/LayersList/index.js @@ -31,11 +31,7 @@ type LayersListBodyProps = {| onSelectLayer: string => void, unsavedChanges?: ?UnsavedChanges, onRemoveLayer: (layerName: string, cb: (done: boolean) => void) => void, - onRenameLayer: ( - oldName: string, - newName: string, - cb: (done: boolean) => void - ) => void, + onLayerRenamed: () => void, onEditEffects: (layer: ?gdLayer) => void, onEdit: (layer: ?gdLayer) => void, width: number, @@ -64,7 +60,7 @@ const LayersListBody = (props: LayersListBodyProps) => { onEditEffects, onEdit, width, - onRenameLayer, + onLayerRenamed, onRemoveLayer, unsavedChanges, } = props; @@ -129,16 +125,15 @@ const LayersListBody = (props: LayersListBodyProps) => { [layerName]: The name {newName} is already taken, })); } else { - onRenameLayer(layerName, newName, doRename => { - if (doRename) - layersContainer.getLayer(layerName).setName(newName); - gd.WholeProjectRefactorer.renameLayer( - project, - layersContainer, - layerName, - newName - ); - }); + layersContainer.getLayer(layerName).setName(newName); + gd.WholeProjectRefactorer.renameLayer( + project, + layersContainer, + layerName, + newName + ); + onLayerRenamed(); + onLayerModified(); } }} onRemove={() => { @@ -204,11 +199,7 @@ type Props = {| onEditLayerEffects: (layer: ?gdLayer) => void, onEditLayer: (layer: ?gdLayer) => void, onRemoveLayer: (layerName: string, cb: (done: boolean) => void) => void, - onRenameLayer: ( - oldName: string, - newName: string, - cb: (done: boolean) => void - ) => void, + onLayerRenamed: () => void, onCreateLayer: () => void, unsavedChanges?: ?UnsavedChanges, @@ -291,7 +282,7 @@ const LayersList = React.forwardRef( onEditEffects={props.onEditLayerEffects} onEdit={props.onEditLayer} onRemoveLayer={props.onRemoveLayer} - onRenameLayer={props.onRenameLayer} + onLayerRenamed={props.onLayerRenamed} unsavedChanges={props.unsavedChanges} width={width} /> diff --git a/newIDE/app/src/SceneEditor/EditorsDisplay.flow.js b/newIDE/app/src/SceneEditor/EditorsDisplay.flow.js index 4ddb9746c6..bdcac890e3 100644 --- a/newIDE/app/src/SceneEditor/EditorsDisplay.flow.js +++ b/newIDE/app/src/SceneEditor/EditorsDisplay.flow.js @@ -37,11 +37,7 @@ export type SceneEditorsDisplayProps = {| editLayerEffects: (layer: ?gdLayer) => void, editLayer: (layer: ?gdLayer) => void, onRemoveLayer: (layerName: string, done: (boolean) => void) => void, - onRenameLayer: ( - oldName: string, - newName: string, - done: (boolean) => void - ) => void, + onLayerRenamed: () => void, onObjectCreated: gdObject => void, onObjectFolderOrObjectWithContextSelected: ( ?ObjectFolderOrObjectWithContext diff --git a/newIDE/app/src/SceneEditor/MosaicEditorsDisplay/index.js b/newIDE/app/src/SceneEditor/MosaicEditorsDisplay/index.js index 53531d62f3..87dab826d3 100644 --- a/newIDE/app/src/SceneEditor/MosaicEditorsDisplay/index.js +++ b/newIDE/app/src/SceneEditor/MosaicEditorsDisplay/index.js @@ -269,7 +269,7 @@ const MosaicEditorsDisplay = React.forwardRef< onEditLayerEffects={props.editLayerEffects} onEditLayer={props.editLayer} onRemoveLayer={props.onRemoveLayer} - onRenameLayer={props.onRenameLayer} + onLayerRenamed={props.onLayerRenamed} onCreateLayer={forceUpdateInstancesPropertiesEditor} layersContainer={layout} unsavedChanges={props.unsavedChanges} diff --git a/newIDE/app/src/SceneEditor/SwipeableDrawerEditorsDisplay/index.js b/newIDE/app/src/SceneEditor/SwipeableDrawerEditorsDisplay/index.js index 383f17056e..32034a555d 100644 --- a/newIDE/app/src/SceneEditor/SwipeableDrawerEditorsDisplay/index.js +++ b/newIDE/app/src/SceneEditor/SwipeableDrawerEditorsDisplay/index.js @@ -391,7 +391,7 @@ const SwipeableDrawerEditorsDisplay = React.forwardRef< onEditLayerEffects={props.editLayerEffects} onEditLayer={props.editLayer} onRemoveLayer={props.onRemoveLayer} - onRenameLayer={props.onRenameLayer} + onLayerRenamed={props.onLayerRenamed} onCreateLayer={forceUpdateInstancesPropertiesEditor} layersContainer={layout} unsavedChanges={props.unsavedChanges} diff --git a/newIDE/app/src/SceneEditor/index.js b/newIDE/app/src/SceneEditor/index.js index 7f3867510d..57312ffc78 100644 --- a/newIDE/app/src/SceneEditor/index.js +++ b/newIDE/app/src/SceneEditor/index.js @@ -873,13 +873,7 @@ export default class SceneEditor extends React.Component { this.updateToolbar(); }; - _onRenameLayer = ( - oldName: string, - newName: string, - done: boolean => void - ) => { - this.props.initialInstances.moveInstancesToLayer(oldName, newName); - done(true); + _onLayerRenamed = () => { this.forceUpdatePropertiesEditor(); }; @@ -1696,7 +1690,7 @@ export default class SceneEditor extends React.Component { selectedObjectFolderOrObjectsWithContext={ selectedObjectFolderOrObjectsWithContext } - onRenameLayer={this._onRenameLayer} + onLayerRenamed={this._onLayerRenamed} onRemoveLayer={this._onRemoveLayer} onSelectLayer={(layer: string) => this.setState({ selectedLayer: layer }) diff --git a/newIDE/app/src/stories/componentStories/LayoutEditor/LayersList.stories.js b/newIDE/app/src/stories/componentStories/LayoutEditor/LayersList.stories.js index 72f975e682..d7c6195940 100644 --- a/newIDE/app/src/stories/componentStories/LayoutEditor/LayersList.stories.js +++ b/newIDE/app/src/stories/componentStories/LayoutEditor/LayersList.stories.js @@ -31,9 +31,7 @@ export const Default = () => { onRemoveLayer={(layerName, cb) => { cb(true); }} - onRenameLayer={(oldName, newName, cb) => { - cb(true); - }} + onLayerRenamed={action('onLayerRenamed')} onCreateLayer={action('onCreateLayer')} layersContainer={testProject.testLayout} hotReloadPreviewButtonProps={fakeHotReloadPreviewButtonProps} @@ -57,9 +55,7 @@ export const SmallWidthAndHeight = () => { onRemoveLayer={(layerName, cb) => { cb(true); }} - onRenameLayer={(oldName, newName, cb) => { - cb(true); - }} + onLayerRenamed={action('onLayerRenamed')} onCreateLayer={action('onCreateLayer')} layersContainer={testProject.testLayout} hotReloadPreviewButtonProps={fakeHotReloadPreviewButtonProps}