Merge pull request #527 from Quenty/users/quenty/wfyb

Quenty · web-flow · commit de6e4de387bc · 2025-01-18T21:02:13.000-08:00
Users/quenty/wfyb
diff --git a/src/actionmanager/src/Client/BaseAction.lua b/src/actionmanager/src/Client/BaseAction.lua
@@ -15,6 +15,7 @@ local ContextActionService = game:GetService("ContextActionService")
 local Signal = require("Signal")
 local Maid = require("Maid")
 local EnabledMixin = require("EnabledMixin")
+local ValueObject = require("ValueObject")
 
 local BaseAction = {}
 BaseAction.__index = BaseAction
@@ -35,9 +36,7 @@ function BaseAction.new(actionData)
 	self.Activated = self._maid:Add(Signal.new()) -- :Fire(actionMaid, ... (activateData))
 	self.Deactivated = self._maid:Add(Signal.new()) -- :Fire()
 
-	self.IsActivatedValue = Instance.new("BoolValue")
-	self.IsActivatedValue.Value = false
-	self._maid:GiveTask(self.IsActivatedValue)
+	self.IsActivatedValue = self._maid:Add(ValueObject.new(false, "boolean"))
 
 	self:InitEnabledMixin()
 
@@ -101,12 +100,6 @@ function BaseAction:_updateShortcuts()
 	if self:IsEnabled() then
 		ContextActionService:BindAction(self._contextActionKey, function(_, userInputState, _)
 			if userInputState == Enum.UserInputState.Begin then
-				if self._actionData.CanActivateShortcutCallback then
-					if not self._actionData.CanActivateShortcutCallback() then
-						return
-					end
-				end
-
 				self:ToggleActivate()
 			end
 		end, false, unpack(shortcuts))
diff --git a/src/blend/src/Shared/Blend/SpringObject.lua b/src/blend/src/Shared/Blend/SpringObject.lua
@@ -268,12 +268,16 @@ function SpringObject:SetTarget(target, doNotAnimate)
 	if not observable then
 		self._maid._targetSub = nil
 		self:_applyTarget(target, doNotAnimate)
-		return
+		return function()
+
+		end
 	end
 
+	local sub
+	self._maid._targetSub = nil
 	if doNotAnimate then
 		local isFirst = true
-		self._maid._targetSub = observable:Subscribe(function(unconverted)
+		sub = observable:Subscribe(function(unconverted)
 			local converted = SpringUtils.toLinearIfNeeded(unconverted)
 			assert(converted, "Not a valid converted target")
 
@@ -282,10 +286,18 @@ function SpringObject:SetTarget(target, doNotAnimate)
 			self:_applyTarget(unconverted, wasFirst)
 		end)
 	else
-		self._maid._targetSub = observable:Subscribe(function(unconverted)
+		sub = observable:Subscribe(function(unconverted)
 			self:_applyTarget(unconverted, doNotAnimate)
 		end)
 	end
+
+	self._maid._targetSub = sub
+
+	return function()
+		if self._maid._targetSub == sub then
+			self._maid._targetSub = nil
+		end
+	end
 end
 
 function SpringObject:_applyTarget(unconverted, doNotAnimate)
diff --git a/src/camera/src/Client/Controls/CameraControls.lua b/src/camera/src/Client/Controls/CameraControls.lua
@@ -235,6 +235,10 @@ function CameraControls:_mouseTranslationToAngle(translationVector)
 	return Vector2.new(xTheta, yTheta)
 end
 
+function CameraControls:SetVelocityStrength(strength)
+	self._strength = strength
+end
+
 function CameraControls:_getVelocityTracker(strength, startVelocity)
 	strength = strength or 1
 
diff --git a/src/clienttranslator/src/Shared/JSONTranslator.lua b/src/clienttranslator/src/Shared/JSONTranslator.lua
@@ -26,6 +26,7 @@ local RxInstanceUtils = require("RxInstanceUtils")
 local TranslationKeyUtils = require("TranslationKeyUtils")
 local TranslatorService = require("TranslatorService")
 local ValueObject = require("ValueObject")
+local NumberLocalizationUtils = require("NumberLocalizationUtils")
 
 local JSONTranslator = {}
 JSONTranslator.ClassName = "JSONTranslator"
@@ -109,6 +110,35 @@ function JSONTranslator:Init(serviceBag)
 	end))
 end
 
