superdesk-ui-framework 3.0.7 → 3.0.8

package/react/components/Lists/TableList.js

@@ -50,12 +50,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableListItem = exports.TableList = void 0;
 var React = __importStar(require("react"));
+var react_dom_1 = __importDefault(require("react-dom"));
 var classnames_1 = __importDefault(require("classnames"));
 var react_beautiful_dnd_1 = require("react-beautiful-dnd");
 var Tooltip_1 = require("../Tooltip");
 var Button_1 = require("../Button");
 var Dropdown_1 = require("../Dropdown");
-var react_dom_1 = __importDefault(require("react-dom"));
+var SingleAndDoubleClickFunction_1 = require("./../SingleAndDoubleClickFunction");
 var reorder = function (list, startIndex, endIndex) {
     var result = Array.from(list);
     var removed = result.splice(startIndex, 1)[0];
@@ -121,30 +122,37 @@ var TableList = /** @class */ (function (_super) {
                                     ? _this.props.itemsDropdown(index)
                                     : []; } })
                             : React.createElement("div", __assign({ ref: provided2.innerRef }, provided2.draggableProps, provided2.dragHandleProps),
-                                React.createElement(TableListItem, { dragAndDrop: _this.props.dragAndDrop, start: item.start, center: item.center, end: item.end, action: item.action, onClick: item.onClick ? item.onClick : undefined, onDoubleClick: item.onDoubleClick
+                                React.createElement(TableListItem, { dragAndDrop: _this.props.dragAndDrop, start: item.start, center: item.center, end: item.end, action: item.action, onClick: item.onClick
+                                        ? item.onClick
+                                        : undefined, onDoubleClick: item.onDoubleClick
                                         ? item.onDoubleClick
                                         : undefined, addItem: _this.props.addItem, itemsDropdown: function () { return _this.props.itemsDropdown
                                         ? _this.props.itemsDropdown(index)
                                         : []; }, hexColor: item.hexColor, locked: item.locked, positionLocked: item.positionLocked, onAddItem: function () { return _this.props.onAddItem
                                         && _this.props.onAddItem(index, item); }, showDragHandle: _this.props.showDragHandle }))); })); }),
                         provided.placeholder,
-                        (_this.props.addItem && !_this.props.readOnly) &&
-                            React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
+                        (_this.props.addItem && !_this.props.readOnly)
+                            && React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
                                 React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
                                     React.createElement("div", { className: 'table-list__add-item--container sd-margin-x--auto' }, _this.dropDown()))))); }))
                 : React.createElement("div", { role: 'list', className: classes },
-                    this.state.items.map(function (item, index) { return (React.createElement(TableListItem, { key: index, start: item.start, center: item.center, end: item.end, action: item.action, onClick: item.onClick ? item.onClick : undefined, onDoubleClick: item.onDoubleClick
+                    this.state.items.map(function (item, index) { return (React.createElement(TableListItem, { key: index, start: item.start, center: item.center, end: item.end, action: item.action, onClick: item.onClick
+                            ? item.onClick
+                            : undefined, onDoubleClick: item.onDoubleClick
                             ? item.onDoubleClick
-                            : undefined, addItem: _this.props.addItem, itemsDropdown: function () { return _this.props.itemsDropdown ? _this.props.itemsDropdown(index) : []; }, hexColor: item.hexColor, locked: item.locked, positionLocked: item.positionLocked, onAddItem: function () { return _this.props.onAddItem
+                            : undefined, addItem: _this.props.addItem, itemsDropdown: function () { return _this.props.itemsDropdown
+                            ? _this.props.itemsDropdown(index)
+                            : []; }, hexColor: item.hexColor, locked: item.locked, positionLocked: item.positionLocked, onAddItem: function () { return _this.props.onAddItem
                             && _this.props.onAddItem(index, item); } })); }),
-                    (this.props.addItem && !this.props.readOnly) &&
-                        React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
+                    (this.props.addItem && !this.props.readOnly)
+                        && React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
                             React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
                                 React.createElement("div", { className: 'table-list__add-item--container sd-margin-x--auto' }, this.dropDown()))))
-            : (this.props.addItem && !this.props.readOnly) ? React.createElement("div", { role: 'list', className: classes },
-                React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
-                    React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
-                        React.createElement("div", { className: 'table-list__add-item--container sd-margin-x--auto' }, this.dropDown()))))
+            : (this.props.addItem && !this.props.readOnly)
+                ? React.createElement("div", { role: 'list', className: classes },
+                    React.createElement("div", { className: "table-list__add-item table-list__item--margin" },
+                        React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
+                            React.createElement("div", { className: 'table-list__add-item--container sd-margin-x--auto' }, this.dropDown()))))
                 : null);
     };
     return TableList;
