shineout 3.4.0-beta.10 → 3.4.0-beta.12

package/cjs/index.js

@@ -492,5 +492,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.4.0-beta.10'
+  version: '3.4.0-beta.12'
 };

package/dist/shineout.js

@@ -11991,7 +11991,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.4.0-beta.10');
+/* harmony default export */ var version = ('3.4.0-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -18129,7 +18129,10 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
   },
   datetimeHide: {
     opacity: '0',
-    pointerEvents: 'none'
+    pointerEvents: 'none',
+    '& > span': {
+      display: 'none'
+    }
   },
   quickPicker: {
     padding: "".concat(src.datePickerQuickPanelPaddingY, " ").concat(src.datePickerQuickPanelPaddingX),
@@ -22044,7 +22047,11 @@ var rateStyle = {
     width: '100%',
     height: '100%',
     transition: 'none',
-    color: src.rateBackgroundColor
+    color: src.rateBackgroundColor,
+    '& > svg': {
+      width: '1em',
+      height: '1em'
+    }
   },
   itemFront: {
     position: 'absolute',
@@ -22053,7 +22060,11 @@ var rateStyle = {
     right: 0,
     bottom: 0,
     opacity: 0,
-    color: src.rateFrontBackgroundColor
+    color: src.rateFrontBackgroundColor,
+    '& > svg': {
+      width: '1em',
+      height: '1em'
+    }
   },
   itemHalf: {
     position: 'absolute',
@@ -41876,7 +41887,8 @@ var Day = function Day(props) {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerFooter,
       dir: direction,
       style: {
-        borderTop: props.needConfirm && props.range ? 'none' : ''
+        borderTop: props.needConfirm && props.range ? 'none' : undefined,
+        marginTop: props.needConfirm && props.range ? -16 : undefined
       },
       children: [props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerFooterTime, styles === null || styles === void 0 ? void 0 : styles.datetime, !timeStr && (styles === null || styles === void 0 ? void 0 : styles.datetimeHide)),
@@ -50351,7 +50363,8 @@ var Root = function Root(props) {
 
 
 
-var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum"];
+
+var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum"];
 
 
 
@@ -50390,10 +50403,11 @@ var Tree = function Tree(props) {
     dragSibling = props.dragSibling,
     unmatch = props.unmatch,
     dragHoverExpand = props.dragHoverExpand,
-    active = props.active,
+    propActive = props.active,
+    propSetActive = props.setActive,
     disabled = props.disabled,
     inlineNode = props.inlineNode,
-    highlight = props.highlight,
+    propHighlight = props.highlight,
     className = props.className,
     onClick = props.onClick,
     loader = props.loader,
@@ -50407,6 +50421,17 @@ var Tree = function Tree(props) {
     onDragStart = props.onDragStart,
     propsDatum = props.datum,
     rest = objectWithoutProperties_default()(props, tree_excluded);
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(propActive),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    active = _useState2[0],
+    setActive = _useState2[1];
+  var isActiveControlled = ('active' in props);
+  var highlight = propHighlight !== null && propHighlight !== void 0 ? propHighlight : isActiveControlled;
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (isActiveControlled && propActive !== active) {
+      setActive(propActive);
+    }
+  }, [active, propActive]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       mounted: false
     }),
@@ -50445,14 +50470,14 @@ var Tree = function Tree(props) {
     });
   };
   var handleUpdateActive = function handleUpdateActive(active) {
+    setActive(active);
+    propSetActive === null || propSetActive === void 0 || propSetActive(active);
     datum.updateMap.forEach(function (update, id) {
       update('active', id === active);
     });
   };
   var handleNodeClick = function handleNodeClick(node, id) {
-    if (active === undefined) {
-      handleUpdateActive(id);
-    }
+    handleUpdateActive(id);
     if (onClick) {
       onClick(node, id, datum.getPath(id));
     }
@@ -64865,7 +64890,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.0-beta.10'
+  version: '3.4.0-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;