sense-react-timeline-editor 1.1.36 → 1.1.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.esm.js +27 -25
  2. package/dist/index.js +27 -25
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -2021,11 +2021,11 @@ var Cursor = /*#__PURE__*/React.forwardRef(function (props, ref) {
2021
2021
  }, [cursorTime, startLeft, scaleWidth, scale], {
2022
2022
  wait: 10
2023
2023
  });
2024
- var clientHeight = ((_document$querySelect = document.querySelector('#time-editor-container')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollHeight) || 0;
2024
+ var clientHeight = ((_document$querySelect = document.querySelector('.timeline-editor')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0;
2025
2025
  return /*#__PURE__*/React.createElement(RowDnd, {
2026
2026
  top: theme === 'light' ? 26 : 0,
2027
2027
  start: startLeft,
2028
- height: clientHeight,
2028
+ height: Math.max(clientHeight - 26, 0),
2029
2029
  ref: rowRnd,
2030
2030
  parentRef: areaRef,
2031
2031
  bounds: {
@@ -4729,21 +4729,18 @@ var Timeline = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(function (p
4729
4729
  scrollLeft: Math.max(scrollSync.current.state.scrollLeft + delta, 0)
4730
4730
  });
4731
4731
  }, [getMaxScrollLeft]);
4732
- useLayoutEffect(function () {
4733
- var _scrollSync$current$s, _scrollSync$current;
4734
- var maxScrollLeft = getMaxScrollLeft();
4735
- var currentScrollLeft = (_scrollSync$current$s = (_scrollSync$current = scrollSync.current) === null || _scrollSync$current === void 0 ? void 0 : _scrollSync$current.state.scrollLeft) !== null && _scrollSync$current$s !== void 0 ? _scrollSync$current$s : 0;
4736
- var nextScrollLeft = Math.min(Math.max(currentScrollLeft, 0), maxScrollLeft);
4737
- var timelineEl = document.querySelector('.timeline-editor');
4738
- if (timelineEl && Math.abs(timelineEl.scrollLeft - nextScrollLeft) > 1) {
4739
- timelineEl.scrollLeft = nextScrollLeft;
4740
- }
4741
- if (scrollSync.current && Math.abs(currentScrollLeft - nextScrollLeft) > 1) {
4742
- scrollSync.current.setState({
4743
- scrollLeft: nextScrollLeft
4744
- });
4745
- }
4746
- }, [getMaxScrollLeft, scale, scaleWidth, scaleCount, width]);
4732
+ // useLayoutEffect(() => {
4733
+ // const maxScrollLeft = getMaxScrollLeft();
4734
+ // const currentScrollLeft = scrollSync.current?.state.scrollLeft ?? 0;
4735
+ // const nextScrollLeft = Math.min(Math.max(currentScrollLeft, 0), maxScrollLeft);
4736
+ // const timelineEl = document.querySelector('.timeline-editor') as HTMLElement | null;
4737
+ // if (timelineEl && Math.abs(timelineEl.scrollLeft - nextScrollLeft) > 1) {
4738
+ // timelineEl.scrollLeft = nextScrollLeft;
4739
+ // }
4740
+ // if (scrollSync.current && Math.abs(currentScrollLeft - nextScrollLeft) > 1) {
4741
+ // scrollSync.current.setState({ scrollLeft: nextScrollLeft });
4742
+ // }
4743
+ // }, [getMaxScrollLeft, scale, scaleWidth, scaleCount, width]);
4747
4744
  var handleInitDragLine = useCallback(function (data) {
4748
4745
  var _checkedProps$onActio, _checkedProps$onActio2, _dragLineControllerRe;
4749
4746
  (_checkedProps$onActio = checkedProps.onActionMoveStart) === null || _checkedProps$onActio === void 0 ? void 0 : _checkedProps$onActio.call(checkedProps, data);
@@ -4792,13 +4789,18 @@ var Timeline = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(function (p
4792
4789
  if (areaEl) return;
4793
4790
  var actionEl = target.closest('.timeline-editor-action');
4794
4791
  if (actionEl) {
4795
- var _props$onClickActionO;
4796
- // @ts-expect-error 类型断言
4797
- (_props$onClickActionO = props.onClickActionOnly) === null || _props$onClickActionO === void 0 ? void 0 : _props$onClickActionO.call(props, e, {
4798
- action: {
4799
- id: actionEl.dataset.actionId
4792
+ setTimeout(function () {
4793
+ // @ts-expect-error 类型断言
4794
+ if ((actionEl === null || actionEl === void 0 ? void 0 : actionEl.dataset.actionDrag) !== 'true') {
4795
+ var _props$onClickActionO;
4796
+ // @ts-expect-error 类型断言
4797
+ (_props$onClickActionO = props.onClickActionOnly) === null || _props$onClickActionO === void 0 ? void 0 : _props$onClickActionO.call(props, e, {
4798
+ action: {
4799
+ id: actionEl.dataset.actionId
4800
+ }
4801
+ });
4800
4802
  }
4801
- });
4803
+ }, 500);
4802
4804
  return;
4803
4805
  }
4804
4806
  engineRef.current.trigger('mousedown', {
@@ -4869,12 +4871,12 @@ var Timeline = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(function (p
4869
4871
  };
4870
4872
  });
4871
4873
  var onClickTimeline = useCallback(function (e) {
4872
- var _ref2, _timelineEditorEl$scr, _scrollSync$current2, _e$target;
4874
+ var _ref2, _timelineEditorEl$scr, _scrollSync$current, _e$target;
4873
4875
  if (!domRef.current) return;
4874
4876
  var timelineEditorEl = document.querySelector('.timeline-editor');
4875
4877
  var rect = domRef.current.getBoundingClientRect();
4876
4878
  var position = e.clientX - rect.x;
4877
- var scrollLeft = (_ref2 = (_timelineEditorEl$scr = timelineEditorEl === null || timelineEditorEl === void 0 ? void 0 : timelineEditorEl.scrollLeft) !== null && _timelineEditorEl$scr !== void 0 ? _timelineEditorEl$scr : (_scrollSync$current2 = scrollSync.current) === null || _scrollSync$current2 === void 0 ? void 0 : _scrollSync$current2.state.scrollLeft) !== null && _ref2 !== void 0 ? _ref2 : 0;
4879
+ var scrollLeft = (_ref2 = (_timelineEditorEl$scr = timelineEditorEl === null || timelineEditorEl === void 0 ? void 0 : timelineEditorEl.scrollLeft) !== null && _timelineEditorEl$scr !== void 0 ? _timelineEditorEl$scr : (_scrollSync$current = scrollSync.current) === null || _scrollSync$current === void 0 ? void 0 : _scrollSync$current.state.scrollLeft) !== null && _ref2 !== void 0 ? _ref2 : 0;
4878
4880
  var left = position + scrollLeft;
4879
4881
  var time = parserPixelToTime(left, {
4880
4882
  startLeft: startLeft,
package/dist/index.js CHANGED
@@ -2031,11 +2031,11 @@ var Cursor = /*#__PURE__*/React__default['default'].forwardRef(function (props,
2031
2031
  }, [cursorTime, startLeft, scaleWidth, scale], {
2032
2032
  wait: 10
2033
2033
  });
2034
- var clientHeight = ((_document$querySelect = document.querySelector('#time-editor-container')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollHeight) || 0;
2034
+ var clientHeight = ((_document$querySelect = document.querySelector('.timeline-editor')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0;
2035
2035
  return /*#__PURE__*/React__default['default'].createElement(RowDnd, {
2036
2036
  top: theme === 'light' ? 26 : 0,
2037
2037
  start: startLeft,
2038
- height: clientHeight,
2038
+ height: Math.max(clientHeight - 26, 0),
2039
2039
  ref: rowRnd,
2040
2040
  parentRef: areaRef,
2041
2041
  bounds: {
@@ -4739,21 +4739,18 @@ var Timeline = /*#__PURE__*/React__default['default'].memo(/*#__PURE__*/React__d
4739
4739
  scrollLeft: Math.max(scrollSync.current.state.scrollLeft + delta, 0)
4740
4740
  });
4741
4741
  }, [getMaxScrollLeft]);
4742
- React.useLayoutEffect(function () {
4743
- var _scrollSync$current$s, _scrollSync$current;
4744
- var maxScrollLeft = getMaxScrollLeft();
4745
- var currentScrollLeft = (_scrollSync$current$s = (_scrollSync$current = scrollSync.current) === null || _scrollSync$current === void 0 ? void 0 : _scrollSync$current.state.scrollLeft) !== null && _scrollSync$current$s !== void 0 ? _scrollSync$current$s : 0;
4746
- var nextScrollLeft = Math.min(Math.max(currentScrollLeft, 0), maxScrollLeft);
4747
- var timelineEl = document.querySelector('.timeline-editor');
4748
- if (timelineEl && Math.abs(timelineEl.scrollLeft - nextScrollLeft) > 1) {
4749
- timelineEl.scrollLeft = nextScrollLeft;
4750
- }
4751
- if (scrollSync.current && Math.abs(currentScrollLeft - nextScrollLeft) > 1) {
4752
- scrollSync.current.setState({
4753
- scrollLeft: nextScrollLeft
4754
- });
4755
- }
4756
- }, [getMaxScrollLeft, scale, scaleWidth, scaleCount, width]);
4742
+ // useLayoutEffect(() => {
4743
+ // const maxScrollLeft = getMaxScrollLeft();
4744
+ // const currentScrollLeft = scrollSync.current?.state.scrollLeft ?? 0;
4745
+ // const nextScrollLeft = Math.min(Math.max(currentScrollLeft, 0), maxScrollLeft);
4746
+ // const timelineEl = document.querySelector('.timeline-editor') as HTMLElement | null;
4747
+ // if (timelineEl && Math.abs(timelineEl.scrollLeft - nextScrollLeft) > 1) {
4748
+ // timelineEl.scrollLeft = nextScrollLeft;
4749
+ // }
4750
+ // if (scrollSync.current && Math.abs(currentScrollLeft - nextScrollLeft) > 1) {
4751
+ // scrollSync.current.setState({ scrollLeft: nextScrollLeft });
4752
+ // }
4753
+ // }, [getMaxScrollLeft, scale, scaleWidth, scaleCount, width]);
4757
4754
  var handleInitDragLine = React.useCallback(function (data) {
4758
4755
  var _checkedProps$onActio, _checkedProps$onActio2, _dragLineControllerRe;
4759
4756
  (_checkedProps$onActio = checkedProps.onActionMoveStart) === null || _checkedProps$onActio === void 0 ? void 0 : _checkedProps$onActio.call(checkedProps, data);
@@ -4802,13 +4799,18 @@ var Timeline = /*#__PURE__*/React__default['default'].memo(/*#__PURE__*/React__d
4802
4799
  if (areaEl) return;
4803
4800
  var actionEl = target.closest('.timeline-editor-action');
4804
4801
  if (actionEl) {
4805
- var _props$onClickActionO;
4806
- // @ts-expect-error 类型断言
4807
- (_props$onClickActionO = props.onClickActionOnly) === null || _props$onClickActionO === void 0 ? void 0 : _props$onClickActionO.call(props, e, {
4808
- action: {
4809
- id: actionEl.dataset.actionId
4802
+ setTimeout(function () {
4803
+ // @ts-expect-error 类型断言
4804
+ if ((actionEl === null || actionEl === void 0 ? void 0 : actionEl.dataset.actionDrag) !== 'true') {
4805
+ var _props$onClickActionO;
4806
+ // @ts-expect-error 类型断言
4807
+ (_props$onClickActionO = props.onClickActionOnly) === null || _props$onClickActionO === void 0 ? void 0 : _props$onClickActionO.call(props, e, {
4808
+ action: {
4809
+ id: actionEl.dataset.actionId
4810
+ }
4811
+ });
4810
4812
  }
4811
- });
4813
+ }, 500);
4812
4814
  return;
4813
4815
  }
4814
4816
  engineRef.current.trigger('mousedown', {
@@ -4879,12 +4881,12 @@ var Timeline = /*#__PURE__*/React__default['default'].memo(/*#__PURE__*/React__d
4879
4881
  };
4880
4882
  });
4881
4883
  var onClickTimeline = React.useCallback(function (e) {
4882
- var _ref2, _timelineEditorEl$scr, _scrollSync$current2, _e$target;
4884
+ var _ref2, _timelineEditorEl$scr, _scrollSync$current, _e$target;
4883
4885
  if (!domRef.current) return;
4884
4886
  var timelineEditorEl = document.querySelector('.timeline-editor');
4885
4887
  var rect = domRef.current.getBoundingClientRect();
4886
4888
  var position = e.clientX - rect.x;
4887
- var scrollLeft = (_ref2 = (_timelineEditorEl$scr = timelineEditorEl === null || timelineEditorEl === void 0 ? void 0 : timelineEditorEl.scrollLeft) !== null && _timelineEditorEl$scr !== void 0 ? _timelineEditorEl$scr : (_scrollSync$current2 = scrollSync.current) === null || _scrollSync$current2 === void 0 ? void 0 : _scrollSync$current2.state.scrollLeft) !== null && _ref2 !== void 0 ? _ref2 : 0;
4889
+ var scrollLeft = (_ref2 = (_timelineEditorEl$scr = timelineEditorEl === null || timelineEditorEl === void 0 ? void 0 : timelineEditorEl.scrollLeft) !== null && _timelineEditorEl$scr !== void 0 ? _timelineEditorEl$scr : (_scrollSync$current = scrollSync.current) === null || _scrollSync$current === void 0 ? void 0 : _scrollSync$current.state.scrollLeft) !== null && _ref2 !== void 0 ? _ref2 : 0;
4888
4890
  var left = position + scrollLeft;
4889
4891
  var time = parserPixelToTime(left, {
4890
4892
  startLeft: startLeft,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sense-react-timeline-editor",
3
- "version": "1.1.36",
3
+ "version": "1.1.38",
4
4
  "author": "xzdarcy",
5
5
  "license": "MIT",
6
6
  "keywords": [