sense-react-timeline-editor 1.1.5 → 1.1.7

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import interact from 'interactjs';
 import { useSelectionContainer } from '@air/react-drag-to-select';
 import { Upload, message } from 'antd/es';
 import { Howl } from 'howler';
-import { groupBy } from 'lodash-es';
+import { groupBy, throttle } from 'lodash-es';
 import useSize from 'ahooks/es/useSize';
 
 function _arrayLikeToArray(r, a) {
@@ -2007,7 +2007,7 @@ var Cursor = function Cursor(_ref) {
   });
   var clientHeight = ((_document$querySelect = document.querySelector("#time-editor-container")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0;
   return /*#__PURE__*/React.createElement(RowDnd, {
-    top: theme === 'light' ? 16 : 0,
+    top: theme === 'light' ? 26 : 0,
     start: startLeft,
     height: clientHeight,
     ref: rowRnd,
@@ -2908,6 +2908,18 @@ var EditRow = function EditRow(props) {
     uploadBgMusic = props.uploadBgMusic;
   var classNames = ['edit-row'];
   if (rowData === null || rowData === void 0 ? void 0 : rowData.selected) classNames.push('selected');
+  var clientWidth = document.documentElement.clientWidth;
+  var timeStart = parserPixelToTime(scrollLeft, {
+    startLeft: startLeft,
+    scale: scale,
+    scaleWidth: scaleWidth
+  });
+  var timeEnd = parserPixelToTime(scrollLeft + clientWidth + 200, {
+    startLeft: startLeft,
+    scale: scale,
+    scaleWidth: scaleWidth
+  });
+  console.log('time = ', timeStart, ', timeEnd = ', timeEnd);
   var handleTime = function handleTime(e) {
     if (!areaRef.current) return;
     var rect = areaRef.current.getBoundingClientRect();
@@ -2971,7 +2983,9 @@ var EditRow = function EditRow(props) {
         });
       }
     }
-  }, ((rowData === null || rowData === void 0 ? void 0 : rowData.actions) || []).map(function (action) {
+  }, ((rowData === null || rowData === void 0 ? void 0 : rowData.actions) || []).filter(function (action) {
+    return action.end >= timeStart && action.start <= timeEnd;
+  }).map(function (action) {
     return /*#__PURE__*/React.createElement(EditAction, _objectSpread2(_objectSpread2({
       key: action.id
     }, props), {}, {
@@ -3630,7 +3644,7 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(info) {
         var _info$file$response, _info$file;
-        var totalDuration, _newAction, uid, duration, newAction;
+        var hasDefault, totalDuration, _newAction, uid, duration, newAction;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -3641,11 +3655,36 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
               }
               return _context.a(2);
             case 1:
-              if (info.file.response) {
+              if (!(info.file.type !== 'audio/mp3' && info.file.type !== 'audio/wav' && info.file.type !== 'audio/mpeg')) {
                 _context.n = 2;
                 break;
               }
-              totalDuration = row.actions.reduce(function (max, current) {
+              return _context.a(2, false);
+            case 2:
+              if (!(info.file.status === 'error')) {
+                _context.n = 3;
+                break;
+              }
+              onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [{
+                id: info.file.uid,
+                isUploading: false,
+                start: 0,
+                end: 0,
+                effectId: 'custom_video_effect',
+                isError: true,
+                segment_type: 'bgm',
+                uid: info.file.uid
+              }]);
+              return _context.a(2);
+            case 3:
+              if (info.file.response) {
+                _context.n = 4;
+                break;
+              }
+              hasDefault = row.actions.some(function (action) {
+                return action.id === 'upload-bg-music';
+              });
+              totalDuration = hasDefault ? 0 : row.actions.reduce(function (max, current) {
                 var _max$end;
                 var currentEnd = current.end || 0;
                 var maxEnd = (_max$end = max === null || max === void 0 ? void 0 : max.end) !== null && _max$end !== void 0 ? _max$end : 0;
@@ -3666,11 +3705,11 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [_newAction]);
               return _context.a(2);
-            case 2:
+            case 4:
               uid = info.file.uid;
-              _context.n = 3;
+              _context.n = 5;
               return getAudioDuration(info.file.response.url);
-            case 3:
+            case 5:
               duration = _context.v;
               newAction = {
                 id: ((_info$file$response = info.file.response) === null || _info$file$response === void 0 ? void 0 : _info$file$response.id) || uid,
@@ -3685,7 +3724,7 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
                 uid: (_info$file = info.file) === null || _info$file === void 0 ? void 0 : _info$file.uid
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [newAction]);
-            case 4:
+            case 6:
               return _context.a(2);
           }
         }, _callee);
@@ -3879,6 +3918,7 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
         backgroundPositionX: "0, ".concat(startLeft, "px"),
         backgroundSize: "".concat(startLeft, "px, ").concat(scaleWidth, "px")
       }),
+      scrollLeft: scrollLeft,
       areaRef: editAreaRef,
       key: key,
       rowHeight: (row === null || row === void 0 ? void 0 : row.rowHeight) || _rowHeight,
@@ -3962,7 +4002,8 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }).length) > 0,
         customRequest: customRequest,
         onDrop: handleDrop,
-        type: "drag"
+        type: "drag",
+        accept: "audio/mp3,audio/wav,audio/mpeg"
       }, tChildren), tChildren ? null : editRow);
     }
     return editRow;
