diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 57536aa9a..b1877b72c 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -5,7 +5,7 @@ Change log **Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)* -- [4.2.2-dev](#422-dev) +- [4.2.3 (2021-5-8)](#423-2021-5-8) - [4.2.2 (2021-4-23)](#422-2021-4-23) - [4.2.1 (2021-4-18)](#421-2021-4-18) - [4.2.0 (2021-4-11)](#420-2021-4-11) @@ -56,7 +56,7 @@ Change log - [v0.1.0 (2014-11-18)](#v010-2014-11-18) -## 4.2.2-dev +## 4.2.3 (2021-5-8) - `Utils.getScrollParent()` -> `getScrollElement()` rename - fix [#1745](https://github.com/gridstack/gridstack.js/issues/1745) digression on scrolling in v4.2.1. Thanks [@Manfred-on-github](https://github.com/Manfred-on-github) for fixing your prev change. diff --git a/package.json b/package.json index a11493c52..161b6f40b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gridstack", - "version": "4.2.2-dev", + "version": "4.2.3", "description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)", "main": "./dist/gridstack.js", "types": "./dist/gridstack.d.ts", diff --git a/src/gridstack-dd.ts b/src/gridstack-dd.ts index ea57f8f4a..2fb9f4709 100644 --- a/src/gridstack-dd.ts +++ b/src/gridstack-dd.ts @@ -1,5 +1,5 @@ /** - * gridstack-dd.ts 4.2.2-dev + * gridstack-dd.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-ddi.ts b/src/gridstack-ddi.ts index de2b20f87..f1029c54d 100644 --- a/src/gridstack-ddi.ts +++ b/src/gridstack-ddi.ts @@ -1,5 +1,5 @@ /** - * gridstack-ddi.ts 4.2.2-dev + * gridstack-ddi.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-engine.ts b/src/gridstack-engine.ts index 8f4937c8b..00bdfadfd 100644 --- a/src/gridstack-engine.ts +++ b/src/gridstack-engine.ts @@ -1,5 +1,5 @@ /** - * gridstack-engine.ts 4.2.2-dev + * gridstack-engine.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-h5.ts b/src/gridstack-h5.ts index b39f32057..17bf26203 100644 --- a/src/gridstack-h5.ts +++ b/src/gridstack-h5.ts @@ -1,5 +1,5 @@ /** - * index-h5.ts 4.2.2-dev - everything you need for a Grid that uses HTML5 native drag&drop + * index-h5.ts 4.2.3 - everything you need for a Grid that uses HTML5 native drag&drop * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-jq.ts b/src/gridstack-jq.ts index fec44e1a7..b134226f8 100644 --- a/src/gridstack-jq.ts +++ b/src/gridstack-jq.ts @@ -1,5 +1,5 @@ /** - * index-jq.ts 4.2.2-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) + * index-jq.ts 4.2.3 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature) * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-poly.js b/src/gridstack-poly.js index f8a5dc1ac..b5f72875e 100644 --- a/src/gridstack-poly.js +++ b/src/gridstack-poly.js @@ -1,5 +1,5 @@ /** - * gridstack-poly.ts 4.2.2-dev - used for older browser support (not currently supported in v2+) + * gridstack-poly.ts 4.2.3 - used for older browser support (not currently supported in v2+) * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack-static.ts b/src/gridstack-static.ts index d716810e8..eaf0c023b 100644 --- a/src/gridstack-static.ts +++ b/src/gridstack-static.ts @@ -1,5 +1,5 @@ /** - * index-static.ts 4.2.2-dev - much smaller, everything you need for a static Grid (non draggable, API driven) + * index-static.ts 4.2.3 - much smaller, everything you need for a static Grid (non draggable, API driven) * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack.scss b/src/gridstack.scss index 48c180019..85ac99c55 100644 --- a/src/gridstack.scss +++ b/src/gridstack.scss @@ -1,5 +1,5 @@ /** - * gridstack SASS styles 4.2.2-dev + * gridstack SASS styles 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/gridstack.ts b/src/gridstack.ts index 0f74c5130..bbe994706 100644 --- a/src/gridstack.ts +++ b/src/gridstack.ts @@ -1,5 +1,5 @@ /*! - * GridStack 4.2.2-dev + * GridStack 4.2.3 * https://gridstackjs.com/ * * Copyright (c) 2021 Alain Dumesny diff --git a/src/h5/dd-base-impl.ts b/src/h5/dd-base-impl.ts index 3a5cbe7b8..9316def77 100644 --- a/src/h5/dd-base-impl.ts +++ b/src/h5/dd-base-impl.ts @@ -1,5 +1,5 @@ /** - * dd-base-impl.ts 4.2.2-dev + * dd-base-impl.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-draggable.ts b/src/h5/dd-draggable.ts index f5163e290..e22a6035b 100644 --- a/src/h5/dd-draggable.ts +++ b/src/h5/dd-draggable.ts @@ -1,5 +1,5 @@ /** - * dd-draggable.ts 4.2.2-dev + * dd-draggable.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-droppable.ts b/src/h5/dd-droppable.ts index be0c64e62..50bac8a9e 100644 --- a/src/h5/dd-droppable.ts +++ b/src/h5/dd-droppable.ts @@ -1,5 +1,5 @@ /** - * dd-droppable.ts 4.2.2-dev + * dd-droppable.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-element.ts b/src/h5/dd-element.ts index 1aa98b180..c705c1285 100644 --- a/src/h5/dd-element.ts +++ b/src/h5/dd-element.ts @@ -1,5 +1,5 @@ /** - * dd-elements.ts 4.2.2-dev + * dd-elements.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-manager.ts b/src/h5/dd-manager.ts index 5ba83d04a..fa0094e5b 100644 --- a/src/h5/dd-manager.ts +++ b/src/h5/dd-manager.ts @@ -1,5 +1,5 @@ /** - * dd-manager.ts 4.2.2-dev + * dd-manager.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-resizable-handle.ts b/src/h5/dd-resizable-handle.ts index f0e8bb7a0..2c7bf9eb5 100644 --- a/src/h5/dd-resizable-handle.ts +++ b/src/h5/dd-resizable-handle.ts @@ -1,5 +1,5 @@ /** - * dd-resizable-handle.ts 4.2.2-dev + * dd-resizable-handle.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-resizable.ts b/src/h5/dd-resizable.ts index 0f34e526e..50a0d53a8 100644 --- a/src/h5/dd-resizable.ts +++ b/src/h5/dd-resizable.ts @@ -1,5 +1,5 @@ /** - * dd-resizable.ts 4.2.2-dev + * dd-resizable.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/h5/dd-utils.ts b/src/h5/dd-utils.ts index 7848850dd..98667a531 100644 --- a/src/h5/dd-utils.ts +++ b/src/h5/dd-utils.ts @@ -1,5 +1,5 @@ /** - * dd-utils.ts 4.2.2-dev + * dd-utils.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ export class DDUtils { diff --git a/src/h5/gridstack-dd-native.ts b/src/h5/gridstack-dd-native.ts index 8842cd47a..cc66f076f 100644 --- a/src/h5/gridstack-dd-native.ts +++ b/src/h5/gridstack-dd-native.ts @@ -1,5 +1,5 @@ /** - * gridstack-dd-native.ts 4.2.2-dev + * gridstack-dd-native.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/jq/gridstack-dd-jqueryui.ts b/src/jq/gridstack-dd-jqueryui.ts index ab4c7a73e..2c5b82586 100644 --- a/src/jq/gridstack-dd-jqueryui.ts +++ b/src/jq/gridstack-dd-jqueryui.ts @@ -1,4 +1,4 @@ -// gridstack-dd-jqueryui.ts 4.2.2-dev +// gridstack-dd-jqueryui.ts 4.2.3 // Copyright (c) 2021 Alain Dumesny - see root license import { GridStackElement } from '../gridstack'; import { GridStackDD, DDOpts, DDKey, DDDropOpt, DDCallback, DDValue } from '../gridstack-dd'; diff --git a/src/types.ts b/src/types.ts index d98f8a55f..cd7c5df0d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,5 +1,5 @@ /** - * types.ts 4.2.2-dev + * types.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ diff --git a/src/utils.ts b/src/utils.ts index 38fc8110a..df23068a8 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,5 @@ /** - * utils.ts 4.2.2-dev + * utils.ts 4.2.3 * Copyright (c) 2021 Alain Dumesny - see GridStack root license */ @@ -351,19 +351,11 @@ export class Utils { static updateScrollResize(event: MouseEvent, el: HTMLElement, distance: number): void { const scrollEl = this.getScrollElement(el); const height = scrollEl.clientHeight; - // #1745 #1727 - check if mouse position is leaving scroll element. - // event.clientY is relative to origin of viewport, must compare this against position of scrollEl, - // accessible via clientHeight and getBoundingClientRect().top. - // Special situation if scroll element is 'html': here browser spec states that + // #1727 event.clientY is relative to viewport, so must compare this against position of scrollEl getBoundingClientRect().top + // #1745 Special situation if scrollEl is document 'html': here browser spec states that // clientHeight is height of viewport, but getBoundingClientRect() is rectangle of html element; // this discrepancy arises because in reality scrollbar is attached to viewport, not html element itself. - let offsetTop : number; - if (scrollEl === this.getScrollElement()) { - offsetTop = 0; - } else { - offsetTop = scrollEl.getBoundingClientRect().top; - } - + const offsetTop = (scrollEl === this.getScrollElement()) ? 0 : scrollEl.getBoundingClientRect().top; const pointerPosY = event.clientY - offsetTop; const top = pointerPosY < distance; const bottom = pointerPosY > height - distance;