From 22360f3b87055baab2046df7bbd038fe0d3f10e3 Mon Sep 17 00:00:00 2001 From: Ryan Cohen Date: Wed, 24 Aug 2022 15:00:04 +0900 Subject: [PATCH] refactor: slideover redesign (#2973) --- src/components/Common/SlideOver/index.tsx | 26 ++++++++++----------- src/components/ManageSlideOver/index.tsx | 28 +++++++++++------------ 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/components/Common/SlideOver/index.tsx b/src/components/Common/SlideOver/index.tsx index 895745a9..079bd7a8 100644 --- a/src/components/Common/SlideOver/index.tsx +++ b/src/components/Common/SlideOver/index.tsx @@ -1,8 +1,8 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ -import Transition from '@app/components/Transition'; import { useLockBodyScroll } from '@app/hooks/useLockBodyScroll'; +import { Transition } from '@headlessui/react'; import { XIcon } from '@heroicons/react/outline'; -import { useEffect, useRef, useState } from 'react'; +import { Fragment, useEffect, useRef, useState } from 'react'; import ReactDOM from 'react-dom'; interface SlideOverProps { @@ -34,6 +34,7 @@ const SlideOver = ({ return ReactDOM.createPortal(
-
- + {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
e.stopPropagation()} > -
-
+
+
-

+

{title}

{subText && (
-

- {subText} -

+

{subText}

)}
@@ -100,7 +98,7 @@ const SlideOver = ({
-
+
diff --git a/src/components/ManageSlideOver/index.tsx b/src/components/ManageSlideOver/index.tsx index a2df65b0..87b96e3c 100644 --- a/src/components/ManageSlideOver/index.tsx +++ b/src/components/ManageSlideOver/index.tsx @@ -137,11 +137,11 @@ const ManageSlideOver = ({
{((data?.mediaInfo?.downloadStatus ?? []).length > 0 || (data?.mediaInfo?.downloadStatus4k ?? []).length > 0) && ( -
+ <>

{intl.formatMessage(messages.downloadstatus)}

-
+
    {data.mediaInfo?.downloadStatus?.map((status, index) => (
-
+ )} {hasPermission([Permission.MANAGE_ISSUES, Permission.VIEW_ISSUES], { type: 'or', @@ -171,7 +171,7 @@ const ManageSlideOver = ({

{intl.formatMessage(messages.manageModalIssues)}

-
+
    {openIssues.map((issue) => (
  • )} {requests.length > 0 && ( -
    + <>

    {intl.formatMessage(messages.manageModalRequests)}

    -
    +
      {requests.map((request) => (
    -
    + )} {hasPermission(Permission.ADMIN) && (data.mediaInfo?.serviceUrl || data.mediaInfo?.tautulliUrl || !!watchData?.data?.playCount) && ( -
    + <>

    {intl.formatMessage(messages.manageModalMedia)}

    @@ -219,13 +219,13 @@ const ManageSlideOver = ({ {!!watchData?.data && (
    -
    +
    {intl.formatMessage(messages.pastdays, { days: 7 })} @@ -320,7 +320,7 @@ const ManageSlideOver = ({ )}
    -
    + )} {hasPermission(Permission.ADMIN) && (data.mediaInfo?.serviceUrl4k || @@ -334,13 +334,13 @@ const ManageSlideOver = ({ {!!watchData?.data4k && (
    -
    +
    {intl.formatMessage(messages.pastdays, { days: 7 })} @@ -487,7 +487,7 @@ const ManageSlideOver = ({ {intl.formatMessage(messages.manageModalClearMedia)} -
    +
    {intl.formatMessage(messages.manageModalClearMediaWarning, { mediaType: intl.formatMessage( mediaType === 'movie' ? messages.movie : messages.tvshow