diff --git a/src/entities/menu/model/types.ts b/src/entities/menu/model/types.ts index f727426..75276de 100644 --- a/src/entities/menu/model/types.ts +++ b/src/entities/menu/model/types.ts @@ -16,5 +16,6 @@ export interface MenuCategoryProps { setMenuOn?: (menuOn: boolean) => void; editMode?: boolean; setChangeMenuId: (menuId?: string) => void; - buttonRefs: RefObject>; + buttonRef: any + btnRef?: any; }; diff --git a/src/entities/menu/ui/menu-category.tsx b/src/entities/menu/ui/menu-category.tsx index 3e580ff..cd794c5 100644 --- a/src/entities/menu/ui/menu-category.tsx +++ b/src/entities/menu/ui/menu-category.tsx @@ -13,7 +13,7 @@ export const MenuCategory = ({ setMenuOn, editMode, setChangeMenuId, - buttonRefs + buttonRef,btnRef }: MenuCategoryProps) => { const { navigate } = useNavigate(); @@ -34,7 +34,7 @@ export const MenuCategory = ({ menuId?: string ) => { let userFavorite = useStore.getState().UserStore.userFavorite; - let randomNum = Math.floor(Math.random() * 5) + 1; + let randomNum = Math.floor(Math.random() * 3) + 1; if(checked){ userFavorite = [ ...userFavorite, @@ -78,7 +78,6 @@ export const MenuCategory = ({
  • onClickToNavigate(subMenu[i]?.path) } - ref={ (element) => { buttonRefs.current[i] = element }} > { subMenu[i]?.menuName }
    @@ -107,7 +106,7 @@ export const MenuCategory = ({
  • onClickToNavigate(subMenu[i]?.path) } - ref={ (element) => { buttonRefs.current[i] = element }} + >{ subMenu[i]?.menuName }
  • ); } @@ -120,8 +119,13 @@ export const MenuCategory = ({ return ( <> -
    -
    +
    +
    { menuName }
    diff --git a/src/shared/ui/assets/css/style-fix.css b/src/shared/ui/assets/css/style-fix.css index 1f2e230..b12418d 100644 --- a/src/shared/ui/assets/css/style-fix.css +++ b/src/shared/ui/assets/css/style-fix.css @@ -121,4 +121,7 @@ main { top: 234px; margin-top: 0; width: 100%; +} +.menu-category{ + position: relative; } \ No newline at end of file diff --git a/src/shared/ui/menu/index.tsx b/src/shared/ui/menu/index.tsx index 9bd7f16..bd68c20 100644 --- a/src/shared/ui/menu/index.tsx +++ b/src/shared/ui/menu/index.tsx @@ -27,16 +27,36 @@ export const Menu = ({ const [editMode, setEditMode] = useState(false); const [changeMenuId, setChangeMenuId] = useState(); - const buttonRefs = useRef>([]); + const buttonRefs = useRef>([]); + const btnRef = useRef(null); const onClickToNavigate = (path: string) => { onClickToMenuClose(); navigate(path); }; const onClickToMenuNavigate = (menuId: string, index: number) => { + //let rect = buttonRefs.current[index]?.getBoundingClientRect(); + //console.log(rect?.top) + /* buttonRefs.current[index]?.scrollIntoView({ behavior: 'smooth' }); + */ + if(index === 1){ + /* + btnRef.current?.scrollTo({ + top: 300, + behavior: "smooth" + }); + */ + btnRef.current?.scrollIntoView({ + block: 'start', + behavior: 'smooth' + }); + + } + + }; const onClickToMenuClose = () => { if(editMode){ @@ -50,7 +70,8 @@ export const Menu = ({ const getMenuCategory = () => { let rs = []; for(let i=0;i ); + } + else{ + rs.push( + + ); + } + } return rs; }; diff --git a/src/widgets/navigation/header.tsx b/src/widgets/navigation/header.tsx index d832ebe..2dd356f 100644 --- a/src/widgets/navigation/header.tsx +++ b/src/widgets/navigation/header.tsx @@ -76,7 +76,10 @@ export const HeaderNavigation = ({