Skip to content
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

Days selection fix when using RTL languages #172

Merged
merged 2 commits into from
Nov 12, 2016
Merged

Days selection fix when using RTL languages #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a2d6b
a better solution
DorWeid Oct 24, 2016
256c087
also a fix for TimeGrid
DorWeid Oct 24, 2016
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
11 changes: 7 additions & 4 deletions src/BackgroundCells.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ class DisplayCells extends React.Component {
static propTypes = {
selectable: React.PropTypes.bool,
onSelect: React.PropTypes.func,
slots: React.PropTypes.number
slots: React.PropTypes.number,
rtl: React.PropTypes.bool
}

state = { selecting: false }
Expand Down Expand Up @@ -62,7 +63,7 @@ class DisplayCells extends React.Component {
let selector = this._selector = new Selection(this.props.container)

selector.on('selecting', box => {
let { slots } = this.props;
let { slots, rtl } = this.props;

let startIdx = -1;
let endIdx = -1;
Expand All @@ -78,7 +79,8 @@ class DisplayCells extends React.Component {
this._initial
, nodeBox
, box
, slots));
, slots
, rtl));
}

this.setState({
Expand All @@ -90,10 +92,11 @@ class DisplayCells extends React.Component {
selector
.on('click', point => {
let rowBox = getBoundsForNode(node)
let { slots, rtl } = this.props;

if (pointInBox(rowBox, point)) {
let width = slotWidth(getBoundsForNode(node), this.props.slots);
let currentCell = getCellAtX(rowBox, point.x, width);
let currentCell = getCellAtX(rowBox, point.x, width, rtl, slots);

this._selectSlot({
startIdx: currentCell,
Expand Down
1 change: 1 addition & 0 deletions src/Month.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ let MonthView = React.createClass({

return (
<BackgroundCells
rtl={this.props.rtl}
slots={7}
onSelectSlot={onSelectSlot}
container={() => findDOMNode(this)}
Expand Down
1 change: 1 addition & 0 deletions src/TimeGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ export default class TimeGrid extends Component {
</div>
<div ref='allDay' className='rbc-allday-cell'>
<BackgroundCells
rtl={this.props.rtl}
slots={range.length}
container={()=> this.refs.allDay}
selectable={this.props.selectable}
Expand Down
12 changes: 7 additions & 5 deletions src/utils/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ export function slotWidth(rowBox, slots){
return cellWidth
}

export function getCellAtX(rowBox, x, cellWidth) {
return Math.floor((x - rowBox.left) / cellWidth);
export function getCellAtX(rowBox, x, cellWidth, rtl, slots) {
return (rtl ? slots - 1 - Math.floor((x - rowBox.left) / cellWidth) :
Math.floor((x - rowBox.left) / cellWidth));
}

export function pointInBox(box, { x, y }) {
Expand All @@ -22,15 +23,15 @@ export function pointInBox(box, { x, y }) {
)
}

export function dateCellSelection(start, rowBox, box, slots){
export function dateCellSelection(start, rowBox, box, slots, rtl){
let startIdx = -1;
let endIdx = -1;
let lastSlotIdx = slots - 1

let cellWidth = slotWidth(rowBox, slots);

// cell under the mouse
let currentSlot = getCellAtX(rowBox, box.x, cellWidth);
let currentSlot = getCellAtX(rowBox, box.x, cellWidth, rtl, slots);

// Identify row as either the initial row
// or the row under the current mouse point
Expand Down Expand Up @@ -61,7 +62,8 @@ export function dateCellSelection(start, rowBox, box, slots){

if (isStartRow) {
// select the cell under the initial point
startIdx = endIdx = Math.floor((start.x - rowBox.left) / cellWidth)
startIdx = endIdx = ( rtl ? lastSlotIdx - Math.floor((start.x - rowBox.left) / cellWidth) :
Math.floor((start.x - rowBox.left) / cellWidth));

if (isCurrentRow) {
if (currentSlot < startIdx) startIdx = currentSlot
Expand Down