Skip to content

Commit 22c3469

Browse files
Fix shortcut to rename a layer
1 parent 707f055 commit 22c3469

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

newIDE/app/src/LayersList/LayerTreeViewItemContent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export class LayerTreeViewItemContent implements TreeViewItemContent {
149149
return [
150150
{
151151
label: i18n._(t`Rename`),
152-
click: () => this.props.editName(this.layer.getName()),
152+
click: () => this.props.editName(this.getId()),
153153
accelerator: 'F2',
154154
enabled: !this._isBaseLayer(),
155155
},

newIDE/app/src/LayersList/index.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,13 @@ const LayersList = React.forwardRef<Props, LayersListInterface>(
336336
}));
337337

338338
const editName = React.useCallback(
339-
(layerName: string) => {
340-
// Don't allow renaming base layer (empty name)
341-
if (!layerName) return;
342-
343-
if (!layersContainer.hasLayerNamed(layerName)) return;
344-
const layer = layersContainer.getLayer(layerName);
339+
(itemId: string) => {
340+
// Don't allow renaming the base layer (empty name). The base layer is
341+
// always accessible by its empty name, so we can compare item IDs directly.
342+
if (itemId === getLayerTreeViewItemId(layersContainer.getLayer(''))) {
343+
return;
344+
}
345345

346-
const itemId = getLayerTreeViewItemId(layer);
347346
const treeView = treeViewRef.current;
348347
if (treeView) {
349348
if (isMobile) {

0 commit comments

Comments
 (0)