@quenty/transitionmodel 2.1.0 → 2.1.2-canary.433.80025dc.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.1.2-canary.433.80025dc.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/transitionmodel@2.1.1...@quenty/transitionmodel@2.1.2-canary.433.80025dc.0) (2023-12-14)
+
+
+### Bug Fixes
+
+* TransitionModel would sometimes stall if no callback was specified ([981cb47](https://github.com/Quenty/NevermoreEngine/commit/981cb4725b4567e3efd6d3ade2566b5a596fea8d))
+
+
+
+
+
+## [2.1.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/transitionmodel@2.1.0...@quenty/transitionmodel@2.1.1) (2023-10-28)
+
+**Note:** Version bump only for package @quenty/transitionmodel
+
+
+
+
+
 # [2.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/transitionmodel@2.0.0...@quenty/transitionmodel@2.1.0) (2023-10-18)
 
 **Note:** Version bump only for package @quenty/transitionmodel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/transitionmodel",
-  "version": "2.1.0",
+  "version": "2.1.2-canary.433.80025dc.0",
   "description": "Helps with Gui visiblity showing and hiding",
   "keywords": [
     "Roblox",
@@ -25,20 +25,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^7.0.0",
-    "@quenty/basicpane": "^8.1.0",
-    "@quenty/blend": "^7.1.0",
-    "@quenty/instanceutils": "^8.1.0",
-    "@quenty/loader": "^7.0.0",
-    "@quenty/maid": "^2.6.0",
-    "@quenty/promise": "^7.0.0",
-    "@quenty/rx": "^8.1.0",
-    "@quenty/signal": "^3.0.0",
-    "@quenty/timedtween": "^2.1.0",
-    "@quenty/valueobject": "^8.1.0"
+    "@quenty/baseobject": "7.0.1-canary.433.80025dc.0",
+    "@quenty/basicpane": "8.1.2-canary.433.80025dc.0",
+    "@quenty/blend": "7.1.2-canary.433.80025dc.0",
+    "@quenty/instanceutils": "8.1.2-canary.433.80025dc.0",
+    "@quenty/loader": "7.0.1-canary.433.80025dc.0",
+    "@quenty/maid": "2.6.0",
+    "@quenty/promise": "7.0.1-canary.433.80025dc.0",
+    "@quenty/rx": "8.1.2-canary.433.80025dc.0",
+    "@quenty/signal": "3.0.1-canary.433.80025dc.0",
+    "@quenty/timedtween": "2.1.2-canary.433.80025dc.0",
+    "@quenty/valueobject": "8.1.2-canary.433.80025dc.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ad451bee2ee34d9cad70ff72d0af360db1f91a34"
+  "gitHead": "80025dcd926765b502d322bb84e013b973409d8c"
 }

package/src/Shared/TransitionModel.lua

@@ -226,10 +226,10 @@ function TransitionModel:_promiseIsHidden()
 end
 
 function TransitionModel:_executeShow(doNotAnimate)
-	local maid = Maid.new()
+	self._maid._transition = nil
 
-	local promise = Promise.new()
-	maid:GiveTask(promise)
+	local maid = Maid.new()
+	local promise = maid:Add(Promise.new())
 
 	self._isHidingComplete.Value = false
 	self._isShowingComplete.Value = false
@@ -242,6 +242,9 @@ function TransitionModel:_executeShow(doNotAnimate)
 			promise:Reject()
 			error(string.format("[TransitionModel] - Expected promise to be returned from showCallback, got %q", tostring(result)))
 		end
+	else
+		-- Immediately resolve
+		promise:Resolve()
 	end
 
 	promise:Then(function()
@@ -252,14 +255,14 @@ function TransitionModel:_executeShow(doNotAnimate)
 end
 
 function TransitionModel:_executeHide(doNotAnimate)
+	self._maid._transition = nil
+
 	local maid = Maid.new()
+	local promise = maid:Add(Promise.new())
 
 	self._isHidingComplete.Value = false
 	self._isShowingComplete.Value = false
 
-	local promise = Promise.new()
-	maid:GiveTask(promise)
-
 	if self._hideCallback then
 		local result = self._hideCallback(maid, doNotAnimate)
 		if Promise.isPromise(result) then
@@ -268,6 +271,9 @@ function TransitionModel:_executeHide(doNotAnimate)
 			promise:Reject()
 			error(string.format("[TransitionModel] - Expected promise to be returned from hideCallback, got %q", tostring(result)))
 		end
+	else
+		-- Immediately resolve
+		promise:Resolve()
 	end
 
 	promise:Then(function()