+function JSONTranslator:ObserveNumber(number)
+	return Rx.combineLatest({
+		localeId = self:ObserveLocaleId();
+		number = number;
+	}):Pipe({
+		Rx.map(function(state)
+			return NumberLocalizationUtils.localize(state.number, state.localeId)
+		end)
+	})
+end
+
+function JSONTranslator:ObserveAbbreviatedNumber(number, roundingBehaviourType, numSignificantDigits)
+	return Rx.combineLatest({
+		localeId = self:ObserveLocaleId();
+		roundingBehaviourType = roundingBehaviourType;
+		numSignificantDigits = numSignificantDigits;
+		number = number;
+	}):Pipe({
+		Rx.map(function(state)
+			return NumberLocalizationUtils.abbreviate(
+				state.number,
+				state.localeId,
+				state.roundingBehaviourType,
+				state.numSignificantDigits)
+		end)
+	})
+end
+
+
 --[=[
 	Observes the translated value
 	@param translationKey string
diff --git a/src/clienttranslator/src/Shared/Numbers/NumberLocalizationUtils.lua b/src/clienttranslator/src/Shared/Numbers/NumberLocalizationUtils.lua
diff --git a/src/clienttranslator/src/Shared/Numbers/NumberLocalizationUtils.spec.lua b/src/clienttranslator/src/Shared/Numbers/NumberLocalizationUtils.spec.lua
diff --git a/src/clienttranslator/src/Shared/Numbers/RoundingBehaviourTypes.lua b/src/clienttranslator/src/Shared/Numbers/RoundingBehaviourTypes.lua
diff --git a/src/enabledmixin/package.json b/src/enabledmixin/package.json
@@ -27,7 +27,9 @@
   "dependencies": {
     "@quenty/loader": "file:../loader",
     "@quenty/maid": "file:../maid",
-    "@quenty/signal": "file:../signal"
+    "@quenty/rx": "file:../rx",
+    "@quenty/signal": "file:../signal",
+    "@quenty/valueobject": "file:../valueobject"
   },
   "publishConfig": {
     "access": "public"
diff --git a/src/enabledmixin/src/Shared/EnabledMixin.lua b/src/enabledmixin/src/Shared/EnabledMixin.lua
@@ -5,8 +5,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local Maid = require("Maid")
 local Signal = require("Signal")
+local ValueObject = require("ValueObject")
 
 local EnabledMixin = {}
 
@@ -17,12 +17,14 @@ function EnabledMixin:Add(class)
 	assert(not class.SetEnabled, "class.SetEnabled already defined")
 	assert(not class.IsEnabled, "class.IsEnabled already defined")
 	assert(not class.InitEnabledMixin, "class.InitEnabledMixin already defined")
+	assert(not class.ObserveIsEnabled, "class.ObserveIsEnabled already defined")
 
 	-- Inject methods
 	class.IsEnabled = self.IsEnabled
 	class.Enable = self.Enable
 	class.Disable = self.Disable
 	class.SetEnabled = self.SetEnabled
+	class.ObserveIsEnabled = self.ObserveIsEnabled
 	class.InitEnabledMixin = self.InitEnabledMixin
 end
 
@@ -33,13 +35,17 @@ function EnabledMixin:InitEnabledMixin(maid)
 
 	self._enabledMaidReference = maid
 
-	self._enabled = false
-	self.EnabledChanged = Signal.new() -- :Fire(isEnabled, doNotAnimate, enabledMaid)
-	self._enabledMaidReference:GiveTask(self.EnabledChanged)
+	self._enabledState = maid:Add(ValueObject.new(false, "boolean"))
+
+	self.EnabledChanged = maid:Add(Signal.new()) -- :Fire(isEnabled, doNotAnimate)
+
+	self._maid:GiveTask(self._enabledState.Changed:Connect(function(isEnabled, _, doNotAnimate)
+		self.EnabledChanged:Fire(isEnabled, doNotAnimate)
+	end))
 end
 
 function EnabledMixin:IsEnabled()
-	return self._enabled
+	return self._enabledState.Value
 end
 
 function EnabledMixin:Enable(doNotAnimate)
@@ -50,17 +56,14 @@ function EnabledMixin:Disable(doNotAnimate)
 	self:SetEnabled(false, doNotAnimate)
 end
 
+function EnabledMixin:ObserveIsEnabled()
+	return self._enabledState:Observe()
+end
+
 function EnabledMixin:SetEnabled(isEnabled, doNotAnimate)
 	assert(type(isEnabled) == "boolean", "Bad isEnabled")
 
-	if self._enabled ~= isEnabled then
-		self._enabled = isEnabled
-
-		local enabledMaid = Maid.new()
-		self._enabledMaidReference._enabledMaid = enabledMaid
-
-		self.EnabledChanged:Fire(isEnabled, doNotAnimate, enabledMaid)
-	end
+	self._enabledState:SetValue(isEnabled, doNotAnimate)
 end
 
 return EnabledMixin
diff --git a/src/funnels/src/Server/Steps/FunnelStepLogger.lua b/src/funnels/src/Server/Steps/FunnelStepLogger.lua
@@ -55,6 +55,10 @@ function FunnelStepLogger:LogStep(stepNumber, stepName)
 	self._stepTracker:LogStep(stepNumber, stepName)
 end
 
+function FunnelStepLogger:IsStepComplete(stepNumber)
+	return self._stepTracker:IsStepComplete(stepNumber)
+end
+
 function FunnelStepLogger:_sendStep(stepNumber, stepName)
 	AnalyticsService:LogFunnelStepEvent(self._player, self._funnelName, self._funnelSessionId, stepNumber, stepName)
 
diff --git a/src/funnels/src/Shared/Steps/FunnelStepTracker.lua b/src/funnels/src/Shared/Steps/FunnelStepTracker.lua
@@ -38,6 +38,12 @@ function FunnelStepTracker:LogStep(stepNumber, stepName)
 	self.StepLogged:Fire(stepNumber, stepName)
 end
 
+function FunnelStepTracker:IsStepComplete(stepNumber)
+	assert(type(stepNumber) == "number", "Bad stepNumber")
+
+	return self._stepsLogged[stepNumber] ~= nil
+end
+
 function FunnelStepTracker:GetLoggedSteps()
 	return table.clone(self._stepsLogged)
 end
diff --git a/src/genericscreenguiprovider/package.json b/src/genericscreenguiprovider/package.json
@@ -27,6 +27,7 @@
     "@quenty/blend": "file:../blend",
     "@quenty/loader": "file:../loader",
     "@quenty/maid": "file:../maid",
+    "@quenty/rx": "file:../rx",
     "@quenty/servicebag": "file:../servicebag",
     "@quenty/string": "file:../string",
     "@quenty/uiobjectutils": "file:../uiobjectutils",
diff --git a/src/genericscreenguiprovider/src/Client/GenericScreenGuiProvider.lua b/src/genericscreenguiprovider/src/Client/GenericScreenGuiProvider.lua
@@ -32,6 +32,7 @@ local Maid = require("Maid")
 local ScreenGuiService = require("ScreenGuiService")
 local ServiceBag = require("ServiceBag")
 local String = require("String")
+local ValueObject = require("ValueObject")
 
 local GenericScreenGuiProvider = {}
 GenericScreenGuiProvider.ClassName = "GenericScreenGuiProvider"
@@ -46,7 +47,7 @@ function GenericScreenGuiProvider.new(orders)
 	assert(type(orders) == "table", "Bad orders")
 
 	local self = setmetatable({
-		_order = orders;
+		_defaultOrders = orders;
 	}, GenericScreenGuiProvider)
 
 	return self
@@ -57,6 +58,11 @@ function GenericScreenGuiProvider:Init(serviceBag)
 	self._maid = Maid.new()
 
 	self._screenGuiService = self._serviceBag:GetService(ScreenGuiService)
+
+	self._orderValues = {}
+	for key, value in self._defaultOrders do
+		self._orderValues[key] = self._maid:Add(ValueObject.new(value, "number"))
+	end
 end
 
 function GenericScreenGuiProvider:Start()
@@ -107,19 +113,27 @@ function GenericScreenGuiProvider:ObserveScreenGui(orderName)
 		Name = String.toCamelCase(orderName);
 		ResetOnSpawn = false;
 		AutoLocalize = false;
-		DisplayOrder = self:GetDisplayOrder(orderName);
+		DisplayOrder = self:ObserveDisplayOrder(orderName);
 		Parent = self:_getScreenGuiService():ObservePlayerGui();
 		ZIndexBehavior = Enum.ZIndexBehavior.Sibling;
 	}
 end
 
+function GenericScreenGuiProvider:SetDisplayOrder(orderName, order)
+	assert(type(orderName) == "string", "Bad orderName")
+	self:_assertOrderExists(orderName)
+
+	return self._orderValues[orderName]:Mount(order)
+end
+
 --[=[
 	Returns a new ScreenGui at DisplayOrder specified
 	@param orderName string -- Order name of display order
 	@return ScreenGui
 ]=]
 function GenericScreenGuiProvider:Get(orderName)
 	assert(type(orderName) == "string", "Bad orderName")
+	self:_assertOrderExists(orderName)
 
 	if not RunService:IsRunning() then
 		local frame = Instance.new("Frame")
@@ -152,9 +166,29 @@ end
 ]=]
 function GenericScreenGuiProvider:GetDisplayOrder(orderName)
 	assert(type(orderName) == "string", "Bad orderName")
