@aloudata/aloudata-design 0.2.0-beta.12 → 0.2.0-beta.13

package/es/Table/index.js

@@ -24,15 +24,15 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 /// <reference types ='./react-table-config' />
+import _ from 'lodash';
+import classnames from 'classnames';
+import Empty from '../Empty';
+import Icon from '../Icon';
+import InfiniteLoader from 'react-window-infinite-loader';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
 import usePrefixCls from '../_utils/hooks/usePrefixCls';
 import { FixedSizeList } from 'react-window';
-import InfiniteLoader from 'react-window-infinite-loader';
-import classnames from 'classnames';
-import Icon from '../Icon';
-import Empty from '../Empty';
-import _ from 'lodash';
+import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
 var DEFAULT_ROW_HEIGHT = 40;
 var ARRAY_FIRST_INDEX = 0;
 var DEFAULT_ROW_WIDTH = 0;
@@ -114,13 +114,29 @@ function Table(_ref) {
       sortDirection = _React$useState4[0],
       setSortDirection = _React$useState4[1];
 
+  var getInitSortBy = function getInitSortBy() {
+    if (!(sortDirection === null || sortDirection === void 0 ? void 0 : sortDirection.id)) {
+      return [];
+    }
+
+    var sortColumn = newColumns.find(function (column) {
+      return column.accessor === sortDirection.id;
+    });
+
+    if (sortColumn === null || sortColumn === void 0 ? void 0 : sortColumn.sorter) {
+      return [];
+    }
+
+    return [sortDirection];
+  };
+
   var _useTable = useTable({
     columns: newColumns,
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
     initialState: {
-      sortBy: sortDirection.id ? [sortDirection] : []
+      sortBy: getInitSortBy()
     }
   }, useBlockLayout, useSortBy, useRowSelect, useResizeColumns),
       getTableProps = _useTable.getTableProps,

package/lib/Table/index.js

@@ -7,33 +7,33 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _lodash = _interopRequireDefault(require("lodash"));
 
-var _reactTable = require("react-table");
+var _classnames5 = _interopRequireDefault(require("classnames"));
 
-var _usePrefixCls = _interopRequireDefault(require("../_utils/hooks/usePrefixCls"));
+var _Empty = _interopRequireDefault(require("../Empty"));
 
-var _reactWindow = require("react-window");
+var _Icon = _interopRequireDefault(require("../Icon"));
 
 var _reactWindowInfiniteLoader = _interopRequireDefault(require("react-window-infinite-loader"));
 
-var _classnames5 = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
 
-var _Icon = _interopRequireDefault(require("../Icon"));
+var _usePrefixCls = _interopRequireDefault(require("../_utils/hooks/usePrefixCls"));
 
-var _Empty = _interopRequireDefault(require("../Empty"));
+var _reactWindow = require("react-window");
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _reactTable = require("react-table");
 
 var _excluded = ["style"],
     _excluded2 = ["style"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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; }
@@ -137,13 +137,29 @@ function Table(_ref) {
       sortDirection = _React$useState4[0],
       setSortDirection = _React$useState4[1];
 
+  var getInitSortBy = function getInitSortBy() {
+    if (!(sortDirection === null || sortDirection === void 0 ? void 0 : sortDirection.id)) {
+      return [];
+    }
+
+    var sortColumn = newColumns.find(function (column) {
+      return column.accessor === sortDirection.id;
+    });
+
+    if (sortColumn === null || sortColumn === void 0 ? void 0 : sortColumn.sorter) {
+      return [];
+    }
+
+    return [sortDirection];
+  };
+
   var _useTable = (0, _reactTable.useTable)({
     columns: newColumns,
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
     initialState: {
-      sortBy: sortDirection.id ? [sortDirection] : []
+      sortBy: getInitSortBy()
     }
   }, _reactTable.useBlockLayout, _reactTable.useSortBy, _reactTable.useRowSelect, _reactTable.useResizeColumns),
       getTableProps = _useTable.getTableProps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.2.0-beta.12",
+  "version": "0.2.0-beta.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",