@lemon-fe/components 1.2.11 → 1.2.12-alpha.1

package/es/data-grid/renderer/cell-index-renderer.d.ts

@@ -1,4 +1,6 @@
+/// <reference types="react" />
 import type { ICellRendererParams } from '@ag-grid-community/core';
 export default function CellIndexRender<TData>(props: ICellRendererParams<TData> & {
     useChildIndex?: boolean;
-}): number | null;
+    validator?: (data: ICellRendererParams<TData>) => string | undefined;
+}): number | JSX.Element | null;

package/es/data-grid/renderer/cell-index-renderer.js

@@ -1,19 +1,34 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { Tooltip } from 'antd';
 import { useContext, useEffect, useState } from 'react';
+import React from 'react';
+import Warn from "../../icons/warn";
 import GridStoreContext from "../context/grid-store";
 export default function CellIndexRender(props) {
   var node = props.node,
-    useChildIndex = props.useChildIndex;
+    useChildIndex = props.useChildIndex,
+    validator = props.validator,
+    data = props.data;
   var type = useChildIndex ? 'childIndex' : 'rowIndex';
   var _useState = useState(node[type]),
     _useState2 = _slicedToArray(_useState, 2),
     index = _useState2[0],
     setIndex = _useState2[1];
+  var _useState3 = useState(data),
+    _useState4 = _slicedToArray(_useState3, 2),
+    row = _useState4[0],
+    setRow = _useState4[1];
   var store = useContext(GridStoreContext);
   useEffect(function () {
     var handler = function handler(evt) {
@@ -25,11 +40,28 @@ export default function CellIndexRender(props) {
       node.removeEventListener(eventType, handler);
     };
   }, [type]);
+  useEffect(function () {
+    var handler = function handler(evt) {
+      setRow(evt.newData);
+    };
+    node.addEventListener('cellChanged', handler);
+    return function () {
+      node.removeEventListener('cellChanged', handler);
+    };
+  }, []);
+  var render = function render(idx) {
+    var message = (validator === null || validator === void 0 ? void 0 : validator(_objectSpread(_objectSpread({}, props), {}, {
+      data: row
+    }))) || '';
+    return message.length ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: message
+    }, /*#__PURE__*/React.createElement(Warn, null)) : idx;
+  };
   if (typeof index !== 'number' || node.isRowPinned()) {
     return null;
   }
   if (type === 'childIndex') {
-    return index + 1;
+    return render(index + 1);
   }
   var _ref = store.getState(),
     grid = _ref.grid;
@@ -37,7 +69,7 @@ export default function CellIndexRender(props) {
     page = _grid$state.page,
     pageSize = _grid$state.pageSize;
   if (grid.isClientMode()) {
-    return index + 1;
+    return render(index + 1);
   }
-  return (page - 1) * pageSize + index + 1;
+  return render((page - 1) * pageSize + index + 1);
 }

package/es/icons/index.d.ts

@@ -19,6 +19,7 @@ import Question from './question';
 import Reload from './reload';
 import Search from './search';
 import Tip from './tip';
+import Warn from './warn';
 declare const Icons: {
     Search: typeof Search;
     Down: typeof Down;
@@ -41,5 +42,6 @@ declare const Icons: {
     NewTag: typeof NewTag;
     Drag: typeof Drag;
     Plus: typeof Plus;
+    Warn: typeof Warn;
 };
 export default Icons;

package/es/icons/index.js

@@ -19,6 +19,7 @@ import Question from "./question";
 import Reload from "./reload";
 import Search from "./search";
 import Tip from "./tip";
+import Warn from "./warn";
 var Icons = {
   Search: Search,
   Down: Down,
@@ -40,6 +41,7 @@ var Icons = {
   Reload: Reload,
   NewTag: NewTag,
   Drag: Drag,
-  Plus: Plus
+  Plus: Plus,
+  Warn: Warn
 };
 export default Icons;

package/es/icons/warn.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentProps } from 'react';
+import Icon from '@ant-design/icons';
+export default function Warn(props: ComponentProps<typeof Icon>): JSX.Element;

package/es/icons/warn.js

@@ -0,0 +1,18 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+import React from 'react';
+import Icon from '@ant-design/icons';
+var Svg = function Svg(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    xmlns: "http://www.w3.org/2000/svg",
+    viewBox: "0 0 14.67 12.3"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    fill: "#FF4128",
+    fillRule: "evenodd",
+    d: "M8.4182.3179a2 2 0 0 1 .6008.6008l5.3367 8.3015c.5973.9292.3283 2.1666-.6008 2.7639a2 2 0 0 1-1.0816.3176H2c-1.1046 0-2-.8954-2-2a2 2 0 0 1 .3176-1.0815L5.6543.9187C6.2516-.0104 7.489-.2794 8.4182.318ZM7.3367 9.3017a.5.5 0 1 0 0 1 .5.5 0 0 0 0-1Zm0-6a.5.5 0 0 0-.5.5v4a.5.5 0 1 0 1 0v-4a.5.5 0 0 0-.5-.5Z"
+  }));
+};
+export default function Warn(props) {
+  return /*#__PURE__*/React.createElement(Icon, _extends({
+    component: Svg
+  }, props));
+}

