@hi-ui/table 4.10.0 → 4.11.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @hi-ui/table
 
+## 4.11.0
+
+### Minor Changes
+
+- [#3219](https://github.com/XiaoMi/hiui/pull/3219) [`ca7a945fe`](https://github.com/XiaoMi/hiui/commit/ca7a945fe1eeaf14b3ffb34375ff613781d7bebd) Thanks [@zyprepare](https://github.com/zyprepare)! - feat(table): TableColumnItem 类型增加 minWidth 参数 (#3216)
+
+### Patch Changes
+
+- [#3254](https://github.com/XiaoMi/hiui/pull/3254) [`fc1360986`](https://github.com/XiaoMi/hiui/commit/fc136098659d111d5df8a369a5b305e4be71d46e) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(table): 更新 useTable 逻辑以确保滚动位置不超出表格宽度，并添加 @hi-ui/radio 依赖
+
 ## 4.10.0
 
 ### Minor Changes

package/lib/cjs/Table.js

@@ -25,7 +25,7 @@ var reactUtils = require('@hi-ui/react-utils');
 var TableSettingMenu = require('./TableSettingMenu.js');
 var Loading = require('@hi-ui/loading');
 var Checkbox = require('@hi-ui/checkbox');
-var index$1 = require('./packages/ui/radio/lib/esm/index.js');
+var Radio = require('@hi-ui/radio');
 var useCheck = require('./hooks/use-check.js');
 var typeAssertion = require('@hi-ui/type-assertion');
 var treeUtils = require('@hi-ui/tree-utils');
@@ -41,6 +41,7 @@ var React__default = /*#__PURE__*/_interopDefaultCompat(React);
 var Pagination__default = /*#__PURE__*/_interopDefaultCompat(Pagination);
 var Loading__default = /*#__PURE__*/_interopDefaultCompat(Loading);
 var Checkbox__default = /*#__PURE__*/_interopDefaultCompat(Checkbox);
+var Radio__default = /*#__PURE__*/_interopDefaultCompat(Radio);
 var _prefix = classname.getPrefixCls('table');
 /**
  * 需要使用双表格的场景对应的 API
@@ -215,7 +216,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
           onClick: function onClick(evt) {
             evt.stopPropagation();
           }
-        })) : ( /*#__PURE__*/React__default["default"].createElement(index$1["default"], {
+        })) : ( /*#__PURE__*/React__default["default"].createElement(Radio__default["default"], {
           checked: checked,
           disabled: disabledCheckbox,
           onChange: function onChange(evt) {

package/lib/cjs/hooks/use-col-width.js

@@ -31,7 +31,7 @@ var useColWidth = function useColWidth(_ref) {
   // 是否重新设置过表格每列宽度
   var hasResetWidths = React__default["default"].useRef(false);
   var _React$useState = React__default["default"].useState(function () {
-      return index.getGroupItemWidth(columns);
+      return index.getGroupItemWidth(columns).colWidths;
     }),
     colWidths = _React$useState[0],
     setColWidths = _React$useState[1];
@@ -39,12 +39,12 @@ var useColWidth = function useColWidth(_ref) {
     if (measureRowElement && measureRowElement.childNodes) {
       // 超出的宽度，即每列真实的宽度超出设置的宽度的总和
       var exceedWidth = 0;
-      var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index) {
+      var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index$1) {
         var _a;
-        var realWidth = node.getBoundingClientRect().width || 0;
-        var _ref2 = (_a = columns[index]) !== null && _a !== void 0 ? _a : {},
-          width = _ref2.width,
+        var realWidth = node.getBoundingClientRect().width || 60;
+        var _ref2 = (_a = columns[index$1]) !== null && _a !== void 0 ? _a : {},
           fixed = _ref2.fixed;
+        var width = index.getGroupItemWidth(columns).colWidths[index$1];
         // 如果该列设置了 fixed 并且真实宽度大于设置的 width 则设置为 width
         if (fixed && width && width < realWidth) {
           exceedWidth += realWidth - width;
@@ -71,12 +71,12 @@ var useColWidth = function useColWidth(_ref) {
         return _realColumnsWidth;
       }
     }
-    return index.getGroupItemWidth(columns);
+    return index.getGroupItemWidth(columns).colWidths;
   }, [columns]);
   var getVirtualWidths = React.useCallback(function () {
     var measureRowElement = measureRowElementRef.current;
     if (!measureRowElement) {
-      return index.getGroupItemWidth(columns);
+      return index.getGroupItemWidth(columns).colWidths;
     }
     /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
     var columnDefaultWidth = 200;
@@ -105,7 +105,7 @@ var useColWidth = function useColWidth(_ref) {
     }
   }, [getVirtualWidths, virtual]);
   useUpdateEffect.useUpdateEffect(function () {
-    setColWidths(index.getGroupItemWidth(columns));
+    setColWidths(index.getGroupItemWidth(columns).colWidths);
     // setColWidths((prev) => {
     //   // resizable 模式下通过 measureRowElementRef.current 去更新列宽，防止拖拽后宽度被重置
     //   // 例如同时设置了 resizable 和 rowSelection，当拖拽某列宽度后再选中某行时，该列宽度会被重置
@@ -147,33 +147,35 @@ var useColWidth = function useColWidth(_ref) {
     setHeaderTableElement = _React$useState2[1];
   // 控制列最小可调整宽度
   var _React$useState3 = React__default["default"].useState([]),
-    minColWidth = _React$useState3[0],
-    setMinColWidth = _React$useState3[1];
-  // 当列变化时同步更新 minColWidth
+    minColWidths = _React$useState3[0],
+    setMinColWidths = _React$useState3[1];
+  // 当列变化时同步更新 minColWidths
   React__default["default"].useEffect(function () {
     var resizeObserver;
     if (headerTableElement) {
       resizeObserver = new ResizeObserver(function () {
         var resizableHandlerWidth = 4;
-        var _minColWidth = Array.from(headerTableElement.childNodes).map(function (th) {
+        var calcMinColWidths = Array.from(headerTableElement.childNodes).map(function (th, index$1) {
+          var minColWidth = index.getGroupItemWidth(columns).minColWidths[index$1];
           var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
           var childNodes = Array.from(th.childNodes);
-          return childNodes.map(function (child) {
+          var childNodesWidth = childNodes.map(function (child) {
             return child.offsetWidth;
           }).reduce(function (prev, next) {
             return prev + next;
           }, 0) + thPaddingLeft * 2 + resizableHandlerWidth;
+          return childNodesWidth > minColWidth ? minColWidth : childNodesWidth;
         });
-        setMinColWidth(_minColWidth);
+        setMinColWidths(calcMinColWidths);
       });
       resizeObserver.observe(headerTableElement);
     } else {
-      setMinColWidth(Array(columns.length).fill(0));
+      setMinColWidths(Array(columns.length).fill(0));
     }
     return function () {
       resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.disconnect();
     };
-  }, [columns.length, headerTableElement, resizable]);
+  }, [columns, columns.length, headerTableElement, resizable]);
   /**
    *  控制列最小可调整宽度
    */
@@ -198,8 +200,8 @@ var useColWidth = function useColWidth(_ref) {
    */
   var onColumnResizable = React__default["default"].useCallback(function (evt, _ref3, index) {
     var size = _ref3.size;
-    var minWidth = minColWidth[index];
-    var anotherMinWidth = minColWidth[index + 1];
+    var minWidth = minColWidths[index];
+    var anotherMinWidth = minColWidths[index + 1];
     var nextWidth = size.width > minWidth ? size.width : minWidth;
     setColWidths(function (prev) {
       var nextColWidths = [].concat(prev);
@@ -216,18 +218,18 @@ var useColWidth = function useColWidth(_ref) {
       nextColWidths[index + 1] = anotherWidth;
       return nextColWidths;
     });
-  }, [minColWidth, tableWidthAdjustOnResize]);
+  }, [minColWidths, tableWidthAdjustOnResize]);
   var getColgroupProps = React__default["default"].useCallback(function (column, index) {
     var width = colWidths[index] || undefined;
+    var minWidth = minColWidths[index] || undefined;
     return {
       style: {
         width: width,
-        // TODO（疑惑）: minWidth 所要解决的问题
-        minWidth: width
+        minWidth: minWidth || width
       }
       // 'data-hover-highlight': setAttrStatus(isHoveredCol(column.dataKey)),
     };
-  }, [colWidths]);
+  }, [colWidths, minColWidths]);
   return {
     measureRowElementRef: measureRowElementRef,
     onColumnResizable: onColumnResizable,

package/lib/cjs/use-table.js

@@ -402,8 +402,18 @@ var useTable = function useTable(_a) {
         right = _scrollBodyElementRef.right;
       scrollRight = tableTefRight - right;
     }
+    var _scrollLeft = scrollLeft;
+    if (bodyTableRef.current && scrollBodyElementRef.current) {
+      var _bodyTableRef$current2 = bodyTableRef.current.getBoundingClientRect(),
+        tableWidth = _bodyTableRef$current2.width;
+      var _scrollBodyElementRef2 = scrollBodyElementRef.current.getBoundingClientRect(),
+        scrollBodyWidth = _scrollBodyElementRef2.width;
+      if (scrollLeft + scrollBodyWidth > tableWidth) {
+        _scrollLeft = tableWidth - scrollBodyWidth;
+      }
+    }
     setScrollSize({
-      scrollLeft: scrollLeft,
+      scrollLeft: _scrollLeft,
       scrollRight: scrollRight
     });
   }, [rightFrozenColKeys, scrollSize]);

package/lib/cjs/utils/index.js

@@ -66,22 +66,29 @@ var setColumnsDefaultWidth = function setColumnsDefaultWidth(columns, defaultWid
  * 如果是多级表头，将会递归 children 得到叶子结点层每项的宽度
  */
 var getGroupItemWidth = function getGroupItemWidth(columns) {
-  var baseColWidths = [];
+  var colWidths = [];
+  var minColWidths = [];
   var dig = function dig(column) {
     column.forEach(function (_ref) {
       var children = _ref.children,
-        width = _ref.width;
+        width = _ref.width,
+        minWidth = _ref.minWidth;
       if (Array.isArray(children)) {
         dig(children);
         return;
       }
       // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
       var colWidth = typeAssertion.isNumeric(width) ? Number(width) : 0;
-      baseColWidths.push(colWidth);
+      var minColWidth = typeAssertion.isNumeric(minWidth) ? Number(minWidth) : colWidth || 60;
+      colWidths.push(colWidth < minColWidth ? minColWidth : colWidth);
+      minColWidths.push(minColWidth);
     });
   };
   dig(columns);
-  return baseColWidths;
+  return {
+    colWidths: colWidths,
+    minColWidths: minColWidths
+  };
 };
 var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, key, parentStickyWidth) {
   if (parentStickyWidth === void 0) {

package/lib/esm/Table.js

@@ -20,7 +20,7 @@ import { withDefaultProps } from '@hi-ui/react-utils';
 import { TableSettingMenu } from './TableSettingMenu.js';
 import Loading from '@hi-ui/loading';
 import Checkbox from '@hi-ui/checkbox';
-import Radio from './packages/ui/radio/lib/esm/index.js';
+import Radio from '@hi-ui/radio';
 import { useTableCheck } from './hooks/use-check.js';
 import { isNullish } from '@hi-ui/type-assertion';
 import { cloneTree, flattenTree } from '@hi-ui/tree-utils';

package/lib/esm/hooks/use-col-width.js

@@ -19,7 +19,7 @@ var useColWidth = function useColWidth(_ref) {
   // 是否重新设置过表格每列宽度
   var hasResetWidths = React__default.useRef(false);
   var _React$useState = React__default.useState(function () {
-      return getGroupItemWidth(columns);
+      return getGroupItemWidth(columns).colWidths;
     }),
     colWidths = _React$useState[0],
     setColWidths = _React$useState[1];
@@ -29,10 +29,10 @@ var useColWidth = function useColWidth(_ref) {
       var exceedWidth = 0;
       var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index) {
         var _a;
-        var realWidth = node.getBoundingClientRect().width || 0;
+        var realWidth = node.getBoundingClientRect().width || 60;
         var _ref2 = (_a = columns[index]) !== null && _a !== void 0 ? _a : {},
-          width = _ref2.width,
           fixed = _ref2.fixed;
+        var width = getGroupItemWidth(columns).colWidths[index];
         // 如果该列设置了 fixed 并且真实宽度大于设置的 width 则设置为 width
         if (fixed && width && width < realWidth) {
           exceedWidth += realWidth - width;
@@ -59,12 +59,12 @@ var useColWidth = function useColWidth(_ref) {
         return _realColumnsWidth;
       }
     }
-    return getGroupItemWidth(columns);
+    return getGroupItemWidth(columns).colWidths;
   }, [columns]);
   var getVirtualWidths = useCallback(function () {
     var measureRowElement = measureRowElementRef.current;
     if (!measureRowElement) {
-      return getGroupItemWidth(columns);
+      return getGroupItemWidth(columns).colWidths;
     }
     /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
     var columnDefaultWidth = 200;
@@ -93,7 +93,7 @@ var useColWidth = function useColWidth(_ref) {
     }
   }, [getVirtualWidths, virtual]);
   useUpdateEffect(function () {
-    setColWidths(getGroupItemWidth(columns));
+    setColWidths(getGroupItemWidth(columns).colWidths);
     // setColWidths((prev) => {
     //   // resizable 模式下通过 measureRowElementRef.current 去更新列宽，防止拖拽后宽度被重置
     //   // 例如同时设置了 resizable 和 rowSelection，当拖拽某列宽度后再选中某行时，该列宽度会被重置
@@ -135,33 +135,35 @@ var useColWidth = function useColWidth(_ref) {
     setHeaderTableElement = _React$useState2[1];
   // 控制列最小可调整宽度
   var _React$useState3 = React__default.useState([]),
-    minColWidth = _React$useState3[0],
-    setMinColWidth = _React$useState3[1];
-  // 当列变化时同步更新 minColWidth
+    minColWidths = _React$useState3[0],
+    setMinColWidths = _React$useState3[1];
+  // 当列变化时同步更新 minColWidths
   React__default.useEffect(function () {
     var resizeObserver;
     if (headerTableElement) {
       resizeObserver = new ResizeObserver(function () {
         var resizableHandlerWidth = 4;
-        var _minColWidth = Array.from(headerTableElement.childNodes).map(function (th) {
+        var calcMinColWidths = Array.from(headerTableElement.childNodes).map(function (th, index) {
+          var minColWidth = getGroupItemWidth(columns).minColWidths[index];
           var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
           var childNodes = Array.from(th.childNodes);
-          return childNodes.map(function (child) {
+          var childNodesWidth = childNodes.map(function (child) {
             return child.offsetWidth;
           }).reduce(function (prev, next) {
             return prev + next;
           }, 0) + thPaddingLeft * 2 + resizableHandlerWidth;
+          return childNodesWidth > minColWidth ? minColWidth : childNodesWidth;
         });
-        setMinColWidth(_minColWidth);
+        setMinColWidths(calcMinColWidths);
       });
       resizeObserver.observe(headerTableElement);
     } else {
-      setMinColWidth(Array(columns.length).fill(0));
+      setMinColWidths(Array(columns.length).fill(0));
     }
     return function () {
       resizeObserver === null || resizeObserver === void 0 ? void 0 : resizeObserver.disconnect();
     };
-  }, [columns.length, headerTableElement, resizable]);
+  }, [columns, columns.length, headerTableElement, resizable]);
   /**
    *  控制列最小可调整宽度
    */
@@ -186,8 +188,8 @@ var useColWidth = function useColWidth(_ref) {
    */
   var onColumnResizable = React__default.useCallback(function (evt, _ref3, index) {
     var size = _ref3.size;
-    var minWidth = minColWidth[index];
-    var anotherMinWidth = minColWidth[index + 1];
+    var minWidth = minColWidths[index];
+    var anotherMinWidth = minColWidths[index + 1];
     var nextWidth = size.width > minWidth ? size.width : minWidth;
     setColWidths(function (prev) {
       var nextColWidths = [].concat(prev);
@@ -204,18 +206,18 @@ var useColWidth = function useColWidth(_ref) {
       nextColWidths[index + 1] = anotherWidth;
       return nextColWidths;
     });
-  }, [minColWidth, tableWidthAdjustOnResize]);
+  }, [minColWidths, tableWidthAdjustOnResize]);
   var getColgroupProps = React__default.useCallback(function (column, index) {
     var width = colWidths[index] || undefined;
+    var minWidth = minColWidths[index] || undefined;
     return {
       style: {
         width: width,
-        // TODO（疑惑）: minWidth 所要解决的问题
-        minWidth: width
+        minWidth: minWidth || width
       }
       // 'data-hover-highlight': setAttrStatus(isHoveredCol(column.dataKey)),
     };
-  }, [colWidths]);
+  }, [colWidths, minColWidths]);
   return {
     measureRowElementRef: measureRowElementRef,
     onColumnResizable: onColumnResizable,

package/lib/esm/use-table.js

@@ -390,8 +390,18 @@ var useTable = function useTable(_a) {
         right = _scrollBodyElementRef.right;
       scrollRight = tableTefRight - right;
     }
+    var _scrollLeft = scrollLeft;
+    if (bodyTableRef.current && scrollBodyElementRef.current) {
+      var _bodyTableRef$current2 = bodyTableRef.current.getBoundingClientRect(),
+        tableWidth = _bodyTableRef$current2.width;
+      var _scrollBodyElementRef2 = scrollBodyElementRef.current.getBoundingClientRect(),
+        scrollBodyWidth = _scrollBodyElementRef2.width;
+      if (scrollLeft + scrollBodyWidth > tableWidth) {
+        _scrollLeft = tableWidth - scrollBodyWidth;
+      }
+    }
     setScrollSize({
-      scrollLeft: scrollLeft,
+      scrollLeft: _scrollLeft,
       scrollRight: scrollRight
     });
   }, [rightFrozenColKeys, scrollSize]);

package/lib/esm/utils/index.js

@@ -61,22 +61,29 @@ var setColumnsDefaultWidth = function setColumnsDefaultWidth(columns, defaultWid
  * 如果是多级表头，将会递归 children 得到叶子结点层每项的宽度
  */
 var getGroupItemWidth = function getGroupItemWidth(columns) {
-  var baseColWidths = [];
+  var colWidths = [];
+  var minColWidths = [];
   var dig = function dig(column) {
     column.forEach(function (_ref) {
       var children = _ref.children,
-        width = _ref.width;
+        width = _ref.width,
+        minWidth = _ref.minWidth;
       if (Array.isArray(children)) {
         dig(children);
         return;
       }
       // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
       var colWidth = isNumeric(width) ? Number(width) : 0;
-      baseColWidths.push(colWidth);
+      var minColWidth = isNumeric(minWidth) ? Number(minWidth) : colWidth || 60;
+      colWidths.push(colWidth < minColWidth ? minColWidth : colWidth);
+      minColWidths.push(minColWidth);
     });
   };
   dig(columns);
-  return baseColWidths;
+  return {
+    colWidths: colWidths,
+    minColWidths: minColWidths
+  };
 };
 var parseFixedColumns = function parseFixedColumns(item, index, columns, arr, key, parentStickyWidth) {
   if (parentStickyWidth === void 0) {

package/lib/types/types.d.ts

@@ -95,7 +95,11 @@ export declare type TableColumnItem = {
      */
     width?: number;
     /**
-     * 是否固定列宽，使用场景：设置 width 后，当所有列宽总和小于表格宽度时，多的宽度会分摊到每一列上，设置 fixed 后该列不会参与多余宽度均分。
+     * 该列最小宽度
+     */
+    minWidth?: number;
+    /**
+     * 是否固定列宽，使用场景：设置 width 后，当所有列宽总和小于表格宽度时，多的宽度会分摊到每一列上，设置 fixed 后该列不会参与多余宽度分摊。
      */
     fixed?: boolean;
     /**

package/lib/types/utils/index.d.ts

@@ -6,7 +6,10 @@ export declare const setColumnsDefaultWidth: (columns: any, defaultWidth: any) =
  * 获取每个 Column 的真实列宽度（排除合并列头）
  * 如果是多级表头，将会递归 children 得到叶子结点层每项的宽度
  */
-export declare const getGroupItemWidth: (columns: TableColumnItem[]) => number[];
+export declare const getGroupItemWidth: (columns: TableColumnItem[]) => {
+    colWidths: number[];
+    minColWidths: number[];
+};
 export declare const getMaskItemsWIdth: (columns: TableColumnItem[]) => number;
 export declare const parseFixedColumns: (item: any, index: number, columns: any[], arr: any[], key: string, parentStickyWidth?: number) => any;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -58,6 +58,7 @@
     "@hi-ui/object-utils": "^4.0.4",
     "@hi-ui/pagination": "^4.2.0",
     "@hi-ui/popper": "^4.1.5",
+    "@hi-ui/radio": "^4.1.4",
     "@hi-ui/react-utils": "^4.0.4",
     "@hi-ui/scrollbar": "^4.2.0",
     "@hi-ui/select": "^4.6.0",

package/lib/cjs/packages/ui/radio/lib/esm/Radio.js

@@ -1,100 +0,0 @@
-/** @LICENSE
- * @hi-ui/table
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
- *
- * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-'use strict';
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-var tslib = require('tslib');
-var React = require('react');
-var classname = require('@hi-ui/classname');
-var env = require('@hi-ui/env');
-var useRadio = require('./use-radio.js');
-var context = require('./context.js');
-var typeAssertion = require('@hi-ui/type-assertion');
-var funcUtils = require('@hi-ui/func-utils');
-function _interopDefaultCompat(e) {
-  return e && _typeof(e) === 'object' && 'default' in e ? e : {
-    'default': e
-  };
-}
-var React__default = /*#__PURE__*/_interopDefaultCompat(React);
-
-/** @LICENSE
- * @hi-ui/radio
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/radio#readme
- *
- * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var RADIO_PREFIX = classname.getPrefixCls('radio');
-/**
- * 单选
- */
-var Radio = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  var _a$prefixCls = _a.prefixCls,
-    prefixCls = _a$prefixCls === void 0 ? RADIO_PREFIX : _a$prefixCls,
-    _a$role = _a.role,
-    role = _a$role === void 0 ? 'radio' : _a$role,
-    className = _a.className,
-    children = _a.children,
-    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children"]);
-  var groupContext = context.useRadioGroupContext();
-  var _ref = groupContext || {},
-    disabledContext = _ref.disabled,
-    isCheckedContext = _ref.isChecked,
-    nameContext = _ref.name,
-    onChangeContext = _ref.onChange,
-    _ref$type = _ref.type,
-    type = _ref$type === void 0 ? 'default' : _ref$type;
-  var checkedProp = rest.checked,
-    valueProp = rest.value,
-    _rest$disabled = rest.disabled,
-    disabled = _rest$disabled === void 0 ? disabledContext : _rest$disabled,
-    _rest$name = rest.name,
-    name = _rest$name === void 0 ? nameContext : _rest$name,
-    onChangeProp = rest.onChange;
-  // Group's priority is higher than its own.
-  var checked = isCheckedContext && !typeAssertion.isNullish(valueProp) ? isCheckedContext(valueProp) : checkedProp;
-  var onChange = onChangeContext && !typeAssertion.isNullish(valueProp) ? funcUtils.callAllFuncs(function (evt) {
-    if (evt.target.checked) {
-      onChangeContext(valueProp);
-    }
-  }, onChangeProp) : onChangeProp;
-  var _useRadio = useRadio.useRadio(Object.assign(Object.assign({}, rest), {
-      disabled: disabled,
-      name: name,
-      checked: checked,
-      onChange: onChange
-    })),
-    rootProps = _useRadio.rootProps,
-    getInputProps = _useRadio.getInputProps;
-  var inputProps = getInputProps();
-  var cls = classname.cx(prefixCls, className, prefixCls + "--type-" + type);
-  return /*#__PURE__*/React__default["default"].createElement("label", Object.assign({
-    ref: ref,
-    role: role,
-    className: cls
-  }, rootProps), /*#__PURE__*/React__default["default"].createElement("input", Object.assign({}, inputProps, {
-    tabIndex: 0,
-    className: prefixCls + "__input"
-  })), /*#__PURE__*/React__default["default"].createElement("span", {
-    className: prefixCls + "__controller"
-  }), children ? /*#__PURE__*/React__default["default"].createElement("span", {
-    className: prefixCls + "__label"
-  }, children) : null);
-});
-if (env.__DEV__) {
-  Radio.displayName = 'Radio';
-}
-exports.Radio = Radio;

package/lib/cjs/packages/ui/radio/lib/esm/RadioGroup.js

@@ -1,104 +0,0 @@
-/** @LICENSE
- * @hi-ui/table
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
- *
- * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-'use strict';
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, '__esModule', {
-  value: true
-});
-var tslib = require('tslib');
-var React = require('react');
-var classname = require('@hi-ui/classname');
-var env = require('@hi-ui/env');
-var useRadioGroup = require('./use-radio-group.js');
-var context = require('./context.js');
-var types = require('./types.js');
-var typeAssertion = require('@hi-ui/type-assertion');
-var Radio = require('./Radio.js');
-function _interopDefaultCompat(e) {
-  return e && _typeof(e) === 'object' && 'default' in e ? e : {
-    'default': e
-  };
-}
-var React__default = /*#__PURE__*/_interopDefaultCompat(React);
-
-/** @LICENSE
- * @hi-ui/radio
- * https://github.com/XiaoMi/hiui/tree/master/packages/ui/radio#readme
- *
- * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var RADIO_GROUP_PREFIX = classname.getPrefixCls('radio-group');
-/**
- * 单选组合器
- */
-var RadioGroup = /*#__PURE__*/React.forwardRef(function (_a, ref) {
-  var _a$prefixCls = _a.prefixCls,
-    prefixCls = _a$prefixCls === void 0 ? RADIO_GROUP_PREFIX : _a$prefixCls,
-    className = _a.className,
-    children = _a.children,
-    data = _a.data,
-    _a$type = _a.type,
-    type = _a$type === void 0 ? types.RadioGroupTypeEnum.DEFAULT : _a$type,
-    _a$placement = _a.placement,
-    placement = _a$placement === void 0 ? types.RadioGroupPlacementEnum.HORIZONTAL : _a$placement,
-    _a$autoWidth = _a.autoWidth,
-    autoWidth = _a$autoWidth === void 0 ? false : _a$autoWidth,
-    rest = tslib.__rest(_a, ["prefixCls", "className", "children", "data", "type", "placement", "autoWidth"]);
-  var _useRadioGroup = useRadioGroup.useRadioGroup(rest),
-    rootProps = _useRadioGroup.rootProps,
-    name = _useRadioGroup.name,
-    value = _useRadioGroup.value,
-    onChange = _useRadioGroup.onChange,
-    isChecked = _useRadioGroup.isChecked,
-    disabled = _useRadioGroup.disabled;
-  var providedValue = React.useMemo(function () {
-    return {
-      name: name,
-      onChange: onChange,
-      value: value,
-      isChecked: isChecked,
-      disabled: disabled,
-      type: type,
-      placement: placement
-    };
-  }, [name, onChange, value, isChecked, disabled, type, placement]);
-  var hasData = typeAssertion.isArrayNonEmpty(data);
-  // data 优先级大于内嵌式组合
-  if (hasData) {
-    children = data.map(function (_ref) {
-      var id = _ref.id,
-        disabled = _ref.disabled,
-        title = _ref.title;
-      return /*#__PURE__*/React__default["default"].createElement(Radio.Radio, {
-        key: id,
-        value: id,
-        name: name,
-        disabled: disabled,
-        checked: isChecked(id),
-        className: prefixCls + "__item"
-      }, title);
-    });
-  }
-  var cls = classname.cx(prefixCls, className, prefixCls + "--placement-" + placement, autoWidth && type === types.RadioGroupTypeEnum.BUTTON && prefixCls + "--auto-width", prefixCls + "--type-" + type, hasData && prefixCls + "--data-wrap");
-  return /*#__PURE__*/React__default["default"].createElement(context.RadioGroupProvider, {
-    value: providedValue
-  }, /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
-    ref: ref,
-    className: cls
-  }, rootProps), children));
-});
-if (env.__DEV__) {
-  RadioGroup.displayName = 'RadioGroup';
-}
-exports.RadioGroup = RadioGroup;