shineout 3.3.3-beta.7 → 3.3.3-fix.1

package/cjs/index.js

@@ -476,5 +476,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.3.3-beta.7'
+  version: '3.3.3-fix.1'
 };

package/dist/shineout.js

@@ -11968,7 +11968,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.3.3-beta.7');
+/* harmony default export */ var version = ('3.3.3-fix.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -16813,6 +16813,13 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.cascaderPlaceholderMarginY,
     marginBottom: src.cascaderPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -22136,6 +22143,13 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.selectPlaceholderMarginY,
     marginBottom: src.selectPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -27042,6 +27056,13 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.treeSelectPlaceholderMarginY,
     marginBottom: src.treeSelectPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -29854,7 +29875,7 @@ var addResizeObserver = function addResizeObserver(el, handler) {
           if (height && lastHeight !== height) {
             debounceHandler(entry);
           }
-        } else if (width && height) {
+        } else if (lastWidth !== width || lastHeight !== height) {
           debounceHandler(entry, {
             x: lastWidth !== width,
             y: lastHeight !== height
@@ -31828,19 +31849,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (delay && control && props.value !== stateValue) {
+      changeStateValue(props.value);
+    } else if (context.timer) {
       clearTimeout(context.timer);
       context.timer = null;
     }
-    if (delay && props.value !== stateValue) {
-      changeStateValue(props.value);
-    }
-  }, [props.value, delay]);
+  }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -36002,6 +36022,14 @@ var result_Input = function Input(props) {
     _useState2 = slicedToArray_default()(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var updateValue = function updateValue() {
+    setValue(props.value);
+  };
+  if (props.inputRef) {
+    props.inputRef.current = {
+      updateValue: updateValue
+    };
+  }
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     setValue(props.value);
   }, [props.value, props.open]);
@@ -36040,6 +36068,7 @@ var Result = function Result(props) {
     range = props.range,
     placeholder = props.placeholder,
     _onChange = props.onChange,
+    _onRef = props.onRef,
     disabledLeft = props.disabledLeft,
     disabledRight = props.disabledRight,
     _props$activeIndex = props.activeIndex,
@@ -36053,6 +36082,7 @@ var Result = function Result(props) {
       clickIndex: 0
     }),
     context = _useRef.current;
+  var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (open) {
       if (context.inputRefs[activeIndex]) {
@@ -36105,10 +36135,12 @@ var Result = function Result(props) {
         className: styles === null || styles === void 0 ? void 0 : styles.resultTextPadding,
         children: info.inputable ? /*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
           onRef: function onRef(el) {
+            _onRef.current.inputRef = el;
             context.inputRefs[info.index] = el;
           },
           disabled: dis,
           open: !!open,
+          inputRef: inputRef,
           value: info.target || info.value || '',
           placeholder: info.place,
           onChange: function onChange(s) {
@@ -36118,10 +36150,11 @@ var Result = function Result(props) {
             context.clickIndex = info.index;
           },
           onBlur: function onBlur(e) {
-            var _props$onBlur;
+            var _props$onBlur, _inputRef$current$upd, _inputRef$current;
             e.stopPropagation();
             if (e.relatedTarget === context.inputRefs[1 - info.index]) return;
             (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+            if (inputRef.current) (_inputRef$current$upd = (_inputRef$current = inputRef.current).updateValue) === null || _inputRef$current$upd === void 0 || _inputRef$current$upd.call(_inputRef$current);
             context.clickIndex = 0;
           },
           onFocus: function onFocus(e) {
@@ -36223,6 +36256,13 @@ var ResultInput = function ResultInput(props) {
     onRef.current = inputRef.current;
     onBindInput === null || onBindInput === void 0 || onBindInput(inputRef.current);
   }, []);
+  var renderResultPlaceholder = function renderResultPlaceholder() {
+    if (inputText || !focus || typeof props.placeholder === 'string') return null;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: styles.inputPlaceholder,
+      children: props.placeholder
+    });
+  };
   var style = {};
   if (!multiple) {
     style.width = '100%';
@@ -36236,7 +36276,7 @@ var ResultInput = function ResultInput(props) {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
       onRef: bindInputRef,
       style: style,
-      placeholder: props.placeholder,
+      placeholder: typeof props.placeholder === 'string' ? props.placeholder : undefined,
       value: inputText,
       maxLength: maxLength,
       onChange: onChange,
@@ -36248,7 +36288,7 @@ var ResultInput = function ResultInput(props) {
       className: styles.inputMirror,
       ref: mirrorRef,
       children: inputText || value
-    })]
+    }), renderResultPlaceholder()]
   });
 };
 /* harmony default export */ var result_input = (ResultInput);
@@ -36777,14 +36817,10 @@ var result_Result = function Result(props) {
     onResultItemClick === null || onResultItemClick === void 0 || onResultItemClick(e, item);
   };
   var renderInput = function renderInput() {
-    var placeholder2 = empty ? placeholder : '';
+    var _placeholder = empty ? placeholder : '';
     if (!multiple && valueProp && valueProp !== 0) {
       var _result = getDataByValues(value);
-      // 获取合法的 content
-      var content = renderResultContent(_result[0]);
-      if (typeof content === 'string') {
-        placeholder2 = content;
-      }
+      _placeholder = renderResultContent(_result[0]);
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(result_input, {
@@ -36802,7 +36838,7 @@ var result_Result = function Result(props) {
         convertBr: convertBr,
         onInputBlur: onInputBlur,
         onClearCreatedData: onClearCreatedData,
-        placeholder: placeholder2,
+        placeholder: _placeholder,
         disabled: isFunc(disabled) ? false : !!disabled
       })
     }, 'input');
@@ -42443,6 +42479,9 @@ var DatePicker = function DatePicker(props0) {
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     activeIndex = _React$useState2[0],
     setActiveIndex = _React$useState2[1];
+  var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+    inputRef: null
+  });
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var isRTL = direction === 'rtl';
   var dfp = isRTL ? 'bottom-right' : 'bottom-left';
@@ -42541,6 +42580,11 @@ var DatePicker = function DatePicker(props0) {
     setFocused(false);
     (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
   });
+  var handleClose = function handleClose() {
+    var _inputRef$current$inp;
+    closePop();
+    (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
+  };
   var handleResultClick = usePersistFn(function () {
     if (disabledStatus === 'all') return;
     openPop();
@@ -42553,6 +42597,7 @@ var DatePicker = function DatePicker(props0) {
         activeIndex: activeIndex,
         type: type,
         range: range,
+        onRef: inputRef,
         inputable: props.inputable && !props.formatResult,
         disabledLeft: disabledStatus === 'left',
         disabledRight: disabledStatus === 'right',
@@ -42581,7 +42626,7 @@ var DatePicker = function DatePicker(props0) {
       onKeyDown: function onKeyDown(e) {
         if (e.key === 'Enter') {
           if (open) {
-            closePop();
+            handleClose();
           } else {
             openPop();
           }
@@ -42638,7 +42683,7 @@ var DatePicker = function DatePicker(props0) {
           options: options,
           disabled: disabled,
           jssStyle: jssStyle,
-          closePop: closePop,
+          closePop: handleClose,
           defaultTime: props.defaultTime,
           min: props.min,
           max: props.max,
@@ -63686,7 +63731,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.3-beta.7'
+  version: '3.3.3-fix.1'
 });
 }();
 /******/ 	return __webpack_exports__;