@quenty/inputmode 7.17.0 → 7.18.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.18.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputmode@7.17.0...@quenty/inputmode@7.18.0) (2023-05-08)
+
+
+### Bug Fixes
+
+* InputModeServiceClient now works in Hoarcekat stories ([ad31c5f](https://github.com/Quenty/NevermoreEngine/commit/ad31c5fe78ba888063a2c9f736803706309d7279))
+
+
+### Features
+
+* Add InputModeTypeSelector:ObserveIsActive(inputModeType) and InputModeTypeSelector:IsActive(inputModeType) ([83ad0ea](https://github.com/Quenty/NevermoreEngine/commit/83ad0ea6903bc1970e6020f85e76cfda2a025927))
+
+
+
+
+
 # [7.17.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputmode@7.16.0...@quenty/inputmode@7.17.0) (2023-04-24)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/inputmode",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "description": "Trace input mode state and trigger changes correctly",
   "keywords": [
     "Roblox",
@@ -30,10 +30,10 @@
     "@quenty/servicebag": "^6.6.1",
     "@quenty/signal": "^2.3.0",
     "@quenty/table": "^3.2.0",
-    "@quenty/valueobject": "^7.12.0"
+    "@quenty/valueobject": "^7.13.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a8a760988c8fd88c2581c5c496a8bad845de104c"
+  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
 }

package/src/Client/InputModeServiceClient.lua

@@ -52,7 +52,19 @@ function InputModeServiceClient:GetInputMode(inputModeType)
 	if not RunService:IsRunning() then
 		if not self._inputModes then
 			-- fake it till we make it!
-			return InputMode.new(inputModeType)
+			local inputMode = InputMode.new(inputModeType)
+			local lastInputType = UserInputService:GetLastInputType()
+
+			-- Hack processing
+			if inputModeType:IsValid(lastInputType) then
+				inputMode:Enable()
+			end
+
+			if inputModeType == InputModeTypes.Keyboard or inputModeType == InputModeTypes.KeyboardAndMouse then
+				inputMode:Enable()
+			end
+
+			return inputMode
 		end
 	end
 

package/src/Client/InputModeTypeSelector.lua

@@ -10,6 +10,8 @@ local Maid = require("Maid")
 local ValueObject = require("ValueObject")
 local InputModeServiceClient = require("InputModeServiceClient")
 local ServiceBag = require("ServiceBag")
+local Rx = require("Rx")
+local InputModeType = require("InputModeType")
 
 local InputModeTypeSelector = {}
 InputModeTypeSelector.ClassName = "InputModeTypeSelector"
@@ -102,6 +104,35 @@ function InputModeTypeSelector:ObserveActiveInputType()
 	return rawget(self, "_activeModeType"):Observe()
 end
 
+--[=[
+	Returns true if the input mode is the most recently activated one
+
+	@param inputModeType InputModeType
+	@return boolean
+]=]
+function InputModeTypeSelector:IsActive(inputModeType)
+	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
+
+	return rawget(self, "_activeModeType").Value == inputModeType
+end
+
+--[=[
+	Observes if the input mode is the most recently activated one
+
+	@param inputModeType InputModeType
+	@return Observable<boolean>
+]=]
+function InputModeTypeSelector:ObserveIsActive(inputModeType)
+	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
+
+	return self:ObserveActiveInputType():Pipe({
+		Rx.map(function(inputType)
+			return inputType == inputModeType
+		end);
+		Rx.distinct();
+	})
+end
+
 --[=[
 	The current active input mode
 	@prop Value InputModeType?
@@ -174,6 +205,8 @@ end
 	@param inputModeType InputModeType
 ]=]
 function InputModeTypeSelector:RemoveInputModeType(inputModeType)
+	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
+
 	if not self._maid[inputModeType] then
 		return
 	end
@@ -197,6 +230,8 @@ end
 	@param inputModeType InputModeType
 ]=]
 function InputModeTypeSelector:AddInputModeType(inputModeType)
+	assert(InputModeType.isInputModeType(inputModeType), "Bad inputModeType")
+
 	if self._maid[inputModeType] then
 		return
 	end