Merge pull request #1 from vparaskevas/master

Merging code from vparaskevas

Author: gabsoftware

.gitignore

@@ -6,3 +6,4 @@ node_modules
 .DS_Store
 *.log
 .idea
+lib/react-selectable-fast.js

dist/index.js

@@ -1,12 +1,12 @@
 {
-  "name": "react-selectable-fast",
-  "version": "3.4.0",
+  "name": "react-selectable-fast2",
+  "version": "3.4.1",
   "description": "Enable other React components to be selectable by drawing a box with your mouse/touch",
   "repository": {
     "type": "git",
-    "url": "git://github.com/valerybugakov/react-selectable-fast.git"
+    "url": "git://github.com/vparaskevas/react-selectable-fast.git"
   },
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "scripts": {
     "clean": "rimraf ./lib ./dist",
     "watch": "webpack --watch",

dist/index.js.map

@@ -9,7 +9,7 @@ import {
   noop,
   Maybe,
   TComputedBounds,
-  getDocumentScroll,
+  getDocumentScroll
 } from './utils'
 import { TSelectableItem } from './Selectable.types'
 import { SelectableGroupContext } from './SelectableGroup.context'
@@ -110,7 +110,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
     allowCtrlClick: false,
     allowMetaClick: false,
     allowShiftClick: false,
-    selectOnClick: true,
+    selectOnClick: true
   }
 
   state = { selectionMode: false }
@@ -132,7 +132,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
   mouseDownData: TMouseDownData = {
     selectboxY: 0,
     selectboxX: 0,
-    target: null,
+    target: null
   }
 
   registry = new Set<TSelectableItem>()
@@ -161,12 +161,12 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
 
   containerScroll = {
     scrollTop: 0,
-    scrollLeft: 0,
+    scrollLeft: 0
   }
 
   documentScroll = {
     scrollTop: 0,
-    scrollLeft: 0,
+    scrollLeft: 0
   }
 
   componentDidMount() {
@@ -214,7 +214,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
 
     this.containerScroll = {
       scrollTop,
-      scrollLeft,
+      scrollLeft
     }
   }
 
@@ -223,20 +223,20 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
 
     this.documentScroll = {
       scrollTop: documentScrollTop,
-      scrollLeft: documentScrollLeft,
+      scrollLeft: documentScrollLeft
     }
   }
 
   get containerDocumentScroll() {
     return {
       scrollTop: this.containerScroll.scrollTop + this.documentScroll.scrollTop,
-      scrollLeft: this.containerScroll.scrollLeft + this.documentScroll.scrollLeft,
+      scrollLeft: this.containerScroll.scrollLeft + this.documentScroll.scrollLeft
     }
   }
 
   removeTempEventListeners() {
     document.removeEventListener('mousemove', this.updateSelectBox)
-    document.removeEventListener('touchmove', this.updateSelectBox)
+    // document.removeEventListener('touchmove', this.updateSelectBox)
     document.removeEventListener('mouseup', this.mouseUp)
     document.removeEventListener('touchend', this.mouseUp)
   }
@@ -279,7 +279,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
   toggleSelectionMode() {
     const {
       selectedItems,
-      state: { selectionMode },
+      state: { selectionMode }
     } = this
 
     if (selectedItems.size && !selectionMode) {
@@ -363,7 +363,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
       x: selectboxX,
       y: selectboxY,
       width: Math.abs(pointX - mouseDownData.selectboxX),
-      height: Math.abs(pointY - mouseDownData.selectboxY),
+      height: Math.abs(pointY - mouseDownData.selectboxY)
     }
 
     this.setSelectboxState!(selectboxState)
@@ -374,7 +374,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
       width: selectboxState.width,
       height: selectboxState.height,
       offsetWidth: selectboxState.width || 1,
-      offsetHeight: selectboxState.height || 1,
+      offsetHeight: selectboxState.height || 1
     }
 
     this.selectItems(selectboxBounds)
@@ -392,7 +392,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
         tolerance: tolerance!,
         mixedDeselect: mixedDeselect!,
         enableDeselect: enableDeselect!,
-        isFromClick: options && options.isFromClick,
+        isFromClick: options && options.isFromClick
       })
     }
   }
@@ -459,7 +459,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
     }
 
     this.setState({ selectionMode: false })
