Cleanup ffooter show

1Hive · Feb 3, 2022 · 31ab20f · 31ab20f
1 parent 0f65465
commit 31ab20f
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 27 deletions.
diff --git a/packages/react-app/src/components/field-input/amount-field-input.tsx b/packages/react-app/src/components/field-input/amount-field-input.tsx
@@ -221,7 +221,7 @@ function AmountFieldInput({
   };
 
   const amountField = (
-    <FieldInput label={amountLabel} isLoading={isLoading} wide={wide} compact={compact}>
+    <FieldInput label={amountLabel} wide={wide} compact={compact}>
       <AmountTokenWrapperStyled isEdit={isEdit} wide={wide}>
         {amount !== undefined &&
           (isEdit ? (
@@ -245,7 +245,6 @@ function AmountFieldInput({
   const tokenField = (
     <FieldInput
       label={tokenLabel}
-      isLoading={isLoading}
       wide={wide}
       compact={compact}
       tooltip="Token"
@@ -291,7 +290,7 @@ function AmountFieldInput({
       label={label}
       tooltip={tooltip}
       tooltipDetail={tooltipDetail}
-      isLoading={false}
+      isLoading={isLoading}
       wide={wide}
       compact
       direction={!!amountLabel || !!tokenLabel ? 'column' : 'row'}

diff --git a/packages/react-app/src/components/field-input/field-input.tsx b/packages/react-app/src/components/field-input/field-input.tsx
@@ -6,7 +6,7 @@ import styled from 'styled-components';
 import { IconTooltip } from './icon-tooltip';
 
 const FieldStyled = styled.div`
-  ${({ compact }: any) => (!compact ? `margin-bottom:${GUpx(2)}` : '')};
+  ${({ compact }: any) => (!compact ? `margin-bottom:${GUpx(1)}` : '')};
   ${({ isLoading, wide }: any) => (isLoading || wide ? `width: 100%;` : 'max-width: 100%;')};
 `;
 
@@ -38,6 +38,7 @@ const ContentWrapperStyled = styled.div`
     }
   }
   flex-direction: ${({ direction }: any) => direction};
+  padding-left: ${GUpx(0.5)};
 `;
 
 const SkeletonWrapperStyled = styled.div`
@@ -52,7 +53,7 @@ type Props = {
   tooltipDetail?: React.ReactNode;
   children: React.ReactNode;
   id?: string;
-  isLoading: boolean;
+  isLoading?: boolean;
   wide?: boolean;
   direction?: 'row' | 'column';
   align?: 'center' | 'baseline' | 'flex-start' | 'flex-end' | 'unset';

diff --git a/packages/react-app/src/components/main-view.tsx b/packages/react-app/src/components/main-view.tsx
@@ -70,7 +70,6 @@ function MainView({ children, toggleTheme, currentTheme }: Props) {
           main={children}
           side={page === ENUM_PAGES.List ? <Sidebar /> : undefined}
           footer={<Footer />}
-          mainScrollable={page === ENUM_PAGES.List}
         />
       </Root.Provider>
     </MainViewStyled>

diff --git a/packages/react-app/src/components/side-content-layout.tsx b/packages/react-app/src/components/side-content-layout.tsx
@@ -1,17 +1,21 @@
 import { useViewport } from '@1hive/1hive-ui';
 import React, { useEffect, useRef, useState } from 'react';
-import { GUpx } from 'src/utils/css.util';
 import styled from 'styled-components';
 import { BREAKPOINTS } from '../styles/breakpoints';
 
 const WrapperStyled = styled.div`
   display: grid;
   grid-template-areas: ${(props: any) =>
-    props.twoCol ? "'m m s'\n'm m s'\n'f f f'" : "'s s s'\n'm m m'\n'f f f'"};
+    props.isOneCol ? "'s s s'\n'm m m'\n'f f f'" : "'m m s'\n'm m s'\n'f f f'"};
   height: calc(100vh - 64px);
   overflow-y: auto;
   grid-template-columns: 1fr auto;
   scroll-behavior: smooth;
+  ::-webkit-scrollbar {
+    display: none;
+  }
+  -ms-overflow-style: none;
+  scrollbar-width: none;
 `;
 
 const SideBlockStyled = styled.div`
@@ -20,6 +24,7 @@ const SideBlockStyled = styled.div`
 
 const FooterStyled = styled.div`
   grid-area: f;
+  transition: all 5s linear;
 `;
 
 const ScrollViewStyled = styled.div`
@@ -36,53 +41,71 @@ const ScrollViewStyled = styled.div`
       `
       : ''}
 
-  ${(props: any) => (props.twoCol ? `padding: ${GUpx(1)} ${GUpx(4)};` : `padding: ${GUpx(1)}`)};
   grid-area: m;
 `;
 
 type Props = {
   main: React.ReactNode;
   side?: React.ReactNode;
   footer: React.ReactNode;
-  mainScrollable?: boolean;
 };
 
-function SideContentLayout({ main, side, footer, mainScrollable = true }: Props) {
+function SideContentLayout({ main, side, footer }: Props) {
   const { width: vw } = useViewport();
+  const wrapperElement = document.getElementById('main-scroll');
   const scrollRef = useRef<HTMLDivElement>();
   const footerRef = useRef<HTMLDivElement>();
-  const [twoCol, setTwoCol] = useState(true);
+  const [isOneCol, setIsOneCol] = useState(false);
 
   useEffect(() => {
     const handleWheelOnMain = (e: WheelEvent) => {
       const scrollElement = scrollRef.current as HTMLElement;
-      const wrapperElement = document.getElementById('main-scroll');
-      const footerElement = footerRef.current as HTMLElement;
-      // scroll is bottom
-      if (wrapperElement && scrollElement) {
-        if (Math.round(wrapperElement.scrollTop) >= footerElement.clientHeight && e.deltaY < 0) {
-          e.preventDefault();
-          wrapperElement.scroll({ top: e.deltaY, behavior: 'smooth' });
+      if (scrollElement && wrapperElement) {
+        if (
+          Math.round(scrollElement.scrollHeight - scrollElement.scrollTop) >=
+            Math.round(scrollElement.clientHeight) &&
+          e.deltaY < 0
+        ) {
+          requestAnimationFrame(() =>
+            wrapperElement.scroll({
+              top: -footerRef.current!.clientHeight,
+              left: 0,
+              behavior: 'auto',
+            }),
+          );
+        }
+        if (
+          Math.round(scrollElement.scrollHeight - scrollElement.scrollTop) ===
+            Math.round(scrollElement.clientHeight) &&
+          wrapperElement.scrollTop - scrollElement.scrollTop <= 0 &&
+          e.deltaY > 0
+        ) {
+          requestAnimationFrame(() =>
+            wrapperElement.scroll({
+              top: footerRef.current!.clientHeight,
+              left: 0,
+              behavior: 'auto',
+            }),
+          );
         }
       }
     };
-
-    if (scrollRef.current && footerRef.current && side) {
+    if (scrollRef.current && footerRef.current && !isOneCol) {
       scrollRef.current?.addEventListener('wheel', handleWheelOnMain);
     } else {
       scrollRef.current?.removeEventListener('wheel', handleWheelOnMain);
     }
     return () => scrollRef.current?.removeEventListener('wheel', handleWheelOnMain);
-  }, [scrollRef.current, footerRef.current, side]);
+  }, [scrollRef.current, footerRef.current, isOneCol]);
 
   useEffect(() => {
-    setTwoCol(vw >= BREAKPOINTS.large);
-  }, [vw]);
+    setIsOneCol(!side || vw < BREAKPOINTS.large);
+  }, [vw, side]);
 
   return (
     <>
-      <WrapperStyled twoCol={twoCol && side} id="main-scroll">
-        <ScrollViewStyled scrollable={mainScrollable} id="scroll-view" ref={scrollRef}>
+      <WrapperStyled isOneCol={isOneCol} id="main-scroll">
+        <ScrollViewStyled scrollable={!isOneCol} id="scroll-view" ref={scrollRef}>
           {main}
         </ScrollViewStyled>
         {side && <SideBlockStyled>{side}</SideBlockStyled>}

diff --git a/packages/react-app/src/components/views/quest-list.tsx b/packages/react-app/src/components/views/quest-list.tsx
@@ -121,7 +121,7 @@ export default function QuestList() {
       pullDownToRefreshContent={<h3 className="center">&#8595; Pull down to refresh</h3>}
       releaseToRefreshContent={<h3 className="center">&#8593; Release to refresh</h3>}
       scrollableTarget="scroll-view"
-      scrollThreshold="50px"
+      scrollThreshold={0.5}
     >
       <div>
         {quests.map((x: QuestModel) => (