Fix breadcrumbs management when navigating back

Fixes #1269

Author: Razoric480

autoload/NavigationManager.gd

@@ -95,7 +95,7 @@ func confirm_unload() -> void:
 func navigate_back() -> void:
 	if _is_unload_confirmation_required():
 		_current_unload_type = UNLOAD_TYPE.BACK
-		emit_signal("last_screen_unload_requested")
+		last_screen_unload_requested.emit()
 		return
 
 	_navigate_back()
@@ -104,7 +104,7 @@ func navigate_back() -> void:
 func navigate_to_outliner() -> void:
 	if _is_unload_confirmation_required():
 		_current_unload_type = UNLOAD_TYPE.OUTLINER
-		emit_signal("all_screens_unload_requested")
+		all_screens_unload_requested.emit()
 		return
 
 	_navigate_to_outliner()
@@ -121,19 +121,19 @@ func _navigate_back() -> void:
 	history.remove_at(history.size() - 1)
 	_js_back()
 
-	emit_signal("back_navigation_requested")
+	back_navigation_requested.emit()
 
 
 func _navigate_to_outliner() -> void:
 	# prints("emptying history")
 	history.resize(0)
 	_js_to_outliner()
 
-	emit_signal("outliner_navigation_requested")
+	outliner_navigation_requested.emit()
 
 
 func navigate_to_welcome_screen() -> void:
-	emit_signal("welcome_screen_navigation_requested")
+	welcome_screen_navigation_requested.emit()
 
 
 func navigate_to_lesson(course_id: String, lesson_slug: String) -> void:

resources/lesson_bbcode_parser/BBCodeParser.gd

@@ -214,6 +214,7 @@ func _parse_tokens(tokens: Array, file_path: String) -> ParseNode:
 						current_paragraph.tag = _parser_data.Tag.PARAGRAPH
 						current_paragraph.line_number = token.line_number
 						current_paragraph.bbcode_path = file_path
+						current_paragraph.parent = current
 						current.children.append(current_paragraph)
 					if accumulated_text != "":
 						current_paragraph.children.append(accumulated_text)
@@ -224,6 +225,7 @@ func _parse_tokens(tokens: Array, file_path: String) -> ParseNode:
 					inline_node.attributes = token.attributes
 					inline_node.line_number = token.line_number
 					inline_node.bbcode_path = file_path
+					inline_node.parent = current_paragraph
 					current_paragraph.children.append(inline_node)
 					continue
 				else:
@@ -262,6 +264,7 @@ func _parse_tokens(tokens: Array, file_path: String) -> ParseNode:
 			node.attributes = token.attributes
 			node.line_number = token.line_number
 			node.bbcode_path = file_path
+			node.parent = current
 			current.children.append(node)
 
 			if _parser_data.is_container_tag(token_tag):
@@ -312,6 +315,7 @@ func _parse_tokens(tokens: Array, file_path: String) -> ParseNode:
 				current_paragraph.tag = _parser_data.Tag.PARAGRAPH
 				current_paragraph.line_number = 0
 				current_paragraph.bbcode_path = file_path
+				current_paragraph.parent = current
 				current.children.append(current_paragraph)
 			current_paragraph.children.append(accumulated_text)
 		else:
@@ -348,6 +352,7 @@ class ParseNode:
 	var children := []
 	var line_number := -1
 	var bbcode_path: String
+	var parent: ParseNode
 
 
 class ParseError:

ui/UINavigator.gd

@@ -162,7 +162,7 @@ func _navigate_to() -> void:
 		var ui_practice_screen: UIPractice = preload("UIPractice.tscn").instantiate()
 		screen = ui_practice_screen
 		ui_practice_screen.setup(target, lesson, course_index, lesson_number)
-	elif target.tag == BBCodeParserData.Tag.LESSON:
+	elif target is BBCodeParser.ParseNode and target.tag == BBCodeParserData.Tag.LESSON:
 		var lesson_number := course_index.get_lesson_number(target.bbcode_path)
 		_lesson_index = lesson_number - 1
 

ui/components/BreadCrumbs.gd

