save home default focus in redux, add eventPopup focus
This commit is contained in:
@@ -6,7 +6,10 @@ import Spotlight from "@enact/spotlight";
|
||||
import { SpotlightContainerDecorator } from "@enact/spotlight/SpotlightContainerDecorator";
|
||||
import Spottable from "@enact/spotlight/Spottable";
|
||||
|
||||
import { getHomeMainContents } from "../../../actions/homeActions";
|
||||
import {
|
||||
getHomeMainContents,
|
||||
setDefaultFocus,
|
||||
} from "../../../actions/homeActions";
|
||||
import CustomImage from "../../../components/CustomImage/CustomImage";
|
||||
import useScrollReset from "../../../hooks/useScrollReset";
|
||||
import css from "./HomeBanner.module.less";
|
||||
@@ -28,9 +31,12 @@ export default function HomeBanner({
|
||||
spotlightId,
|
||||
handleItemFocus,
|
||||
}) {
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const homeTopDisplayInfo = useSelector(
|
||||
(state) => state.home.homeTopDisplayInfo
|
||||
);
|
||||
const popupVisible = useSelector((state) => state.common.popup.popupVisible);
|
||||
|
||||
const bannerDataList = useSelector(
|
||||
(state) => state.home.bannerData?.bannerInfos
|
||||
@@ -81,13 +87,17 @@ export default function HomeBanner({
|
||||
Spotlight.focus(defaultFocus);
|
||||
}, 0);
|
||||
}
|
||||
}, [defaultFocus]);
|
||||
|
||||
if (defaultFocus) {
|
||||
dispatch(setDefaultFocus(defaultFocus));
|
||||
}
|
||||
}, [defaultFocus, dispatch]);
|
||||
|
||||
const renderItem = useCallback(
|
||||
(index, isHorizontal) => {
|
||||
const data = bannerDataList?.[index] ?? {};
|
||||
return (
|
||||
<div className={!isHorizontal ? css.imgBox: undefined}>
|
||||
<div className={!isHorizontal ? css.imgBox : undefined}>
|
||||
{data.shptmDspyTpNm === "Rolling" ? (
|
||||
<Rolling
|
||||
bannerData={data}
|
||||
|
||||
Reference in New Issue
Block a user