From eba5d0a2c63ee251840734bfcac11eddc899cfb3 Mon Sep 17 00:00:00 2001
From: DD Liu <liudi@media.mit.edu>
Date: Thu, 28 Dec 2017 11:59:54 -0500
Subject: [PATCH] pass in null for the delete callback when x should not be
 displayed

---
 src/components/asset-panel/selector.jsx       |  3 +-
 .../sprite-selector-item.jsx                  | 45 ++++++++++---------
 src/containers/sprite-selector-item.jsx       |  6 +--
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/asset-panel/selector.jsx b/src/components/asset-panel/selector.jsx
index 67b765ff7..39c5fd90e 100644
--- a/src/components/asset-panel/selector.jsx
+++ b/src/components/asset-panel/selector.jsx
@@ -23,14 +23,13 @@ const Selector = props => {
                     <SpriteSelectorItem
                         assetId={item.assetId}
                         className={styles.listItem}
-                        costumeCount={items.length}
                         costumeURL={item.url}
                         id={index}
                         key={`asset-${index}`}
                         name={item.name}
                         selected={index === selectedItemIndex}
                         onClick={onItemClick}
-                        onDeleteButtonClick={onDeleteClick}
+                        onDeleteButtonClick={items.length > 1 ? onDeleteClick : null}
                     />
                 ))}
             </Box>
diff --git a/src/components/sprite-selector-item/sprite-selector-item.jsx b/src/components/sprite-selector-item/sprite-selector-item.jsx
index 0a65907d7..aa292cfaa 100644
--- a/src/components/sprite-selector-item/sprite-selector-item.jsx
+++ b/src/components/sprite-selector-item/sprite-selector-item.jsx
@@ -22,7 +22,7 @@ const SpriteSelectorItem = props => (
         }}
         id={`${props.name}-${contextMenuId}`}
     >
-        {(props.selected && props.costumeCount > 1) ? (
+        {(props.selected && props.onDeleteButtonClick) ? (
             <CloseButton
                 className={styles.deleteButton}
                 size={CloseButton.SIZE_SMALL}
@@ -38,34 +38,37 @@ const SpriteSelectorItem = props => (
             />
         ) : null}
         <div className={styles.spriteName}>{props.name}</div>
-        <ContextMenu id={`${props.name}-${contextMenuId++}`}>
-            {props.onDuplicateButtonClick ? (
-                <MenuItem onClick={props.onDuplicateButtonClick}>
-                    <FormattedMessage
-                        defaultMessage="duplicate"
-                        description="Menu item to duplicate in the right click menu"
-                        id="gui.spriteSelectorItem.contextMenuDuplicate"
-                    />
-                </MenuItem>
-            ) : null}
-            <MenuItem onClick={props.onDeleteButtonClick}>
-                <FormattedMessage
-                    defaultMessage="delete"
-                    description="Menu item to delete in the right click menu"
-                    id="gui.spriteSelectorItem.contextMenuDelete"
-                />
-            </MenuItem>
-        </ContextMenu>
+        {props.onDuplicateButtonClick || props.onDeleteButtonClick ? (
+            <ContextMenu id={`${props.name}-${contextMenuId++}`}>
+                {props.onDuplicateButtonClick ? (
+                    <MenuItem onClick={props.onDuplicateButtonClick}>
+                        <FormattedMessage
+                            defaultMessage="duplicate"
+                            description="Menu item to duplicate in the right click menu"
+                            id="gui.spriteSelectorItem.contextMenuDuplicate"
+                        />
+                    </MenuItem>
+                ) : null}
+                {props.onDeleteButtonClick ? (
+                    <MenuItem onClick={props.onDeleteButtonClick}>
+                        <FormattedMessage
+                            defaultMessage="delete"
+                            description="Menu item to delete in the right click menu"
+                            id="gui.spriteSelectorItem.contextMenuDelete"
+                        />
+                    </MenuItem>
+                ) : null }
+            </ContextMenu>
+        ) : null}
     </ContextMenuTrigger>
 );
 
 SpriteSelectorItem.propTypes = {
     className: PropTypes.string,
-    costumeCount: PropTypes.number,
     costumeURL: PropTypes.string,
     name: PropTypes.string.isRequired,
     onClick: PropTypes.func,
-    onDeleteButtonClick: PropTypes.func.isRequired,
+    onDeleteButtonClick: PropTypes.func,
     onDuplicateButtonClick: PropTypes.func,
     selected: PropTypes.bool.isRequired
 };
diff --git a/src/containers/sprite-selector-item.jsx b/src/containers/sprite-selector-item.jsx
index a0588bf0a..1bdb6d368 100644
--- a/src/containers/sprite-selector-item.jsx
+++ b/src/containers/sprite-selector-item.jsx
@@ -20,6 +20,7 @@ class SpriteSelectorItem extends React.Component {
         this.props.onClick(this.props.id);
     }
     handleDelete () {
+        // @todo add i18n here
         // eslint-disable-next-line no-alert
         if (window.confirm('Are you sure you want to delete this sprite?')) {
             this.props.onDeleteButtonClick(this.props.id);
@@ -43,7 +44,7 @@ class SpriteSelectorItem extends React.Component {
         return (
             <SpriteSelectorItemComponent
                 onClick={this.handleClick}
-                onDeleteButtonClick={this.handleDelete}
+                onDeleteButtonClick={onDeleteButtonClick ? this.handleDelete : null}
                 onDuplicateButtonClick={onDuplicateButtonClick ? this.handleDuplicate : null}
                 {...props}
             />
@@ -53,12 +54,11 @@ class SpriteSelectorItem extends React.Component {
 
 SpriteSelectorItem.propTypes = {
     assetId: PropTypes.string,
-    costumeCount: PropTypes.number,
     costumeURL: PropTypes.string,
     id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     name: PropTypes.string,
     onClick: PropTypes.func,
-    onDeleteButtonClick: PropTypes.func.isRequired,
+    onDeleteButtonClick: PropTypes.func,
     onDuplicateButtonClick: PropTypes.func,
     selected: PropTypes.bool
 };