Web: Common: Layout: fixed isTablet
This commit is contained in:
parent
ead4841112
commit
8e0104920b
@ -21,6 +21,8 @@ const Layout = (props) => {
|
|||||||
matches: isTablet,
|
matches: isTablet,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(size.tablet);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let mediaQuery = window.matchMedia("(max-width: 1024px)");
|
let mediaQuery = window.matchMedia("(max-width: 1024px)");
|
||||||
mediaQuery.addListener(setWindowWidth);
|
mediaQuery.addListener(setWindowWidth);
|
||||||
@ -29,17 +31,17 @@ const Layout = (props) => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isIOS && !isFirefox) {
|
if (isTablet) {
|
||||||
if (isSafari) window.addEventListener("resize", resizeHandler);
|
if (isIOS && isSafari) window.addEventListener("resize", resizeHandler);
|
||||||
if (isChrome) window.addEventListener("orientationchange", resizeHandler);
|
else window.addEventListener("orientationchange", resizeHandler);
|
||||||
resizeHandler();
|
resizeHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
if (isIOS && !isFirefox) {
|
if (isTablet) {
|
||||||
if (isSafari) window.removeEventListener("resize", resizeHandler);
|
if (isIOS && isSafari)
|
||||||
if (isChrome)
|
window.removeEventListener("resize", resizeHandler);
|
||||||
window.removeEventListener("orientationchange", resizeHandler);
|
else window.removeEventListener("orientationchange", resizeHandler);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
@ -87,7 +89,7 @@ const Layout = (props) => {
|
|||||||
return (
|
return (
|
||||||
<StyledContainer className="Layout">
|
<StyledContainer className="Layout">
|
||||||
{windowWidth && windowWidth.matches ? (
|
{windowWidth && windowWidth.matches ? (
|
||||||
<MobileLayout {...props} />
|
<MobileLayout {...props} windowWidth={windowWidth} />
|
||||||
) : (
|
) : (
|
||||||
children
|
children
|
||||||
)}
|
)}
|
||||||
|
Loading…
Reference in New Issue
Block a user