Skip to content

Feat/xzdarcy integration branch #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khanzzirfan wants to merge 7 commits into
base: fix/drag-droparea
Choose a base branch
from
Open

Feat/xzdarcy integration branch #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f5dcd0
fix: updated upstream changes in to current branch
khanzzirfan Sep 16, 2023
c1579cd
fix: drop row appened to on actionmoving and actionmovingend function…
khanzzirfan Sep 24, 2023
7570a17
chore(release): 0.19.6
khanzzirfan Sep 24, 2023
2d6b1e3
chore(release): 0.19.7-alpha.0
khanzzirfan Sep 25, 2023
519f4db
fix: updated end of the timeline to restrict the dragging
khanzzirfan Oct 1, 2023
3b0c57f
chore(release): 0.19.7-alpha.1
khanzzirfan Oct 1, 2023
62d659a
chore(release): 0.19.7-alpha.2
khanzzirfan Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .dumi/theme/builtins/API.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ const DataLink = {
TimelineRow: '/data#timelinerow',
TimelineAction: '/data#timelineaction',
TimelineEffect: '/data#timelineeffect',
ITimelineEngine: '/engine/api',
};

const keys = Object.keys(DataLink);
const reg = new RegExp(/TimelineState|TimelineAction|TimelineRow|TimelineEffect/);
const reg = new RegExp(/TimelineState|TimelineAction|TimelineRow|TimelineEffect|ITimelineEngine/);

