Merge pull request #784 from wowsims/feature/port-cata-improvements

[Bug] fix removing random suffixes
wowsims · Jun 9, 2024 · 8a66046 · 8a66046
2 parents d9f9130 + 816774b
commit 8a66046
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/ui/core/components/gear_picker/selector_modal.tsx b/ui/core/components/gear_picker/selector_modal.tsx
@@ -359,7 +359,7 @@ export default class SelectorModal extends BaseModal {
 			onRemove: (eventID: number) => {
 				const equippedItem = gearData.getEquippedItem();
 				if (equippedItem) {
-					gearData.equipItem(eventID, equippedItem.withRandomSuffix(null));
+					gearData.equipItem(eventID, equippedItem.withItem(equippedItem.item).withRandomSuffix(null));
 				}
 			},
 		});

diff --git a/ui/core/components/individual_sim_ui/bulk/bulk_item_picker.tsx b/ui/core/components/individual_sim_ui/bulk/bulk_item_picker.tsx
@@ -32,7 +32,9 @@ export default class BulkItemPicker extends Component {
 				<i className="fas fa-times" />
 			</button>,
 		);
-		removeBtn.value!.addEventListener('click', () => this.bulkUI.removeItemByIndex(this.index));
+		const removeItem = () => this.bulkUI.removeItemByIndex(this.index);
+		removeBtn.value!.addEventListener('click', removeItem);
+		this.addOnDisposeCallback(() => removeBtn.value!.removeEventListener('click', removeItem));
 
 		this.simUI.sim.waitForInit().then(() => {
 			this.setItem(item);

diff --git a/ui/scss/core/components/individual_sim_ui/_bulk_tab.scss b/ui/scss/core/components/individual_sim_ui/_bulk_tab.scss
@@ -1,3 +1,5 @@
+@import './bulk';
+
 .bulk-tab {
 	.bulk-tab-right {
 		.content-block-body {

diff --git a/...vidual_sim_ui/bulk/_bulk_item_picker.scss → ...vidual_sim_ui/bulk/_bulk_item_picker.scss b/...vidual_sim_ui/bulk/_bulk_item_picker.scss → ...vidual_sim_ui/bulk/_bulk_item_picker.scss
diff --git a/...sim_ui/bulk/bulk_sim_result_renderer.scss → ...im_ui/bulk/_bulk_sim_result_renderer.scss b/...sim_ui/bulk/bulk_sim_result_renderer.scss → ...im_ui/bulk/_bulk_sim_result_renderer.scss
diff --git a/...ss/core/individual_sim_ui/bulk/index.scss → ...ponents/individual_sim_ui/bulk/index.scss b/...ss/core/individual_sim_ui/bulk/index.scss → ...ponents/individual_sim_ui/bulk/index.scss
diff --git a/ui/scss/core/individual_sim_ui/index.scss b/ui/scss/core/individual_sim_ui/index.scss
@@ -3,7 +3,6 @@
 
 // Import Individual Sim UI Styles
 @import './shared';
-@import './bulk';
 
 // Import component styles
 @import '../components/boolean_picker';
@@ -12,7 +11,6 @@
 @import '../components/encounter_picker';
 @import '../components/exporters';
 @import '../components/enum_picker';
-@import '../components/bulk';
 @import '../components/gear_picker';
 @import '../components/icon_enum_picker';
 @import '../components/icon_picker';