package/es/modal/index.d.ts

@@ -12,5 +12,5 @@ declare const Modal: Pick<React.FC<AntdModalProps> & import("antd/lib/modal/conf
     useModal: typeof import("antd/lib/modal/useModal").default;
     destroyAll: () => void;
     config: typeof import("antd/lib/modal/confirm").modalGlobalConfig;
-}, "success" | "error" | "warning" | "info" | "warn" | "confirm" | "useModal" | "destroyAll" | "config"> & typeof LemonModal;
+}, "success" | "error" | "warning" | "info" | "warn" | "confirm" | "useModal" | "config" | "destroyAll"> & typeof LemonModal;
 export default Modal;

package/es/modal/index.js

@@ -1,8 +1,8 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["enableFullscreen", "defaultFullscreen", "fullscreen", "onFullscreenChange", "title", "wrapClassName"];
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+var _excluded = ["enableFullscreen", "defaultFullscreen", "fullscreen", "onFullscreenChange", "title", "wrapClassName", "transform"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -15,11 +15,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Modal as AntdModal } from 'antd';
-import React, { useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import Icons from "../icons";
 import { prefixClassName } from "../utils";
+import { DndContext, useDraggable, MouseSensor, TouchSensor, useSensor, useSensors } from '@dnd-kit/core';
 import classNames from 'classnames';
-function LemonModal(props) {
+function LemonModalInternal(props) {
   var _ref;
   var enableFullscreen = props.enableFullscreen,
     defaultFullscreen = props.defaultFullscreen,
@@ -27,12 +28,33 @@ function LemonModal(props) {
     onFullscreenChange = props.onFullscreenChange,
     title = props.title,
     wrapClassName = props.wrapClassName,
+    transformProp = props.transform,
     restProps = _objectWithoutProperties(props, _excluded);
   var _useState = useState((_ref = fullscreenProp !== null && fullscreenProp !== void 0 ? fullscreenProp : defaultFullscreen) !== null && _ref !== void 0 ? _ref : false),
     _useState2 = _slicedToArray(_useState, 2),
     fullscreen = _useState2[0],
     setFullscreen = _useState2[1];
   var prefixCls = prefixClassName('modal');
+  var _useDraggable = useDraggable({
+      id: 'draggable-modal'
+    }),
+    attributes = _useDraggable.attributes,
+    listeners = _useDraggable.listeners,
+    setNodeRef = _useDraggable.setNodeRef,
+    transform = _useDraggable.transform,
+    isDragging = _useDraggable.isDragging;
+  var translate = useMemo(function () {
+    var x = transformProp.x,
+      y = transformProp.y;
+    if (transform) {
+      x += transform.x;
+      y += transform.y;
+    }
+    return {
+      x: x,
+      y: y
+    };
+  }, [transform, transformProp]);
   var mergedFullscreen = fullscreenProp !== null && fullscreenProp !== void 0 ? fullscreenProp : fullscreen;
   var handleFullscreenChange = function handleFullscreenChange(result) {
     onFullscreenChange === null || onFullscreenChange === void 0 || onFullscreenChange(result);
@@ -40,11 +62,13 @@ function LemonModal(props) {
   };
   return /*#__PURE__*/React.createElement(AntdModal, _extends({
     closeIcon: /*#__PURE__*/React.createElement(Icons.CloseLight, null),
-    wrapClassName: classNames(prefixCls(), wrapClassName),
+    wrapClassName: classNames(prefixCls(), wrapClassName, _defineProperty({}, prefixCls('dragging'), isDragging)),
     maskClosable: false,
-    title: enableFullscreen ? /*#__PURE__*/React.createElement("div", {
+    title: /*#__PURE__*/React.createElement("div", {
       className: prefixCls('header')
-    }, title, /*#__PURE__*/React.createElement("button", {
+    }, /*#__PURE__*/React.createElement("div", _extends({
+      className: prefixCls('header-title')
+    }, attributes, listeners), title), enableFullscreen ? /*#__PURE__*/React.createElement("button", {
       className: prefixCls('fullscreen'),
       onClick: function onClick() {
         handleFullscreenChange(!mergedFullscreen);
@@ -65,15 +89,72 @@ function LemonModal(props) {
       d: "m9.828 9.121 3.182 3.182-.707.707-3.182-3.182a.5.5 0 0 1 .707-.707ZM1.697.99 4.878 4.17a.5.5 0 0 1-.707.707L.99 1.697 1.697.99ZM4.879 9.828 1.697 13.01l-.707-.707 3.182-3.182a.5.5 0 0 1 .707.707Zm8.131-8.131L9.83 4.878a.5.5 0 0 1-.707-.707L12.303.99l.707.707Z"
     }), /*#__PURE__*/React.createElement("path", {
       d: "M1.5 8a.5.5 0 0 1 .5.5V12h3.5a.5.5 0 0 1 .492.41L6 12.5a.5.5 0 0 1-.5.5h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5Zm11 0a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5h-4a.5.5 0 1 1 0-1H12V8.5a.5.5 0 0 1 .41-.492L12.5 8Zm-7-7a.5.5 0 0 1 0 1H2v3.5a.5.5 0 0 1-.41.492L1.5 6a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5h4Zm7 0a.5.5 0 0 1 .5.5v4a.5.5 0 1 1-1 0V2H8.5a.5.5 0 0 1-.492-.41L8 1.5a.5.5 0 0 1 .5-.5h4Z"
-    }))))) : title
+    })))) : null),
+    modalRender: function modalRender(node) {
+      return /*#__PURE__*/React.createElement("div", {
+        ref: setNodeRef,
+        style: {
+          transform: "translate3d(".concat(translate.x, "px, ").concat(translate.y, "px, 0)")
+        }
+      }, node);
+    }
   }, restProps, {
-    centered: fullscreen ? true : restProps.centered,
-    width: fullscreen ? '95vw' : restProps.width,
-    bodyStyle: fullscreen ? _objectSpread(_objectSpread({}, restProps.bodyStyle), {}, {
+    centered: mergedFullscreen ? true : restProps.centered,
+    width: mergedFullscreen ? '95vw' : restProps.width,
+    bodyStyle: mergedFullscreen ? _objectSpread(_objectSpread({}, restProps.bodyStyle), {}, {
       height: '85vh'
     }) : restProps.bodyStyle
   }));
 }
+function LemonModal(props) {
+  var defaultTransform = useMemo(function () {
+    return {
+      x: 0,
+      y: 0
+    };
+  }, []);
+  var _useState3 = useState(defaultTransform),
+    _useState4 = _slicedToArray(_useState3, 2),
+    transform = _useState4[0],
+    setTransform = _useState4[1];
+  var sensors = useSensors(useSensor(MouseSensor), useSensor(TouchSensor));
+  var handleDragEnd = useCallback(function (evt) {
+    setTransform(function (prev) {
+      return {
+        x: prev.x + evt.delta.x,
+        y: prev.y + evt.delta.y
+      };
+    });
+  }, []);
+  var handleFullscreenChange = function handleFullscreenChange(value) {
+    var _props$onFullscreenCh;
+    setTransform(defaultTransform);
+    (_props$onFullscreenCh = props.onFullscreenChange) === null || _props$onFullscreenCh === void 0 || _props$onFullscreenCh.call(props, value);
+  };
+  var modifiers = useMemo(function () {
+    var modifier = function modifier(args) {
+      var draggingNodeRect = args.draggingNodeRect;
+      if (!draggingNodeRect) {
+        return args.transform;
+      }
+      if (args.transform.y + transform.y + draggingNodeRect.top < 0) {
+        return _objectSpread(_objectSpread({}, args.transform), {}, {
+          y: -(transform.y + draggingNodeRect.top)
+        });
+      }
+      return args.transform;
+    };
+    return [modifier];
+  }, [transform]);
+  return /*#__PURE__*/React.createElement(DndContext, {
+    onDragEnd: handleDragEnd,
+    sensors: sensors,
+    modifiers: modifiers
+  }, /*#__PURE__*/React.createElement(LemonModalInternal, _extends({}, props, {
+    onFullscreenChange: handleFullscreenChange,
+    transform: transform
+  })));
+}
 var types = ['info', 'success', 'error', 'warning', 'warn', 'confirm'];
 var Modal = LemonModal;
 types.forEach(function (type) {

package/es/modal/index.less

@@ -2,6 +2,17 @@
   &-header {
     display: flex;
     justify-content: space-between;
+
+    &-title {
+      flex: 1;
+      min-width: 0;
+      margin-right: @padding-md;
+      cursor: move;
+    }
+  }
+
+  &-dragging {
+    overflow: hidden;
   }
 
   &-fullscreen {
@@ -9,7 +20,6 @@
     width: 24px;
     height: 24px;
     margin-right: 24px;
-    margin-left: auto;
     padding: 0;
     color: rgba(51, 51, 51, 0.5);
     font-size: 14px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.2.11",
+  "version": "1.2.12-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -26,7 +26,7 @@
     "@ag-grid-community/infinite-row-model": "29.2.0",
     "@ag-grid-community/react": "29.2.0",
     "@ag-grid-community/styles": "29.2.0",
-    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/core": ">=6.0.0",
     "@lemon-fe/hooks": "^1.2.11",
     "@lemon-fe/utils": "^1.1.0",
     "async-validator": "^4.2.5",
@@ -67,5 +67,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "cef67af16608ce9d8f154bf892336d6a9fcf5f53"
+  "gitHead": "d78e483deec792ba988460766ad6398dc2ee58a7"
 }