change focused-id to id

hpi-schul-cloud · Sep 20, 2024 · 9d23e8a · 9d23e8a
1 parent 8bcbb4f
commit 9d23e8a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/src/modules/data/board/BoardFocusHandler.composable.ts b/src/modules/data/board/BoardFocusHandler.composable.ts
@@ -195,9 +195,7 @@ const useSharedFocusedId = createSharedComposable(() => {
 	};
 
 	const setElementFocused = (id: MaybeRefOrGetter<FocusableId>) => {
-		const element = document.querySelector(
-			`[data-focused-id="${id}"]`
-		) as HTMLElement;
+		const element = document.getElementById(id.toString()) as HTMLElement;
 
 		element?.focus();
 	};

diff --git a/src/modules/data/board/index.ts b/src/modules/data/board/index.ts
@@ -10,7 +10,6 @@ import { useSocketConnection } from "./socket/socket";
 import { useCardStore } from "./Card.store";
 import { useBoardInactivity } from "./boardInactivity.composable";
 import { useForceRender } from "./fixSamePositionDnD.composable";
-import { useSetFocusPrevious } from "./FocusPrevious.composable";
 
 export {
 	boardActions,
@@ -23,7 +22,6 @@ export {
 	useContentElementState,
 	useEditMode,
 	useForceRender,
-	useSetFocusPrevious,
 	useSharedEditMode,
 	useSharedBoardPageInformation,
 	useSocketConnection,

diff --git a/src/modules/feature/board-text-element/RichTextContentElement.vue b/src/modules/feature/board-text-element/RichTextContentElement.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :data-focused-id="element.id">
+	<div :id="element.id">
 		<RichTextContentElementDisplay
 			v-if="!isEditMode"
 			class="rich_text"

diff --git a/src/modules/feature/board/board/BoardColumnHeader.vue b/src/modules/feature/board/board/BoardColumnHeader.vue
@@ -4,7 +4,7 @@
 		@start-edit-mode="onStartEditMode"
 		@end-edit-mode="onEndEditMode"
 		@move:column-keyboard="onMoveColumnKeyboard"
-		:data-focused-id="columnId"
+		:id="columnId"
 	>
 		<div class="column-header mb-4 rounded" ref="columnHeader">
 			<div class="d-flex align-center py-2 pr-4 pl-2">

diff --git a/src/modules/feature/board/board/BoardHeader.vue b/src/modules/feature/board/board/BoardHeader.vue
@@ -6,7 +6,7 @@
 			@end-edit-mode="onEndEditMode"
 			@keydown.enter="onStartEditMode"
 			tabindex="0"
-			:data-focused-id="boardId"
+			:id="boardId"
 		>
 			<div ref="boardHeader">
 				<BoardAnyTitleInput

diff --git a/src/modules/feature/board/card/CardHost.vue b/src/modules/feature/board/card/CardHost.vue
@@ -14,7 +14,6 @@
 				variant="outlined"
 				tabindex="0"
 				min-height="120px"
-				:data-focused-id="card?.id"
 				:elevation="isEditMode ? 6 : isHovered ? 4 : 2"
 				:id="cardId"
 				:ripple="false"

diff --git a/src/modules/feature/board/card/ContentElementList.vue b/src/modules/feature/board/card/ContentElementList.vue
@@ -6,7 +6,7 @@
 					v-if="isRichTextElementResponse(element)"
 					:element="element"
 					:isEditMode="isEditMode"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -17,7 +17,7 @@
 					:element="element"
 					:isEditMode="isEditMode"
 					:isDetailView="isDetailView"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -27,7 +27,7 @@
 					v-else-if="isFileElementResponse(element)"
 					:element="element"
 					:isEditMode="isEditMode"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -37,7 +37,7 @@
 					v-else-if="showSubmissionContainerElement(element)"
 					:element="element"
 					:isEditMode="isEditMode"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -47,7 +47,7 @@
 					v-else-if="showExternalToolElement(element)"
 					:element="element"
 					:isEditMode="isEditMode"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -61,7 +61,7 @@
 					:isFirstElement="firstElementId === element.id"
 					:isLastElement="lastElementId === element.id"
 					:hasMultipleElements="hasMultipleElements"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"
@@ -74,7 +74,7 @@
 					:isFirstElement="firstElementId === element.id"
 					:isLastElement="lastElementId === element.id"
 					:hasMultipleElements="hasMultipleElements"
-					:data-focused-id="element.id"
+					:id="element.id"
 					@move-keyboard:edit="onMoveElementKeyboard(index, element, $event)"
 					@move-down:edit="onMoveElementDown(index, element)"
 					@move-up:edit="onMoveElementUp(index, element)"