Merge branch 'preview'

pdelfan · Jan 15, 2024 · 46c3205 · 46c3205
2 parents 61e3480 + 54211c3
commit 46c3205
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/components/actions/composeButton/ComposeButton.tsx b/src/components/actions/composeButton/ComposeButton.tsx
@@ -26,7 +26,7 @@ export default function ComposeButton(props: Props) {
       {mode === "float" && (
         <button
           onClick={() => openComposer({ mention: userHandle })}
-          className="z-40 p-3.5 rounded-full fixed md:hidden right-3 bottom-24 bg-primary text-white hover:bg-primary-dark outline-none"
+          className="z-40 p-3.5 rounded-full fixed md:hidden right-3 bottom-24 bg-primary text-white hover:bg-primary-dark outline-none ease-linear transition-all"
           style={{
             opacity: canUpdate ? `${100 - (val ?? 0)}%` : "none",
             transform: canUpdate ? `translateY(${val ?? 0}%)` : "none",

diff --git a/src/components/actions/refetch/Refetch.tsx b/src/components/actions/refetch/Refetch.tsx
@@ -19,7 +19,7 @@ export default function Refetch(props: Props) {
   return (
     <Button
       onClick={debouncedRefetch}
-      className="z-40 p-3 rounded-full fixed bottom-24 md:bottom-8 ml-3 md:ml-[0.80rem] border border-neutral-300 bg-white hover:bg-neutral-50 hover:-rotate-180"
+      className="z-40 p-3 rounded-full fixed bottom-24 md:bottom-8 ml-3 md:ml-[0.80rem] border border-neutral-300 bg-white hover:bg-neutral-50 hover:-rotate-180 ease-linear transition-all"
       style={{
         opacity: canUpdate ? `${100 - (val ?? 0)}%` : "none",
         transform: canUpdate ? `translateY(${val ?? 0}%)` : "none",

diff --git a/src/components/navigational/appBar/AppBar.tsx b/src/components/navigational/appBar/AppBar.tsx
@@ -29,7 +29,7 @@ export default function AppBar() {
 
   return (
     <nav
-      className="flex justify-between pb-8 pt-1 px-6 border-t gap-6 fixed bottom-0 z-40 w-full md:hidden bg-white overflow-auto"
+      className="flex justify-between pb-8 pt-1 px-6 border-t gap-6 fixed bottom-0 z-40 w-full md:hidden bg-white overflow-auto ease-linear transition-all"
       style={{
         opacity: canUpdate ? `${100 - (val ?? 0)}%` : "none",
         transform: canUpdate ? `translateY(${val ?? 0}%)` : "none",

diff --git a/src/components/navigational/feedTabs/FeedTabs.tsx b/src/components/navigational/feedTabs/FeedTabs.tsx
@@ -34,7 +34,7 @@ export default function FeedTabs() {
     <>
       <div className="z-40 hidden md:block fixed bg-white top-0 lg:p-5 md:p-5 max-w-xl w-full" />
       <div
-        className={`bg-white border-x-0 border-t-0 border-b md:border md:rounded-t-2xl overflow-x-hidden hover:overflow-x-auto md:opacity-100 sticky top-[3.2rem] md:top-6 z-50 md:z-50`}
+        className={`bg-white border-x-0 border-t-0 border-b md:border md:rounded-t-2xl overflow-x-hidden hover:overflow-x-auto md:opacity-100 sticky top-[3.2rem] md:top-6 z-50 md:z-50 ease-linear transition-all`}
         style={{
           opacity: canUpdate ? `${100 - (val ?? 0)}%` : "none",
           transform: canUpdate ? `translateY(-${val ?? 0}%)` : "none",

diff --git a/src/components/navigational/topBar/TopBar.tsx b/src/components/navigational/topBar/TopBar.tsx
@@ -20,7 +20,7 @@ export default function TopBar(props: Props) {
 
   return (
     <div
-      className="flex justify-between bg-white border-b px-3 py-2.5 sticky md:hidden top-0 z-50"
+      className="flex justify-between bg-white border-b px-3 py-2.5 sticky md:hidden top-0 z-50 ease-linear transition-all"
       style={{
         opacity: canUpdate ? `${100 - (val ?? 0)}%` : "none",
         transform: canUpdate ? `translateY(-${val ?? 0}%)` : "none",

diff --git a/src/lib/hooks/useScrollTranslation.tsx b/src/lib/hooks/useScrollTranslation.tsx
@@ -22,7 +22,7 @@ const useScrollTranslation = () => {
         return MAX;
       }
 
-      if (nextVal <= MIN) {
+      if (nextVal <= MIN || currY <= 0) {
         return MIN;
       }