@rxdrag/website-lib-core 0.0.109 → 0.0.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdrag/website-lib-core",
-  "version": "0.0.109",
+  "version": "0.0.110",
   "type": "module",
   "exports": {
     ".": "./index.ts"
@@ -25,8 +25,8 @@
     "eslint": "^7.32.0",
     "typescript": "^5",
     "@rxdrag/eslint-config-custom": "0.2.12",
-    "@rxdrag/tsconfig": "0.2.0",
-    "@rxdrag/slate-preview": "1.2.63"
+    "@rxdrag/slate-preview": "1.2.63",
+    "@rxdrag/tsconfig": "0.2.0"
   },
   "dependencies": {
     "@iconify/utils": "^3.0.2",
@@ -34,8 +34,8 @@
     "gsap": "^3.12.7",
     "hls.js": "^1.6.13",
     "lodash-es": "^4.17.21",
-    "@rxdrag/rxcms-models": "0.3.96",
-    "@rxdrag/entify-lib": "0.0.23"
+    "@rxdrag/entify-lib": "0.0.23",
+    "@rxdrag/rxcms-models": "0.3.96"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0",

package/src/react/components/ReactVideoPlayer.tsx

@@ -54,17 +54,21 @@ export const ReactVideoPlayer = forwardRef<
   const [isPlaying, setIsPlaying] = useState(false);
   const [isEnded, setIsEnded] = useState(false);
   const [isSourceReady, setIsSourceReady] = useState(false);
+  const sourceReadyRef = useRef(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const isEndedRef = useRef(false);
 
   const ensureSourceReady = useCallback(() => {
     const video = videoRef.current;
     const url = media.file?.original;
     if (!video || !url) return false;
-    if (isSourceReady) return true;
+    if (sourceReadyRef.current) return true;
 
     if (media.storageType === "cloudflare_stream") {
       if (!Hls.isSupported()) {
         if (video.canPlayType("application/vnd.apple.mpegurl")) {
           video.src = url;
+          sourceReadyRef.current = true;
           setIsSourceReady(true);
           return true;
         }
@@ -90,14 +94,16 @@ export const ReactVideoPlayer = forwardRef<
       hls.loadSource(url);
       hls.attachMedia(video);
       hlsRef.current = hls;
+      sourceReadyRef.current = true;
       setIsSourceReady(true);
       return true;
     }
 
     video.src = url;
+    sourceReadyRef.current = true;
     setIsSourceReady(true);
     return true;
-  }, [isSourceReady, media.file?.original, media.storageType]);
+  }, [media.file?.original, media.storageType]);
 
   const handleContainerClick = useCallback(
     (e: React.MouseEvent) => {
@@ -128,7 +134,12 @@ export const ReactVideoPlayer = forwardRef<
       const ok = ensureSourceReady();
       if (!ok) return;
 
-      v.play();
+      setIsLoading(true);
+
+      v.play().catch((error) => {
+        console.log("ReactVideoPlayer play() failed:", error);
+        setIsLoading(false);
+      });
     },
     [isPlaying, designMode, ensureSourceReady]
   );
@@ -137,6 +148,7 @@ export const ReactVideoPlayer = forwardRef<
     const video = videoRef.current;
     if (!video) return;
 
+    video.pause();
     if (hlsRef.current) {
       hlsRef.current.destroy();
       hlsRef.current = null;
@@ -144,20 +156,34 @@ export const ReactVideoPlayer = forwardRef<
     video.removeAttribute("src");
     video.load();
     setIsSourceReady(false);
+    sourceReadyRef.current = false;
 
     const onPlay = () => {
       setIsPlaying(true);
       setIsEnded(false);
+      isEndedRef.current = false;
+      setIsLoading(false);
     };
     const onPause = () => setIsPlaying(false);
     const onEnded = () => {
       setIsPlaying(false);
       setIsEnded(true);
+      isEndedRef.current = true;
+      setIsLoading(false);
+    };
+    const onWaiting = () => {
+      if (!isEndedRef.current) setIsLoading(true);
+    };
+    const onCanPlay = () => {
+      setIsLoading(false);
     };
 
     video.addEventListener("play", onPlay);
     video.addEventListener("pause", onPause);
     video.addEventListener("ended", onEnded);
+    video.addEventListener("waiting", onWaiting);
+    video.addEventListener("canplay", onCanPlay);
+    video.addEventListener("playing", onCanPlay);
 
     if (eagerLoad) {
       ensureSourceReady();
@@ -167,6 +193,9 @@ export const ReactVideoPlayer = forwardRef<
       video.removeEventListener("play", onPlay);
       video.removeEventListener("pause", onPause);
       video.removeEventListener("ended", onEnded);
+      video.removeEventListener("waiting", onWaiting);
+      video.removeEventListener("canplay", onCanPlay);
+      video.removeEventListener("playing", onCanPlay);
 
       if (hlsRef.current) {
         hlsRef.current.destroy();
@@ -202,7 +231,7 @@ export const ReactVideoPlayer = forwardRef<
         Your browser does not support video playback.
       </video>
 
-      {!isPlaying && !isEnded && (
+      {!isPlaying && !isEnded && !isLoading && (
         <button
           type="button"
           onClick={handlePlayClick}
@@ -243,6 +272,21 @@ export const ReactVideoPlayer = forwardRef<
         </button>
       )}
 
+      {!isPlaying && !isEnded && isLoading && (
+        <div
+          className={clsx(
+            "absolute inset-0 flex items-center justify-center w-full h-full rounded-lg z-10 bg-black/20",
+            classNames?.playButton
+          )}
+          onClick={(e) => e.stopPropagation()}
+        >
+          <div className="flex items-center gap-3 rounded-full bg-black/50 px-4 py-2 text-white">
+            <div className="h-4 w-4 animate-spin rounded-full border-2 border-white/30 border-t-white" />
+            <span className="text-sm">Loading...</span>
+          </div>
+        </div>
+      )}
+
       <div
         className={clsx(
           "absolute inset-0 bg-black/50 flex-col gap-6 items-center justify-center text-center text-white hidden z-10 rounded-2xl",
@@ -277,9 +321,13 @@ export const ReactVideoPlayer = forwardRef<
               if (!v) return;
               const ok = ensureSourceReady();
               if (!ok) return;
+              setIsLoading(true);
               v.currentTime = 0;
               setIsEnded(false);
-              v.play();
+              v.play().catch((error) => {
+                console.log("ReactVideoPlayer play() failed:", error);
+                setIsLoading(false);
+              });
             }}
           >
             Replay