Skip to content

Add order enforcement in stack process #854

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add order enforcement in stack process #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres (more or less) to [Semantic Versioning](http://semver.o
* Add unit argument to onZoom and onTimeChange callbacks
* Add `className` prop to Timeline component to override `react-calendar-timeline` class #682
* Fix injecting custom vertical line's class names for time periods longer than day
* Add shouldStackEnforceOrder parameter for groups to keep the consistent order of items

## 0.26.7

Expand Down
47 changes: 36 additions & 11 deletions src/lib/utility/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,34 @@ export function getVisibleItems(items, canvasTimeStart, canvasTimeEnd, keys) {

const EPSILON = 0.001

export function collision(a, b, lineHeight, collisionPadding = EPSILON) {
export function simpleCollision(a, b, lineHeight, collisionPadding = EPSILON) {
// 2d collisions detection - https://developer.mozilla.org/en-US/docs/Games/Techniques/2D_collision_detection
var verticalMargin = 0

return (
a.collisionLeft + collisionPadding < b.collisionLeft + b.collisionWidth &&
a.collisionLeft + a.collisionWidth - collisionPadding > b.collisionLeft &&
a.top - verticalMargin + collisionPadding < b.top + b.height &&
a.top + a.height + verticalMargin - collisionPadding > b.top
a.top - verticalMargin + collisionPadding < b.top + b.height &&
a.top + a.height + verticalMargin - collisionPadding > b.top
)
}

export function collisionOrOrderMismatch(a, b, lineHeight, collisionPadding = EPSILON) {
// 2d collisions detection - https://developer.mozilla.org/en-US/docs/Games/Techniques/2D_collision_detection
var verticalMargin = 0

return (
a.collisionLeft + collisionPadding < b.collisionLeft + b.collisionWidth &&
a.collisionLeft + a.collisionWidth - collisionPadding > b.collisionLeft &&
((
a.top - verticalMargin + collisionPadding < b.top + b.height &&
a.top + a.height + verticalMargin - collisionPadding > b.top
)
||
(
a.top < b.top
)
)
)
}

Expand All @@ -309,7 +328,8 @@ export function groupStack(
group,
groupHeight,
groupTop,
itemIndex
itemIndex,
collision
) {
// calculate non-overlapping positions
let curHeight = groupHeight
Expand Down Expand Up @@ -387,9 +407,12 @@ export function stackAll(itemsDimensions, groupOrders, lineHeight, stackItems) {
// Is group being stacked?
const isGroupStacked =
group.stackItems !== undefined ? group.stackItems : stackItems
const shouldStackEnforceOrder =
group.shouldStackEnforceOrder !== undefined ? group.shouldStackEnforceOrder : false
const { groupHeight, verticalMargin } = stackGroup(
itemsDimensions,
isGroupStacked,
shouldStackEnforceOrder,
lineHeight,
groupTop
)
Expand All @@ -411,15 +434,16 @@ export function stackAll(itemsDimensions, groupOrders, lineHeight, stackItems) {
}

/**
*
* @param {*} itemsDimensions
* @param {*} isGroupStacked
* @param {*} lineHeight
* @param {*} groupTop
*
* @param {*} itemsDimensions
* @param {*} isGroupStacked
* @param {*} lineHeight
* @param {*} groupTop
*/
export function stackGroup(itemsDimensions, isGroupStacked, lineHeight, groupTop) {
export function stackGroup(itemsDimensions, isGroupStacked, shouldStackEnforceOrder, lineHeight, groupTop) {
var groupHeight = 0
var verticalMargin = 0
const collision = shouldStackEnforceOrder ? collisionOrOrderMismatch : simpleCollision
// Find positions for each item in group
for (let itemIndex = 0; itemIndex < itemsDimensions.length; itemIndex++) {
let r = {}
Expand All @@ -430,7 +454,8 @@ export function stackGroup(itemsDimensions, isGroupStacked, lineHeight, groupTop
itemsDimensions,
groupHeight,
groupTop,
itemIndex
itemIndex,
collision
)
} else {
r = groupNoStack(lineHeight, itemsDimensions[itemIndex], groupHeight, groupTop)
Expand Down