@nutui/nutui-react-taro 1.5.11-beta.2 → 1.5.12-beta.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.5.12
+`2023-07-12`
+
+* :bug: fix: 修复menu组件使用的overlay在小程序中高度计算错误问题 (#1189) @oasis-cloud
+* :bug: fix: 修复gridItem组件外部传入样式为空时冲掉组件内置样式问题 (#1214) @cuicuiworld
+
+
 # v1.5.11
 `2023-07-05`
 

package/dist/esm/GridItem.js

@@ -1,4 +1,4 @@
-import { G as GridItem } from './griditem.taro-cdb3f119.js';
+import { G as GridItem } from './griditem.taro-8c77a891.js';
 import 'react';
 import 'classnames';
 import './configprovider.taro-8d71eb49.js';

package/dist/esm/{griditem.taro-cdb3f119.js → griditem.taro-8c77a891.js}

@@ -26,7 +26,7 @@ const defaultProps = {
 };
 const GridItem = (props) => {
     useConfig();
-    const { children, columnNum, index, gutter, square, text, fontSize, color, icon, iconColor, iconSize, parentIconSize, parentIconColor, border, center, reverse, direction, iconClassPrefix, iconFontClassName, className, onClick, ...rest } = {
+    const { children, columnNum, index, gutter, square, text, fontSize, color, icon, iconColor, iconSize, parentIconSize, parentIconColor, border, center, reverse, direction, iconClassPrefix, iconFontClassName, className, onClick, style, ...rest } = {
         ...defaultProps,
         ...props,
     };
@@ -37,19 +37,19 @@ const GridItem = (props) => {
         return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
     };
     const rootStyle = () => {
-        const style = {
+        const rootStyle = {
             flexBasis: `${100 / +columnNum}%`,
         };
         if (square) {
-            style.paddingTop = `${100 / +columnNum}%`;
+            rootStyle.paddingTop = `${100 / +columnNum}%`;
         }
         else if (gutter) {
-            style.paddingRight = pxCheck(gutter);
+            rootStyle.paddingRight = pxCheck(gutter);
             if (index >= columnNum) {
-                style.marginTop = pxCheck(gutter);
+                rootStyle.marginTop = pxCheck(gutter);
             }
         }
-        return style;
+        return { ...rootStyle, ...style };
     };
     const contentClass = () => {
         return classNames(b('content'), {

package/dist/esm/nutui-react.es.js

@@ -9,7 +9,7 @@ export { P as Popup } from './popup.taro-01676bff.js';
 export { C as Col } from './col.taro-53eed3cc.js';
 export { D as Divider } from './divider.taro-26d1d8b4.js';
 export { G as Grid } from './grid.taro-3503b82c.js';
-export { G as GridItem } from './griditem.taro-cdb3f119.js';
+export { G as GridItem } from './griditem.taro-8c77a891.js';
 export { L as Layout } from './layout.taro-9046d093.js';
 export { R as Row } from './row.taro-f64d4a13.js';
 export { S as Sticky } from './sticky.taro-218bda37.js';

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-UG.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:48:08 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:48:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/nutui.react.mjs

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v1.5.11 Thu Jul 06 2023 16:47:25 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v1.5.12-beta.0 Wed Jul 12 2023 16:47:44 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -15,15 +15,10 @@ import Taro, { redirectTo, navigateTo, getEnv, usePageScroll, getSystemInfoSync,
 import { View, ScrollView, PickerView, PickerViewColumn, Image as Image$2 } from "@tarojs/components";
 import ReactDOM, { createPortal, unstable_batchedUpdates } from "react-dom";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-var classnameExports = {};
-var classname = {
-  get exports() {
-    return classnameExports;
-  },
-  set exports(v) {
-    classnameExports = v;
-  }
-};
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
+}
+var classname = { exports: {} };
 var classname_production_min = {};
 var hasRequiredClassname_production_min;
 function requireClassname_production_min() {
@@ -127,13 +122,12 @@ function requireClassname_development() {
   classname_development.withNaming = withNaming;
   return classname_development;
 }
-(function(module) {
-  if (process.env.NODE_ENV === "production") {
-    module.exports = requireClassname_production_min();
-  } else {
-    module.exports = requireClassname_development();
-  }
-})(classname);
+if (process.env.NODE_ENV === "production") {
+  classname.exports = requireClassname_production_min();
+} else {
+  classname.exports = requireClassname_development();
+}
+var classnameExports = classname.exports;
 const cn = classnameExports.withNaming({ n: "nut-", e: "__", m: "--", v: "-" });
 const defaultProps$1v = {
   name: "",
@@ -749,6 +743,7 @@ function words(string, pattern, guard) {
   return string.match(pattern) || [];
 }
 var lodash_kebabcase = kebabCase;
+const kebabCase$1 = /* @__PURE__ */ getDefaultExportFromCjs(lodash_kebabcase);
 const zhCN = {
   save: "保存",
   confirm: "确认",
@@ -896,7 +891,7 @@ const useConfig$1 = () => {
 function convertThemeVarsToCSSVars(themeVars) {
   const cssVars = {};
   Object.keys(themeVars).forEach((key) => {
-    cssVars[`--${lodash_kebabcase(key)}`] = themeVars[key];
+    cssVars[`--${kebabCase$1(key)}`] = themeVars[key];
   });
   return cssVars;
 }
@@ -1013,15 +1008,7 @@ const Image$1 = (props) => {
 };
 Image$1.defaultProps = defaultProps$1q;
 Image$1.displayName = "NutImage";
-var classnamesExports = {};
-var classnames = {
-  get exports() {
-    return classnamesExports;
-  },
-  set exports(v) {
-    classnamesExports = v;
-  }
-};
+var classnames = { exports: {} };
 /*!
 	Copyright (c) 2018 Jed Watson.
 	Licensed under the MIT License (MIT), see
@@ -1068,7 +1055,8 @@ var classnames = {
     }
   })();
 })(classnames);
-const classNames = classnamesExports;
+var classnamesExports = classnames.exports;
+const classNames = /* @__PURE__ */ getDefaultExportFromCjs(classnamesExports);
 const defaultOverlayProps = {
   zIndex: 2e3,
   duration: 0.3,
@@ -1194,24 +1182,8 @@ function _inheritsLoose(subClass, superClass) {
   subClass.prototype.constructor = subClass;
   _setPrototypeOf(subClass, superClass);
 }
-var propTypesExports = {};
-var propTypes = {
-  get exports() {
-    return propTypesExports;
-  },
-  set exports(v) {
-    propTypesExports = v;
-  }
-};
-var reactIsExports = {};
-var reactIs = {
-  get exports() {
-    return reactIsExports;
-  },
-  set exports(v) {
-    reactIsExports = v;
-  }
-};
+var propTypes = { exports: {} };
+var reactIs = { exports: {} };
 var reactIs_production_min = {};
 /** @license React v16.13.1
  * react-is.production.min.js
@@ -1482,16 +1454,14 @@ function requireReactIs_development() {
 var hasRequiredReactIs;
 function requireReactIs() {
   if (hasRequiredReactIs)
-    return reactIsExports;
+    return reactIs.exports;
   hasRequiredReactIs = 1;
-  (function(module) {
-    if (process.env.NODE_ENV === "production") {
-      module.exports = requireReactIs_production_min();
-    } else {
-      module.exports = requireReactIs_development();
-    }
-  })(reactIs);
-  return reactIsExports;
+  if (process.env.NODE_ENV === "production") {
+    reactIs.exports = requireReactIs_production_min();
+  } else {
+    reactIs.exports = requireReactIs_development();
+  }
+  return reactIs.exports;
 }
 /*
 object-assign
@@ -2158,6 +2128,8 @@ if (process.env.NODE_ENV !== "production") {
 } else {
   propTypes.exports = requireFactoryWithThrowingShims()();
 }
+var propTypesExports = propTypes.exports;
+const PropTypes = /* @__PURE__ */ getDefaultExportFromCjs(propTypesExports);
 function hasClass(element, className) {
   if (element.classList)
     return !!className && element.classList.contains(className);
@@ -2187,22 +2159,22 @@ function removeClass$1(element, className) {
 const config$1 = {
   disabled: false
 };
-var timeoutsShape = process.env.NODE_ENV !== "production" ? propTypesExports.oneOfType([propTypesExports.number, propTypesExports.shape({
-  enter: propTypesExports.number,
-  exit: propTypesExports.number,
-  appear: propTypesExports.number
+var timeoutsShape = process.env.NODE_ENV !== "production" ? PropTypes.oneOfType([PropTypes.number, PropTypes.shape({
+  enter: PropTypes.number,
+  exit: PropTypes.number,
+  appear: PropTypes.number
 }).isRequired]) : null;
-var classNamesShape = process.env.NODE_ENV !== "production" ? propTypesExports.oneOfType([propTypesExports.string, propTypesExports.shape({
-  enter: propTypesExports.string,
-  exit: propTypesExports.string,
-  active: propTypesExports.string
-}), propTypesExports.shape({
-  enter: propTypesExports.string,
-  enterDone: propTypesExports.string,
-  enterActive: propTypesExports.string,
-  exit: propTypesExports.string,
-  exitDone: propTypesExports.string,
-  exitActive: propTypesExports.string
+var classNamesShape = process.env.NODE_ENV !== "production" ? PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
+  enter: PropTypes.string,
+  exit: PropTypes.string,
+  active: PropTypes.string
+}), PropTypes.shape({
+  enter: PropTypes.string,
+  enterDone: PropTypes.string,
+  enterActive: PropTypes.string,
+  exit: PropTypes.string,
+  exitDone: PropTypes.string,
+  exitActive: PropTypes.string
 })]) : null;
 const TransitionGroupContext = React__default.createContext(null);
 var forceReflow = function forceReflow2(node) {
@@ -2452,10 +2424,10 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *     (see
    *     [test/CSSTransition-test.js](https://github.com/reactjs/react-transition-group/blob/13435f897b3ab71f6e19d724f145596f5910581c/test/CSSTransition-test.js#L362-L437)).
    */
-  nodeRef: propTypesExports.shape({
-    current: typeof Element === "undefined" ? propTypesExports.any : function(propValue, key, componentName, location, propFullName, secret) {
+  nodeRef: PropTypes.shape({
+    current: typeof Element === "undefined" ? PropTypes.any : function(propValue, key, componentName, location, propFullName, secret) {
       var value = propValue[key];
-      return propTypesExports.instanceOf(value && "ownerDocument" in value ? value.ownerDocument.defaultView.Element : Element)(propValue, key, componentName, location, propFullName, secret);
+      return PropTypes.instanceOf(value && "ownerDocument" in value ? value.ownerDocument.defaultView.Element : Element)(propValue, key, componentName, location, propFullName, secret);
     }
   }),
   /**
@@ -2472,23 +2444,23 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    * </Transition>
    * ```
    */
-  children: propTypesExports.oneOfType([propTypesExports.func.isRequired, propTypesExports.element.isRequired]).isRequired,
+  children: PropTypes.oneOfType([PropTypes.func.isRequired, PropTypes.element.isRequired]).isRequired,
   /**
    * Show the component; triggers the enter or exit states
    */
-  in: propTypesExports.bool,
+  in: PropTypes.bool,
   /**
    * By default the child component is mounted immediately along with
    * the parent `Transition` component. If you want to "lazy mount" the component on the
    * first `in={true}` you can set `mountOnEnter`. After the first enter transition the component will stay
    * mounted, even on "exited", unless you also specify `unmountOnExit`.
    */
-  mountOnEnter: propTypesExports.bool,
+  mountOnEnter: PropTypes.bool,
   /**
    * By default the child component stays mounted after it reaches the `'exited'` state.
    * Set `unmountOnExit` if you'd prefer to unmount the component after it finishes exiting.
    */
-  unmountOnExit: propTypesExports.bool,
+  unmountOnExit: PropTypes.bool,
   /**
    * By default the child component does not perform the enter transition when
    * it first mounts, regardless of the value of `in`. If you want this
@@ -2500,15 +2472,15 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    * > additional `.appear-*` classes, that way you can choose to style it
    * > differently.
    */
-  appear: propTypesExports.bool,
+  appear: PropTypes.bool,
   /**
    * Enable or disable enter transitions.
    */
-  enter: propTypesExports.bool,
+  enter: PropTypes.bool,
   /**
    * Enable or disable exit transitions.
    */
-  exit: propTypesExports.bool,
+  exit: PropTypes.bool,
   /**
    * The duration of the transition, in milliseconds.
    * Required unless `addEndListener` is provided.
@@ -2558,7 +2530,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    * }}
    * ```
    */
-  addEndListener: propTypesExports.func,
+  addEndListener: PropTypes.func,
   /**
    * Callback fired before the "entering" status is applied. An extra parameter
    * `isAppearing` is supplied to indicate if the enter stage is occurring on the initial mount
@@ -2567,7 +2539,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement, isAppearing: bool) -> void
    */
-  onEnter: propTypesExports.func,
+  onEnter: PropTypes.func,
   /**
    * Callback fired after the "entering" status is applied. An extra parameter
    * `isAppearing` is supplied to indicate if the enter stage is occurring on the initial mount
@@ -2576,7 +2548,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement, isAppearing: bool)
    */
-  onEntering: propTypesExports.func,
+  onEntering: PropTypes.func,
   /**
    * Callback fired after the "entered" status is applied. An extra parameter
    * `isAppearing` is supplied to indicate if the enter stage is occurring on the initial mount
@@ -2585,7 +2557,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement, isAppearing: bool) -> void
    */
-  onEntered: propTypesExports.func,
+  onEntered: PropTypes.func,
   /**
    * Callback fired before the "exiting" status is applied.
    *
@@ -2593,7 +2565,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement) -> void
    */
-  onExit: propTypesExports.func,
+  onExit: PropTypes.func,
   /**
    * Callback fired after the "exiting" status is applied.
    *
@@ -2601,7 +2573,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement) -> void
    */
-  onExiting: propTypesExports.func,
+  onExiting: PropTypes.func,
   /**
    * Callback fired after the "exited" status is applied.
    *
@@ -2609,7 +2581,7 @@ Transition.propTypes = process.env.NODE_ENV !== "production" ? {
    *
    * @type Function(node: HtmlElement) -> void
    */
-  onExited: propTypesExports.func
+  onExited: PropTypes.func
 } : {};
 function noop$2() {
 }
@@ -2848,7 +2820,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement, isAppearing: bool)
    */
-  onEnter: propTypesExports.func,
+  onEnter: PropTypes.func,
   /**
    * A `<Transition>` callback fired immediately after the 'enter-active' or
    * 'appear-active' class is applied.
@@ -2857,7 +2829,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement, isAppearing: bool)
    */
-  onEntering: propTypesExports.func,
+  onEntering: PropTypes.func,
   /**
    * A `<Transition>` callback fired immediately after the 'enter' or
    * 'appear' classes are **removed** and the `done` class is added to the DOM node.
@@ -2866,7 +2838,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement, isAppearing: bool)
    */
-  onEntered: propTypesExports.func,
+  onEntered: PropTypes.func,
   /**
    * A `<Transition>` callback fired immediately after the 'exit' class is
    * applied.
@@ -2875,7 +2847,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement)
    */
-  onExit: propTypesExports.func,
+  onExit: PropTypes.func,
   /**
    * A `<Transition>` callback fired immediately after the 'exit-active' is applied.
    *
@@ -2883,7 +2855,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement)
    */
-  onExiting: propTypesExports.func,
+  onExiting: PropTypes.func,
   /**
    * A `<Transition>` callback fired immediately after the 'exit' classes
    * are **removed** and the `exit-done` class is added to the DOM node.
@@ -2892,7 +2864,7 @@ CSSTransition.propTypes = process.env.NODE_ENV !== "production" ? _extends$3({},
    *
    * @type Function(node: HtmlElement)
    */
-  onExited: propTypesExports.func
+  onExited: PropTypes.func
 }) : {};
 const CSSTransition$1 = CSSTransition;
 const defaultProps$1p = {
@@ -3285,6 +3257,7 @@ const GridItem = (props) => {
     iconFontClassName,
     className,
     onClick,
+    style,
     ...rest
   } = {
     ...defaultProps$1l,
@@ -3297,18 +3270,18 @@ const GridItem = (props) => {
     return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
   };
   const rootStyle = () => {
-    const style = {
+    const rootStyle2 = {
       flexBasis: `${100 / +columnNum}%`
     };
     if (square) {
-      style.paddingTop = `${100 / +columnNum}%`;
+      rootStyle2.paddingTop = `${100 / +columnNum}%`;
     } else if (gutter) {
-      style.paddingRight = pxCheck2(gutter);
+      rootStyle2.paddingRight = pxCheck2(gutter);
       if (index >= columnNum) {
-        style.marginTop = pxCheck2(gutter);
+        rootStyle2.marginTop = pxCheck2(gutter);
       }
     }
-    return style;
+    return { ...rootStyle2, ...style };
   };
   const contentClass = () => {
     return classNames(b2("content"), {