@rbxts/centurion-ui 1.0.0-dev-d64d6ec → 1.0.0-dev-92cc801

package/out/components/suggestions/main-suggestion.d.ts

@@ -8,5 +8,6 @@ export interface MainSuggestionProps {
     descriptionSize: Derivable<UDim2>;
     badgeSize: Derivable<UDim2>;
     errorSize: Derivable<UDim2>;
+    action?: (instance: Frame) => void;
 }
-export declare function MainSuggestion({ suggestion, currentText, size, titleSize, descriptionSize, badgeSize, errorSize, }: MainSuggestionProps): Vide.Node;
+export declare function MainSuggestion({ suggestion, currentText, size, titleSize, descriptionSize, badgeSize, errorSize, action, }: MainSuggestionProps): Vide.Node;

package/out/components/suggestions/main-suggestion.lua

@@ -25,8 +25,10 @@ local function MainSuggestion(_param)
 	local descriptionSize = _param.descriptionSize
 	local badgeSize = _param.badgeSize
 	local errorSize = _param.errorSize
+	local action = _param.action
 	local options = useAtom(interfaceOptions)
 	return Vide.jsx(Frame, {
+		action = action,
 		size = size,
 		backgroundColor = function()
 			return options().palette.background

package/out/components/suggestions/suggestions.lua

@@ -5,6 +5,7 @@ local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
 local cleanup = _vide.cleanup
 local derive = _vide.derive
+local source = _vide.source
 local spring = _vide.spring
 local _text = TS.import(script, script.Parent.Parent.Parent, "constants", "text")
 local SUGGESTION_TEXT_SIZE = _text.SUGGESTION_TEXT_SIZE
@@ -20,12 +21,18 @@ local Group = TS.import(script, script.Parent.Parent, "ui", "group").Group
 local MainSuggestion = TS.import(script, script.Parent, "main-suggestion").MainSuggestion
 local SuggestionList = TS.import(script, script.Parent, "suggestion-list").SuggestionList
 local MAX_SUGGESTION_WIDTH = 180
-local MAX_BADGE_WIDTH = 80
 local PADDING = 8
 local function Suggestions()
 	local options = useAtom(interfaceOptions)
 	local textPart = useAtom(currentTextPart)
 	local suggestion = useAtom(currentSuggestion)
+	local suggestionRef = source()
+	local offset = function(boundsState)
+		return function()
+			local bounds = boundsState()
+			return UDim2.new(0, bounds.X, 0, bounds.Y)
+		end
+	end
 	local titleBounds = useTextBounds({
 		text = function()
 			local _result = suggestion()
@@ -132,33 +139,29 @@ local function Suggestions()
 		local height = titleBounds().Y + descriptionBounds().Y + errorBounds().Y
 		local padding = px(PADDING * 2)
 		if width == 0 or height == 0 then
-			return UDim2.fromOffset(0, px(SUGGESTION_TITLE_TEXT_SIZE) + padding)
+			local _result = suggestionRef()
+			if _result ~= nil then
+				_result = _result.AbsoluteSize.Y
+			end
+			local _condition = _result
+			if _condition == nil then
+				_condition = 0
+			end
+			return UDim2.fromOffset(0, _condition)
 		end
 		return UDim2.fromOffset(width + padding, height + padding)
 	end)
 	return Vide.jsx(Group, {
 		size = UDim2.fromScale(1, 1),
-		visible = currentSuggestion ~= nil,
 	}, Vide.jsx(MainSuggestion, {
 		suggestion = suggestion,
 		currentText = textPart,
 		size = spring(windowSize, 0.2),
-		titleSize = function()
-			local bounds = titleBounds()
-			return UDim2.fromOffset(bounds.X, bounds.Y)
-		end,
-		descriptionSize = function()
-			local bounds = descriptionBounds()
-			return UDim2.fromOffset(bounds.X, bounds.Y)
-		end,
-		badgeSize = function()
-			local bounds = typeBadgeBounds()
-			return UDim2.fromOffset(bounds.X, bounds.Y)
-		end,
-		errorSize = function()
-			local bounds = errorBounds()
-			return UDim2.fromOffset(bounds.X, bounds.Y)
-		end,
+		titleSize = offset(titleBounds),
+		descriptionSize = offset(descriptionBounds),
+		badgeSize = offset(typeBadgeBounds),
+		errorSize = offset(errorBounds),
+		action = suggestionRef,
 	}), Vide.jsx(SuggestionList, {
 		suggestion = suggestion,
 		currentText = textPart,

package/out/components/suggestions/util.d.ts

@@ -1,4 +1 @@
-import { InterfaceOptions, Suggestion } from "../../types";
-import { SuggestionTextBounds } from "./types";
 export declare function highlightMatching(color: Color3, text?: string, terminalText?: string): string;
-export declare function getSuggestionTextBounds(options: InterfaceOptions, suggestion: Suggestion, titleTextSize: number, textSize: number, maxWidth: number, maxBadgeWidth: number): SuggestionTextBounds;

package/out/components/suggestions/util.lua

@@ -1,11 +1,4 @@
 -- Compiled with roblox-ts v2.3.0-dev-26ec859
-local TS = _G[script]
-local TextService = TS.import(script, TS.getModule(script, "@rbxts", "services")).TextService
-local TEXT_BOUNDS_PARAMS = Instance.new("GetTextBoundsParams")
-TEXT_BOUNDS_PARAMS.RichText = true
-local DEFAULT_BOUNDS = Vector2.new()
-local prevColor
-local prevColorHex
 local function highlightMatching(color, text, terminalText)
 	if text == nil then
 		return ""
@@ -19,55 +12,11 @@ local function highlightMatching(color, text, terminalText)
 	if string.lower(terminalText) ~= string.lower(subText) then
 		return text
 	end
-	if prevColor ~= color then
-		prevColor = color
-		prevColorHex = color:ToHex()
-	end
 	local _text_1 = text
 	local _arg0 = #terminalText + 1
 	local unhighlightedText = string.sub(_text_1, _arg0)
-	return `<font color="#{prevColorHex}">{subText}</font>{unhighlightedText}`
-end
-local function getSuggestionTextBounds(options, suggestion, titleTextSize, textSize, maxWidth, maxBadgeWidth)
-	-- Get title text bounds
-	TEXT_BOUNDS_PARAMS.Text = suggestion.title
-	TEXT_BOUNDS_PARAMS.Size = titleTextSize
-	TEXT_BOUNDS_PARAMS.Font = options.font.bold
-	local titleBounds = TextService:GetTextBoundsAsync(TEXT_BOUNDS_PARAMS)
-	-- Get description text bounds
-	TEXT_BOUNDS_PARAMS.Width = maxWidth
-	TEXT_BOUNDS_PARAMS.Size = textSize
-	TEXT_BOUNDS_PARAMS.Font = options.font.regular
-	local descriptionBounds = DEFAULT_BOUNDS
-	if suggestion.description ~= nil then
-		TEXT_BOUNDS_PARAMS.Text = suggestion.description
-		descriptionBounds = TextService:GetTextBoundsAsync(TEXT_BOUNDS_PARAMS)
-	end
-	local errorTextHeight = 0
-	local typeBadgeWidth = 0
-	if suggestion.type == "argument" then
-		-- Get error text bounds
-		if suggestion.error ~= nil then
-			local _condition = suggestion.error
-			if _condition == nil then
-				_condition = ""
-			end
-			TEXT_BOUNDS_PARAMS.Text = _condition
-			errorTextHeight = TextService:GetTextBoundsAsync(TEXT_BOUNDS_PARAMS).Y
-		end
-		-- Get type badge bounds
-		TEXT_BOUNDS_PARAMS.Text = suggestion.dataType
-		TEXT_BOUNDS_PARAMS.Width = maxBadgeWidth
-		typeBadgeWidth = TextService:GetTextBoundsAsync(TEXT_BOUNDS_PARAMS).X
-	end
-	return {
-		title = UDim2.fromOffset(titleBounds.X, titleBounds.Y),
-		description = UDim2.fromOffset(descriptionBounds.X, descriptionBounds.Y),
-		errorTextHeight = errorTextHeight,
-		typeBadgeWidth = typeBadgeWidth,
-	}
+	return `<font color="#{color:ToHex()}">{subText}</font>{unhighlightedText}`
 end
 return {
 	highlightMatching = highlightMatching,
-	getSuggestionTextBounds = getSuggestionTextBounds,
 }

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

@@ -44,7 +44,6 @@ local function TerminalTextField(_param)
 	local ref = source()
 	local commandHistory = source({})
 	local commandHistoryIndex = source(nil)
-	local text = source("")
 	local suggestionText = source("")
 	-- Focus text field when terminal becomes visible
 	effect(function()
@@ -69,9 +68,13 @@ local function TerminalTextField(_param)
 		if not up and historyIndex == nil then
 			return nil
 		end
+		local textBox = ref()
+		if textBox == nil then
+			return nil
+		end
 		local lastIndex = #history - 1
 		if not up and historyIndex == lastIndex then
-			text("")
+			textBox.Text = ""
 			suggestionText("")
 			commandHistoryIndex(nil)
 			return nil
@@ -82,13 +85,10 @@ local function TerminalTextField(_param)
 		end
 		local newIndex = math.clamp(_condition + (if up then -1 else 1), 0, lastIndex)
 		local newText = history[newIndex + 1]
-		text(newText)
+		textBox.Text = newText
+		textBox.CursorPosition = #newText + 1
 		suggestionText("")
 		commandHistoryIndex(newIndex)
-		local textBox = ref()
-		if textBox ~= nil then
-			textBox.CursorPosition = #newText + 1
-		end
 	end
 	local suggestionConnection = subscribe(currentSuggestion, function(suggestion)
 		if suggestion == nil then
@@ -101,10 +101,18 @@ local function TerminalTextField(_param)
 			suggestionText(suggestion.title)
 			return nil
 		end
+		local _currentText = ref()
+		if _currentText ~= nil then
+			_currentText = _currentText.Text
+		end
+		local currentText = _currentText
+		if currentText == nil then
+			return nil
+		end
 		-- Command suggestions
 		if suggestion.type == "command" then
 			local suggestionStartIndex = (if not atNextPart then #textParts[#textParts] else 0) + 1
-			suggestionText(text() .. string.sub(suggestion.title, suggestionStartIndex))
+			suggestionText(currentText .. string.sub(suggestion.title, suggestionStartIndex))
 			return nil
 		end
 		-- Argument suggestions
@@ -113,7 +121,7 @@ local function TerminalTextField(_param)
 		if suggestion.type ~= "argument" or command == nil or argIndex == nil then
 			return nil
 		end
-		local newText = text()
+		local newText = currentText
 		if atNextPart and argIndex == commandArgIndex() then
 			newText ..= suggestion.title
 		elseif not (#suggestion.others == 0) then
@@ -162,7 +170,7 @@ local function TerminalTextField(_param)
 		if suggestion == nil then
 			return nil
 		end
-		local currentText = text()
+		local currentText = textBox.Text
 		local atNextPart = string.sub(currentText, -1) == " "
 		if commandPath == nil then
 			local suggestionTitle = suggestion.title
@@ -208,7 +216,7 @@ local function TerminalTextField(_param)
 				newText ..= " "
 			end
 			suggestionText("")
-			text(newText)
+			textBox.Text = newText
 			textBox.CursorPosition = #newText + 1
 			return nil
 		end
@@ -232,7 +240,7 @@ local function TerminalTextField(_param)
 		if _condition_1 then
 			suggestionText("")
 			local newText = `{currentText} `
-			text(newText)
+			textBox.Text = newText
 			textBox.CursorPosition = #newText + 1
 			return nil
 		end
@@ -244,7 +252,7 @@ local function TerminalTextField(_param)
 		if argIndex == nil or commandArgs == nil then
 			return nil
 		end
-		local newText = text()
+		local newText = currentText
 		local otherSuggestion = suggestion.others[1]
 		local _newText = newText
 		local _exp = #newText
@@ -262,7 +270,7 @@ local function TerminalTextField(_param)
 			newText ..= " "
 		end
 		suggestionText("")
-		text(newText)
+		textBox.Text = newText
 		textBox.CursorPosition = #newText + 1
 	end)
 	return Vide.jsx(Frame, {
@@ -283,22 +291,6 @@ local function TerminalTextField(_param)
 	}), Vide.jsx(TextField, {
 		action = ref,
 		size = UDim2.fromScale(1, 1),
-		text = function()
-			local value = text()
-			-- Remove line breaks
-			if (string.match(value, "[\n\r]")) ~= nil then
-				value = (string.gsub(value, "[\n\r]", ""))
-			end
-			-- Remove all tabs from text input - we use these for autocompletion
-			if (string.match(value, "\t")) ~= nil then
-				value = (string.gsub(value, "\t", ""))
-			end
-			local _result = onTextChange
-			if _result ~= nil then
-				_result(value)
-			end
-			return value
-		end,
 		textSize = function()
 			return px(TEXT_SIZE)
 		end,
@@ -339,15 +331,32 @@ local function TerminalTextField(_param)
 				if _result ~= nil then
 					_result(currentText)
 				end
+				textBox.Text = ""
 				textBox:CaptureFocus()
-				text("")
 			end,
 			TextChanged = function(currentText)
+				local textBox = ref()
+				if textBox == nil then
+					return nil
+				end
 				local historyIndex = commandHistoryIndex()
 				if historyIndex ~= nil and currentText ~= commandHistory()[historyIndex + 1] then
 					commandHistoryIndex(nil)
 				end
-				text(currentText)
+				-- Remove line breaks
+				local value = currentText
+				if (string.match(value, "[\n\r]")) ~= nil then
+					value = (string.gsub(value, "[\n\r]", ""))
+				end
+				-- Remove all tabs from text input - we use these for autocompletion
+				if (string.match(value, "\t")) ~= nil then
+					value = (string.gsub(value, "\t", ""))
+				end
+				textBox.Text = value
+				local _result = onTextChange
+				if _result ~= nil then
+					_result(value)
+				end
 			end,
 		},
 		zIndex = 2,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rbxts/centurion-ui",
   "description": "Terminal UI for the Centurion command framework",
-  "version": "1.0.0-dev-d64d6ec",
+  "version": "1.0.0-dev-92cc801",
   "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-d64d6ec",
+    "@rbxts/centurion": "^1.0.0-dev-92cc801",
     "@rbxts/compiler-types": "2.3.0-types.1",
     "@rbxts/types": "^1.0.794",
     "roblox-ts": "2.3.0-dev-26ec859",

package/out/hooks/use-debounce-source.d.ts

@@ -1,11 +0,0 @@
-import { DebounceOptions } from "@rbxts/set-timeout";
-export interface UseDebounceOptions extends DebounceOptions {
-    /**
-     * The amount of time to wait before the first call.
-     */
-    wait?: number;
-}
-export declare function useDebounceSource<T>(initialValue: T, options?: UseDebounceOptions): {
-    get: () => T;
-    set: (value: T) => T;
-};

package/out/hooks/use-debounce-source.lua

@@ -1,27 +0,0 @@
--- Compiled with roblox-ts v2.3.0-dev-26ec859
-local TS = _G[script]
-local debounce = TS.import(script, TS.getModule(script, "@rbxts", "set-timeout").out).debounce
-local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
-local cleanup = _vide.cleanup
-local source = _vide.source
-local function useDebounceSource(initialValue, options)
-	if options == nil then
-		options = {}
-	end
-	local state = source(initialValue)
-	local update = debounce(state, options.wait, options)
-	cleanup(function()
-		update.cancel()
-	end)
-	return {
-		get = function()
-			return state()
-		end,
-		set = function(value)
-			return update(value)
-		end,
-	}
-end
-return {
-	useDebounceSource = useDebounceSource,
-}

package/out/hooks/use-motion.d.ts

@@ -1,4 +0,0 @@
-import { MotionGoal } from "@rbxts/ripple";
-type NonStrict<T> = T extends number ? number : T;
-export declare function useMotion<T extends MotionGoal>(initialValue: NonStrict<T>): LuaTuple<[import("@rbxts/vide").Source<NonStrict<T>>, import("@rbxts/ripple").Motion<NonStrict<T>>]>;
-export {};

package/out/hooks/use-motion.lua

@@ -1,19 +0,0 @@
--- Compiled with roblox-ts v2.3.0-dev-26ec859
-local TS = _G[script]
-local createMotion = TS.import(script, TS.getModule(script, "@rbxts", "ripple").src).createMotion
-local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
-local cleanup = _vide.cleanup
-local source = _vide.source
-local function useMotion(initialValue)
-	local motion = createMotion(initialValue)
-	local state = source(initialValue)
-	motion:onStep(state)
-	motion:start()
-	cleanup(function()
-		motion:stop()
-	end)
-	return state, motion
-end
-return {
-	useMotion = useMotion,
-}