From f4cea5eef0a06e87ff8e4a3d492efca4dd2a04fd Mon Sep 17 00:00:00 2001 From: yonghyon Date: Thu, 23 May 2024 20:19:52 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.twin.app.shoptime/src/hooks/useScrollTopByDistance.js | 2 +- com.twin.app.shoptime/src/utils/helperMethods.js | 4 ++-- .../src/views/DetailPanel/GroupProduct/GroupOption.jsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/com.twin.app.shoptime/src/hooks/useScrollTopByDistance.js b/com.twin.app.shoptime/src/hooks/useScrollTopByDistance.js index b013f20d..cdd01ce4 100644 --- a/com.twin.app.shoptime/src/hooks/useScrollTopByDistance.js +++ b/com.twin.app.shoptime/src/hooks/useScrollTopByDistance.js @@ -25,7 +25,7 @@ export default function useScrollTopByDistance() { const distance = targetRect.top - markerRect.top - scaleH(gap); - jobRef.current.start(() => scrollTop({ y: distance })); + jobRef.current.start(() => scrollTop({ y: distance >=0 ? distance : 0 })); } catch (error) { console.error(error.message); } diff --git a/com.twin.app.shoptime/src/utils/helperMethods.js b/com.twin.app.shoptime/src/utils/helperMethods.js index a1b37b0c..38550ab8 100644 --- a/com.twin.app.shoptime/src/utils/helperMethods.js +++ b/com.twin.app.shoptime/src/utils/helperMethods.js @@ -279,9 +279,9 @@ export const getSpottableDescendants = (containerId) => { export const isElementInContainer = (element, container) => { // 요소와 컨테이너의 사각형 정보 가져오기 if (typeof window === "object") { - const elementRect = element.getBoundingClientRect(); + const elementRect = getBoundingClientRect(element); const containerRect = container - ? container.getBoundingClientRect() + ? getBoundingClientRect(container) : { top: 0, left: 0, diff --git a/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupOption.jsx b/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupOption.jsx index d36b42b6..7bb486ca 100644 --- a/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupOption.jsx +++ b/com.twin.app.shoptime/src/views/DetailPanel/GroupProduct/GroupOption.jsx @@ -9,7 +9,7 @@ import Spottable from "@enact/spotlight/Spottable"; import noGroupImg from "../../../../assets/images/img-my-info-billing@3x.png"; import { pushPanel } from "../../../actions/panelActions"; import TScroller from "../../../components/TScroller/TScroller"; -import { panel_names } from "../../../utils/Config"; +import { LOG_MENU, panel_names } from "../../../utils/Config"; import { $L } from "../../../utils/helperMethods"; import css from "./GroupOption.module.less"; import useLogService from "../../../hooks/useLogService";