@@ -152,39 +160,13 @@ var TableList = /** @class */ (function (_super) {
 exports.TableList = TableList;
 var TableListItem = /** @class */ (function (_super) {
     __extends(TableListItem, _super);
-    function TableListItem() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.delay = 200;
-        _this.prevent = false;
-        _this.onSingleClick = function () {
-            var selection = window.getSelection();
-            _this.timer = setTimeout(function () {
-                if (!_this.prevent && _this.props.onClick && selection) {
-                    if (_this.props.dragAndDrop) {
-                        _this.props.onClick();
-                    }
-                    else {
-                        if (selection.toString().length < 1) {
-                            _this.props.onClick();
-                        }
-                    }
-                }
-            }, _this.delay);
-        };
-        _this.onDoubleClick = function () {
-            clearTimeout(_this.timer);
-            _this.prevent = true;
-            if (_this.props.onDoubleClick) {
-                _this.props.onDoubleClick();
-            }
-            setTimeout(function () {
-                _this.prevent = false;
-            }, _this.delay);
-        };
+    function TableListItem(props) {
+        var _this = _super.call(this, props) || this;
         _this.onActionMenuClick = function (event) {
             event.preventDefault();
             event.stopPropagation();
         };
+        _this.multiClickHandler = (0, SingleAndDoubleClickFunction_1.setupSingleAndDoubleClick)();
         return _this;
     }
     TableListItem.prototype.render = function () {
@@ -196,30 +178,52 @@ var TableListItem = /** @class */ (function (_super) {
             'table-list__item--position-locked': this.props.positionLocked,
             'table-list__item--drag-handles-always': !this.props.showDragHandle,
             'table-list__item--drag-handles-none': this.props.showDragHandle === 'none',
+            'table-list__item--margin': !this.props.addItem,
         });
-        return (this.props.addItem ?
-            React.createElement("div", { className: 'table-list__item-container' },
-                React.createElement("div", { role: 'listitem', onClick: function () { return _this.onSingleClick(); }, onDoubleClick: function () { return _this.onDoubleClick(); }, className: classes },
+        var Wrapper = this.props.addItem
+            ? function (_a) {
+                var children = _a.children;
+                return (React.createElement("div", { className: 'table-list__item-container' }, children));
+            }
+            : function (_a) {
+                var children = _a.children;
+                return children;
+            };
+        return (React.createElement(Wrapper, null,
+            React.createElement(React.Fragment, null,
+                React.createElement("div", { role: 'listitem', className: classes, onClick: function (e) { return _this.multiClickHandler(e, {
+                        onSingleClick: function () {
+                            var selection = window.getSelection();
+                            if (_this.props.onClick && selection) {
+                                if (_this.props.dragAndDrop) {
+                                    _this.props.onClick();
+                                }
+                                else {
+                                    if (selection.toString().length < 1) {
+                                        _this.props.onClick();
+                                    }
+                                }
+                            }
+                        },
+                        onDoubleClick: function () {
+                            if (_this.props.onDoubleClick) {
+                                _this.props.onDoubleClick();
+                            }
+                        },
+                    }); } },
                     React.createElement("div", { className: 'table-list__item-border', style: { backgroundColor: this.props.hexColor } }),
                     React.createElement("div", { className: 'table-list__item-content' },
                         React.createElement("div", { className: 'table-list__item-content-block' }, this.props.start && this.props.start),
                         React.createElement("div", { className: 'table-list__item-content-block table-list__item-content-block--center' }, this.props.center && this.props.center),
                         React.createElement("div", { className: 'table-list__item-content-block' }, this.props.end && this.props.end)),
-                    this.props.action &&
-                        React.createElement("div", { className: 'table-list__slide-in-actions', onClick: this.onActionMenuClick }, this.props.action)),
-                React.createElement("div", { className: 'table-list__add-bar-container' },
-                    React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
-                        React.createElement("div", { className: 'table-list__add-bar' },
-                            React.createElement(Dropdown_1.Dropdown, { onChange: this.props.onAddItem, items: this.props.itemsDropdown ? this.props.itemsDropdown() : [] },
-                                React.createElement(Button_1.Button, { type: "primary", icon: "plus-large", text: "Add item", size: "small", shape: "round", iconOnly: true, onClick: function () { return false; } }))))))
-            : React.createElement("div", { role: 'listitem', className: "".concat(classes, " table-list__item--margin"), onClick: function () { return _this.onSingleClick(); }, onDoubleClick: function () { return _this.onDoubleClick(); } },
-                React.createElement("div", { className: 'table-list__item-border', style: { backgroundColor: this.props.hexColor } }),
-                React.createElement("div", { className: 'table-list__item-content' },
-                    React.createElement("div", { className: 'table-list__item-content-block' }, this.props.start && this.props.start),
-                    React.createElement("div", { className: 'table-list__item-content-block table-list__item-content-block--center' }, this.props.center && this.props.center),
-                    React.createElement("div", { className: 'table-list__item-content-block' }, this.props.end && this.props.end)),
-                this.props.action &&
-                    React.createElement("div", { className: 'table-list__slide-in-actions', onClick: this.onActionMenuClick }, this.props.action)));
+                    this.props.action
+                        && React.createElement("div", { className: 'table-list__slide-in-actions', onClick: this.onActionMenuClick }, this.props.action)),
+                this.props.addItem
+                    && React.createElement("div", { className: 'table-list__add-bar-container' },
+                        React.createElement(Tooltip_1.Tooltip, { text: 'Add item', flow: 'top', appendToBody: true },
+                            React.createElement("div", { className: 'table-list__add-bar' },
+                                React.createElement(Dropdown_1.Dropdown, { onChange: this.props.onAddItem, items: this.props.itemsDropdown ? this.props.itemsDropdown() : [] },
+                                    React.createElement(Button_1.Button, { type: "primary", icon: "plus-large", text: "Add item", size: "small", shape: "round", iconOnly: true, onClick: function () { return false; } }))))))));
     };
     return TableListItem;
 }(React.PureComponent));
@@ -235,7 +239,9 @@ var PortalItem = /** @class */ (function (_super) {
         var snapshot = this.props.snapshot;
         var usePortal = snapshot.isDragging;
         var child = (React.createElement("div", __assign({ ref: provided.innerRef }, provided.draggableProps, provided.dragHandleProps),
-            React.createElement(TableListItem, { dragAndDrop: this.props.dragAndDrop, start: this.props.item.start, center: this.props.item.center, end: this.props.item.end, action: this.props.item.action, onClick: this.props.item.onClick ? this.props.item.onClick : undefined, onDoubleClick: this.props.item.onDoubleClick
+            React.createElement(TableListItem, { dragAndDrop: this.props.dragAndDrop, start: this.props.item.start, center: this.props.item.center, end: this.props.item.end, action: this.props.item.action, onClick: this.props.item.onClick
+                    ? this.props.item.onClick
+                    : undefined, onDoubleClick: this.props.item.onDoubleClick
                     ? this.props.item.onDoubleClick
                     : undefined, addItem: this.props.addItem, itemsDropdown: this.props.itemsDropdown, hexColor: this.props.item.hexColor, locked: this.props.item.locked, positionLocked: this.props.item.positionLocked, onAddItem: function () { return _this.props.onAddItem; }, showDragHandle: this.props.showDragHandle })));
         if (!usePortal) {

package/react/components/SingleAndDoubleClickFunction.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export interface ICallbacks {
+    onSingleClick: (event: React.MouseEvent) => void;
+    onDoubleClick: (event: React.MouseEvent) => void;
+}
+export declare function setupSingleAndDoubleClick(): (event: React.MouseEvent, cb: ICallbacks) => void;

package/react/components/SingleAndDoubleClickFunction.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupSingleAndDoubleClick = void 0;
+function setupSingleAndDoubleClick() {
+    var timer;
+    var delay;
+    return function (event, cb) {
+        clearTimeout(timer);
+        if (event.nativeEvent.detail === 1) {
+            timer = window.setTimeout(function () {
+                cb.onSingleClick(event);
+            }, delay);
+        }
+        else if (event.nativeEvent.detail === 2) {
+            cb.onDoubleClick(event);
+        }
+    };
+}
+exports.setupSingleAndDoubleClick = setupSingleAndDoubleClick;