@@ -4020,6 +4061,7 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }
     heightRef.current = height;
+    console.log('Math.max(scaleCount * scaleWidth + startLeft, width)', Math.max(scaleCount * scaleWidth + startLeft, width), ', width', width);
     return /*#__PURE__*/React.createElement(Grid, {
       columnCount: 1,
       rowCount: heights.length,
@@ -4212,7 +4254,7 @@ var DragLines = /*#__PURE__*/memo(function (_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: prefix('drag-line-container'),
     style: {
-      height: height || '100%'
+      height: height ? height + 30 :  '100%'
     }
   }, isMoving && movePositions.map(function (movePos) {
     // 查找在容差范围内的辅助线位置
@@ -4630,6 +4672,20 @@ var Timeline = /*#__PURE__*/React.forwardRef(function (props, ref) {
       };
     }
   }, []);
+  useEffect(function () {
+    var containerEl = document.querySelector('.timeline-editor');
+    var handleScroll = throttle(function (e) {
+      console.log('scroll', e);
+      scrollSync.current && scrollSync.current.setState({
+        scrollLeft: e.target.scrollLeft || 0
+      });
+    }, 100);
+    containerEl.addEventListener('scroll', handleScroll);
+    return function () {
+      containerEl.removeEventListener('scroll', handleScroll);
+      handleScroll.cancel();
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     ref: domRef,
     style: style,

package/dist/index.js

@@ -2017,7 +2017,7 @@ var Cursor = function Cursor(_ref) {
   });
   var clientHeight = ((_document$querySelect = document.querySelector("#time-editor-container")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0;
   return /*#__PURE__*/React__default['default'].createElement(RowDnd, {
-    top: theme === 'light' ? 16 : 0,
+    top: theme === 'light' ? 26 : 0,
     start: startLeft,
     height: clientHeight,
     ref: rowRnd,
@@ -2918,6 +2918,18 @@ var EditRow = function EditRow(props) {
     uploadBgMusic = props.uploadBgMusic;
   var classNames = ['edit-row'];
   if (rowData === null || rowData === void 0 ? void 0 : rowData.selected) classNames.push('selected');
+  var clientWidth = document.documentElement.clientWidth;
+  var timeStart = parserPixelToTime(scrollLeft, {
+    startLeft: startLeft,
+    scale: scale,
+    scaleWidth: scaleWidth
+  });
+  var timeEnd = parserPixelToTime(scrollLeft + clientWidth + 200, {
+    startLeft: startLeft,
+    scale: scale,
+    scaleWidth: scaleWidth
+  });
+  console.log('time = ', timeStart, ', timeEnd = ', timeEnd);
   var handleTime = function handleTime(e) {
     if (!areaRef.current) return;
     var rect = areaRef.current.getBoundingClientRect();
@@ -2981,7 +2993,9 @@ var EditRow = function EditRow(props) {
         });
       }
     }
-  }, ((rowData === null || rowData === void 0 ? void 0 : rowData.actions) || []).map(function (action) {
+  }, ((rowData === null || rowData === void 0 ? void 0 : rowData.actions) || []).filter(function (action) {
+    return action.end >= timeStart && action.start <= timeEnd;
+  }).map(function (action) {
     return /*#__PURE__*/React__default['default'].createElement(EditAction, _objectSpread2(_objectSpread2({
       key: action.id
     }, props), {}, {
@@ -3640,7 +3654,7 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(info) {
         var _info$file$response, _info$file;
-        var totalDuration, _newAction, uid, duration, newAction;
+        var hasDefault, totalDuration, _newAction, uid, duration, newAction;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -3651,11 +3665,36 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
               }
               return _context.a(2);
             case 1:
-              if (info.file.response) {
+              if (!(info.file.type !== 'audio/mp3' && info.file.type !== 'audio/wav' && info.file.type !== 'audio/mpeg')) {
                 _context.n = 2;
                 break;
               }
-              totalDuration = row.actions.reduce(function (max, current) {
+              return _context.a(2, false);
+            case 2:
+              if (!(info.file.status === 'error')) {
+                _context.n = 3;
+                break;
+              }
+              onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [{
+                id: info.file.uid,
+                isUploading: false,
+                start: 0,
+                end: 0,
+                effectId: 'custom_video_effect',
+                isError: true,
+                segment_type: 'bgm',
+                uid: info.file.uid
+              }]);
+              return _context.a(2);
+            case 3:
+              if (info.file.response) {
+                _context.n = 4;
+                break;
+              }
+              hasDefault = row.actions.some(function (action) {
+                return action.id === 'upload-bg-music';
+              });
+              totalDuration = hasDefault ? 0 : row.actions.reduce(function (max, current) {
                 var _max$end;
                 var currentEnd = current.end || 0;
                 var maxEnd = (_max$end = max === null || max === void 0 ? void 0 : max.end) !== null && _max$end !== void 0 ? _max$end : 0;
@@ -3676,11 +3715,11 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [_newAction]);
               return _context.a(2);
-            case 2:
+            case 4:
               uid = info.file.uid;
-              _context.n = 3;
+              _context.n = 5;
               return getAudioDuration(info.file.response.url);
-            case 3:
+            case 5:
               duration = _context.v;
               newAction = {
                 id: ((_info$file$response = info.file.response) === null || _info$file$response === void 0 ? void 0 : _info$file$response.id) || uid,
@@ -3695,7 +3734,7 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
                 uid: (_info$file = info.file) === null || _info$file === void 0 ? void 0 : _info$file.uid
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [newAction]);
-            case 4:
+            case 6:
               return _context.a(2);
           }
         }, _callee);
@@ -3889,6 +3928,7 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
         backgroundPositionX: "0, ".concat(startLeft, "px"),
         backgroundSize: "".concat(startLeft, "px, ").concat(scaleWidth, "px")
       }),
+      scrollLeft: scrollLeft,
       areaRef: editAreaRef,
       key: key,
       rowHeight: (row === null || row === void 0 ? void 0 : row.rowHeight) || _rowHeight,
@@ -3972,7 +4012,8 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
         }).length) > 0,
         customRequest: customRequest,
         onDrop: handleDrop,
-        type: "drag"
+        type: "drag",
+        accept: "audio/mp3,audio/wav,audio/mpeg"
       }, tChildren), tChildren ? null : editRow);
     }
     return editRow;
@@ -4030,6 +4071,7 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
       }
     }
     heightRef.current = height;
+    console.log('Math.max(scaleCount * scaleWidth + startLeft, width)', Math.max(scaleCount * scaleWidth + startLeft, width), ', width', width);
     return /*#__PURE__*/React__default['default'].createElement(reactVirtualized.Grid, {
       columnCount: 1,
       rowCount: heights.length,
@@ -4222,7 +4264,7 @@ var DragLines = /*#__PURE__*/React.memo(function (_ref) {
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: prefix('drag-line-container'),
     style: {
-      height: height || '100%'
+      height: height ? height + 30 :  '100%'
     }
   }, isMoving && movePositions.map(function (movePos) {
     // 查找在容差范围内的辅助线位置
@@ -4640,6 +4682,20 @@ var Timeline = /*#__PURE__*/React__default['default'].forwardRef(function (props
       };
     }
   }, []);
+  React.useEffect(function () {
+    var containerEl = document.querySelector('.timeline-editor');
+    var handleScroll = lodashEs.throttle(function (e) {
+      console.log('scroll', e);
+      scrollSync.current && scrollSync.current.setState({
+        scrollLeft: e.target.scrollLeft || 0
+      });
+    }, 100);
+    containerEl.addEventListener('scroll', handleScroll);
+    return function () {
+      containerEl.removeEventListener('scroll', handleScroll);
+      handleScroll.cancel();
+    };
+  }, []);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     ref: domRef,
     style: style,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sense-react-timeline-editor",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "author": "xzdarcy",
   "license": "MIT",
   "keywords": [