-    this.props.onSelectionFinish!([...this.selectedItems])
+    this.props.onSelectionFinish!([...this.selectedItems], this.selectableGroup)
     this.props.onSelectionClear!()
   }
 
@@ -474,7 +474,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
     }
 
     this.setState({ selectionMode: true })
-    this.props.onSelectionFinish!([...this.selectedItems])
+    this.props.onSelectionFinish!([...this.selectedItems], this.selectableGroup)
   }
 
   isInIgnoreList(target: HTMLElement | null) {
@@ -511,7 +511,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
         allowAltClick: this.props.allowAltClick,
         allowCtrlClick: this.props.allowCtrlClick,
         allowMetaClick: this.props.allowMetaClick,
-        allowShiftClick: this.props.allowShiftClick,
+        allowShiftClick: this.props.allowShiftClick
       })
     if (this.mouseDownStarted || this.props.disabled || isNotLeftButtonClick) {
       return
@@ -541,15 +541,15 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
           width: 0,
           height: 0,
           offsetHeight: bounds.offsetHeight,
-          offsetWidth: bounds.offsetWidth,
+          offsetWidth: bounds.offsetWidth
         },
         {
           top: evt.pageY,
           left: evt.pageX,
           width: 0,
           height: 0,
           offsetWidth: 0,
-          offsetHeight: 0,
+          offsetHeight: 0
         }
       )
 
@@ -564,7 +564,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
     this.mouseDownData = {
       target: evt.target as HTMLElement,
       selectboxY: evt.clientY - this.scrollBounds!.top + this.containerScroll.scrollTop,
-      selectboxX: evt.clientX - this.scrollBounds!.left + this.containerScroll.scrollLeft,
+      selectboxX: evt.clientX - this.scrollBounds!.left + this.containerScroll.scrollLeft
     }
 
     if( this.props.selectingWithoutMouseMove ) {
@@ -574,7 +574,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
     evt.preventDefault()
 
     document.addEventListener('mousemove', this.updateSelectBox)
-    document.addEventListener('touchmove', this.updateSelectBox)
+    // document.addEventListener('touchmove', this.updateSelectBox)
     document.addEventListener('mouseup', this.mouseUp)
     document.addEventListener('touchend', this.mouseUp)
   }
@@ -621,9 +621,9 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
         x: 0,
         y: 0,
         width: 0,
-        height: 0,
+        height: 0
       })
-      this.props.onSelectionFinish!([...this.selectedItems])
+      this.props.onSelectionFinish!([...this.selectedItems], this.selectableGroup)
     }
 
     this.toggleSelectionMode()
@@ -659,7 +659,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
 
   // eslint-disable-next-line react/sort-comp
   defaultContainerStyle: CSSProperties = {
-    position: 'relative',
+    position: 'relative'
   }
 
   contextValue = {
@@ -668,8 +668,8 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
       unregister: this.unregisterSelectable,
       selectAll: this.selectAll,
       clearSelection: this.clearSelection,
-      getScrolledContainer: () => this.scrollContainer,
-    },
+      getScrolledContainer: () => this.scrollContainer
+    }
   }
 
   handleClick(evt: any, top: number, left: number) {
@@ -694,12 +694,12 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
           width: 0,
           height: 0,
           offsetWidth: 0,
-          offsetHeight: 0,
+          offsetHeight: 0
         },
         { isFromClick: true }
       )
 
-      onSelectionFinish!([...this.selectedItems], this.clickedItem)
+      onSelectionFinish!([...this.selectedItems], this.selectableGroup, this.clickedItem)
 
       if (evt.which === 1) {
         this.preventEvent(evt.target, 'click')
@@ -719,7 +719,7 @@ export class SelectableGroup extends Component<TSelectableGroupProps> {
       selectionModeClass,
       fixedPosition,
       selectboxClassName,
-      children,
+      children
     } = this.props
 
     return (

dist/react-selectable-fast.js

@@ -19,7 +19,7 @@ module.exports = {
   output: {
     path: path.resolve(__dirname, 'dist'),
     publicPath: '',
-    filename: 'react-selectable-fast.js',
+    filename: 'index.js',
     library: 'React-Selectable-Fast',
     libraryTarget: 'umd',
   },