@layers-app/editor-video 0.1.6 → 0.1.8

package/dist/index.js

@@ -5,11 +5,12 @@ import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { createContext, useState, useRef, useCallback, useMemo, useContext, forwardRef, createElement, useEffect } from "react";
 import { createCommand, $getNodeByKey, $setSelection, COMMAND_PRIORITY_LOW, DecoratorNode } from "lexical";
 import { useTranslation } from "react-i18next";
-import { Tooltip, ActionIcon, Text, Progress, Paper, Button, TextInput, Menu, Box, Slider, Flex, Select, Stack, Divider, Group, Textarea, Loader, Modal } from "@mantine/core";
+import { Tooltip, ActionIcon, Text, Progress, Paper, Button, TextInput, Menu, Box, Slider, Flex, useCombobox, Combobox, InputBase, Group, Stack, Divider, Textarea, Loader, Switch, Modal } from "@mantine/core";
 import { BlockWithAlignableContents } from "@lexical/react/LexicalBlockWithAlignableContents";
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
 import { Dropzone as Dropzone$1, IMAGE_MIME_TYPE } from "@mantine/dropzone";
 import ShakaPlayer from "shaka-player-react";
+import { IconChevronDown, IconCheck } from "@tabler/icons-react";
 import { Carousel } from "@mantine/carousel";
 const VideoContext = createContext(null);
 function VideoPluginProvider({
@@ -328,25 +329,34 @@ function setVideoSize(editor, nodeKey, width, height) {
   });
 }
 function setVideoPoster(editor, nodeKey, posterUrl) {
-  editor.update(() => {
-    const node = $getNodeByKey(nodeKey);
-    if (!node || !$isVideoNode(node)) return;
-    node.setPosterUrl(posterUrl || "");
-  });
+  editor.update(
+    () => {
+      const node = $getNodeByKey(nodeKey);
+      if (!node || !$isVideoNode(node)) return;
+      node.setPosterUrl(posterUrl || "");
+    },
+    { tag: "skip-scroll-into-view" }
+  );
 }
 function setVideoPrimaryUrl(editor, nodeKey, primaryUrl) {
-  editor.update(() => {
-    const node = $getNodeByKey(nodeKey);
-    if (!node || !$isVideoNode(node)) return;
-    node.setUrl(primaryUrl);
-  });
+  editor.update(
+    () => {
+      const node = $getNodeByKey(nodeKey);
+      if (!node || !$isVideoNode(node)) return;
+      node.setUrl(primaryUrl);
+    },
+    { tag: "skip-scroll-into-view" }
+  );
 }
 function setVideoChaptersDisabled(editor, nodeKey, disabled2) {
-  editor.update(() => {
-    const node = $getNodeByKey(nodeKey);
-    if (!node || !$isVideoNode(node)) return;
-    node.setChaptersDisabled(disabled2);
-  });
+  editor.update(
+    () => {
+      const node = $getNodeByKey(nodeKey);
+      if (!node || !$isVideoNode(node)) return;
+      node.setChaptersDisabled(disabled2);
+    },
+    { tag: "skip-scroll-into-view" }
+  );
 }
 function removeVideoNode(editor, nodeKey, deleteNode) {
   deleteNode(editor, nodeKey);
@@ -854,11 +864,6 @@ function useVideoTranscoding({
       const now = Date.now();
       if (!procStallReportedRef.current && lastProcChangeAtRef.current > 0 && now - lastProcChangeAtRef.current > STALL_TIMEOUT_MS$1) {
         procStallReportedRef.current = true;
-        console.warn("Processing stall detected", {
-          stage: proc.stage,
-          percent,
-          stalledMs: now - lastProcChangeAtRef.current
-        });
       }
       const monotonicPercent = Math.max(maxPercentRef.current, percent);
       maxPercentRef.current = monotonicPercent;
@@ -955,7 +960,26 @@ function useCancelUpload() {
 const DEFAULT_CHUNK_SIZE = 8 * 1024 * 1024;
 const STALL_TIMEOUT_MS = 3e4;
 const MAX_CONSECUTIVE_CONFLICTS = 3;
+const MAX_RETRIES_PER_CHUNK = 3;
+const MAX_TOTAL_RETRIES = 15;
+const RETRY_BASE_DELAY_MS = 3e3;
+function abortableSleep(ms, signal) {
+  return new Promise((resolve) => {
+    if (signal == null ? void 0 : signal.aborted) {
+      resolve();
+      return;
+    }
+    const id = setTimeout(resolve, ms);
+    signal == null ? void 0 : signal.addEventListener("abort", () => {
+      clearTimeout(id);
+      resolve();
+    }, { once: true });
+  });
+}
 function getBaseUrl() {
+  if (typeof window !== "undefined" && window.location.hostname === "dev-app.layers.md") {
+    return "https://api.layers.md";
+  }
   return "";
 }
 function getAuthHeaders$2() {
@@ -971,10 +995,13 @@ async function uploadChunkWithProgress(videoId, file, offset, end, total, baseUr
       onXhrReady(xhr);
     }
     if (signal) {
+      if (signal.aborted) {
+        reject(new Error("Upload cancelled"));
+        return;
+      }
       signal.addEventListener("abort", () => {
         xhr.abort();
-        reject(new Error("Upload cancelled"));
-      });
+      }, { once: true });
     }
     xhr.upload.addEventListener("progress", (e) => {
       if (e.lengthComputable && onProgress) {
@@ -987,18 +1014,30 @@ async function uploadChunkWithProgress(videoId, file, offset, end, total, baseUr
           const contentType = xhr.getResponseHeader("content-type") || "";
           const isJson = contentType.includes("application/json");
           const data = isJson ? JSON.parse(xhr.responseText) : xhr.responseText;
-          if (xhr.status === 409 && data && typeof data === "object" && "expectedOffset" in data) {
-            resolve({
-              expectedOffset: data.expectedOffset
-            });
-            return;
-          }
           resolve(
             typeof data === "object" && data !== null ? data : {}
           );
         } catch (error) {
           reject(error);
         }
+      } else if (xhr.status === 409) {
+        try {
+          const contentType = xhr.getResponseHeader("content-type") || "";
+          const isJson = contentType.includes("application/json");
+          const data = isJson ? JSON.parse(xhr.responseText) : {};
+          if (data && typeof data === "object" && "expectedOffset" in data) {
+            resolve({
+              expectedOffset: data.expectedOffset
+            });
+            return;
+          }
+        } catch {
+        }
+        reject({
+          status: xhr.status,
+          statusText: xhr.statusText,
+          data: { message: "Upload conflict" }
+        });
       } else {
         let errorData = {};
         try {
@@ -1035,9 +1074,7 @@ async function uploadChunkWithProgress(videoId, file, offset, end, total, baseUr
     Object.keys(headers).forEach((key) => {
       xhr.setRequestHeader(key, headers[key]);
     });
-    if (!baseUrl) {
-      xhr.withCredentials = true;
-    }
+    xhr.withCredentials = true;
     xhr.send(blob);
   });
 }
@@ -1073,13 +1110,16 @@ function useVideoUpload({
     isPaused: false,
     isPausing: false,
     currentXhr: null,
-    uploadSession: 0
+    chunkAbortController: null,
+    uploadSession: 0,
+    cancelled: false
   });
   const progressIntervalRef = useRef(
     null
   );
   const speedHistoryRef = useRef([]);
   const lastDisplayedRemainingRef = useRef(0);
+  const maxDisplayedPercentRef = useRef(0);
   const MAX_SPEED_HISTORY = 20;
   const EMA_ALPHA = 0.15;
   const emaSpeedRef = useRef(null);
@@ -1096,6 +1136,11 @@ function useVideoUpload({
       }
       const timeDiff = (now - state.lastTime) / 1e3;
       const uploadedDiff = uploaded - state.lastBytes;
+      if (uploadedDiff < 0) {
+        state.lastBytes = uploaded;
+        state.lastTime = now;
+        return { speed: emaSpeedRef.current ?? 0, remaining: lastDisplayedRemainingRef.current };
+      }
       if (timeDiff > 0 && !state.isPaused) {
         const instantSpeed = Math.max(0, uploadedDiff / timeDiff);
         speedHistoryRef.current.push(instantSpeed);
@@ -1134,10 +1179,12 @@ function useVideoUpload({
     (uploaded, total) => {
       const now = Date.now();
       const { speed, remaining } = calculateSpeed(uploaded, total, now);
-      const percent = Math.floor(uploaded * 100 / total);
+      const rawPercent = Math.floor(uploaded * 100 / total);
+      const percent = Math.max(rawPercent, maxDisplayedPercentRef.current);
+      maxDisplayedPercentRef.current = percent;
       setUploadProgress({
         percent,
-        uploaded,
+        uploaded: Math.max(uploaded, total * percent / 100),
         total,
         speed,
         remaining
@@ -1147,7 +1194,7 @@ function useVideoUpload({
   );
   const uploadFileChunks = useCallback(
     async (file, videoId, startOffset = 0) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const state = uploadStateRef.current;
       const total = file.size;
       let offset = Math.max(0, startOffset);
@@ -1170,6 +1217,8 @@ function useVideoUpload({
         }
       }, 1e3);
       let consecutiveConflicts = 0;
+      let chunkRetries = 0;
+      let totalRetries = 0;
       let hasSuccessfulChunk = false;
       if (offset > 0) {
         updateProgress(offset, total);
@@ -1177,7 +1226,7 @@ function useVideoUpload({
         updateProgress(0, total);
       }
       while (offset < total) {
-        if ((_a = state.signal) == null ? void 0 : _a.aborted) {
+        if (state.cancelled || ((_a = state.signal) == null ? void 0 : _a.aborted)) {
           throw new Error("Upload cancelled");
         }
         if (state.isPaused) {
@@ -1192,13 +1241,17 @@ function useVideoUpload({
         const nowStall = Date.now();
         if (!state.uploadStallReported && nowStall - state.lastUploadAckAt > STALL_TIMEOUT_MS) {
           state.uploadStallReported = true;
-          console.warn("Upload stall detected", {
-            atOffset: offset,
-            stalledMs: nowStall - state.lastUploadAckAt
-          });
         }
         const end = Math.min(total - 1, offset + chunkSize - 1);
         const chunkStartOffset = offset;
+        const chunkAc = new AbortController();
+        state.chunkAbortController = chunkAc;
+        const forwardAbort = () => chunkAc.abort();
+        if (((_b = state.signal) == null ? void 0 : _b.aborted) || state.cancelled) {
+          chunkAc.abort();
+        } else if (state.signal) {
+          state.signal.addEventListener("abort", forwardAbort, { once: true });
+        }
         try {
           const response = await uploadChunkWithProgress(
             videoId,
@@ -1208,7 +1261,7 @@ function useVideoUpload({
             total,
             baseUrl,
             authHeaders,
-            state.signal || void 0,
+            chunkAc.signal,
             (loaded) => {
               if (state.isPaused || state.isPausing) return;
               const estimatedOffset = chunkStartOffset + loaded;
@@ -1220,13 +1273,11 @@ function useVideoUpload({
               state.currentXhr = xhr;
             }
           );
+          state.chunkAbortController = null;
+          state.currentXhr = null;
+          (_c = state.signal) == null ? void 0 : _c.removeEventListener("abort", forwardAbort);
           if (response.expectedOffset != null) {
             consecutiveConflicts++;
-            console.warn("Offset mismatch detected", {
-              expectedOffset: response.expectedOffset,
-              hadOffset: offset,
-              attempt: consecutiveConflicts
-            });
             if (consecutiveConflicts >= MAX_CONSECUTIVE_CONFLICTS) {
               throw {
                 status: 409,
@@ -1238,10 +1289,14 @@ function useVideoUpload({
             continue;
           }
           consecutiveConflicts = 0;
+          chunkRetries = 0;
           hasSuccessfulChunk = true;
           offset = response.nextOffset != null ? response.nextOffset : end + 1;
+          if (offset < total) {
+            await abortableSleep(500, state.signal ?? void 0);
+          }
           state.currentOffset = offset;
-          state.currentXhr = null;
+          state.chunkAbortController = null;
           state.lastUploadAckAt = Date.now();
           state.uploadStallReported = false;
           if (!state.isPaused && !state.isPausing) {
@@ -1255,26 +1310,54 @@ function useVideoUpload({
           }
         } catch (error) {
           state.currentXhr = null;
+          state.chunkAbortController = null;
+          (_d = state.signal) == null ? void 0 : _d.removeEventListener("abort", forwardAbort);
           if (state.isPaused || state.isPausing) {
             state.isPausing = false;
+            state.isPaused = true;
             break;
           }
-          if ((error == null ? void 0 : error.name) === "AbortError" || ((_b = state.signal) == null ? void 0 : _b.aborted)) {
+          if ((error == null ? void 0 : error.name) === "AbortError" || ((_e = state.signal) == null ? void 0 : _e.aborted) || state.cancelled) {
             throw new Error("Upload cancelled");
           }
-          if ((error == null ? void 0 : error.status) === 409 && ((_c = error == null ? void 0 : error.data) == null ? void 0 : _c.expectedOffset) != null) {
+          if ((error == null ? void 0 : error.status) === 409 && ((_f = error == null ? void 0 : error.data) == null ? void 0 : _f.expectedOffset) != null) {
             consecutiveConflicts++;
-            console.warn("Offset conflict in error handler", {
-              expectedOffset: error.data.expectedOffset,
-              hadOffset: offset,
-              attempt: consecutiveConflicts
-            });
             if (consecutiveConflicts >= MAX_CONSECUTIVE_CONFLICTS) {
               throw error;
             }
             offset = error.data.expectedOffset;
             continue;
           }
+          const isNetworkError = !(error == null ? void 0 : error.status) || (error == null ? void 0 : error.status) === 0 || (error == null ? void 0 : error.status) === 409;
+          if (isNetworkError && chunkRetries < MAX_RETRIES_PER_CHUNK && totalRetries < MAX_TOTAL_RETRIES) {
+            chunkRetries++;
+            totalRetries++;
+            const delay = RETRY_BASE_DELAY_MS * chunkRetries;
+            await abortableSleep(delay, state.signal ?? void 0);
+            if (state.cancelled || ((_g = state.signal) == null ? void 0 : _g.aborted) || state.isPaused || state.isPausing) {
+              break;
+            }
+            try {
+              const currentStatus = await fetchStatus(videoId, baseUrl, authHeaders);
+              if (((_h = currentStatus.upload) == null ? void 0 : _h.nextOffset) != null) {
+                const serverOffset = currentStatus.upload.nextOffset;
+                if (serverOffset === offset && chunkRetries >= 2) {
+                  await abortableSleep(5e3, state.signal ?? void 0);
+                  const recheck = await fetchStatus(videoId, baseUrl, authHeaders);
+                  if (((_i = recheck.upload) == null ? void 0 : _i.nextOffset) != null && recheck.upload.nextOffset > offset) {
+                    offset = recheck.upload.nextOffset;
+                    state.currentOffset = offset;
+                    chunkRetries = 0;
+                    continue;
+                  }
+                }
+                offset = serverOffset;
+                state.currentOffset = serverOffset;
+              }
+            } catch {
+            }
+            continue;
+          }
           throw error;
         }
       }
@@ -1303,7 +1386,15 @@ function useVideoUpload({
   );
   const handleUpload = useCallback(
     async (file) => {
-      var _a, _b;
+      var _a, _b, _c, _d, _e, _f;
+      const state0 = uploadStateRef.current;
+      if (state0.isPaused || state0.isPausing) {
+        state0.isPaused = false;
+        state0.isPausing = false;
+        state0.cancelled = true;
+        state0.videoId = null;
+        state0.attachmentId = null;
+      }
       setIsUploading(true);
       setIsPaused(false);
       const state = uploadStateRef.current;
@@ -1311,11 +1402,13 @@ function useVideoUpload({
       const mySession = state.uploadSession;
       state.isPaused = false;
       state.isPausing = false;
+      state.cancelled = false;
       state.file = file;
       state.currentOffset = 0;
       state.lastTime = 0;
       state.lastBytes = 0;
       state.uploadStallReported = false;
+      maxDisplayedPercentRef.current = 0;
       state.signal = start();
       try {
         if (!parentId) {
@@ -1338,19 +1431,19 @@ function useVideoUpload({
             state.videoId = videoId;
             state.attachmentId = attachmentId;
             setUploadVideoId(videoId);
-            if (initResponse.status) {
-              const status = initResponse.status;
-              if (((_a = status.upload) == null ? void 0 : _a.nextOffset) != null) {
-                startOffset = status.upload.nextOffset;
+            try {
+              const verifiedStatus = await fetchStatus(videoId, baseUrl, authHeaders);
+              if (((_a = verifiedStatus.upload) == null ? void 0 : _a.nextOffset) != null && verifiedStatus.upload.nextOffset > 0) {
+                startOffset = verifiedStatus.upload.nextOffset;
+              } else if (((_c = (_b = initResponse.status) == null ? void 0 : _b.upload) == null ? void 0 : _c.nextOffset) != null) {
+                startOffset = initResponse.status.upload.nextOffset;
+              }
+            } catch {
+              if (((_e = (_d = initResponse.status) == null ? void 0 : _d.upload) == null ? void 0 : _e.nextOffset) != null) {
+                startOffset = initResponse.status.upload.nextOffset;
               }
             }
           } catch (initError) {
-            console.error("Init video error:", {
-              status: initError == null ? void 0 : initError.status,
-              statusText: initError == null ? void 0 : initError.statusText,
-              data: initError == null ? void 0 : initError.data,
-              error: initError
-            });
             throw initError;
           }
         } else {
@@ -1360,7 +1453,7 @@ function useVideoUpload({
               baseUrl,
               authHeaders
             );
-            if (((_b = status.upload) == null ? void 0 : _b.nextOffset) != null) {
+            if (((_f = status.upload) == null ? void 0 : _f.nextOffset) != null) {
               startOffset = status.upload.nextOffset;
             } else {
               videoId = null;
@@ -1415,20 +1508,14 @@ function useVideoUpload({
         if (state.isPaused || state.isPausing) {
           return;
         }
-        console.error("Upload error:", (error == null ? void 0 : error.message) || error);
         if ((error == null ? void 0 : error.message) === "Upload cancelled") {
           return;
         }
         if ((error == null ? void 0 : error.status) === 409) {
           onError("offset-mismatch", uploadStateRef.current.videoId, error);
         } else if (error == null ? void 0 : error.status) {
-          console.error(
-            `API error: ${error.status} ${error.statusText}`,
-            error.data
-          );
           onError("interrupted", uploadStateRef.current.videoId, error);
         } else {
-          console.error("Unknown upload error:", error);
           onError("interrupted", uploadStateRef.current.videoId, error);
         }
         setIsUploading(false);
@@ -1453,15 +1540,15 @@ function useVideoUpload({
       return;
     }
     state.isPausing = true;
-    state.isPaused = true;
     setIsPaused(true);
     if (progressIntervalRef.current) {
       clearInterval(progressIntervalRef.current);
       progressIntervalRef.current = null;
     }
-    if (state.currentXhr) {
-      state.currentXhr.abort();
+    if (state.chunkAbortController) {
+      state.chunkAbortController.abort();
     } else {
+      state.isPaused = true;
       state.isPausing = false;
     }
   }, []);
@@ -1499,6 +1586,7 @@ function useVideoUpload({
         setIsPaused(false);
         state.isPaused = false;
         state.isPausing = false;
+        state.cancelled = false;
         await uploadFileChunks(state.file, state.videoId, startOffset);
         if (state.uploadSession !== mySession) return;
         if (!state.isPaused && !state.isPausing && state.videoId) {
@@ -1513,7 +1601,7 @@ function useVideoUpload({
         if ((error == null ? void 0 : error.message) === "Upload cancelled") {
           return;
         }
-        if (((error == null ? void 0 : error.status) === 0 || (error == null ? void 0 : error.status) === 409) && state.file) {
+        if (((error == null ? void 0 : error.status) === 0 || (error == null ? void 0 : error.status) === 409) && state.file && !state.cancelled) {
           state.videoId = null;
           state.attachmentId = null;
           handleUpload(state.file);
@@ -1532,10 +1620,14 @@ function useVideoUpload({
   }, [baseUrl, authHeaders, uploadFileChunks, onError, start, handleUpload]);
   const handleCancel = useCallback(() => {
     const state = uploadStateRef.current;
-    cancelUpload();
-    if (state.signal) {
-      state.signal = null;
+    if (state.chunkAbortController) {
+      try {
+        state.chunkAbortController.abort();
+      } catch {
+      }
     }
+    state.cancelled = true;
+    cancelUpload();
     if (progressIntervalRef.current) {
       clearInterval(progressIntervalRef.current);
       progressIntervalRef.current = null;
@@ -1559,7 +1651,9 @@ function useVideoUpload({
     state.isPaused = false;
     state.isPausing = false;
     state.currentXhr = null;
+    state.chunkAbortController = null;
     speedHistoryRef.current = [];
+    maxDisplayedPercentRef.current = 0;
     setUploadVideoId(null);
   }, [cancelUpload]);
   return {
@@ -1669,7 +1763,7 @@ function CheckCircleIcon({
           "path",
           {
             d: "M16 1.66699C23.916 1.66699 30.333 8.08391 30.333 16C30.333 23.916 23.916 30.333 16 30.333C8.08391 30.333 1.66699 23.916 1.66699 16C1.66699 8.08392 8.08392 1.66699 16 1.66699Z",
-            fill: "var(--mantine-primary-color-filled, #3B5BDB)"
+            fill: "var(--mantine-primary-color-filled, #4c6ef5)"
           }
         ),
         /* @__PURE__ */ jsx(
@@ -1816,7 +1910,7 @@ function ProgressBar({
         "%"
       ] }),
       isPaused ? /* @__PURE__ */ jsx(Text, { size: "sm", c: "var(--mantine-color-text)", children: t("editor.video.actions.pause") }) : showRemaining && progress.remaining > 0 && /* @__PURE__ */ jsxs(Text, { size: "sm", c: "var(--mantine-color-dimmed)", children: [
-        "Remaining:",
+        t("editor.video.upload.remaining"),
         /* @__PURE__ */ jsxs(Text, { component: "span", c: "var(--mantine-color-text)", children: [
           " ",
           formatTime2(progress.remaining)
@@ -1826,7 +1920,7 @@ function ProgressBar({
     /* @__PURE__ */ jsx(Progress, { value: clampedPercent, size: 6, radius: "md" }),
     showInfo && /* @__PURE__ */ jsxs("div", { className: "video-upload-progress-info", children: [
       /* @__PURE__ */ jsxs(Text, { size: "xs", c: "dimmed", children: [
-        "Uploading:",
+        t("editor.video.upload.progress"),
         /* @__PURE__ */ jsxs(Text, { component: "span", size: "xs", c: "var(--mantine-color-text)", inherit: true, children: [
           " ",
           formatBytes(progress.uploaded),
@@ -2413,6 +2507,7 @@ function UploadState({
   onCancel,
   isPaused = false
 }) {
+  const { t } = useTranslation();
   return /* @__PURE__ */ jsxs(
     Paper,
     {
@@ -2481,7 +2576,7 @@ function UploadState({
                         ]
                       }
                     ),
-                    /* @__PURE__ */ jsx(Text, { size: "md", fw: 500, c: "var(--mantine-color-bright)", children: "Uploading File" })
+                    /* @__PURE__ */ jsx(Text, { size: "md", fw: 500, c: "var(--mantine-color-bright)", children: t("editor.video.upload.uploading") })
                   ]
                 }
               ),
@@ -2953,6 +3048,138 @@ function VideoSpeedMenu({
     }
   );
 }
+function buildApiUrl$1(path, baseUrl) {
+  if (path.startsWith("http://") || path.startsWith("https://")) {
+    return path;
+  }
+  const base = baseUrl || (typeof window !== "undefined" ? window.location.origin : "");
+  return `${base}${path}`;
+}
+function getAuthHeaders$1(authToken) {
+  if (!authToken) return {};
+  return { Authorization: `Bearer ${authToken}` };
+}
+async function parseJson$1(response) {
+  const text = await response.text();
+  if (!text) return null;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+async function handleResponse$1(response) {
+  if (!response.ok) {
+    const data = await parseJson$1(response);
+    const message = (data && typeof data === "object" && "message" in data ? data.message : null) || response.statusText || "Request failed";
+    throw new Error(message);
+  }
+  return parseJson$1(response);
+}
+function normalizeSubtitleTrack(raw) {
+  const id = (raw == null ? void 0 : raw.id) ?? (raw == null ? void 0 : raw.trackId) ?? (raw == null ? void 0 : raw.subtitleId) ?? "";
+  const langRaw = (raw == null ? void 0 : raw.lang) ?? (raw == null ? void 0 : raw.language) ?? (raw == null ? void 0 : raw.srclang) ?? "";
+  const lang = langRaw ? String(langRaw) : "und";
+  const labelRaw = (raw == null ? void 0 : raw.label) ?? (raw == null ? void 0 : raw.name) ?? (raw == null ? void 0 : raw.title) ?? lang;
+  const label = labelRaw ? String(labelRaw) : lang;
+  const kind = (raw == null ? void 0 : raw.kind) ?? "subtitles";
+  const isDefault = Boolean((raw == null ? void 0 : raw.isDefault) ?? (raw == null ? void 0 : raw.default) ?? false);
+  const isDisabled = Boolean((raw == null ? void 0 : raw.isDisabled) ?? false);
+  const url = typeof (raw == null ? void 0 : raw.url) === "string" ? raw.url : typeof (raw == null ? void 0 : raw.vttUrl) === "string" ? raw.vttUrl : typeof (raw == null ? void 0 : raw.src) === "string" ? raw.src : void 0;
+  const createdAt = typeof (raw == null ? void 0 : raw.createdAt) === "string" ? raw.createdAt : void 0;
+  const fileName = typeof (raw == null ? void 0 : raw.fileName) === "string" ? raw.fileName : void 0;
+  const auto = Boolean((raw == null ? void 0 : raw.auto) ?? (raw == null ? void 0 : raw.isAuto) ?? (raw == null ? void 0 : raw.source) === "auto");
+  return {
+    id: String(id),
+    lang,
+    label,
+    kind: String(kind),
+    isDefault,
+    isDisabled,
+    url,
+    createdAt,
+    fileName,
+    status: "ready",
+    auto
+  };
+}
+function isAutoGeneratedTrack(track) {
+  return track.label.length <= 3;
+}
+async function listTracks(videoId, options = {}) {
+  const url = buildApiUrl$1(`/v1/videos/${videoId}/subtitles`, options.baseUrl);
+  const response = await fetch(url, {
+    method: "GET",
+    credentials: "include",
+    headers: {
+      ...getAuthHeaders$1(options.authToken)
+    }
+  });
+  const data = await handleResponse$1(response);
+  const rawTracks = Array.isArray(data) ? data : Array.isArray(data == null ? void 0 : data.tracks) ? data.tracks : [];
+  return rawTracks.map(normalizeSubtitleTrack).filter((track) => track.id);
+}
+async function uploadTrack(videoId, file, uploadOptions, options = {}) {
+  const params = new URLSearchParams();
+  params.set("lang", uploadOptions.lang);
+  if (uploadOptions.label) {
+    params.set("label", uploadOptions.label);
+  }
+  if (uploadOptions.kind) {
+    params.set("kind", uploadOptions.kind);
+  }
+  {
+    params.set("default", "false");
+  }
+  const url = buildApiUrl$1(
+    `/v1/videos/${videoId}/subtitles?${params.toString()}`,
+    options.baseUrl
+  );
+  const formData = new FormData();
+  formData.append("file", file);
+  const response = await fetch(url, {
+    method: "POST",
+    credentials: "include",
+    headers: {
+      ...getAuthHeaders$1(options.authToken)
+    },
+    body: formData,
+    signal: uploadOptions.signal
+  });
+  const data = await handleResponse$1(response);
+  if (!data) return null;
+  return normalizeSubtitleTrack(data);
+}
+async function patchTrackDisabled(videoId, trackId, isDisabled, options = {}) {
+  const url = buildApiUrl$1(
+    `/v1/videos/${videoId}/subtitles/${trackId}/disabled`,
+    options.baseUrl
+  );
+  const response = await fetch(url, {
+    method: "PATCH",
+    credentials: "include",
+    headers: {
+      "Content-Type": "application/json",
+      ...getAuthHeaders$1(options.authToken)
+    },
+    body: JSON.stringify({ isDisabled })
+  });
+  await handleResponse$1(response);
+}
+async function deleteTrack(videoId, trackId, options = {}) {
+  const url = buildApiUrl$1(
+    `/v1/videos/${videoId}/subtitles/${trackId}`,
+    options.baseUrl
+  );
+  const response = await fetch(url, {
+    method: "DELETE",
+    credentials: "include",
+    headers: {
+      ...getAuthHeaders$1(options.authToken)
+    }
+  });
+  await handleResponse$1(response);
+}
 const LANG_NAMES = {
   en: "English",
   es: "Español",
@@ -2988,7 +3215,7 @@ function VideoSubtitlesMenu({
   const items = settings.subtitles.map((item) => {
     const isActive = item.id === settings.currentSubtitleId;
     let label = item.label;
-    if (item.isDefault) {
+    if (isAutoGeneratedTrack({ label })) {
       const fullName = item.lang ? LANG_NAMES[item.lang.toLowerCase()] : null;
       if (fullName) label = fullName;
       label = `${label} (${autoLabel})`;
@@ -3176,8 +3403,8 @@ function VideoCustomControls({
   const visibleBufferedRanges = isProcessing ? [] : bufferedRanges;
   const sortedChapters = useMemo(() => {
     if (!chapters || chapters.length === 0) return [];
-    return [...chapters].sort((a, b) => a.startSec - b.startSec);
-  }, [chapters]);
+    return [...chapters].filter((ch) => duration > 0 && ch.startSec <= duration).sort((a, b) => a.startSec - b.startSec);
+  }, [chapters, duration]);
   const chapterSegments = useMemo(() => {
     if (sortedChapters.length === 0 || duration <= 0) return [];
     const segments = [];
@@ -3538,10 +3765,6 @@ function VideoCustomControls({
                       className: "video-player-button",
                       type: "button",
                       "aria-label": t("editor.video.player.settings"),
-                      onClick: () => {
-                        setIsSettingsOpen((prev) => !prev);
-                        setActiveMenu("main");
-                      },
                       children: /* @__PURE__ */ jsx(SettingsPlayerIcon, { size: 20 })
                     }
                   ) }),
@@ -3579,6 +3802,7 @@ function VideoCustomControls({
                       onSelect: (speed) => {
                         setOptimisticSpeed(speed);
                         onSpeedClick(speed);
+                        setIsSettingsOpen(false);
                       }
                     }
                   ),
@@ -3588,7 +3812,10 @@ function VideoCustomControls({
                       disabled: isSettingsDisabled,
                       settings,
                       onBack: () => setActiveMenu("main"),
-                      onSelect: onSubtitleSelect
+                      onSelect: (subtitleId) => {
+                        onSubtitleSelect(subtitleId);
+                        setIsSettingsOpen(false);
+                      }
                     }
                   ),
                   activeMenu === "quality" && /* @__PURE__ */ jsx(
@@ -3597,7 +3824,10 @@ function VideoCustomControls({
                       disabled: isSettingsDisabled,
                       settings,
                       onBack: () => setActiveMenu("main"),
-                      onSelect: onQualityClick
+                      onSelect: (qualityId) => {
+                        onQualityClick(qualityId);
+                        setIsSettingsOpen(false);
+                      }
                     }
                   )
                 ]
@@ -3772,141 +4002,21 @@ const setSubtitle = (player, id, videoElement) => {
     track.mode = index === id ? "showing" : "disabled";
   });
 };
-function buildApiUrl$1(path, baseUrl) {
-  if (path.startsWith("http://") || path.startsWith("https://")) {
-    return path;
+function normalizeUrl(url, baseUrl) {
+  if (!url) return null;
+  if (url.startsWith("http://") || url.startsWith("https://")) {
+    return url;
   }
-  const base = baseUrl || (typeof window !== "undefined" ? window.location.origin : "");
-  return `${base}${path}`;
-}
-function getAuthHeaders$1(authToken) {
-  if (!authToken) return {};
-  return { Authorization: `Bearer ${authToken}` };
-}
-async function parseJson$1(response) {
-  const text = await response.text();
-  if (!text) return null;
-  try {
-    return JSON.parse(text);
-  } catch {
-    return text;
+  if (url.startsWith("/")) {
+    const base = baseUrl || window.location.origin;
+    return `${base}${url}`;
   }
+  return url;
 }
-async function handleResponse$1(response) {
-  if (!response.ok) {
-    const data = await parseJson$1(response);
-    const message = (data && typeof data === "object" && "message" in data ? data.message : null) || response.statusText || "Request failed";
-    throw new Error(message);
-  }
-  return parseJson$1(response);
-}
-function normalizeSubtitleTrack(raw) {
-  const id = (raw == null ? void 0 : raw.id) ?? (raw == null ? void 0 : raw.trackId) ?? (raw == null ? void 0 : raw.subtitleId) ?? "";
-  const langRaw = (raw == null ? void 0 : raw.lang) ?? (raw == null ? void 0 : raw.language) ?? (raw == null ? void 0 : raw.srclang) ?? "";
-  const lang = langRaw ? String(langRaw) : "und";
-  const labelRaw = (raw == null ? void 0 : raw.label) ?? (raw == null ? void 0 : raw.name) ?? (raw == null ? void 0 : raw.title) ?? lang;
-  const label = labelRaw ? String(labelRaw) : lang;
-  const kind = (raw == null ? void 0 : raw.kind) ?? "subtitles";
-  const isDefault = Boolean((raw == null ? void 0 : raw.isDefault) ?? (raw == null ? void 0 : raw.default) ?? false);
-  const url = typeof (raw == null ? void 0 : raw.url) === "string" ? raw.url : typeof (raw == null ? void 0 : raw.vttUrl) === "string" ? raw.vttUrl : typeof (raw == null ? void 0 : raw.src) === "string" ? raw.src : void 0;
-  const createdAt = typeof (raw == null ? void 0 : raw.createdAt) === "string" ? raw.createdAt : void 0;
-  const fileName = typeof (raw == null ? void 0 : raw.fileName) === "string" ? raw.fileName : void 0;
-  const auto = Boolean((raw == null ? void 0 : raw.auto) ?? (raw == null ? void 0 : raw.isAuto) ?? (raw == null ? void 0 : raw.source) === "auto");
-  return {
-    id: String(id),
-    lang,
-    label,
-    kind: String(kind),
-    isDefault,
-    url,
-    createdAt,
-    fileName,
-    status: "ready",
-    auto
-  };
-}
-async function uploadTrack(videoId, file, uploadOptions, options = {}) {
-  const params = new URLSearchParams();
-  params.set("lang", uploadOptions.lang);
-  if (uploadOptions.label) {
-    params.set("label", uploadOptions.label);
-  }
-  if (uploadOptions.kind) {
-    params.set("kind", uploadOptions.kind);
-  }
-  {
-    params.set("default", "false");
-  }
-  const url = buildApiUrl$1(
-    `/v1/videos/${videoId}/subtitles?${params.toString()}`,
-    options.baseUrl
-  );
-  const formData = new FormData();
-  formData.append("file", file);
-  const response = await fetch(url, {
-    method: "POST",
-    credentials: "include",
-    headers: {
-      ...getAuthHeaders$1(options.authToken)
-    },
-    body: formData,
-    signal: uploadOptions.signal
-  });
-  const data = await handleResponse$1(response);
-  if (!data) return null;
-  return normalizeSubtitleTrack(data);
-}
-function getVttUrl(videoId, trackId, options = {}) {
-  return buildApiUrl$1(
-    `/v1/videos/${videoId}/subtitles/${trackId}.vtt`,
-    options.baseUrl
-  );
-}
-function normalizeUrl$1(path, baseUrl) {
-  if (path.startsWith("http://") || path.startsWith("https://")) {
-    return path;
-  }
-  const base = baseUrl || (typeof window !== "undefined" ? window.location.origin : "");
-  if (path.startsWith("/")) {
-    return `${base}${path}`;
-  }
-  return `${base}/${path}`;
-}
-function resolveSubtitleUrl(videoId, track, options = {}) {
-  if (track.url) {
-    return normalizeUrl$1(track.url, options.baseUrl);
-  }
-  return getVttUrl(videoId, track.id, options);
-}
-async function deleteTrack(videoId, trackId, options = {}) {
-  const url = buildApiUrl$1(
-    `/v1/videos/${videoId}/subtitles/${trackId}`,
-    options.baseUrl
-  );
-  const response = await fetch(url, {
-    method: "DELETE",
-    credentials: "include",
-    headers: {
-      ...getAuthHeaders$1(options.authToken)
-    }
-  });
-  await handleResponse$1(response);
-}
-function normalizeUrl(url, baseUrl) {
-  if (!url) return null;
-  if (url.startsWith("http://") || url.startsWith("https://")) {
-    return url;
-  }
-  if (url.startsWith("/")) {
-    const base = baseUrl || window.location.origin;
-    return `${base}${url}`;
-  }
-  return url;
-}
-function getNativeSubtitleTracks(videoElement) {
-  return Array.from(videoElement.textTracks || []).filter(
-    (track) => track.kind === "subtitles" || track.kind === "captions"
-  );
+function getNativeSubtitleTracks(videoElement) {
+  return Array.from(videoElement.textTracks || []).filter(
+    (track) => track.kind === "subtitles" || track.kind === "captions"
+  );
 }
 function getSubtitleUrl(track, baseUrl) {
   if (!track.url) return null;
@@ -3926,7 +4036,8 @@ function VideoPlayerState({
   subtitles,
   isProcessing = false,
   posterUrl,
-  onPlayerInfo
+  onPlayerInfo,
+  onFallback
 }) {
   const { t, i18n } = useTranslation();
   const [currentVideoUrl, setCurrentVideoUrl] = useState(null);
@@ -3953,6 +4064,9 @@ function VideoPlayerState({
   );
   const shakaAddedIdsRef = useRef([]);
   const shakaFilterRegisteredRef = useRef(false);
+  const triedFallbackUrlsRef = useRef(/* @__PURE__ */ new Set());
+  const hlsUrlCheckedRef = useRef(null);
+  const savedStateLockRef = useRef(false);
   useEffect(() => {
     if (!language) {
       return;
@@ -3966,16 +4080,17 @@ function VideoPlayerState({
       return;
     }
     if (subtitles != null) {
-      const normalized = (subtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id);
+      const normalized = (subtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id && !track.isDisabled);
       setSubtitleTracks(normalized);
     }
   }, [videoId, subtitles]);
   useEffect(() => {
     setIsAutoQualityEnabled(true);
+    hlsUrlCheckedRef.current = null;
   }, [videoId]);
   const handleSubtitlesOpen = useCallback(() => {
     if (!videoId || subtitles == null) return;
-    const normalized = (subtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id);
+    const normalized = (subtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id && !track.isDisabled);
     setSubtitleTracks(normalized);
   }, [videoId, subtitles]);
   useEffect(() => {
@@ -4082,102 +4197,148 @@ function VideoPlayerState({
     selectedSubtitleMeta
   ]);
   useEffect(() => {
-    var _a;
-    if (!currentVideoUrl || !((_a = playerRef.current) == null ? void 0 : _a.player)) {
-      return;
-    }
-    const player = playerRef.current.player;
-    if (errorHandlerRef.current) {
-      try {
-        player.removeEventListener("error", errorHandlerRef.current);
-      } catch (e) {
-        console.warn("Error removing old event listener:", e);
+    if (!currentVideoUrl) return;
+    let cancelled = false;
+    let player = null;
+    const handleFatalError = (error) => {
+      if (cancelled) return;
+      const fallback = normalizeUrl(nativeVideoUrl, baseUrl) || normalizeUrl(rawUrl ?? null, baseUrl);
+      if (fallback) {
+        setHlsFailed(true);
+        onFallback == null ? void 0 : onFallback(true);
+      } else {
+        setPlayerError(
+          t("editor.video.player.playbackError", { code: error.code })
+        );
       }
-    }
+    };
     const errorHandler = (event) => {
       const error = event.detail;
-      console.error("Shaka Player error:", {
-        code: error.code,
-        category: error.category,
-        severity: error.severity,
-        data: error.data
-      });
       if (error.severity === 2) {
-        const fallback = normalizeUrl(nativeVideoUrl, baseUrl) || normalizeUrl(rawUrl ?? null, baseUrl);
-        if (fallback) {
-          console.warn(
-            `[VideoPlayer] HLS failed (code=${error.code}), falling back to native video:`,
-            fallback
-          );
-          setHlsFailed(true);
-        } else {
-          setPlayerError(
-            t("editor.video.player.playbackError", { code: error.code })
-          );
-        }
+        handleFatalError(error);
       } else {
         try {
-          player.recover();
-        } catch (recoverError) {
-          console.error("Failed to recover from error:", recoverError);
+          player == null ? void 0 : player.recover();
+        } catch {
         }
       }
     };
-    errorHandlerRef.current = errorHandler;
-    player.addEventListener("error", errorHandler);
+    const tryLoad = () => {
+      var _a;
+      player = (_a = playerRef.current) == null ? void 0 : _a.player;
+      if (!player) {
+        const raf2 = requestAnimationFrame(tryLoad);
+        return () => cancelAnimationFrame(raf2);
+      }
+      if (errorHandlerRef.current) {
+        try {
+          player.removeEventListener("error", errorHandlerRef.current);
+        } catch {
+        }
+      }
+      errorHandlerRef.current = errorHandler;
+      player.addEventListener("error", errorHandler);
+      player.load(currentVideoUrl).catch((loadError) => {
+        if (cancelled) return;
+        if (loadError.code === 7e3) return;
+        handleFatalError(loadError);
+      });
+    };
+    const raf = requestAnimationFrame(tryLoad);
     return () => {
+      cancelled = true;
+      cancelAnimationFrame(raf);
       if (player && errorHandlerRef.current) {
         try {
           player.removeEventListener("error", errorHandlerRef.current);
-        } catch (e) {
-          console.warn("Error removing event listener on cleanup:", e);
+        } catch {
         }
       }
     };
-  }, [currentVideoUrl, nativeVideoUrl, rawUrl, baseUrl]);
+  }, [currentVideoUrl, nativeVideoUrl, rawUrl, baseUrl, onFallback]);
   useEffect(() => {
-    var _a, _b;
+    let cancelled = false;
+    let retryTimer = null;
     if (optimizedReady && primaryUrl) {
       const normalizedUrl = normalizeUrl(primaryUrl, baseUrl);
       if (normalizedUrl) {
-        if (previousVideoUrlRef.current && previousVideoUrlRef.current !== normalizedUrl) {
-          const videoElement = nativeVideoRef.current || ((_a = playerRef.current) == null ? void 0 : _a.videoElement);
-          if (videoElement) {
-            savedStateRef.current = {
-              time: videoElement.currentTime || 0,
-              paused: videoElement.paused
-            };
+        if (!currentNativeVideoUrl && rawUrl) {
+          const normalizedNative = normalizeUrl(rawUrl, baseUrl);
+          if (normalizedNative) {
+            setCurrentNativeVideoUrl(normalizedNative);
           }
-        } else if (nativeVideoRef.current && !savedStateRef.current) {
-          const nativeVideo = nativeVideoRef.current;
+        }
+        if (hlsUrlCheckedRef.current === normalizedUrl) {
+          return;
+        }
+        const nv = nativeVideoRef.current;
+        if (nv && nv.currentTime > 0) {
           savedStateRef.current = {
-            time: nativeVideo.currentTime || 0,
-            paused: nativeVideo.paused
+            time: nv.currentTime,
+            paused: nv.paused
           };
+          savedStateLockRef.current = true;
         }
-        setCurrentVideoUrl(normalizedUrl);
-        setPlayerError(null);
-        setHlsFailed(false);
-        previousVideoUrlRef.current = normalizedUrl;
+        const checkHls = (attempt) => {
+          if (cancelled) return;
+          fetch(normalizedUrl, { method: "HEAD", credentials: "include" }).then((res) => {
+            if (cancelled) return;
+            hlsUrlCheckedRef.current = normalizedUrl;
+            if (res.ok) {
+              setCurrentVideoUrl(normalizedUrl);
+              setPlayerError(null);
+              setHlsFailed(false);
+              onFallback == null ? void 0 : onFallback(false);
+              triedFallbackUrlsRef.current.clear();
+            } else {
+              triedFallbackUrlsRef.current.clear();
+              setHlsFailed(true);
+              onFallback == null ? void 0 : onFallback(true);
+              scheduleRetry(attempt);
+            }
+          }).catch((err) => {
+            if (cancelled) return;
+            triedFallbackUrlsRef.current.clear();
+            setHlsFailed(true);
+            onFallback == null ? void 0 : onFallback(true);
+            scheduleRetry(attempt);
+          });
+        };
+        const MAX_RETRIES = 10;
+        const RETRY_INTERVAL = 5e3;
+        const scheduleRetry = (attempt) => {
+          if (cancelled || attempt >= MAX_RETRIES) return;
+          retryTimer = setTimeout(() => checkHls(attempt + 1), RETRY_INTERVAL);
+        };
+        checkHls(0);
       }
     } else if (nativeVideoUrl) {
       const normalizedUrl = normalizeUrl(nativeVideoUrl, baseUrl);
       if (normalizedUrl) {
-        if (previousVideoUrlRef.current && previousVideoUrlRef.current !== normalizedUrl) {
-          const videoElement = (_b = playerRef.current) == null ? void 0 : _b.videoElement;
-          if (videoElement) {
-            savedStateRef.current = {
-              time: videoElement.currentTime || 0,
-              paused: videoElement.paused
-            };
-          }
+        if (previousVideoUrlRef.current === normalizedUrl) {
+          return;
+        }
+        const nv = nativeVideoRef.current;
+        if (nv && nv.readyState > 0 && !nv.error && nv.src) {
+          previousVideoUrlRef.current = normalizedUrl;
+          return;
+        }
+        if (previousVideoUrlRef.current && nv && nv.currentTime > 0) {
+          savedStateRef.current = {
+            time: nv.currentTime,
+            paused: nv.paused
+          };
         }
         setCurrentNativeVideoUrl(normalizedUrl);
         setCurrentVideoUrl(null);
         previousVideoUrlRef.current = normalizedUrl;
       }
     }
-  }, [videoUrl, primaryUrl, baseUrl, optimizedReady, nativeVideoUrl]);
+    return () => {
+      cancelled = true;
+      if (retryTimer) clearTimeout(retryTimer);
+    };
+  }, [primaryUrl, baseUrl, optimizedReady, nativeVideoUrl]);
   useEffect(() => {
     if (optimizedReady && currentVideoUrl && playerRef.current) {
       const videoElement = playerRef.current.videoElement;
@@ -4191,6 +4352,9 @@ function VideoPlayerState({
                 });
               }
               savedStateRef.current = null;
+              savedStateLockRef.current = false;
+            } else {
+              savedStateLockRef.current = false;
             }
           }
         };
@@ -4224,10 +4388,35 @@ function VideoPlayerState({
       }
     }
   }, [optimizedReady, currentVideoUrl]);
+  useEffect(() => {
+    const nv = nativeVideoRef.current;
+    if (!nv) return;
+    if (currentVideoUrl && !hlsFailed) {
+      if (nv.currentTime > 0) {
+        savedStateRef.current = {
+          time: nv.currentTime,
+          paused: nv.paused
+        };
+      }
+      if (!nv.paused) {
+        nv.pause();
+      }
+    }
+  }, [currentVideoUrl, hlsFailed]);
   useEffect(() => {
     var _a;
-    const nextVideoElement = optimizedReady && !hlsFailed ? ((_a = playerRef.current) == null ? void 0 : _a.videoElement) || null : nativeVideoRef.current;
-    setActiveVideoElement(nextVideoElement);
+    if (currentVideoUrl && !hlsFailed) {
+      const shakaVideo = ((_a = playerRef.current) == null ? void 0 : _a.videoElement) || null;
+      if (shakaVideo && shakaVideo.readyState >= 1) {
+        setActiveVideoElement(shakaVideo);
+      } else if (shakaVideo) {
+        const onReady = () => setActiveVideoElement(shakaVideo);
+        shakaVideo.addEventListener("loadedmetadata", onReady, { once: true });
+        return () => shakaVideo.removeEventListener("loadedmetadata", onReady);
+      }
+    } else {
+      setActiveVideoElement(nativeVideoRef.current);
+    }
   }, [optimizedReady, hlsFailed, currentVideoUrl, currentNativeVideoUrl]);
   useEffect(() => {
     if (!activeVideoElement) return;
@@ -4257,16 +4446,29 @@ function VideoPlayerState({
     return () => observer.disconnect();
   }, []);
   useEffect(() => {
-    var _a;
+    var _a, _b;
     if (!onPlayerInfo) return;
     const shakaPlayer = ((_a = playerRef.current) == null ? void 0 : _a.player) || null;
     const nativeVideo = nativeVideoRef.current || null;
     const containerEl = containerRef.current || null;
-    const mode = optimizedReady && !hlsFailed && shakaPlayer ? "shaka" : "native";
-    onPlayerInfo({ shakaPlayer, nativeVideo, mode, containerEl });
-  }, [onPlayerInfo, optimizedReady, hlsFailed, currentVideoUrl, currentNativeVideoUrl]);
+    const mode = currentVideoUrl && !hlsFailed && shakaPlayer ? "shaka" : "native";
+    let videoDuration = null;
+    try {
+      const range = (_b = shakaPlayer == null ? void 0 : shakaPlayer.seekRange) == null ? void 0 : _b.call(shakaPlayer);
+      if (range && Number.isFinite(range.end) && range.end > 0) {
+        videoDuration = range.end;
+      }
+    } catch {
+    }
+    if (videoDuration == null && activeVideoElement) {
+      const d = activeVideoElement.duration;
+      if (Number.isFinite(d) && d > 0) videoDuration = d;
+    }
+    onPlayerInfo({ shakaPlayer, nativeVideo, mode, containerEl, videoDuration });
+  }, [onPlayerInfo, optimizedReady, hlsFailed, currentVideoUrl, currentNativeVideoUrl, activeVideoElement]);
   useEffect(() => {
     var _a;
+    console.log("[Cover] posterUrl effect:", posterUrl);
     const nativeVideo = nativeVideoRef.current;
     if (nativeVideo) {
       nativeVideo.poster = posterUrl || "";
@@ -4343,6 +4545,7 @@ function VideoPlayerState({
           nativeVideo.play().catch(() => {
           });
         }
+        savedStateLockRef.current = false;
       }
     };
     if (nativeVideo.readyState >= 1) {
@@ -4353,10 +4556,12 @@ function VideoPlayerState({
       });
     }
     const handleTimeUpdate = () => {
+      if (savedStateLockRef.current) return;
       if (timeUpdateThrottleRef.current) {
         clearTimeout(timeUpdateThrottleRef.current);
       }
       timeUpdateThrottleRef.current = setTimeout(() => {
+        if (savedStateLockRef.current) return;
         if (!savedStateRef.current) {
           savedStateRef.current = { time: 0, paused: true };
         }
@@ -4364,6 +4569,7 @@ function VideoPlayerState({
       }, 100);
     };
     const handlePlay = () => {
+      if (savedStateLockRef.current) return;
       if (!savedStateRef.current) {
         savedStateRef.current = { time: 0, paused: false };
       } else {
@@ -4371,6 +4577,7 @@ function VideoPlayerState({
       }
     };
     const handlePause = () => {
+      if (savedStateLockRef.current) return;
       if (!savedStateRef.current) {
         savedStateRef.current = { time: nativeVideo.currentTime, paused: true };
       } else {
@@ -4388,6 +4595,12 @@ function VideoPlayerState({
       if (timeUpdateThrottleRef.current) {
         clearTimeout(timeUpdateThrottleRef.current);
       }
+      if (nativeVideo.currentTime > 0) {
+        savedStateRef.current = {
+          time: nativeVideo.currentTime,
+          paused: nativeVideo.paused
+        };
+      }
     };
   }, [currentNativeVideoUrl]);
   useEffect(() => {
@@ -4547,7 +4760,8 @@ function VideoPlayerState({
       }
     );
   }
-  const fallbackVideoUrl = currentNativeVideoUrl || normalizeUrl(rawUrl ?? null, baseUrl);
+  const fallbackVideoUrl = normalizeUrl(rawUrl ?? null, baseUrl) || currentNativeVideoUrl;
+  const shakaActive = !!(currentVideoUrl && !hlsFailed);
   const isCompact = playerWidth > 0 && playerWidth < 500;
   const isNarrow = playerWidth > 0 && playerWidth < 380;
   const hasChapters = ((chapters == null ? void 0 : chapters.length) ?? 0) > 0;
@@ -4576,25 +4790,41 @@ function VideoPlayerState({
           ref: containerRef,
           onClick: handleContainerClick,
           children: [
-            (!optimizedReady || hlsFailed) && /* @__PURE__ */ jsx(
+            /* @__PURE__ */ jsx(
               "video",
               {
                 ref: nativeVideoRef,
-                src: (hlsFailed ? fallbackVideoUrl : currentNativeVideoUrl) || void 0,
+                src: currentNativeVideoUrl || (hlsFailed ? fallbackVideoUrl : null) || void 0,
                 className: "video-player-media",
-                poster: posterUrl || void 0
+                style: shakaActive ? { display: "none" } : void 0,
+                poster: posterUrl || void 0,
+                onError: (e) => {
+                  const video = e.currentTarget;
+                  const failedSrc = video.currentSrc || video.src;
+                  if (!failedSrc) return;
+                  const mediaError = video.error;
+                  if (!mediaError) return;
+                  triedFallbackUrlsRef.current.add(failedSrc);
+                  const candidates = [
+                    normalizeUrl(rawUrl ?? null, baseUrl),
+                    normalizeUrl(nativeVideoUrl, baseUrl)
+                  ].filter((url) => !!url && !triedFallbackUrlsRef.current.has(url));
+                  if (candidates.length > 0) {
+                    video.src = candidates[0];
+                    video.load();
+                  }
+                }
               }
             ),
-            optimizedReady && !hlsFailed && currentVideoUrl && /* @__PURE__ */ jsx(
+            shakaActive && /* @__PURE__ */ jsx(
               ShakaPlayer,
               {
                 ref: playerRef,
-                src: currentVideoUrl,
                 autoPlay: false,
                 className: "video-player-media"
               }
             ),
-            (currentNativeVideoUrl || currentVideoUrl || hlsFailed && fallbackVideoUrl) && /* @__PURE__ */ jsxs(Fragment, { children: [
+            (currentNativeVideoUrl || currentVideoUrl || primaryUrl || hlsFailed && fallbackVideoUrl) && /* @__PURE__ */ jsxs(Fragment, { children: [
               isPaused && !isCompact && /* @__PURE__ */ jsx(
                 "button",
                 {
@@ -4743,6 +4973,115 @@ function VideoPlayerState({
     }
   );
 }
+function VideoSelect({
+  size = "sm",
+  w = 150,
+  comboboxProps,
+  rightSection,
+  renderOption,
+  data,
+  value,
+  defaultValue,
+  onChange,
+  inputClassName,
+  ...inputProps
+}) {
+  var _a;
+  const {
+    onClick: onInputClick,
+    type: _inputType,
+    onCopy: _onCopy,
+    onCut: _onCut,
+    onPaste: _onPaste,
+    classNames: parentClassNames,
+    allowDeselect: _allowDeselect,
+    ...restInputProps
+  } = inputProps;
+  const parentInputClass = typeof parentClassNames === "object" && parentClassNames && "input" in parentClassNames ? parentClassNames.input : void 0;
+  const inputClass = [parentInputClass, inputClassName].filter(Boolean).join(" ") || void 0;
+  const mergedClassNames = inputClass ? {
+    ...typeof parentClassNames === "object" && parentClassNames ? parentClassNames : {},
+    input: inputClass
+  } : parentClassNames;
+  const [search, setSearch] = useState("");
+  const combobox = useCombobox({
+    onDropdownClose: () => {
+      combobox.resetSelectedOption();
+      combobox.focusTarget();
+      setSearch("");
+    },
+    onDropdownOpen: () => {
+      combobox.focusSearchInput();
+    }
+  });
+  const normalizedData = useMemo(
+    () => (Array.isArray(data) ? data : []).map(
+      (item) => typeof item === "string" ? { value: item, label: item } : item
+    ),
+    [data]
+  );
+  const selectedValue = value ?? defaultValue ?? null;
+  const selectedLabel = ((_a = normalizedData.find((item) => item.value === selectedValue)) == null ? void 0 : _a.label) ?? "";
+  const renderOptionNode = (optionValue, optionLabel, checked) => renderOption ? renderOption({
+    option: { value: optionValue, label: optionLabel },
+    checked
+  }) : /* @__PURE__ */ jsxs(Group, { justify: "space-between", wrap: "nowrap", w: "100%", children: [
+    optionLabel,
+    checked && /* @__PURE__ */ jsx(IconCheck, { size: 16, color: "var(--primary-color-text, #4C6EF5)" })
+  ] });
+  const { width: comboboxWidth, ...restComboboxProps } = comboboxProps || {};
+  const dropdownWidth = comboboxWidth ?? 250;
+  return /* @__PURE__ */ jsxs(
+    Combobox,
+    {
+      store: combobox,
+      withinPortal: true,
+      onOptionSubmit: (val) => {
+        const option = normalizedData.find((item) => item.value === val) ?? {
+          value: val,
+          label: val
+        };
+        onChange == null ? void 0 : onChange(val, option);
+        combobox.closeDropdown();
+      },
+      width: dropdownWidth,
+      ...restComboboxProps,
+      children: [
+        /* @__PURE__ */ jsx(Combobox.Target, { children: /* @__PURE__ */ jsx(
+          InputBase,
+          {
+            component: "button",
+            size,
+            w,
+            classNames: mergedClassNames,
+            pointer: true,
+            rightSection: rightSection ?? /* @__PURE__ */ jsx(IconChevronDown, { size: 16, className: "editor-select__chevron" }),
+            rightSectionPointerEvents: "none",
+            onClick: (e) => {
+              onInputClick == null ? void 0 : onInputClick(e);
+              combobox.toggleDropdown();
+            },
+            ...restInputProps,
+            children: selectedLabel
+          }
+        ) }),
+        /* @__PURE__ */ jsx(Combobox.Dropdown, { children: /* @__PURE__ */ jsx(
+          Combobox.Options,
+          {
+            style: {
+              maxHeight: 200,
+              overflowY: "auto"
+            },
+            children: normalizedData.length > 0 ? normalizedData.map((item) => {
+              const checked = item.value === selectedValue;
+              return /* @__PURE__ */ jsx(Combobox.Option, { value: item.value, children: renderOptionNode(item.value, item.label, checked) }, item.value);
+            }) : /* @__PURE__ */ jsx(Combobox.Empty, { children: "Nothing found" })
+          }
+        ) })
+      ]
+    }
+  );
+}
 const isLinkPlatform = (value) => value === "link" || value === "youtube" || value === "vk" || value === "rutube";
 const isUploadPlatform = (value) => value === "upload" || value === "download";
 function VideoUploadComponent({
@@ -4768,7 +5107,7 @@ function VideoUploadComponent({
   const { t, i18n } = useTranslation();
   const { config, dependencies, registerUpload, unregisterUpload, reportError } = useVideoPluginContext();
   const { maxFileSize = 5, pageId } = config;
-  const SelectComponent = dependencies.Select || Select;
+  const SelectComponent = dependencies.Select || VideoSelect;
   const [currentState, setCurrentState] = useState(
     initialVideoState ?? "default"
   );
@@ -4780,6 +5119,7 @@ function VideoUploadComponent({
   const [videoId, setVideoId] = useState(initialVideoId ?? null);
   const [linkUrl, setLinkUrl] = useState("");
   const [linkError, setLinkError] = useState(null);
+  const [isHlsFallback, setIsHlsFallback] = useState(false);
   const lastUploadFileRef = useRef(null);
   const uploadCallbackRef = useRef(false);
   const uploadIdRef = useRef(null);
@@ -4869,7 +5209,16 @@ function VideoUploadComponent({
   const resolvedRawPlayable = sourceType === "upload" ? rawPlayable : false;
   const resolvedStatusAvailable = sourceType === "upload" ? isStatusAvailable : false;
   const chapters = chaptersOverride ?? (resolvedStatus == null ? void 0 : resolvedStatus.chapters) ?? void 0;
-  const subtitles = subtitlesOverride ?? (resolvedStatus == null ? void 0 : resolvedStatus.subtitles) ?? void 0;
+  const rawSubtitles = subtitlesOverride ?? (resolvedStatus == null ? void 0 : resolvedStatus.subtitles) ?? void 0;
+  const subtitlesRef = useRef(rawSubtitles);
+  const subtitles = useMemo(() => {
+    if (rawSubtitles === subtitlesRef.current) return subtitlesRef.current;
+    if (JSON.stringify(rawSubtitles) === JSON.stringify(subtitlesRef.current)) {
+      return subtitlesRef.current;
+    }
+    subtitlesRef.current = rawSubtitles;
+    return rawSubtitles;
+  }, [rawSubtitles]);
   const inferredNativeVideoUrl = useMemo(() => {
     if (fallbackNativeVideoUrl) return fallbackNativeVideoUrl;
     if (platform === "link") {
@@ -4960,7 +5309,7 @@ function VideoUploadComponent({
   const isReadyForPreview = currentState === "video-preview" && (sourceType === "link" ? true : resolvedStatusAvailable ? resolvedOptimizedReady : resolvedOptimizedReady || resolvedRawPlayable || hasPreviewSource);
   const isProcessingStatus = (resolvedStatus == null ? void 0 : resolvedStatus.state) === "PROCESSING" || (resolvedStatus == null ? void 0 : resolvedStatus.state) === "UPLOADING";
   const hasProcessingPercent = typeof ((_a = resolvedStatus == null ? void 0 : resolvedStatus.processing) == null ? void 0 : _a.percent) === "number";
-  const showProcessingBanner = currentState === "video-preview" && sourceType === "upload" && !!resolvedNativeVideoUrl && resolvedStatusAvailable && !resolvedOptimizedReady && (isProcessingStatus || hasProcessingPercent);
+  const showProcessingBanner = currentState === "video-preview" && sourceType === "upload" && !!resolvedNativeVideoUrl && resolvedStatusAvailable && !resolvedOptimizedReady && !isHlsFallback && (isProcessingStatus || hasProcessingPercent);
   const maxBannerPercentRef = useRef(0);
   const rawPercent = Math.max(0, Math.min(100, ((_b = resolvedStatus == null ? void 0 : resolvedStatus.processing) == null ? void 0 : _b.percent) ?? 0));
   if (rawPercent > maxBannerPercentRef.current) {
@@ -5015,12 +5364,17 @@ function VideoUploadComponent({
     setLinkError(null);
     setCurrentState("video-preview");
   };
+  const videoIdRef = useRef(videoId);
+  videoIdRef.current = videoId;
+  const uploadVideoIdRef = useRef(uploadVideoId);
+  uploadVideoIdRef.current = uploadVideoId;
   useEffect(() => {
     return editor.registerCommand(
       UPLOAD_VIDEO_COMMAND,
       (payload) => {
-        if (sourceType === "upload" && payload.length > 0) {
+        if (sourceType === "upload" && payload.length > 0 && !videoIdRef.current && !uploadVideoIdRef.current) {
           handleFileSelect(payload[0]);
+          return true;
         }
         return false;
       },
@@ -5075,7 +5429,7 @@ function VideoUploadComponent({
     onStateChange == null ? void 0 : onStateChange(currentState);
   }, [currentState, onStateChange]);
   const renderState = () => {
-    var _a2;
+    var _a2, _b2;
     if (sourceType === "link" && currentState !== "video-preview") {
       return /* @__PURE__ */ jsx(
         LinkState,
@@ -5168,6 +5522,8 @@ function VideoUploadComponent({
             }
           ) });
         }
+        const effectivePoster = posterUrl ?? ((_a2 = resolvedStatus == null ? void 0 : resolvedStatus.cover) == null ? void 0 : _a2.url) ?? null;
+        console.log("[Cover] VideoUploadComponent render: posterUrl prop=", posterUrl, "cover.url=", (_b2 = resolvedStatus == null ? void 0 : resolvedStatus.cover) == null ? void 0 : _b2.url, "effective=", effectivePoster);
         return /* @__PURE__ */ jsx(
           VideoPlayerState,
           {
@@ -5182,8 +5538,9 @@ function VideoUploadComponent({
             chapters: showProcessingBanner ? void 0 : chapters,
             isProcessing: showProcessingBanner,
             subtitles,
-            posterUrl: posterUrl ?? ((_a2 = resolvedStatus == null ? void 0 : resolvedStatus.cover) == null ? void 0 : _a2.url) ?? null,
-            onPlayerInfo
+            posterUrl: effectivePoster,
+            onPlayerInfo,
+            onFallback: setIsHlsFallback
           }
         );
       default:
@@ -5323,21 +5680,6 @@ async function handleResponse(response) {
   }
   return parseJson(response);
 }
-async function listChaptersEffective(videoId, options = {}) {
-  const url = buildApiUrl(
-    `/v1/videos/${videoId}/chapters/effective`,
-    options.baseUrl
-  );
-  const response = await fetch(url, {
-    method: "GET",
-    credentials: "include",
-    headers: {
-      ...getAuthHeaders(options.authToken)
-    }
-  });
-  const data = await handleResponse(response);
-  return Array.isArray(data) ? data : [];
-}
 async function saveChapters(videoId, chapters, options = {}) {
   const url = buildApiUrl(`/v1/videos/${videoId}/chapters`, options.baseUrl);
   const response = await fetch(url, {
@@ -5465,9 +5807,7 @@ function ChapterRow({
         /* @__PURE__ */ jsxs(
           Stack,
           {
-            gap: 10,
             className: "video-settings-modal-chapter-times",
-            style: { width: 72, flex: "0 0 72px" },
             children: [
               /* @__PURE__ */ jsx(
                 TextInput,
@@ -5527,9 +5867,7 @@ function ChapterRow({
         /* @__PURE__ */ jsx(
           Flex,
           {
-            align: "center",
             className: "video-settings-modal-chapter-title",
-            style: { flex: 1, minWidth: 0, height: 82 },
             children: /* @__PURE__ */ jsx(
               Textarea,
               {
@@ -5566,10 +5904,7 @@ function ChapterRow({
         /* @__PURE__ */ jsx(
           Flex,
           {
-            align: "center",
-            justify: "center",
             className: "video-settings-modal-chapter-actions",
-            style: { width: 36, flex: "0 0 36px", height: 82 },
             children: /* @__PURE__ */ jsxs(Menu, { position: "bottom-end", children: [
               /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(
                 ActionIcon,
@@ -5595,6 +5930,8 @@ function ChaptersSection({
   videoId,
   initialChapters,
   nativeVideo,
+  shakaPlayer,
+  videoDuration: videoDurationProp,
   baseUrl,
   authToken,
   title: title2,
@@ -5614,7 +5951,7 @@ function ChaptersSection({
   addTranscriptManuallyLabel
 }) {
   const dependencies = useVideoPluginDependencies();
-  const SelectComponent = dependencies.Select || Select;
+  const SelectComponent = dependencies.Select || VideoSelect;
   const [editableChapters, setEditableChapters] = useState(
     []
   );
@@ -5639,50 +5976,32 @@ function ChaptersSection({
     setEditableChapters(toEditable(list));
   }, []);
   useEffect(() => {
-    if (!nativeVideo) {
-      setDurationSec(null);
+    var _a;
+    if (videoDurationProp != null && videoDurationProp > 0) {
+      setDurationSec(videoDurationProp);
       return;
     }
-    const updateDuration = () => {
-      const d = nativeVideo.duration;
-      setDurationSec(Number.isFinite(d) && d > 0 ? d : null);
-    };
-    updateDuration();
-    nativeVideo.addEventListener("loadedmetadata", updateDuration);
-    nativeVideo.addEventListener("durationchange", updateDuration);
-    return () => {
-      nativeVideo.removeEventListener("loadedmetadata", updateDuration);
-      nativeVideo.removeEventListener("durationchange", updateDuration);
-    };
-  }, [nativeVideo]);
-  const loadEffective = useCallback(async () => {
-    if (!videoId) return;
-    setIsLoading(true);
-    setError(null);
-    setValidationError(null);
     try {
-      const next = await listChaptersEffective(videoId, apiOptions);
-      applyChapters(next);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : errorLabel);
-    } finally {
-      setIsLoading(false);
+      const range = (_a = shakaPlayer == null ? void 0 : shakaPlayer.seekRange) == null ? void 0 : _a.call(shakaPlayer);
+      if (range && Number.isFinite(range.end) && range.end > 0) {
+        setDurationSec(range.end);
+        return;
+      }
+    } catch {
     }
-  }, [videoId, apiOptions, applyChapters, errorLabel]);
-  const reliableDurationSec = useMemo(() => {
-    if (durationSec == null) return null;
-    const maxChapterStart = editableChapters.reduce(
-      (max, ch) => Math.max(max, ch.startSec),
-      0
-    );
-    if (maxChapterStart > durationSec) return null;
-    return durationSec;
-  }, [durationSec, editableChapters]);
+    if (nativeVideo) {
+      const d = nativeVideo.duration;
+      if (Number.isFinite(d) && d > 0) {
+        setDurationSec(d);
+        return;
+      }
+    }
+  }, [videoDurationProp, shakaPlayer, nativeVideo]);
   const getMaxAllowedSec = useCallback(() => {
-    if (reliableDurationSec == null) return null;
-    return Math.floor(reliableDurationSec);
-  }, [reliableDurationSec]);
-  const validateChapters = useCallback(() => {
+    if (durationSec == null) return null;
+    return Math.floor(durationSec);
+  }, [durationSec]);
+  useCallback(() => {
     const list = [...editableChapters].filter((ch) => ch.title.trim()).sort((a, b) => a.startSec - b.startSec);
     const maxAllowed = getMaxAllowedSec();
     for (let i = 0; i < list.length; i++) {
@@ -5700,21 +6019,19 @@ function ChaptersSection({
   const handleSave = useCallback(async () => {
     if (!videoId) return null;
     setValidationError(null);
-    if (!validateChapters()) {
-      setValidationError(invalidRangeLabel);
-      return null;
-    }
     setIsSaving(true);
     isSavingRef.current = true;
     setError(null);
     try {
-      const payload = editableChapters.filter((ch) => ch.title.trim()).sort((a, b) => a.startSec - b.startSec).map(({ startSec, title: title22 }) => ({ startSec, title: title22 }));
+      const payload = editableChapters.filter((ch) => ch.title.trim()).filter((ch) => durationSec == null || ch.startSec < durationSec).sort((a, b) => a.startSec - b.startSec).map(({ startSec, title: title22 }) => ({ startSec, title: title22 }));
       await saveChapters(videoId, payload, apiOptions);
       hasLocalEditsRef.current = false;
-      await loadEffective();
       return payload;
     } catch (err) {
-      setError(err instanceof Error ? err.message : errorLabel);
+      const msg = err instanceof Error ? err.message : errorLabel;
+      if (!/exceeds/i.test(msg)) {
+        setError(msg);
+      }
       return null;
     } finally {
       setIsSaving(false);
@@ -5724,10 +6041,8 @@ function ChaptersSection({
     videoId,
     editableChapters,
     apiOptions,
-    loadEffective,
     errorLabel,
-    validateChapters,
-    invalidRangeLabel
+    getMaxAllowedSec
   ]);
   useEffect(() => {
     onSave == null ? void 0 : onSave(handleSave);
@@ -5736,7 +6051,7 @@ function ChaptersSection({
     hasLocalEditsRef.current = true;
     setValidationError(null);
     setEditableChapters((prev) => {
-      const maxAllowed = reliableDurationSec != null ? Math.floor(reliableDurationSec) : null;
+      const maxAllowed = durationSec != null ? Math.floor(durationSec) : null;
       const sorted = [...prev].sort((a, b) => a.startSec - b.startSec);
       const lastStart = sorted.length > 0 ? Math.floor(sorted[sorted.length - 1].startSec) : -1;
       const nextStart = Math.max(0, lastStart + 1);
@@ -5807,11 +6122,8 @@ function ChaptersSection({
     }
     if (Array.isArray(initialChapters)) {
       applyChapters(initialChapters);
-      return;
     }
-    loadEffective().catch(() => {
-    });
-  }, [videoId, initialChapters, applyChapters, loadEffective]);
+  }, [videoId, initialChapters, applyChapters]);
   return /* @__PURE__ */ jsxs(Stack, { gap: "xs", children: [
     /* @__PURE__ */ jsx(
       Text,
@@ -5851,7 +6163,7 @@ function ChaptersSection({
       /* @__PURE__ */ jsx(Stack, { gap: 12, children: [...editableChapters].sort((a, b) => a.startSec - b.startSec).map((chapter, index, list) => {
         const next = list[index + 1] || null;
         const nextNext = list[index + 2] || null;
-        const maxAllowed = reliableDurationSec != null ? Math.floor(reliableDurationSec) : null;
+        const maxAllowed = durationSec != null ? Math.floor(durationSec) : null;
         const endSec = next != null ? Math.floor(next.startSec) : maxAllowed != null ? maxAllowed : null;
         const startSec = Math.floor(chapter.startSec);
         const prevStart = index > 0 ? Math.floor(list[index - 1].startSec) : null;
@@ -5879,7 +6191,7 @@ function ChaptersSection({
             endMax,
             disabled: false,
             startTimePlaceholder: timePlaceholder,
-            endTimePlaceholder: reliableDurationSec != null ? secondsToTimestamp(Math.floor(reliableDurationSec)) : endTimePlaceholder,
+            endTimePlaceholder: durationSec != null ? secondsToTimestamp(Math.floor(durationSec)) : endTimePlaceholder,
             titlePlaceholder,
             deleteChapterLabel,
             onStartSecChange: handleStartSecChange,
@@ -5952,7 +6264,7 @@ function CoverSection({
     [(_a = status == null ? void 0 : status.cover) == null ? void 0 : _a.previewId, previews]
   );
   const effectiveSelected = selectedPreviewId ?? coverId;
-  const hasCoverCandidates = previews.length > 0;
+  previews.length > 0;
   const slidesCount = previews.length + 1;
   const showControls = slidesCount > 3;
   const setPreviewLoaded = useCallback((id) => {
@@ -6000,7 +6312,7 @@ function CoverSection({
   }, [videoId]);
   const handleCoverDrop = useCallback(
     async (files) => {
-      var _a2, _b2, _c;
+      var _a2, _b2, _c, _d;
       const file = files[0];
       if (!file || !onCoverUpload) return;
       const objectUrl = URL.createObjectURL(file);
@@ -6010,7 +6322,6 @@ function CoverSection({
       onSelectedPosterChange == null ? void 0 : onSelectedPosterChange(objectUrl);
       try {
         const nextStatus = await Promise.resolve(onCoverUpload(file));
-        console.log("cover upload response", nextStatus);
         setOptimisticPreviewUrl(null);
         if (objectUrl) URL.revokeObjectURL(objectUrl);
         const nextPreviews = nextStatus == null ? void 0 : nextStatus.previews;
@@ -6018,10 +6329,16 @@ function CoverSection({
         if (nextStatus && hasPreviews && nextPreviews) {
           scrollToEndAfterUpdateRef.current = true;
           setStatus(nextStatus);
-          const fallbackId = ((_a2 = nextPreviews[0]) == null ? void 0 : _a2.id) ?? ((_b2 = nextStatus == null ? void 0 : nextStatus.cover) == null ? void 0 : _b2.previewId);
-          setSelectedPreviewId(
-            ((_c = nextStatus == null ? void 0 : nextStatus.cover) == null ? void 0 : _c.previewId) ?? fallbackId ?? "uploaded"
-          );
+          const uploadedPreviewId = ((_a2 = nextPreviews[nextPreviews.length - 1]) == null ? void 0 : _a2.id) ?? ((_b2 = nextStatus == null ? void 0 : nextStatus.cover) == null ? void 0 : _b2.previewId) ?? ((_c = nextPreviews[0]) == null ? void 0 : _c.id);
+          setSelectedPreviewId(uploadedPreviewId ?? "uploaded");
+          if (uploadedPreviewId) {
+            const uploadedUrl = (_d = nextPreviews.find(
+              (p) => p.id === uploadedPreviewId
+            )) == null ? void 0 : _d.url;
+            if (uploadedUrl) {
+              onSelectedPosterChange == null ? void 0 : onSelectedPosterChange(uploadedUrl);
+            }
+          }
           setLoadingIds(/* @__PURE__ */ new Set());
           setErrorIds(/* @__PURE__ */ new Set());
         } else {
@@ -6038,7 +6355,7 @@ function CoverSection({
         loadStatus();
       }
     },
-    [onCoverUpload, loadStatus]
+    [onCoverUpload, loadStatus, onSelectedPosterChange]
   );
   const selectedUrl = useMemo(() => {
     var _a2, _b2;
@@ -6159,6 +6476,7 @@ function CoverSection({
                 className: `video-settings-modal-cover-cell video-settings-modal-cover-thumb ${isSelected && !isError ? "selected" : ""} ${isLoading2 ? "loading" : ""} ${isError ? "error" : ""}`,
                 onClick: () => {
                   if (isError) return;
+                  console.log("[Cover] click preview:", preview.id, preview.url);
                   setSelectedPreviewId(preview.id);
                   onSelectedPosterChange == null ? void 0 : onSelectedPosterChange(preview.url);
                 },
@@ -6208,15 +6526,15 @@ function CoverSection({
           })
         ]
       }
-    ),
-    !hasCoverCandidates && !isLoading && !loadError && /* @__PURE__ */ jsx(Text, { size: "xs", c: "dimmed", children: emptyCoverLabel })
+    )
   ] });
 }
 function FooterActions({
   cancelLabel,
   saveLabel,
   onCancel,
-  onSave
+  onSave,
+  isSaving
 }) {
   return /* @__PURE__ */ jsxs(Group, { justify: "flex-end", gap: 8, children: [
     /* @__PURE__ */ jsx(
@@ -6227,6 +6545,7 @@ function FooterActions({
         color: "gray",
         radius: "md",
         onClick: onCancel,
+        disabled: isSaving,
         children: cancelLabel
       }
     ),
@@ -6234,9 +6553,9 @@ function FooterActions({
       Button,
       {
         size: "sm",
-        color: "blue",
         radius: "md",
         onClick: onSave,
+        loading: isSaving,
         children: saveLabel
       }
     )
@@ -6276,23 +6595,29 @@ const LANGUAGE_LABELS = LANGUAGE_OPTIONS.reduce(
 );
 function ManualSubtitlesPanel({
   videoId,
-  mode,
-  shakaPlayer,
-  nativeVideo,
   baseUrl,
   authToken,
   statusSubtitles,
-  onTracksChange
+  onTracksChange,
+  onSave
 }) {
   const { t } = useTranslation();
+  const { reportError } = useVideoPluginContext();
   const dependencies = useVideoPluginDependencies();
-  const SelectComponent = dependencies.Select || Select;
+  const SelectComponent = dependencies.Select || VideoSelect;
   const [tracks, setTracks] = useState([]);
   const [drafts, setDrafts] = useState([]);
-  const [loadError, setLoadError] = useState(null);
   const uploadControllersRef = useRef(/* @__PURE__ */ new Map());
-  const shakaAddedIdsRef = useRef([]);
-  const shakaFilterRegisteredRef = useRef(false);
+  const [autoSubtitlesDisabled, setAutoSubtitlesDisabled] = useState(false);
+  const autoTrack = useMemo(
+    () => tracks.find(isAutoGeneratedTrack) ?? null,
+    [tracks]
+  );
+  useEffect(() => {
+    if (autoTrack) {
+      setAutoSubtitlesDisabled(autoTrack.isDisabled);
+    }
+  }, [autoTrack]);
   const apiOptions = useMemo(
     () => ({
       baseUrl,
@@ -6300,26 +6625,54 @@ function ManualSubtitlesPanel({
     }),
     [baseUrl, authToken]
   );
+  const handleAutoSubtitlesToggle = useCallback(
+    (disabled2) => {
+      if (!autoTrack) return;
+      setAutoSubtitlesDisabled(disabled2);
+      setTracks(
+        (prev) => prev.map(
+          (t2) => t2.id === autoTrack.id ? { ...t2, isDisabled: disabled2 } : t2
+        )
+      );
+    },
+    [autoTrack]
+  );
+  const initialAutoDisabledRef = useRef(null);
+  useEffect(() => {
+    if (autoTrack && initialAutoDisabledRef.current === null) {
+      initialAutoDisabledRef.current = autoTrack.isDisabled;
+    }
+  }, [autoTrack]);
   const refreshTracks = useCallback(
     async (forceApi = false) => {
       if (!videoId) return;
-      if (!forceApi && statusSubtitles != null) {
-        const nextTracks = (statusSubtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id);
-        setTracks(nextTracks);
-        setLoadError(null);
-        return;
+      if (forceApi || statusSubtitles == null) {
+        try {
+          const freshTracks = await listTracks(videoId, apiOptions);
+          setTracks(freshTracks);
+          return;
+        } catch {
+        }
       }
       try {
-        const status = await fetchStatus(videoId);
-        const nextTracks = ((status == null ? void 0 : status.subtitles) || []).map(normalizeSubtitleTrack).filter((track) => track.id);
-        setTracks(nextTracks);
-        setLoadError(null);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : t("editor.video.errors.uploadFailed");
-        setLoadError(message);
+        const freshTracks = await listTracks(videoId, apiOptions);
+        setTracks(freshTracks);
+      } catch {
+        if (statusSubtitles != null) {
+          const nextTracks = (statusSubtitles || []).map(normalizeSubtitleTrack).filter((track) => track.id);
+          setTracks(nextTracks);
+        } else {
+          try {
+            const status = await fetchStatus(videoId);
+            const nextTracks = ((status == null ? void 0 : status.subtitles) || []).map(normalizeSubtitleTrack).filter((track) => track.id);
+            setTracks(nextTracks);
+          } catch (error) {
+            reportError(error, "subtitles", videoId);
+          }
+        }
       }
     },
-    [videoId, t, statusSubtitles]
+    [videoId, apiOptions, reportError, statusSubtitles]
   );
   useEffect(() => {
     if (!videoId) {
@@ -6333,18 +6686,44 @@ function ManualSubtitlesPanel({
   useEffect(() => {
     onTracksChange == null ? void 0 : onTracksChange(tracks);
   }, [tracks, onTracksChange]);
+  useEffect(() => {
+    onSave == null ? void 0 : onSave(async () => {
+      if (!videoId || !autoTrack) return;
+      if (autoSubtitlesDisabled !== initialAutoDisabledRef.current) {
+        await patchTrackDisabled(videoId, autoTrack.id, autoSubtitlesDisabled, apiOptions);
+        initialAutoDisabledRef.current = autoSubtitlesDisabled;
+      }
+    });
+  }, [onSave, videoId, autoTrack, autoSubtitlesDisabled, apiOptions]);
+  const manualTracks = useMemo(() => {
+    const manual = tracks.filter((track) => !isAutoGeneratedTrack(track));
+    const byLang = /* @__PURE__ */ new Map();
+    for (const track of manual) {
+      byLang.set(track.lang, track);
+    }
+    return Array.from(byLang.values());
+  }, [tracks]);
+  const usedLanguages = useMemo(() => {
+    const langs = new Set(manualTracks.map((t2) => t2.lang));
+    drafts.forEach((d) => {
+      if (d.lang) langs.add(d.lang);
+    });
+    return langs;
+  }, [manualTracks, drafts]);
   const handleAddDraft = useCallback(() => {
-    const defaultLabel = LANGUAGE_LABELS[DEFAULT_LANG] || DEFAULT_LANG;
+    var _a;
+    const availableLang = ((_a = LANGUAGE_OPTIONS.find((opt) => !usedLanguages.has(opt.value))) == null ? void 0 : _a.value) ?? (usedLanguages.has(DEFAULT_LANG) ? null : DEFAULT_LANG);
+    const label = availableLang ? LANGUAGE_LABELS[availableLang] || availableLang : null;
     setDrafts((prev) => [
       ...prev,
       {
         id: crypto.randomUUID(),
-        lang: DEFAULT_LANG,
-        label: defaultLabel,
+        lang: availableLang,
+        label,
         status: "draft"
       }
     ]);
-  }, []);
+  }, [usedLanguages]);
   const updateDraft = useCallback(
     (id, updates) => {
       setDrafts(
@@ -6388,12 +6767,13 @@ function ManualSubtitlesPanel({
         } else {
           await refreshTracks(true);
         }
-      } catch {
+      } catch (error) {
         uploadControllersRef.current.delete(draftId);
         updateDraft(draftId, { status: "error" });
+        reportError(error, "subtitles", videoId);
       }
     },
-    [videoId, drafts, apiOptions, refreshTracks, updateDraft]
+    [videoId, drafts, apiOptions, refreshTracks, updateDraft, reportError]
   );
   const handleDelete = useCallback(
     async (trackId) => {
@@ -6403,96 +6783,38 @@ function ManualSubtitlesPanel({
     },
     [videoId, apiOptions]
   );
-  useEffect(() => {
-    if (mode !== "native" || !nativeVideo) return;
-    const existingTracks = nativeVideo.querySelectorAll(
-      'track[data-subtitle-track="managed"]'
-    );
-    existingTracks.forEach((node) => node.remove());
-    tracks.forEach((track) => {
-      const element = document.createElement("track");
-      element.setAttribute("data-subtitle-track", "managed");
-      element.kind = track.kind || "subtitles";
-      element.label = track.label;
-      element.srclang = track.lang;
-      element.src = resolveSubtitleUrl(videoId || "", track, apiOptions);
-      element.default = track.isDefault;
-      nativeVideo.appendChild(element);
-    });
-  }, [mode, nativeVideo, tracks, videoId, apiOptions]);
-  useEffect(() => {
-    var _a;
-    if (mode !== "shaka" || !shakaPlayer) return;
-    const engine = (_a = shakaPlayer.getNetworkingEngine) == null ? void 0 : _a.call(shakaPlayer);
-    if (engine && !shakaFilterRegisteredRef.current) {
-      engine.registerRequestFilter((type, request) => {
-        request.allowCrossSiteCredentials = true;
-        if (authToken) {
-          request.headers = request.headers || {};
-          request.headers.Authorization = `Bearer ${authToken}`;
-        }
-      });
-      shakaFilterRegisteredRef.current = true;
-    }
-    if (shakaPlayer.getTextTracks && shakaPlayer.removeTextTrack) {
-      const existing = shakaPlayer.getTextTracks();
-      existing.forEach((track) => {
-        if (shakaAddedIdsRef.current.includes(track.id)) {
-          shakaPlayer.removeTextTrack(track);
-        }
-      });
-      shakaAddedIdsRef.current = [];
-    }
-    const addTracks = async () => {
-      var _a2, _b, _c;
-      const existingTracks = ((_a2 = shakaPlayer.getTextTracks) == null ? void 0 : _a2.call(shakaPlayer)) || [];
-      for (const track of tracks) {
-        const vttUrl = resolveSubtitleUrl(videoId || "", track, apiOptions);
-        const label = track.label || track.lang || "und";
-        const lang = track.lang || "und";
-        const kind = track.kind || "subtitles";
-        const alreadyExists = existingTracks.some(
-          (item) => (item.language || "") === lang && (item.label || "") === label && (item.kind || "subtitles") === kind
-        );
-        if (alreadyExists) {
-          continue;
-        }
-        let added = null;
-        if (typeof shakaPlayer.addTextTrackAsync === "function") {
-          added = await shakaPlayer.addTextTrackAsync(
-            vttUrl,
-            lang,
-            kind,
-            label
-          );
-        } else if (typeof shakaPlayer.addTextTrack === "function") {
-          added = shakaPlayer.addTextTrack(vttUrl, lang, kind, label);
-        }
-        if (added && typeof added.id === "number") {
-          shakaAddedIdsRef.current.push(added.id);
-          existingTracks.push(added);
-        }
-      }
-      const defaultTrack = tracks.find((item) => item.isDefault);
-      if (defaultTrack && shakaPlayer.selectTextTrack) {
-        const list = ((_b = shakaPlayer.getTextTracks) == null ? void 0 : _b.call(shakaPlayer)) || [];
-        const target = list.find(
-          (item) => item.language === defaultTrack.lang && item.label === defaultTrack.label
-        );
-        if (target) {
-          (_c = shakaPlayer.setTextTrackVisibility) == null ? void 0 : _c.call(shakaPlayer, true);
-          shakaPlayer.selectTextTrack(target);
-        }
-      }
-    };
-    addTracks().catch(() => {
-    });
-  }, [mode, shakaPlayer, tracks, videoId, apiOptions, authToken]);
   const handleRemoveDraft = useCallback((draftId) => {
     setDrafts((prev) => prev.filter((item) => item.id !== draftId));
   }, []);
   return /* @__PURE__ */ jsxs("div", { className: "video-settings-modal-subtitles", children: [
-    loadError && /* @__PURE__ */ jsx(Text, { size: "sm", c: "red", mb: "xs", children: loadError }),
+    autoTrack && /* @__PURE__ */ jsxs(
+      Flex,
+      {
+        align: "center",
+        gap: "md",
+        className: "video-settings-modal-subtitles-auto-toggle",
+        children: [
+          /* @__PURE__ */ jsx(
+            Text,
+            {
+              size: "sm",
+              fw: 500,
+              c: "var(--mantine-color-bright)",
+              flex: 1,
+              children: t("editor.video.settingsModal.hideAutoSubtitles")
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Switch,
+            {
+              size: "sm",
+              checked: autoSubtitlesDisabled,
+              onChange: (event) => handleAutoSubtitlesToggle(event.currentTarget.checked)
+            }
+          )
+        ]
+      }
+    ),
     /* @__PURE__ */ jsx(
       Text,
       {
@@ -6502,7 +6824,7 @@ function ManualSubtitlesPanel({
         children: t("editor.video.settingsModal.uploadSubtitlesManually")
       }
     ),
-    tracks.filter((track) => !track.isDefault).map((track) => /* @__PURE__ */ jsxs(
+    manualTracks.map((track) => /* @__PURE__ */ jsxs(
       Flex,
       {
         align: "center",
@@ -6555,6 +6877,7 @@ function ManualSubtitlesPanel({
       DraftRow,
       {
         draft,
+        usedLanguages,
         onChange: (updates) => updateDraft(draft.id, updates),
         onUpload: (file) => handleUploadDraft(draft.id, file),
         onRemove: () => handleRemoveDraft(draft.id),
@@ -6574,9 +6897,15 @@ function ManualSubtitlesPanel({
     )
   ] });
 }
-function DraftRow({ draft, onChange, onUpload, onRemove, SelectComponent }) {
+function DraftRow({ draft, usedLanguages, onChange, onUpload, onRemove, SelectComponent }) {
   const { t } = useTranslation();
   const inputRef = useRef(null);
+  const availableLanguages = useMemo(
+    () => LANGUAGE_OPTIONS.filter(
+      (opt) => opt.value === draft.lang || !usedLanguages.has(opt.value)
+    ),
+    [usedLanguages, draft.lang]
+  );
   const handleFileChange = (e) => {
     var _a;
     const file = (_a = e.target.files) == null ? void 0 : _a[0];
@@ -6588,7 +6917,6 @@ function DraftRow({ draft, onChange, onUpload, onRemove, SelectComponent }) {
     Flex,
     {
       align: "center",
-      gap: "md",
       wrap: "nowrap",
       className: "video-settings-modal-subtitles-row",
       children: [
@@ -6597,7 +6925,7 @@ function DraftRow({ draft, onChange, onUpload, onRemove, SelectComponent }) {
           {
             size: "sm",
             placeholder: t("editor.video.settingsModal.selectLanguage"),
-            data: LANGUAGE_OPTIONS,
+            data: availableLanguages,
             value: draft.lang,
             onChange: (value) => onChange({
               lang: value,
@@ -6610,7 +6938,7 @@ function DraftRow({ draft, onChange, onUpload, onRemove, SelectComponent }) {
             inputClassName: "video-settings-modal-language-select"
           }
         ),
-        /* @__PURE__ */ jsx(Flex, { align: "center", gap: 6, flex: 1, children: draft.status === "uploading" ? /* @__PURE__ */ jsx(Loader, { size: 22, color: "blue" }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Flex, { align: "center", gap: 6, flex: 1, children: draft.status === "uploading" ? /* @__PURE__ */ jsx(Loader, { size: 22 }) : /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx(
             "input",
             {
@@ -6668,6 +6996,7 @@ function VideoSettingsModal({
   chaptersDisabled = false,
   shakaPlayer,
   nativeVideo,
+  videoDuration,
   playerMode = "native"
 }) {
   const { t } = useTranslation();
@@ -6682,17 +7011,24 @@ function VideoSettingsModal({
   const saveChaptersRef = useRef(
     null
   );
+  const saveSubtitlesRef = useRef(null);
+  const [isSaving, setIsSaving] = useState(false);
   const handlePosterSelect = useCallback((url) => {
+    console.log("[Cover] handlePosterSelect:", url);
     setSelectedPosterUrl(url);
   }, []);
   useEffect(() => {
-    if (!opened || !videoId) {
-      setStatus(null);
-      return;
+    if (initialStatus) {
+      setStatus(initialStatus);
     }
-    fetchStatus(videoId).then((nextStatus) => {
-      setStatus(nextStatus);
-      onStatusChange == null ? void 0 : onStatusChange(nextStatus);
+  }, [initialStatus]);
+  useEffect(() => {
+    if (!opened || !videoId) return;
+    fetchStatus(videoId).then((freshStatus) => {
+      if (freshStatus) {
+        setStatus(freshStatus);
+        onStatusChange == null ? void 0 : onStatusChange(freshStatus);
+      }
     }).catch(() => {
     });
   }, [opened, videoId]);
@@ -6708,28 +7044,47 @@ function VideoSettingsModal({
     [videoId]
   );
   const handleSave = useCallback(async () => {
-    if (saveChaptersRef.current) {
-      const payload = await saveChaptersRef.current();
-      if (!Array.isArray(payload)) return;
-      onChaptersSaved == null ? void 0 : onChaptersSaved(payload);
-    }
-    onChaptersDisabledChange == null ? void 0 : onChaptersDisabledChange(chaptersDisabledValue);
-    onSubtitlesSaved == null ? void 0 : onSubtitlesSaved(subtitlesSnapshot);
-    if (selectedPosterUrl !== null) {
-      onPosterChange == null ? void 0 : onPosterChange(selectedPosterUrl);
+    setIsSaving(true);
+    try {
+      if (saveChaptersRef.current) {
+        const payload = await saveChaptersRef.current();
+        if (Array.isArray(payload)) {
+          onChaptersSaved == null ? void 0 : onChaptersSaved(payload);
+        }
+      }
+      onChaptersDisabledChange == null ? void 0 : onChaptersDisabledChange(chaptersDisabledValue);
+      if (saveSubtitlesRef.current) {
+        await saveSubtitlesRef.current();
+      }
+      onSubtitlesSaved == null ? void 0 : onSubtitlesSaved(subtitlesSnapshot);
+      console.log("[Cover] handleSave: selectedPosterUrl=", selectedPosterUrl, "onPosterChange=", !!onPosterChange);
+      if (selectedPosterUrl !== null) {
+        console.log("[Cover] calling onPosterChange with:", selectedPosterUrl);
+        onPosterChange == null ? void 0 : onPosterChange(selectedPosterUrl);
+      } else {
+        console.log("[Cover] selectedPosterUrl is null, skipping onPosterChange");
+      }
+      if (videoId) {
+        const updatedStatus = await fetchStatus(videoId);
+        onStatusChange == null ? void 0 : onStatusChange(updatedStatus);
+      }
+      onClose();
+    } finally {
+      setIsSaving(false);
     }
-    onClose();
   }, [
+    videoId,
     chaptersDisabledValue,
     onChaptersDisabledChange,
     onChaptersSaved,
     onClose,
     onPosterChange,
+    onStatusChange,
     onSubtitlesSaved,
     selectedPosterUrl,
     subtitlesSnapshot
   ]);
-  return /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsxs(
     Modal,
     {
       opened,
@@ -6740,13 +7095,14 @@ function VideoSettingsModal({
       withinPortal: true,
       zIndex: 300,
       className: "video-settings-modal",
-      children: /* @__PURE__ */ jsx(Box, { className: "video-settings-modal-body", children: /* @__PURE__ */ jsxs(Stack, { gap: 24, children: [
-        /* @__PURE__ */ jsxs(Stack, { gap: 32, children: [
+      children: [
+        /* @__PURE__ */ jsx(Box, { className: "video-settings-modal-body", children: /* @__PURE__ */ jsxs(Stack, { gap: 32, children: [
           /* @__PURE__ */ jsx(
             CoverSection,
             {
               opened,
               videoId,
+              initialStatus: status,
               title: t("editor.video.settingsModal.cover"),
               uploadLabel: t("editor.video.settingsModal.uploadFile"),
               cropLabel: t("editor.video.settingsModal.cropCoverImage"),
@@ -6785,7 +7141,10 @@ function VideoSettingsModal({
                 shakaPlayer,
                 nativeVideo,
                 statusSubtitles: status == null ? void 0 : status.subtitles,
-                onTracksChange: setSubtitlesSnapshot
+                onTracksChange: setSubtitlesSnapshot,
+                onSave: (handler) => {
+                  saveSubtitlesRef.current = handler;
+                }
               }
             )
           ] }),
@@ -6795,6 +7154,8 @@ function VideoSettingsModal({
               videoId,
               initialChapters: status == null ? void 0 : status.chapters,
               nativeVideo,
+              shakaPlayer,
+              videoDuration,
               title: t("editor.video.settingsModal.chapters"),
               customLabel: t("editor.video.settingsModal.chaptersCustom"),
               dontShowLabel: t("editor.video.settingsModal.chaptersDontShow"),
@@ -6824,17 +7185,18 @@ function VideoSettingsModal({
               )
             }
           )
-        ] }),
-        /* @__PURE__ */ jsx(
+        ] }) }),
+        /* @__PURE__ */ jsx(Box, { className: "video-settings-modal-footer", children: /* @__PURE__ */ jsx(
           FooterActions,
           {
             cancelLabel: t("editor.video.settingsModal.cancel"),
             saveLabel: t("editor.video.settingsModal.save"),
             onCancel: onClose,
-            onSave: handleSave
+            onSave: handleSave,
+            isSaving
           }
-        )
-      ] }) })
+        ) })
+      ]
     }
   );
 }
@@ -6875,7 +7237,8 @@ function VideoBlock({
     shakaPlayer: null,
     nativeVideo: null,
     mode: "native",
-    containerEl: null
+    containerEl: null,
+    videoDuration: null
   });
   const fallbackNativeVideoUrl = useMemo(() => {
     if (platform === "download" || platform === "link") {
@@ -6919,6 +7282,7 @@ function VideoBlock({
   };
   const handlePosterChange = useCallback(
     (posterUrl2) => {
+      console.log("[Cover] handlePosterChange: setting posterUrl=", posterUrl2);
       setPosterUrl(posterUrl2);
       setVideoPoster(editor, nodeKey, posterUrl2);
     },
@@ -6947,7 +7311,7 @@ function VideoBlock({
     });
   }, [editor, nodeKey]);
   const resolvedChaptersOverride = chaptersDisabled ? [] : chaptersOverride;
-  const TrashIcon = /* @__PURE__ */ jsx(HugeiconsIcon, { icon: tI, size: 16, color: "var(--mantine-color-red-outline)" });
+  const TrashIcon = /* @__PURE__ */ jsx("span", { style: { color: "var(--mantine-color-red-outline)", display: "flex", alignItems: "center" }, children: /* @__PURE__ */ jsx(HugeiconsIcon, { icon: tI, size: 16 }) });
   const uploadComponentProps = {
     className,
     format,
@@ -6986,7 +7350,7 @@ function VideoBlock({
                   event.stopPropagation();
                   setSettingsModalOpened(true);
                 },
-                children: /* @__PURE__ */ jsx(SettingsIcon, { size: 16 })
+                children: /* @__PURE__ */ jsx("span", { style: { color: "var(--mantine-color-gray-text)", display: "flex", alignItems: "center" }, children: /* @__PURE__ */ jsx(SettingsIcon, { size: 16 }) })
               }
             ) }),
             /* @__PURE__ */ jsx(
@@ -7005,7 +7369,8 @@ function VideoBlock({
                 onChaptersDisabledChange: handleChaptersDisabledChange,
                 shakaPlayer: playerInfo.shakaPlayer,
                 nativeVideo: playerInfo.nativeVideo,
-                playerMode: playerInfo.mode
+                playerMode: playerInfo.mode,
+                videoDuration: playerInfo.videoDuration
               }
             )
           ] }),