WRR-8543: Fixed editable Scroller not to use static classname (#1767)

* WRR-8543: Fixed Editable Scroller not to use static classname Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com) * Added a guard Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com)
enactjs · Dec 19, 2024 · de22a0f · de22a0f
1 parent 7ec3f80
commit de22a0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Scroller/EditableWrapper.js b/Scroller/EditableWrapper.js
@@ -268,7 +268,7 @@ const EditableWrapper = (props) => {
 	}, [customCss.focused, findItemNode]);
 
 	const handleClickCapture = useCallback((ev) => {
-		if (ev.target.className.includes('Button')) {
+		if (ev.target?.parentNode?.parentNode.getAttribute('role') === 'button') {
 			return;
 		}
 		// Consume the event to prevent Item behavior
@@ -280,7 +280,7 @@ const EditableWrapper = (props) => {
 	}, []);
 
 	const handleMouseDown = useCallback((ev) => {
-		if (ev.target.className.includes('Button')) {
+		if (ev.target?.parentNode?.parentNode.getAttribute('role') === 'button') {
 			return;
 		}
 		if (mutableRef.current.selectedItem) {
@@ -732,7 +732,7 @@ const EditableWrapper = (props) => {
 			ev.preventDefault();
 		}
 
-		if (mutableRef.current.isDraggingItem && !ev.target.className.includes('Button')) {
+		if (mutableRef.current.isDraggingItem && ev.target?.parentNode?.parentNode.getAttribute('role') !== 'button') {
 			const {clientX} = ev.targetTouches[0];
 			mutableRef.current.lastMouseClientX = clientX;
 
@@ -755,7 +755,7 @@ const EditableWrapper = (props) => {
 		const {clientX} = ev.changedTouches[0];
 		const targetItemIndex = getNextIndexFromPosition(clientX, 0);
 
-		if (ev.target.className.includes('Button') && Number(selectedItem?.style.order) - 1 === targetItemIndex) {
+		if (ev.target?.parentNode?.parentNode.getAttribute('role') === 'button' && Number(selectedItem?.style.order) - 1 === targetItemIndex) {
 			return;
 		}
 

diff --git a/samples/sampler/stories/qa/IconItem.js b/samples/sampler/stories/qa/IconItem.js
@@ -160,7 +160,7 @@ export const EditableIcon = (args) => {
 	}, [setEditMode]);
 
 	const handleMouseDown = useCallback((ev) => {
-		if (!ev.target.className.includes('Button')) {
+		if (ev.target?.parentNode?.parentNode.getAttribute('role') !== 'button') {
 			const targetItemNode = findItemNode(ev.target);
 			if (targetItemNode && targetItemNode.style.order) {
 				mutableRef.current.initialSelected.itemIndex = targetItemNode.style.order;