Skip to content

Commit

Permalink
Merge pull request #141 from melfore/70-drag-do-not-inherit-resolution
Browse files Browse the repository at this point in the history
70 drag do not inherit resolution
  • Loading branch information
CrisGrud authored Oct 31, 2023
2 parents 58b0bfa + 9fbda43 commit f73c53a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# [1.16.0](https://github.com/melfore/konva-timeline/compare/v1.15.4...v1.16.0) (2023-10-27)


### Features

* 🎸 [KonvaTimeLine]Added Range validation ([7b601d4](https://github.com/melfore/konva-timeline/commit/7b601d44645fbfd21920631e6eab4472f844d4ca)), closes [#138](https://github.com/melfore/konva-timeline/issues/138)
- 🎸 [KonvaTimeLine]Added Range validation ([7b601d4](https://github.com/melfore/konva-timeline/commit/7b601d44645fbfd21920631e6eab4472f844d4ca)), closes [#138](https://github.com/melfore/konva-timeline/issues/138)

## [1.15.4](https://github.com/melfore/konva-timeline/compare/v1.15.3...v1.15.4) (2023-10-26)

Expand Down
2 changes: 1 addition & 1 deletion src/timeline/TimelineContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const TimelineProvider = ({
onTaskChange,
tasks: externalTasks = [],
range: externalRange,
resolution: externalResolution = "1hrs",
resolution: externalResolution = "1min",
resources: externalResources,
rowHeight: externalRowHeight,
timezone: externalTimezone,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/timeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export type TimelineInput = {
*/
hideResources?: boolean;
/**
* Resolution to display data in konva-timeline (defaults to 1hrs)
* Resolution to display data in konva-timeline (defaults to 1min)
*/
resolution?: Resolution;
/**
Expand Down

0 comments on commit f73c53a

Please sign in to comment.