Update Rich Input with selection/arrows control. Add template and nodes to self:get_druid

druid/custom/pin_knob/pin_knob.lua

@@ -58,9 +58,7 @@ end
 -- @tparam string template The template string name
 -- @tparam table nodes Nodes table from gui.clone_tree
 function PinKnob.init(self, callback, template, nodes)
-	self:set_template(template)
-	self:set_nodes(nodes)
-	self.druid = self:get_druid()
+	self.druid = self:get_druid(template, nodes)
 	self.node = self:get_node(SCHEME.PIN)
 	self.is_drag = false
 

druid/custom/rich_input/rich_input.lua

@@ -24,8 +24,13 @@
 ---
 
 local component = require("druid.component")
-local input = require("druid.extended.input")
+local helper = require("druid.helper")
+local const  = require("druid.const")
+local utf8_lua = require("druid.system.utf8")
+local utf8 = utf8 or utf8_lua
 
+local hotkey = require("druid.extended.hotkey")
+local input = require("druid.extended.input")
 local RichInput = component.create("druid.rich_input")
 
 local SCHEME = {
@@ -34,34 +39,142 @@ local SCHEME = {
 	PLACEHOLDER = "placeholder_text",
 	INPUT = "input_text",
 	CURSOR = "cursor_node",
+	CURSOR_TEXT = "cursor_text",
 }
 
+local DOUBLE_CLICK_TIME = 0.35
 
 local function animate_cursor(self)
-	gui.cancel_animation(self.cursor, gui.PROP_COLOR)
-	gui.set_color(self.cursor, vmath.vector4(1))
-	gui.animate(self.cursor, gui.PROP_COLOR, vmath.vector4(1,1,1,0), gui.EASING_INSINE, 0.8, 0, nil, gui.PLAYBACK_LOOP_PINGPONG)
+	gui.cancel_animation(self.cursor_text, "color.w")
+	gui.set_alpha(self.cursor_text, 1)
+	gui.animate(self.cursor_text, "color.w", 0, gui.EASING_INSINE, 0.8, 0, nil, gui.PLAYBACK_LOOP_PINGPONG)
 end
 
 
-local function update_text(self, text)
-	local text_width = self.input.total_width
-	animate_cursor(self)
-	gui.set_position(self.cursor, vmath.vector3(text_width/2, 0, 0))
+local function set_selection_width(self, selection_width)
+	gui.set_visible(self.cursor, selection_width > 0)
+
+	local width = selection_width / self.input.text.scale.x
+	local height = gui.get_size(self.cursor).y
+	gui.set_size(self.cursor, vmath.vector3(width, height, 0))
+
+	local is_selection_to_right = self.input.cursor_index == self.input.end_index
+	gui.set_pivot(self.cursor, is_selection_to_right and gui.PIVOT_E or gui.PIVOT_W)
+end
+
+
+local function update_text(self)
+	local left_text_part = utf8.sub(self.input:get_text(), 0, self.input.cursor_index)
+	local selected_text_part = utf8.sub(self.input:get_text(), self.input.start_index + 1, self.input.end_index)
+
+	local left_part_width = self.input.text:get_text_size(left_text_part)
+	local selected_part_width = self.input.text:get_text_size(selected_text_part)
+
+	local pivot_text = gui.get_pivot(self.input.text.node)
+	local pivot_offset = helper.get_pivot_offset(pivot_text)
+
+	self.cursor_position.x = self.text_position.x - self.input.total_width * (0.5 + pivot_offset.x) + left_part_width
+
+	gui.set_position(self.cursor, self.cursor_position)
 	gui.set_scale(self.cursor, self.input.text.scale)
+
+	set_selection_width(self, selected_part_width)
 end
 
 
 local function on_select(self)
 	gui.set_enabled(self.cursor, true)
 	gui.set_enabled(self.placeholder.node, false)
+	gui.set_enabled(self.input.button.node, true)
+
 	animate_cursor(self)
+	self.drag:set_enabled(true)
+	self:_set_hotkeys_enabled(true)
 end
 
 
 local function on_unselect(self)
+	gui.cancel_animation(self.cursor, gui.PROP_COLOR)
 	gui.set_enabled(self.cursor, false)
+	gui.set_enabled(self.input.button.node, self.is_button_input_enabled)
 	gui.set_enabled(self.placeholder.node, true and #self.input:get_text() == 0)
+
+	self.drag:set_enabled(false)
+	self:_set_hotkeys_enabled(false)
+end
+
+
+--- Update selection
+local function update_selection(self)
+	update_text(self)
+end
+
+
+local TEMP_VECTOR = vmath.vector3(0)
+local function get_index_by_touch(self, touch)
+	local text_node = self.input.text.node
+	TEMP_VECTOR.x = touch.screen_x
+	TEMP_VECTOR.y = touch.screen_y
+
+	-- Distance to the text node position
+	local scene_scale = helper.get_scene_scale(text_node)
+	local local_pos = gui.screen_to_local(text_node, TEMP_VECTOR)
+	local_pos.x = local_pos.x / scene_scale.x
+
+	-- Offset to the left side of the text node
+	local pivot_offset = helper.get_pivot_offset(gui.get_pivot(text_node))
+	local_pos.x = local_pos.x + self.input.total_width * (0.5 + pivot_offset.x)
+	local_pos.x = local_pos.x - self.text_position.x
+
+	local cursor_index = self.input.text:get_text_index_by_width(local_pos.x)
+	return cursor_index
+end
+
+
+local function on_touch_start_callback(self, touch)
+	local cursor_index = get_index_by_touch(self, touch)
+
+	if self._last_touch_info.cursor_index == cursor_index then
+		local time = socket.gettime()
+		if time - self._last_touch_info.time < DOUBLE_CLICK_TIME then
+			local len = utf8.len(self.input:get_text())
+			self.input:select_cursor(len, 0, len)
+			self._last_touch_info.cursor_index = nil
+
+			return
+		end
+	end
+
+	self._last_touch_info.cursor_index = cursor_index
+	self._last_touch_info.time = socket.gettime()
+
+	if self.input.is_lshift then
+		local start_index = self.input.start_index
+		local end_index = self.input.end_index
+
+		if cursor_index < start_index then
+			self.input:select_cursor(cursor_index, cursor_index, end_index)
+		elseif cursor_index > end_index then
+			self.input:select_cursor(cursor_index, start_index, cursor_index)
+		end
+	else
+		self.input:select_cursor(cursor_index)
+	end
+end
+
+
+
+local function on_drag_callback(self, dx, dy, x, y, touch)
+	if not self._last_touch_info.cursor_index then
+		return
+	end
+
+	local index = get_index_by_touch(self, touch)
+	if self._last_touch_info.cursor_index <= index then
+		self.input:select_cursor(index, self._last_touch_info.cursor_index, index)
+	else
+		self.input:select_cursor(index, index, self._last_touch_info.cursor_index)
+	end
 end
 
 
@@ -70,38 +183,112 @@ end
 -- @tparam string template The template string name
 -- @tparam table nodes Nodes table from gui.clone_tree
 function RichInput.init(self, template, nodes)
-	self:set_template(template)
-	self:set_nodes(nodes)
-	self.druid = self:get_druid()
+	self.druid = self:get_druid(template, nodes)
 	self.root = self:get_node(SCHEME.ROOT)
 
+	self._last_touch_info = {
+		cursor_index = nil,
+		time = 0,
+	}
+	self.is_lshift = false
+	self.is_lctrl = false
+
+	---@type druid.input
 	self.input = self.druid:new(input, self:get_node(SCHEME.BUTTON), self:get_node(SCHEME.INPUT))
+	self.is_button_input_enabled = gui.is_enabled(self.input.button.node)
+
 	self.cursor = self:get_node(SCHEME.CURSOR)
+	self.cursor_position = gui.get_position(self.cursor)
+	self.cursor_text = self:get_node(SCHEME.CURSOR_TEXT)
+
+	self.drag = self.druid:new_drag(self:get_node(SCHEME.BUTTON), on_drag_callback)
+	self.drag.on_touch_start:subscribe(on_touch_start_callback)
+	self.drag:set_input_priority(const.PRIORITY_INPUT_MAX + 1)
+	self.drag:set_enabled(false)
 
 	self.input:set_text("")
 	self.placeholder = self.druid:new_text(self:get_node(SCHEME.PLACEHOLDER))
+	self.text_position = gui.get_position(self.input.text.node)
 
 	self.input.on_input_text:subscribe(update_text)
 	self.input.on_input_select:subscribe(on_select)
 	self.input.on_input_unselect:subscribe(on_unselect)
+	self.input.on_select_cursor_change:subscribe(update_selection)
+
 	on_unselect(self)
-	update_text(self, "")
+	update_text(self)
+end
+
+
+function RichInput.on_input(self, action_id, action)
+	if action_id == const.ACTION_LSHIFT then
+		if action.pressed then
+			self.is_lshift = true
+		elseif action.released then
+			self.is_lshift = false
+		end
+	end
+
+	if action_id == const.ACTION_LCTRL then
+		if action.pressed then
+			self.is_lctrl = true
+		elseif action.released then
+			self.is_lctrl = false
+		end
+	end
+
+	if action_id == const.ACTION_LEFT and (action.pressed or action.repeated) then
+		self.input:move_selection(-1, self.is_lshift, self.is_lctrl)
+	end
+
+	if action_id == const.ACTION_RIGHT and (action.pressed or action.repeated) then
+		self.input:move_selection(1, self.is_lshift, self.is_lctrl)
+	end
 end
 
 
 --- Set placeholder text
 -- @tparam RichInput self @{RichInput}
--- @tparam string|nil placeholder_text The placeholder text
--- @treturn RichInput Current instance
+-- @tparam string placeholder_text The placeholder text
 function RichInput.set_placeholder(self, placeholder_text)
 	self.placeholder:set_to(placeholder_text)
 	return self
 end
 
 
----GSet input field text
+--- Select input field
+-- @tparam RichInput self @{RichInput}
+function RichInput.select(self)
+	self.input:select()
+end
+
+
+--- Set input field text
+-- @tparam RichInput self @{RichInput}
+-- @treturn druid.input Current input instance
+-- @tparam string text The input text
+function RichInput.set_text(self, text)
+	self.input:set_text(text)
+	gui.set_enabled(self.placeholder.node, true and #self.input:get_text() == 0)
+
+	return self
+end
+
+
+--- Set input field font
+-- @tparam RichInput self @{RichInput}
+-- @tparam hash font The font hash
+-- @treturn druid.input Current input instance
+function RichInput.set_font(self, font)
+	gui.set_font(self.input.text.node, font)
+	gui.set_font(self.placeholder.node, font)
+
+	return self
+end
+
+
+--- Set input field text
 -- @tparam RichInput self @{RichInput}
--- @treturn string Current input text
 function RichInput.get_text(self)
 	return self.input:get_text()
 end

druid/custom/rich_text/module/rt.lua

@@ -234,6 +234,9 @@ function M._split_on_lines(words, settings)
 
 	repeat
 		local word = words[i]
+		if word == nil then
+			break
+		end
 		if word.image then
 			word.default_animation = settings.default_animation
 		end

druid/custom/rich_text/module/rt_parse.lua

@@ -117,6 +117,10 @@ function M.parse(text, default_settings, style)
 	assert(default_settings)
 
 	text = text:gsub("&zwsp;", "<zwsp>\226\128\139</zwsp>")
+
+	-- Replace all \n with <br/> to make it easier to split the text
+	text = text:gsub("\n", "<br/>")
+
 	local all_words = {}
 	local open_tags = {}
 

druid/custom/rich_text/rich_text.lua

@@ -109,11 +109,9 @@ local SCHEME = {
 -- @tparam string template The Rich Text template name
 -- @tparam table nodes The node table, if prefab was copied by gui.clone_tree()
 function RichText.init(self, template, nodes)
-	self:set_template(template)
-	self:set_nodes(nodes)
+	self.druid = self:get_druid(template, nodes)
 
 	self.root = self:get_node(SCHEME.ROOT)
-	self.druid = self:get_druid()
 
 	self.text_prefab = self:get_node(SCHEME.TEXT_PREFAB)
 	self.icon_prefab = self:get_node(SCHEME.ICON_PREFAB)
@@ -151,7 +149,7 @@ end
 
 --- Set text for Rich Text
 -- @tparam RichText self @{RichText}
--- @tparam string text The text to set
+-- @tparam string text|nil The text to set
 -- @treturn druid.rich_text.word[] words
 -- @treturn druid.rich_text.lines_metrics line_metrics
 -- @usage
@@ -198,6 +196,7 @@ end
 -- <img=texture:image,size/>
 -- <img=texture:image,width,height/>
 function RichText.set_text(self, text)
+	text = text or ""
 	self:clear()
 	self._last_value = text