@rbxts/centurion-ui 1.0.0-dev-e01f578 → 1.0.0-dev-a7b773c

package/README.md

@@ -1,6 +1,6 @@
 <div align="center">
   <a href="https://centurion.paradoxum.dev/" target="_blank">
-    <img src="../../docs/src/assets/logo.webp" width="150" />
+    <img src="https://raw.githubusercontent.com/paradoxuum/centurion/main/docs/src/assets/logo.webp" width="150" />
   </a>
 
   <h1>Centurion - UI</h1>
@@ -26,4 +26,4 @@
   <a href="https://centurion.paradoxum.dev/">📖 Documentation</a>
 </div>
 
-<img src="../../public/banner.png" />
+<img src="https://raw.githubusercontent.com/paradoxuum/centurion/main/public/banner.png" />

package/out/components/terminal/terminal-text-field.lua

@@ -7,6 +7,7 @@ local subscribe = TS.import(script, TS.getModule(script, "@rbxts", "charm").src)
 local UserInputService = TS.import(script, TS.getModule(script, "@rbxts", "services")).UserInputService
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
+local cleanup = _vide.cleanup
 local effect = _vide.effect
 local source = _vide.source
 local getAPI = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-api").getAPI
@@ -14,8 +15,6 @@ local useAtom = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-ato
 local useEvent = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-event").useEvent
 local px = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-px").px
 local _store = TS.import(script, script.Parent.Parent.Parent, "store")
-local commandHistory = _store.commandHistory
-local commandHistoryIndex = _store.commandHistoryIndex
 local currentArgIndex = _store.currentArgIndex
 local currentCommandPath = _store.currentCommandPath
 local currentSuggestion = _store.currentSuggestion
@@ -42,6 +41,8 @@ local function TerminalTextField(_param)
 	local visible = useAtom(interfaceVisible)
 	local valid = useAtom(terminalTextValid)
 	local ref = source(nil)
+	local commandHistory = source({})
+	local commandHistoryIndex = source(nil)
 	local text = source("")
 	local suggestionText = source("")
 	-- Focus text field when terminal becomes visible
@@ -64,16 +65,22 @@ local function TerminalTextField(_param)
 			return nil
 		end
 		local historyIndex = commandHistoryIndex()
-		if (up and historyIndex == 0) or (not up and historyIndex == -1) then
+		if not up and historyIndex == nil then
 			return nil
 		end
-		local newIndex
-		if up then
-			newIndex = if historyIndex == -1 then #history - 1 else historyIndex - 1
-		else
-			newIndex = if historyIndex ~= #history - 1 then historyIndex + 1 else -1
+		local lastIndex = #history - 1
+		if not up and historyIndex == lastIndex then
+			text("")
+			suggestionText("")
+			commandHistoryIndex(nil)
+			return nil
+		end
+		local _condition = historyIndex
+		if _condition == nil then
+			_condition = #history
 		end
-		local newText = if newIndex ~= -1 then history[newIndex + 1] else ""
+		local newIndex = math.clamp(_condition + (if up then -1 else 1), 0, lastIndex)
+		local newText = history[newIndex + 1]
 		text(newText)
 		suggestionText("")
 		commandHistoryIndex(newIndex)
@@ -82,7 +89,7 @@ local function TerminalTextField(_param)
 			textBox.CursorPosition = #newText + 1
 		end
 	end
