shineout 3.3.5 → 3.3.6-beta.2

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.5'
+  version: '3.3.6-beta.2'
 };

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.5');
+/* harmony default export */ var version = ('3.3.6-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -13287,6 +13287,8 @@ var datePickerTokens = {
   datePickerQuickPanelItemFontSize: 'Font-12',
   datePickerQuickPanelItemPaddingX: 'Spacing-12',
   datePickerQuickPanelItemPaddingY: 'Spacing-2',
+  datePickerQuickPanelItemActiveBackgroundColor: 'Brand-1',
+  datePickerQuickPanelItemActiveFontColor: 'Brand-6',
   datePickerQuickPanelItemHoverBackgroundColor: 'Neutral-fill-2'
 };
 /* harmony default export */ var date_picker = (datePickerTokens);
@@ -17906,6 +17908,10 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
       cursor: 'pointer'
     }
   },
+  quickPickerActiveItem: {
+    color: src.datePickerQuickPanelItemActiveFontColor,
+    background: src.datePickerQuickPanelItemActiveBackgroundColor
+  },
   pickerFooterBtn: {}
 });
 /* harmony default export */ var date_picker_date_picker = (datePickerStyle);
@@ -28470,6 +28476,9 @@ var usePositionStyle = function usePositionStyle(config) {
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
     if (!parentElRef.current) return hideStyle;
     var rect = context.parentRect;
+    console.log('======================');
+    console.log('rect: >>', rect);
+    console.log('======================');
     if (scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current) {
       var _scrollElRef$current;
       var visibleRect = ((_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.getBoundingClientRect()) || {};
@@ -28478,6 +28487,25 @@ var usePositionStyle = function usePositionStyle(config) {
       }
     }
     var style = getAbsolutePositionStyle(rect, position);
+
+    // TODO: 如果是版本大于chrome128，需要根据currentCSSZoom处理chrome的bug
+    if (!isChromeLowerThan(128)) {
+      // @ts-ignore currentCSSZoom
+      var currentCSSZoom = document.body.currentCSSZoom;
+      if (currentCSSZoom === 1 || !currentCSSZoom) return style;
+      if (style.left && typeof style.left === 'number') {
+        style.left = style.left * (1 / currentCSSZoom);
+      }
+      if (style.top && typeof style.top === 'number') {
+        style.top = style.top * (1 / currentCSSZoom);
+      }
+      if (style.right && typeof style.right === 'number') {
+        style.right = style.right * (1 / currentCSSZoom);
+      }
+      if (style.bottom && typeof style.bottom === 'number') {
+        style.bottom = style.bottom * (1 / currentCSSZoom);
+      }
+    }
     return style;
   };
   var getStyle = function getStyle() {
@@ -40171,11 +40199,12 @@ function clearHMS(date, options) {
 function compareDateArray(arr1, arr2) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'date';
   var options = arguments.length > 3 ? arguments[3] : undefined;
+  var fmt = arguments.length > 4 ? arguments[4] : undefined;
   if (!arr1 || !arr2 || arr1.length !== arr2.length) return false;
   return arr1.every(function (v, i) {
     if (!v || !arr2[i]) return false;
     if (type === 'week') return format(v, 'gggg ww', options) === format(arr2[i], 'gggg ww', options);
-    return v.getTime() === arr2[i].getTime();
+    return toDateWithFormat(v, fmt).getTime() === toDateWithFormat(arr2[i], fmt).getTime();
   });
 }
 function getFormat(fo) {
@@ -42041,10 +42070,15 @@ var Quick = function Quick(props) {
     quickSelect = props.quickSelect,
     format = props.format,
     options = props.options,
-    children = props.children;
+    children = props.children,
+    type = props.type;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
-  var handleClick = function handleClick(item) {
+  var quickDateCache = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
+  var quickActiveKey = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
+  var handleClick = function handleClick(item, index) {
     var itemV = isFunc(item.value) ? item.value() : item.value;
+    quickDateCache.current = itemV;
+    quickActiveKey.current = index;
     if (!isArray(itemV)) {
       itemV = [itemV];
     }
@@ -42060,13 +42094,23 @@ var Quick = function Quick(props) {
   if (!(quickSelect !== null && quickSelect !== void 0 && quickSelect.length)) {
     return children || null;
   }
+  var compareDate = function compareDate(index) {
+    if (!quickDateCache.current) return false;
+    if (index !== quickActiveKey.current) return false;
+    var currentArr = quickDateCache.current;
+    if (!isArray(currentArr)) {
+      currentArr = [currentArr];
+    }
+    return util.compareDateArray(currentArr, props.dateArr, type, options, format);
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.quickPicker, styles === null || styles === void 0 ? void 0 : styles.picker),
     children: quickSelect === null || quickSelect === void 0 ? void 0 : quickSelect.map(function (item, index) {
+      var isActive = compareDate(index);
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: styles === null || styles === void 0 ? void 0 : styles.quickPickerItem,
+        className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.quickPickerItem, isActive && (styles === null || styles === void 0 ? void 0 : styles.quickPickerActiveItem)),
         onClick: function onClick() {
-          handleClick(item);
+          handleClick(item, index);
         },
         children: item.name
       }, index);
@@ -42304,7 +42348,8 @@ var Picker = function Picker(props) {
     dateArr = props.dateArr,
     options = props.options,
     jssStyle = props.jssStyle,
-    isDisabledDate = props.isDisabledDate;
+    isDisabledDate = props.isDisabledDate,
+    type = props.type;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var _useDatePickerRange = use_datepicker_range({
       type: props.type,
@@ -42417,6 +42462,7 @@ var Picker = function Picker(props) {
       range: props.range,
       jssStyle: jssStyle,
       dateArr: dateArr,
+      type: type,
       setDateArr: props.setDateArr,
       setCurrentArr: props.setCurrentArr,
       format: props.format,
@@ -63727,7 +63773,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.5'
+  version: '3.3.6-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;