shineout 3.0.0-rc.4 → 3.0.0-rc.5

package/cjs/index.js

@@ -481,5 +481,5 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = exports.default = {
-  version: '3.0.0-rc.4'
+  version: '3.0.0-rc.5'
 };

package/cjs/utils/dom/detect.d.ts

@@ -5,7 +5,7 @@ export declare const TRANSFORMS: {
     MozTransform: string;
     transform: string;
 };
-export declare function getTransformName(): "transform" | "msTransform" | "OTransform" | "webkitTransform" | "MozTransform";
+export declare function getTransformName(): "transform" | "webkitTransform" | "msTransform" | "OTransform" | "MozTransform";
 export declare function has3d(): boolean;
 export declare const eventPassive: boolean | {
     passive: boolean;

package/dist/shineout.js

@@ -11368,8 +11368,6 @@ var css_jss_esm_css = createCss();
 /* harmony default export */ var css_jss_esm = (css_jss_esm_css);
 
 ;// CONCATENATED MODULE: ../../node_modules/.pnpm/react-jss@10.9.2_react@18.2.0/node_modules/react-jss/dist/react-jss.esm.js
-"use client";
-
 
 
 
@@ -12022,7 +12020,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.0.0-rc.4');
+/* harmony default export */ var version = ('3.0.0-rc.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -31713,6 +31711,10 @@ var checkbox_Checkbox = function Checkbox(props) {
     inputable = props.inputable,
     rest = objectWithoutProperties_default()(props, checkbox_excluded);
   var checkboxStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$checkbox = jssStyle.checkbox) === null || _jssStyle$checkbox === void 0 ? void 0 : _jssStyle$checkbox.call(jssStyle);
+  var disabled = props.disabled;
+  if (htmlValue !== undefined && typeof disabled === 'function') {
+    disabled = disabled(htmlValue);
+  }
   var _useInputAble = useInputAble({
       value: valuePo,
       defaultValue: defaultValuePo,
@@ -31757,6 +31759,7 @@ var checkbox_Checkbox = function Checkbox(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(simple_checkbox, objectSpread2_default()(objectSpread2_default()({
     jssStyle: jssStyle
   }, rest), {}, {
+    disabled: disabled,
     checked: getChecked(),
     onChange: handleChange,
     renderFooter: function renderFooter(c) {
@@ -35283,6 +35286,7 @@ var result_Result = function Result(props) {
   var renderMultipleResultMore = /*#__PURE__*/(0,jsx_runtime.jsx)(result_more, {
     keygen: keygen,
     classes: props.classes,
+    jssStyle: props.jssStyle,
     data: result,
     size: size,
     more: moreNumber,
@@ -52250,28 +52254,29 @@ StepsComp.Step = StepsStep;
 var sticky_cssSupport = cssSupport;
 var supportSticky = sticky_cssSupport('position', 'sticky');
 var defaultZIndex = 900;
-var getFirstScrollParent = function getFirstScrollParent(el) {
-  var parent = el.parentNode;
-  while (parent) {
-    if (parent === document.body || parent === document.documentElement) {
-      parent = document.body;
-      break;
-    }
-    var _window$getComputedSt = window.getComputedStyle(parent),
-      overflowY = _window$getComputedSt.overflowY;
-    if (overflowY === 'scroll' || overflowY === 'auto') {
-      break;
-    }
-    parent = parent.parentNode;
-  }
-  return parent;
-};
+
+// const getFirstScrollParent = (el: HTMLElement) => {
+//   let parent = el.parentNode as HTMLElement;
+//   while (parent) {
+//     if (parent === document.body || parent === document.documentElement) {
+//       parent = document.body;
+//       break;
+//     }
+//     const { overflowY } = window.getComputedStyle(parent);
+//     if (overflowY === 'scroll' || overflowY === 'auto') {
+//       break;
+//     }
+//     parent = parent.parentNode as HTMLElement;
+//   }
+//   return parent;
+// };
+
 var Sticky = function Sticky(props) {
   var _props$style;
-  var css = props.css,
-    children = props.children,
+  var children = props.children,
     top = props.top,
     bottom = props.bottom;
+  var css = props.css || props.target;
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       target: null,
       div: null,
@@ -52299,15 +52304,15 @@ var Sticky = function Sticky(props) {
     timer: 0
   });
   var getTarget = function getTarget() {
-    var target = props.target;
-    if (typeof props.target === 'string') {
-      target = document.querySelector(props.target);
+    var scrollContainer = props.scrollContainer;
+    if (typeof scrollContainer === 'string') {
+      scrollContainer = document.querySelector(scrollContainer);
     }
     // 判断是否是dom元素
-    if (target && target.nodeType === 1) {
-      return target;
+    if (scrollContainer && scrollContainer.nodeType === 1) {
+      return scrollContainer;
     }
-    return getFirstScrollParent(elementRef.current);
+    return document.body;
   };
   var updateStyle = usePersistFn(function () {
     if (context.div && !context.isTop && show) {
@@ -52403,7 +52408,7 @@ var Sticky = function Sticky(props) {
   };
   var createObserver = function createObserver() {
     var target = getTarget();
-    if (!context.div) {
+    if (!context.div && target !== document.body) {
       context.div = document.createElement('div');
       context.div.style.position = 'relative';
     }
@@ -52411,18 +52416,21 @@ var Sticky = function Sticky(props) {
       forceRender();
       context.target = target;
       cleanEvents();
-      if (target === document.body) {
-        document.body.appendChild(context.div);
-      } else {
-        target.parentNode.insertBefore(context.div, target);
-      }
-      var _style4 = window.getComputedStyle(target);
-      if (_style4.position === 'absolute' || _style4.position === 'fixed') {
-        context.div.style.position = _style4.position;
-        context.div.style.top = _style4.top;
-        context.div.style.left = _style4.left;
-        context.div.style.right = _style4.right;
-        context.div.style.bottom = _style4.bottom;
+      if (context.div) {
+        // append div
+        if (target === document.body) {
+          document.body.appendChild(context.div);
+        } else {
+          target.parentNode.insertBefore(context.div, target);
+        }
+        var _style4 = window.getComputedStyle(target);
+        if (_style4.position === 'absolute' || _style4.position === 'fixed') {
+          context.div.style.position = _style4.position;
+          context.div.style.top = _style4.top;
+          context.div.style.left = _style4.left;
+          context.div.style.right = _style4.right;
+          context.div.style.bottom = _style4.bottom;
+        }
       }
       if (window.IntersectionObserver) {
         var observer = new IntersectionObserver(handlePosition, {
@@ -52499,8 +52507,9 @@ var Sticky = function Sticky(props) {
       children: children
     })
   }) : null;
+  var isFixed = style.position === 'fixed';
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-    children: [context.target && context.div && /*#__PURE__*/(0,external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_.createPortal)(StickyEl, context.div), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    children: [isFixed ? StickyEl : context.target && context.div && /*#__PURE__*/(0,external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_.createPortal)(StickyEl, context.div), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: props.className,
       style: objectSpread2_default()(objectSpread2_default()({}, props.style), {}, {
         opacity: show && parentVisible ? 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.opacity
@@ -60995,7 +61004,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.0-rc.4'
+  version: '3.0.0-rc.5'
 });
 }();
 /******/ 	return __webpack_exports__;