@@ -23,11 +23,11 @@ func update_breadcrumbs(course_index: CourseIndex, target: BBCodeParser.ParseNod
 
 
 func _rebuild_breadcrumbs() -> void:
+	_clear_navigation_nodes()
+	
 	if not _last_course_index or not _last_target:
 		return
 
-	_clear_navigation_nodes()
-
 	if _last_target is BBCodeParser.ParseNode and _last_target.tag == BBCodeParserData.Tag.LESSON:
 		var lesson := _last_target as BBCodeParser.ParseNode
 		var lesson_index := -1
@@ -46,23 +46,22 @@ func _rebuild_breadcrumbs() -> void:
 		if lesson_index >= 0:
 			node_text = "%s. %s" % [lesson_index + 1, tr(title)]
 
-		_create_navigation_node(node_text, "", true)
+		_create_navigation_node(node_text, null, "", true)
 		return
 
-	if _last_target is BBCodeParser.ParseNode and _last_target.tag == BBCodeParserData.Tag.PRACTICE:
+	elif _last_target is BBCodeParser.ParseNode and _last_target.tag == BBCodeParserData.Tag.PRACTICE:
 		var practice := _last_target as BBCodeParser.ParseNode
 		# TODO: Should probably avoid relying on content ID for getting paths.
+		
 		var practice_id := BBCodeUtils.get_practice_id(practice)
-		var lesson_path = practice_id.get_base_dir().path_join("lesson.bbcode")
 
-		var lesson: BBCodeParser.ParseNode
+		var lesson: BBCodeParser.ParseNode = practice.parent
 		var lesson_index := -1
 
 		var i := 0
 		for l in _last_course_index.get_lessons_count():
 			var lesson_data := NavigationManager.get_navigation_resource(_last_course_index.get_lesson_path(l)) as BBCodeParser.ParseNode
-			if lesson_data.bbcode_path == lesson_path:
-				lesson = lesson_data
+			if lesson_data.bbcode_path == lesson.bbcode_path:
 				lesson_index = i
 				break
 
@@ -71,7 +70,7 @@ func _rebuild_breadcrumbs() -> void:
 		if lesson and lesson_index >= 0:
 			var title := BBCodeUtils.get_lesson_title(lesson)
 			var lesson_text := "%d. %s" % [lesson_index + 1, tr(title)]
-			_create_navigation_node(lesson_text, lesson.bbcode_path)
+			_create_navigation_node(lesson_text, _last_course_index, lesson.bbcode_path)
 
 			var practice_count := BBCodeUtils.get_lesson_practice_count(lesson)
 			var practice_index := -1
@@ -83,7 +82,7 @@ func _rebuild_breadcrumbs() -> void:
 					break
 			var practice_title := BBCodeUtils.get_practice_title(practice)
 			var node_text: String = "%d. %s" % [practice_index + 1, tr(practice_title)]
-			_create_navigation_node(node_text, "", true)
+			_create_navigation_node(node_text, null, "", true)
 		return
 
 
@@ -93,7 +92,7 @@ func _clear_navigation_nodes() -> void:
 		child_node.queue_free()
 
 
-func _create_navigation_node(text: String, path: String = "", current: bool = false) -> void:
+func _create_navigation_node(text: String, course_index: CourseIndex, path: String = "", current: bool = false) -> void:
 	if get_child_count() > 0:
 		var separator := Label.new()
 		separator.text = "•"
@@ -117,7 +116,8 @@ func _create_navigation_node(text: String, path: String = "", current: bool = fa
 		navigation_node.add_theme_font_size_override("font_size", NODE_FONT_SIZE)
 		navigation_node.mouse_default_cursor_shape = CURSOR_POINTING_HAND
 		add_child(navigation_node)
-		navigation_node.pressed.connect(_on_navigation_pressed.bind(path))
+		var slug := "#%s/%s" % [course_index.get_course_id(), course_index.get_lesson_slug_from_path(path)]
+		navigation_node.pressed.connect(_on_navigation_pressed.bind(slug))
 
 
 func _on_navigation_pressed(path: String) -> void: