diff --git a/src/app/WardrobePage/Item.js b/src/app/WardrobePage/Item.js index 2e48fca..f12837d 100644 --- a/src/app/WardrobePage/Item.js +++ b/src/app/WardrobePage/Item.js @@ -62,10 +62,6 @@ function Item({ const restrictedZoneLabels = getZoneLabels( item.appearanceOn.restrictedZones.filter((z) => z.isCommonlyUsedByItems) ); - const zonesAreSimple = - occupiedZoneLabels.length <= 1 && restrictedZoneLabels.length === 0; - const shouldHideZones = hideSimpleZones && zonesAreSimple; - const shouldShowZones = !shouldHideZones; return ( <> @@ -84,35 +80,39 @@ function Item({ {item.isNc ? ( NC ) : ( + // The main purpose of the NP badge is alignment: if there are + // zone badges, we want them to start at the same rough position, + // even if there's an NC badge at the start. But if this view + // generally avoids zone badges, we'd rather have the NC badge be + // a little extra that might pop up and hide the NP case, rather + // than try to line things up like a table. NP )} - {shouldShowZones && - occupiedZoneLabels.map((zoneLabel) => ( - {getZoneShorthand(zoneLabel)} - ))} - {shouldShowZones && - restrictedZoneLabels.map((zoneLabel) => ( - - Restricted: This isn't a {zoneLabel} item, but you can't - wear {zoneLabel} items with it - - } - placement="top" - openDelay={250} + {occupiedZoneLabels.map((zoneLabel) => ( + {getZoneShorthand(zoneLabel)} + ))} + {restrictedZoneLabels.map((zoneLabel) => ( + + Restricted: This isn't a {zoneLabel} item, but you can't + wear {zoneLabel} items with it + + } + placement="top" + openDelay={250} + > + - - {getZoneShorthand(zoneLabel)} - - - - ))} + {getZoneShorthand(zoneLabel)} + + + + ))} diff --git a/src/app/WardrobePage/ItemsPanel.js b/src/app/WardrobePage/ItemsPanel.js index 7714ed7..118ab18 100644 --- a/src/app/WardrobePage/ItemsPanel.js +++ b/src/app/WardrobePage/ItemsPanel.js @@ -123,7 +123,6 @@ function ItemZoneGroup({ zoneLabel, items, outfitState, dispatchToOutfit }) { isWorn={outfitState.wornItemIds.includes(item.id)} isInOutfit={outfitState.allItemIds.includes(item.id)} dispatchToOutfit={dispatchToOutfit} - hideSimpleZones />