Merge pull request #1231 from podverse/develop

Release v4.15.7
podverse · Dec 16, 2023 · e411cee · e411cee
2 parents 92fa85f + b899061
commit e411cee
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "podverse-web",
-  "version": "4.15.6",
+  "version": "4.15.7",
   "description": "Web app for the Podverse podcast clip sharing ecosystem",
   "repository": {
     "type": "git",

diff --git a/src/components/Player/PlayerAPI/PlayerAPIVideo.scss b/src/components/Player/PlayerAPI/PlayerAPIVideo.scss
@@ -1,5 +1,5 @@
 .video-player-wrapper {
-  position: fixed;
+  position: fixed !important;
   bottom: 110px;
   right: 0;
   z-index: 1;

diff --git a/src/components/Player/PlayerAPI/PlayerAPIVideo.tsx b/src/components/Player/PlayerAPI/PlayerAPIVideo.tsx
@@ -16,9 +16,12 @@ import { OmniAuralState } from '~/state/omniauralState'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const PlayerVideo = require('react-player').default
 
-type Props = unknown
+type Props = {
+  isFullView: boolean
+}
 
 export const PlayerAPIVideo = (props: Props) => {
+  const { isFullView } = props
   const [player] = useOmniAural('player') as [OmniAuralState['player']]
   const [isResizing, setIsResizing] = useState(false)
   const [isDragging, setIsDragging] = useState(false)
@@ -144,15 +147,16 @@ export const PlayerAPIVideo = (props: Props) => {
   }
 
   const preventPlayPauseOnDragEnd = isDragging ? { pointerEvents: 'none' } : {}
-console.log('preventPlayPauseOnDragEnd', preventPlayPauseOnDragEnd)
+
   return (
-    <Draggable disabled={isResizing} onDrag={onDragStart} onStop={onDragStop}>
+    <Draggable disabled={isFullView || isResizing} onDrag={onDragStart} onStop={onDragStop}>
       <Resizable
         className='video-player-wrapper'
         defaultSize={{
           width: 390,
           height: 220
         }}
+        {...(isFullView ? { enable: false } : {})}
         lockAspectRatio
         minHeight={220}
         minWidth={390}

diff --git a/src/components/Player/PlayerFullView.scss b/src/components/Player/PlayerFullView.scss
@@ -19,7 +19,8 @@
     @include blurredBackground();
 
     .video-player-wrapper {
-      position: unset;
+      transform: translate(0px, 0px) !important;
+      position: unset !important;
       bottom: unset;
       right: unset;
       z-index: unset;

diff --git a/src/components/Player/PlayerFullView.tsx b/src/components/Player/PlayerFullView.tsx
@@ -126,7 +126,7 @@ export const PlayerFullView = ({ isEmbed, nowPlayingItem }: Props) => {
         </>
       )}
       <div className={imageWrapperClass}>
-        {isVideo && <PlayerAPIVideo />}
+        {isVideo && <PlayerAPIVideo isFullView={showFullView} />}
         {showFullView &&
           !isVideo &&
           (nowPlayingItem.clipLinkUrl ? (