const LOCALE_TEXTS = {
'zh-CN': {
Expand Down
83 changes: 83 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,89 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.19.7-alpha.2](https://github.com/khanzzirfan/react-timeline-editor/compare/v0.19.7-alpha.1...v0.19.7-alpha.2) (2023-10-01)

### [0.19.7-alpha.1](https://github.com/khanzzirfan/react-timeline-editor/compare/v0.19.7-alpha.0...v0.19.7-alpha.1) (2023-10-01)


### Bug Fixes

* updated end of the timeline to restrict the dragging ([519f4db](https://github.com/khanzzirfan/react-timeline-editor/commit/519f4dbfa2ff8ed1009b544f8fbbb639564c8cf0))

### [0.19.7-alpha.0](https://github.com/khanzzirfan/react-timeline-editor/compare/v0.19.6...v0.19.7-alpha.0) (2023-09-25)

### 0.19.6 (2023-09-24)


### Features

* ✨ add cursor drag start/end props ([61b5a5e](https://github.com/khanzzirfan/react-timeline-editor/commit/61b5a5e2a0a263541d908fe82d65c3eed74851f8))
* ✨ allow to set scrollLeft ([dcc8d1e](https://github.com/khanzzirfan/react-timeline-editor/commit/dcc8d1eade0c4c4c70976c6c8c02b5d1fc2570fe))
* ✨ auto scroll when drag cursor ([fc55f56](https://github.com/khanzzirfan/react-timeline-editor/commit/fc55f56afb8ec0633d4e90e1e3bc7ee1aec7b790))
* ✨ on cursor drag ([8150141](https://github.com/khanzzirfan/react-timeline-editor/commit/815014156d39eb0736c346fc270da8f5ffb6d31a))
* fixed the row drag and drop and cursor locked to its y position ([85dbf46](https://github.com/khanzzirfan/react-timeline-editor/commit/85dbf46ca6fd12c27c0c957dcb7662dedc511c21))


### Bug Fixes

* 🐛 compatible with react18 ([de966e0](https://github.com/khanzzirfan/react-timeline-editor/commit/de966e012a7306cc492a12547638a8d494846301))
* 🐛 cursor listen scrollLeft change ([520e4cb](https://github.com/khanzzirfan/react-timeline-editor/commit/520e4cbedf0c5a5d5063fa91d4359733105d9abd))
* 🐛 engine example audio play ([a0f6e54](https://github.com/khanzzirfan/react-timeline-editor/commit/a0f6e54be025b688e0c9d5ed0c36b05b8fc5c788))
* 🐛 engine example destroy error ([b2919d9](https://github.com/khanzzirfan/react-timeline-editor/commit/b2919d919e0b03fc1b2880017c12e8eabf4a502e))
* 🐛 engine example engine reference error ([123e72e](https://github.com/khanzzirfan/react-timeline-editor/commit/123e72eb315046ab954ae591574ae2500f2f57c5))
* 🐛 react type config ([cca5a5b](https://github.com/khanzzirfan/react-timeline-editor/commit/cca5a5b9d617de092b5b8904390a2a34c2f87822))
* 🐛 remove 'window' to adapt for nextjs ([51904d5](https://github.com/khanzzirfan/react-timeline-editor/commit/51904d5456643e0b66e2227fe74eb6fc78f8ac20))
* 🐛 remove not necessary dependencies ([61a115d](https://github.com/khanzzirfan/react-timeline-editor/commit/61a115dd5dcfe870a080e6915486898bae27b873))
* 🐛 scroll sync error ([0a7b459](https://github.com/khanzzirfan/react-timeline-editor/commit/0a7b459a3bf77e9c0879528ff0956ec5163f7440))
* drop row appened to on actionmoving and actionmovingend functionality ([c1579cd](https://github.com/khanzzirfan/react-timeline-editor/commit/c1579cd5a307f2c6df4824db6970e9e614586826))
* **emitter:** make offAll() keep events names ([d02f2b7](https://github.com/khanzzirfan/react-timeline-editor/commit/d02f2b79017c1cb1d78465b42afb64804c8f86bf))
* fixed bug fixes on null action items ([635ce17](https://github.com/khanzzirfan/react-timeline-editor/commit/635ce17a04bc3e60786df6b8eeba53f684354729))
* fixed bug fixes on null action items ([7566dc8](https://github.com/khanzzirfan/react-timeline-editor/commit/7566dc8c0843ddc42f0c60fea3b6aca316d3984e))
* fixed bug fixes on null action items ([248e9cb](https://github.com/khanzzirfan/react-timeline-editor/commit/248e9cb16a4531db7ee81f433be70b49800040e5))
* fixed bug fixes on null action items ([0b12559](https://github.com/khanzzirfan/react-timeline-editor/commit/0b12559735cfdd670143989a0decda29576fc038))
* fixed bug fixes on null action items ([b446a19](https://github.com/khanzzirfan/react-timeline-editor/commit/b446a19af540b37d2cc610d4ee4e1408bfecd974))
* updated packagejson ([629a2c9](https://github.com/khanzzirfan/react-timeline-editor/commit/629a2c9c0db4f0dcbda3056131f7eadd20cdf175))
* updated packagejson ([941743a](https://github.com/khanzzirfan/react-timeline-editor/commit/941743a179a798e27c37dd1648acb85084013027))
* updated packagejson ([1b160c5](https://github.com/khanzzirfan/react-timeline-editor/commit/1b160c599bf120df9ee8c769f6b0c7e8a02a6617))
* updated timeline editor ([ed1522f](https://github.com/khanzzirfan/react-timeline-editor/commit/ed1522f649b74cfa0a93706bce9931bb468600dd))
* updated upstream changes in to current branch ([4f5dcd0](https://github.com/khanzzirfan/react-timeline-editor/commit/4f5dcd005da00255842c0e09501ed4e502d76c63))

### 0.19.5 (2023-09-24)


### Features

* ✨ add cursor drag start/end props ([61b5a5e](https://github.com/khanzzirfan/react-timeline-editor/commit/61b5a5e2a0a263541d908fe82d65c3eed74851f8))
* ✨ allow to set scrollLeft ([dcc8d1e](https://github.com/khanzzirfan/react-timeline-editor/commit/dcc8d1eade0c4c4c70976c6c8c02b5d1fc2570fe))
* ✨ auto scroll when drag cursor ([fc55f56](https://github.com/khanzzirfan/react-timeline-editor/commit/fc55f56afb8ec0633d4e90e1e3bc7ee1aec7b790))
* ✨ on cursor drag ([8150141](https://github.com/khanzzirfan/react-timeline-editor/commit/815014156d39eb0736c346fc270da8f5ffb6d31a))
* fixed the row drag and drop and cursor locked to its y position ([85dbf46](https://github.com/khanzzirfan/react-timeline-editor/commit/85dbf46ca6fd12c27c0c957dcb7662dedc511c21))


### Bug Fixes

* 🐛 compatible with react18 ([de966e0](https://github.com/khanzzirfan/react-timeline-editor/commit/de966e012a7306cc492a12547638a8d494846301))
* 🐛 cursor listen scrollLeft change ([520e4cb](https://github.com/khanzzirfan/react-timeline-editor/commit/520e4cbedf0c5a5d5063fa91d4359733105d9abd))
* 🐛 engine example audio play ([a0f6e54](https://github.com/khanzzirfan/react-timeline-editor/commit/a0f6e54be025b688e0c9d5ed0c36b05b8fc5c788))
* 🐛 engine example destroy error ([b2919d9](https://github.com/khanzzirfan/react-timeline-editor/commit/b2919d919e0b03fc1b2880017c12e8eabf4a502e))
* 🐛 engine example engine reference error ([123e72e](https://github.com/khanzzirfan/react-timeline-editor/commit/123e72eb315046ab954ae591574ae2500f2f57c5))
* 🐛 react type config ([cca5a5b](https://github.com/khanzzirfan/react-timeline-editor/commit/cca5a5b9d617de092b5b8904390a2a34c2f87822))
* 🐛 remove 'window' to adapt for nextjs ([51904d5](https://github.com/khanzzirfan/react-timeline-editor/commit/51904d5456643e0b66e2227fe74eb6fc78f8ac20))
* 🐛 remove not necessary dependencies ([61a115d](https://github.com/khanzzirfan/react-timeline-editor/commit/61a115dd5dcfe870a080e6915486898bae27b873))
* 🐛 scroll sync error ([0a7b459](https://github.com/khanzzirfan/react-timeline-editor/commit/0a7b459a3bf77e9c0879528ff0956ec5163f7440))
* drop row appened to on actionmoving and actionmovingend functionality ([c1579cd](https://github.com/khanzzirfan/react-timeline-editor/commit/c1579cd5a307f2c6df4824db6970e9e614586826))
* **emitter:** make offAll() keep events names ([d02f2b7](https://github.com/khanzzirfan/react-timeline-editor/commit/d02f2b79017c1cb1d78465b42afb64804c8f86bf))
* fixed bug fixes on null action items ([635ce17](https://github.com/khanzzirfan/react-timeline-editor/commit/635ce17a04bc3e60786df6b8eeba53f684354729))
* fixed bug fixes on null action items ([7566dc8](https://github.com/khanzzirfan/react-timeline-editor/commit/7566dc8c0843ddc42f0c60fea3b6aca316d3984e))
* fixed bug fixes on null action items ([248e9cb](https://github.com/khanzzirfan/react-timeline-editor/commit/248e9cb16a4531db7ee81f433be70b49800040e5))
* fixed bug fixes on null action items ([0b12559](https://github.com/khanzzirfan/react-timeline-editor/commit/0b12559735cfdd670143989a0decda29576fc038))
* fixed bug fixes on null action items ([b446a19](https://github.com/khanzzirfan/react-timeline-editor/commit/b446a19af540b37d2cc610d4ee4e1408bfecd974))
* updated packagejson ([629a2c9](https://github.com/khanzzirfan/react-timeline-editor/commit/629a2c9c0db4f0dcbda3056131f7eadd20cdf175))
* updated packagejson ([941743a](https://github.com/khanzzirfan/react-timeline-editor/commit/941743a179a798e27c37dd1648acb85084013027))
* updated packagejson ([1b160c5](https://github.com/khanzzirfan/react-timeline-editor/commit/1b160c599bf120df9ee8c769f6b0c7e8a02a6617))
* updated timeline editor ([ed1522f](https://github.com/khanzzirfan/react-timeline-editor/commit/ed1522f649b74cfa0a93706bce9931bb468600dd))
* updated upstream changes in to current branch ([4f5dcd0](https://github.com/khanzzirfan/react-timeline-editor/commit/4f5dcd005da00255842c0e09501ed4e502d76c63))

### 0.19.4 (2023-07-08)


Expand Down
2 changes: 1 addition & 1 deletion docs/editor-demo/editor-basic-irfan/mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const mockData: TimelineRow[] = [
{
id: 'action10',
start: 1.5,
end: 5,
end: 3,
effectId: 'effect1',
},
],
Expand Down
1 change: 1 addition & 0 deletions docs/editor-demo/editor-basic/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const TimelineEditor = () => {
editorData={data}
effects={mockEffect}
hideCursor={false}
autoScroll={true}
/>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions docs/editor-demo/editor-scale-customization/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const TimelineEditor = () => {
</Input.Group>
<Timeline
onChange={setData}
autoScroll={true}
editorData={data}
effects={mockEffect}
scale={scale}
Expand Down
Loading