@xh/hoist 44.2.0 → 44.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v44.3.0 - 2021-12-15
+
+### 🐞 Bug Fixes
+* Fixes issue with columns failing to resize on first try.
+* Fixes issue preventing use of context menus on iPad.
+
+### 📚 Libraries
+
+* @blueprintjs/core `3.51 -> 3.52`
+
+* [Commit Log](https://github.com/xh/hoist-react/compare/v44.2.0...v44.3.0)
+
 ## v44.2.0 - 2021-12-07
 
 ### 🎁 New Features

package/cmp/grid/Grid.js

@@ -719,7 +719,8 @@ class GridLocalModel extends HoistModel {
     onColumnResized = (ev) => {
         if (!isDisplayed(this.viewRef.current) || !ev.finished) return;
         if (ev.source === 'uiColumnDragged') {
-            this.model.noteColumnsManuallySized(ev.column.colId);
+            const width = ev.columnApi.getColumnState().find(it => it.colId === ev.column.colId)?.width;
+            this.model.noteColumnManuallySized(ev.column.colId, width);
         } else if (ev.source === 'autosizeColumns') {
             this.model.noteAgColumnStateChanged(ev.columnApi.getColumnState());
         }

package/cmp/grid/GridModel.js

@@ -838,8 +838,10 @@ export class GridModel extends HoistModel {
         }
     }
 
-    noteColumnsManuallySized(colIds) {
-        const colStateChanges = castArray(colIds).map(colId => ({colId, manuallySized: true}));
+    noteColumnManuallySized(colId, width) {
+        const col = this.findColumn(this.columns, colId);
+        if (!width || !col || col.flex) return;
+        const colStateChanges = [{colId, width, manuallySized: true}];
         this.applyColumnStateChanges(colStateChanges);
     }
 

package/desktop/cmp/dash/DashContainerModel.js

@@ -13,7 +13,7 @@ import {action, observable, bindable, makeObservable} from '@xh/hoist/mobx';
 import {wait} from '@xh/hoist/promise';
 import {debounced, ensureUniqueBy, throwIf} from '@xh/hoist/utils/js';
 import {createObservableRef} from '@xh/hoist/utils/react';
-import {cloneDeep, defaultsDeep, find, isFinite, reject} from 'lodash';
+import {cloneDeep, defaultsDeep, find, isFinite, isNil, reject} from 'lodash';
 import {DashViewModel} from './DashViewModel';
 import {DashViewSpec} from './DashViewSpec';
 import {dashContainerMenuButton} from './impl/DashContainerMenuButton';
@@ -395,21 +395,27 @@ export class DashContainerModel extends HoistModel {
         // Add context menu listener for adding components
         const $el = stack.header.element;
         $el.off('contextmenu').contextmenu(e => {
-            this.showContextMenu(e, {stack});
+            this.showContextMenu(e, $el, {stack});
             return false;
         });
     }
 
-    showContextMenu(e, {stack, viewModel, index}) {
+    showContextMenu(e, $target, {stack, viewModel, index}) {
         if (this.contentLocked) return;
 
-        const offset = {left: e.clientX, top: e.clientY},
-            menu = dashContainerContextMenu({
-                stack,
-                viewModel,
-                index,
-                dashContainerModel: this
-            });
+        // If event does not contain co-ordinates, fallback to showing context menu below target
+        let offset = {left: e.clientX, top: e.clientY};
+        if (isNil(offset.left) || isNil(offset.top)) {
+            offset = $target.offset();
+            offset.top += 30;
+        }
+
+        const menu = dashContainerContextMenu({
+            stack,
+            viewModel,
+            index,
+            dashContainerModel: this
+        });
 
         ContextMenu.show(menu, offset, null, XH.darkTheme);
     }
@@ -456,7 +462,7 @@ export class DashContainerModel extends HoistModel {
 
             $el.off('contextmenu').contextmenu(e => {
                 const index = stack.contentItems.indexOf(item);
-                this.showContextMenu(e, {stack, viewModel, index});
+                this.showContextMenu(e, $el, {stack, viewModel, index});
                 return false;
             });
 

package/kit/golden-layout/index.js

@@ -59,9 +59,9 @@ GoldenLayout['__lm'].utils.ReactComponentHandler = ReactComponentHandlerPatched;
 const DragListener = GoldenLayout['__lm'].utils.DragListener;
 class DragListenerPatched extends DragListener {
     onMouseDown(oEvent) {
-        oEvent.preventDefault();
-
         // PATCH BEGINS
+        if (oEvent.cancelable) oEvent.preventDefault();
+
         if (oEvent.type === 'touchstart') {
             this._touchTarget = oEvent.target;
 
@@ -87,7 +87,14 @@ class DragListenerPatched extends DragListener {
             this._oDocument.on('mousemove touchmove', this._fMove);
             this._oDocument.one('mouseup touchend', this._fUp);
 
-            this._timeout = setTimeout(GoldenLayout['__lm'].utils.fnBind(this._startDrag, this), this._nDelay);
+            // PATCH BEGINS
+            // Extend time held to begin drag for stationary touch events. Note that this should be
+            // quite long to allow for showing the context menu on a shorter hold. The user can
+            // initiate a drag at any time in the interim by moving their touch.
+            const ms = oEvent.type === 'touchstart' ? 3000 : this._nDelay;
+            this._touchStart = Date.now();
+            this._timeout = setTimeout(GoldenLayout['__lm'].utils.fnBind(this._startDrag, this), ms);
+            // PATCH ENDS
         }
     }
 
@@ -110,7 +117,14 @@ class DragListenerPatched extends DragListener {
             if (this._bDragging === true) {
                 this._bDragging = false;
                 this.emit('dragStop', oEvent, this._nOriginalX + this._nX);
+            // PATCH BEGINS
+            // If the touch is released *before* dragging has started, trigger the context menu
+            // event. We still require a minimum about of time to pass, to differentiate from
+            // taps to change the selected tab.
+            } else if (oEvent.type === 'touchend' && Date.now() - this._touchStart > 800) {
+                this._eElement.trigger('contextmenu');
             }
+            // PATCH ENDS
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "44.2.0",
+  "version": "44.3.0",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "@blueprintjs/core": "~3.51.0",
-    "@blueprintjs/datetime": "~3.23.15",
+    "@blueprintjs/core": "~3.52.0",
+    "@blueprintjs/datetime": "~3.23.18",
     "@fortawesome/fontawesome-pro": "~5.15.4",
     "@fortawesome/fontawesome-svg-core": "~1.2.36",
     "@fortawesome/pro-light-svg-icons": "~5.15.4",