fix(parser): ensure overlay unhides after resuming combat

GoldenChrysus · Jun 11, 2024 · 75f0a4b · 75f0a4b
1 parent bbf397f
commit 75f0a4b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## 1.7.1
+
+**Released: 2024-06-11**
+
+### Bug Fixes
+- Resolved issue where overlay did not unhide after auto-hiding and resuming combat
+
+### Features
+- N/A
+
+### UI Changes
+- N/A
+
+### Code Changes
+- N/A
+
+### Miscellaneous
+- N/A
+
 ## 1.7.0
 
 **Released: 2024-06-09**

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "ffxiv-ember-overlay",
 	"description": "React + Redux overlay for the OverlayPlugin and ACTWebSocket plugins for Advanced Combat Tracker for use with Final Fantasy XIV.",
 	"license": "GPL-3.0-only",
-	"version": "1.7.0",
+	"version": "1.7.1",
 	"keywords": [
 		"ffxiv",
 		"endwalker",

diff --git a/src/components/Parser.js b/src/components/Parser.js
@@ -57,18 +57,20 @@ class Parser extends React.Component {
 			visible = false;
 		}
 
-		if (!visible) {
-			if (this.props.auto_hide === "hide") {
-				if (this.state.visible !== visible) {
-					this.setState({
-						visible,
-						last_activity : this.props.last_activity,
-					});
-				}
-			} else if (this.props.auto_hide.startsWith("minimize_")) {
-				const location = this.props.auto_hide.substring(9);
+		if (this.props.auto_hide === "hide") {
+			if (this.state.visible !== visible) {
+				this.setState({
+					visible,
+					last_activity : this.props.last_activity,
+				});
+			}
+		} else if (this.props.auto_hide.startsWith("minimize_")) {
+			const location = this.props.auto_hide.substring(9);
 
-				if (!this.props.toggles[location] && this.props.last_activity !== this.state.minimized_last_activity) {
+			if (this.props.last_activity !== this.state.minimized_last_activity) {
+				if (visible) {
+					this.props.autoHideRestore(location);
+				} else {
 					this.setState({ minimized_last_activity : this.props.last_activity });
 					this.props.autoHideMinimize(location);
 				}
@@ -165,6 +167,9 @@ const mapDispatchToProps = dispatch => ({
 	autoHideMinimize(location) {
 		dispatch(updateToggle({ location, enabled : true }));
 	},
+	autoHideRestore(location) {
+		dispatch(updateToggle({ location, enabled : false }));
+	},
 });
 
 const mapStateToProps = state => ({