-	subscribe(currentSuggestion, function(suggestion)
+	local suggestionConnection = subscribe(currentSuggestion, function(suggestion)
 		if suggestion == nil then
 			suggestionText("")
 			return nil
@@ -113,6 +120,7 @@ local function TerminalTextField(_param)
 		end
 		suggestionText(newText)
 	end)
+	cleanup(suggestionConnection)
 	useEvent(UserInputService.InputBegan, function(input)
 		local textBox = ref()
 		local _condition = textBox == nil
@@ -276,17 +284,15 @@ local function TerminalTextField(_param)
 			local currentText = textBox.Text
 			local history = commandHistory()
 			if currentText ~= "" and (#history == 0 or history[#history] ~= currentText) then
-				commandHistory(function(prev)
-					local _array = {}
-					local _length = #_array
-					local _prevLength = #prev
-					table.move(prev, 1, _prevLength, _length + 1, _array)
-					_length += _prevLength
-					_array[_length + 1] = textBox.Text
-					return _array
-				end)
+				local _array = {}
+				local _length = #_array
+				local _historyLength = #history
+				table.move(history, 1, _historyLength, _length + 1, _array)
+				_length += _historyLength
+				_array[_length + 1] = textBox.Text
+				commandHistory(_array)
 			end
-			commandHistoryIndex(-1)
+			commandHistoryIndex(nil)
 			local _result = onSubmit
 			if _result ~= nil then
 				_result(currentText)
@@ -295,7 +301,10 @@ local function TerminalTextField(_param)
 			text("")
 		end,
 		textChanged = function(currentText)
-			commandHistoryIndex(-1)
+			local historyIndex = commandHistoryIndex()
+			if historyIndex ~= nil and currentText ~= commandHistory()[historyIndex + 1] then
+				commandHistoryIndex(nil)
+			end
 			text(currentText)
 		end,
 		zIndex = 2,

package/out/store.d.ts

@@ -5,8 +5,6 @@ export declare const interfaceOptions: import("@rbxts/charm").Atom<InterfaceOpti
 export declare const mouseOverInterface: import("@rbxts/charm").Atom<boolean>;
 export declare const currentCommandPath: import("@rbxts/charm").Atom<ImmutableRegistryPath | undefined>;
 export declare const currentArgIndex: import("@rbxts/charm").Atom<number | undefined>;
-export declare const commandHistory: import("@rbxts/charm").Atom<string[]>;
-export declare const commandHistoryIndex: import("@rbxts/charm").Atom<number>;
 export declare const currentSuggestion: import("@rbxts/charm").Atom<Suggestion | undefined>;
 export declare const terminalText: import("@rbxts/charm").Atom<string>;
 export declare const terminalTextParts: import("@rbxts/charm").Molecule<string[]>;

package/out/store.lua

@@ -10,8 +10,6 @@ local interfaceOptions = atom(DEFAULT_INTERFACE_OPTIONS)
 local mouseOverInterface = atom(false)
 local currentCommandPath = atom(nil)
 local currentArgIndex = atom(nil)
-local commandHistory = atom({})
-local commandHistoryIndex = atom(-1)
 local currentSuggestion = atom(nil)
 local terminalText = atom("")
 local terminalTextParts = computed(function()
@@ -34,8 +32,6 @@ return {
 	mouseOverInterface = mouseOverInterface,
 	currentCommandPath = currentCommandPath,
 	currentArgIndex = currentArgIndex,
-	commandHistory = commandHistory,
-	commandHistoryIndex = commandHistoryIndex,
 	currentSuggestion = currentSuggestion,
 	terminalText = terminalText,
 	terminalTextParts = terminalTextParts,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rbxts/centurion-ui",
   "description": "Terminal UI for the Centurion command framework",
-  "version": "1.0.0-dev-e01f578",
+  "version": "1.0.0-dev-a7b773c",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",
@@ -32,7 +32,7 @@
     "dev": "shx rm -rf out && rbxtsc -w"
   },
   "devDependencies": {
-    "@rbxts/centurion": "^1.0.0-dev-e01f578",
+    "@rbxts/centurion": "^1.0.0-dev-a7b773c",
     "@rbxts/compiler-types": "2.3.0-types.1",
     "@rbxts/types": "^1.0.790",
     "roblox-ts": "2.3.0-dev-26ec859",
@@ -47,7 +47,7 @@
     "@rbxts/vide": "^0.4.1"
   },
   "peerDependencies": {
-    "@rbxts/centurion": "^1.0.0-dev-e01f578"
+    "@rbxts/centurion": "^1.0.0-dev-a7b773c"
   },
   "stableVersion": "1.0.0"
 }