-	assert(self._order[orderName], string.format("No DisplayOrder with orderName '%s'", tostring(orderName)))
+	self:_assertOrderExists(orderName)
+
+	return self._orderValues[orderName].Value
+end
 
-	return self._order[orderName]
+--[=[
+	Retrieve the display order for a given order.
+	@param orderName string -- Order name of display order
+	@return Observable<number>
+]=]
+function GenericScreenGuiProvider:ObserveDisplayOrder(orderName)
+	assert(type(orderName) == "string", "Bad orderName")
+	self:_assertOrderExists(orderName)
+
+	return self._orderValues[orderName]:Observe()
+end
+
+function GenericScreenGuiProvider:_assertOrderExists(orderName)
+	assert(type(orderName) == "string", "Bad orderName")
+
+	if not self._defaultOrders[orderName] then
+		error(string.format("No DisplayOrder with orderName '%s'", tostring(orderName)))
+	end
 end
 
 function GenericScreenGuiProvider:_getScreenGuiService()
diff --git a/src/hide/src/Server/Hide.lua b/src/hide/src/Server/Hide.lua
@@ -34,6 +34,8 @@ function Hide.new(adornee)
 				self:_setupPart(item)
 			end
 		end
+	elseif self._obj:IsA("GuiObject") then
+		self._obj.BackgroundTransparency = 1
 	else
 		error("[Hide] - Bad object type for hide")
 	end
